Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gdyjdao
SkyWalking
提交
f7700d50
S
SkyWalking
项目概览
gdyjdao
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f7700d50
编写于
11月 21, 2017
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into feature/history-data-delete
上级
a9eaa2ee
baf40004
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
205 addition
and
9 deletion
+205
-9
apm-collector/apm-collector-boot/bin/collectorService.sh
apm-collector/apm-collector-boot/bin/collectorService.sh
+2
-2
apm-collector/apm-collector-boot/docker/Dockerfile
apm-collector/apm-collector-boot/docker/Dockerfile
+29
-0
apm-collector/apm-collector-boot/docker/application.yml
apm-collector/apm-collector-boot/docker/application.yml
+40
-0
apm-collector/apm-collector-boot/docker/collectorService.sh
apm-collector/apm-collector-boot/docker/collectorService.sh
+23
-0
apm-collector/apm-collector-boot/docker/docker-entrypoint.sh
apm-collector/apm-collector-boot/docker/docker-entrypoint.sh
+40
-0
apm-collector/apm-collector-boot/docker/log4j2.xml
apm-collector/apm-collector-boot/docker/log4j2.xml
+36
-0
apm-collector/apm-collector-boot/pom.xml
apm-collector/apm-collector-boot/pom.xml
+27
-1
apm-sniffer/config/agent.config
apm-sniffer/config/agent.config
+1
-1
docker-compose.yml
docker-compose.yml
+4
-3
docs/README.md
docs/README.md
+1
-1
docs/README_ZH.md
docs/README_ZH.md
+2
-1
未找到文件。
apm-collector/apm-collector-boot/bin/collectorService.sh
浏览文件 @
f7700d50
...
@@ -20,9 +20,9 @@ do
...
@@ -20,9 +20,9 @@ do
CLASSPATH
=
"
$i
:
$CLASSPATH
"
CLASSPATH
=
"
$i
:
$CLASSPATH
"
done
done
WEBUI
_OPTIONS
=
" -Dcollector.logDir=
${
COLLECT_LOG_DIR
}
"
COLLECTOR
_OPTIONS
=
" -Dcollector.logDir=
${
COLLECT_LOG_DIR
}
"
eval exec
"
\"
$_RUNJAVA
\"
${
JAVA_OPTS
}
${
WEBUI
_OPTIONS
}
-classpath
$CLASSPATH
org.skywalking.apm.collector.boot.CollectorBootStartUp
\
eval exec
"
\"
$_RUNJAVA
\"
${
JAVA_OPTS
}
${
COLLECTOR
_OPTIONS
}
-classpath
$CLASSPATH
org.skywalking.apm.collector.boot.CollectorBootStartUp
\
2>
${
COLLECT_LOG_DIR
}
/collector.log 1> /dev/null &"
2>
${
COLLECT_LOG_DIR
}
/collector.log 1> /dev/null &"
if
[
$?
-eq
0
]
;
then
if
[
$?
-eq
0
]
;
then
...
...
apm-collector/apm-collector-boot/docker/Dockerfile
0 → 100644
浏览文件 @
f7700d50
FROM
openjdk:8u111-jdk
ENV
ZK_ADDRESSES=127.0.0.1:2181 \
ES_CLUSTER_NAME=CollectorDBCluster \
ES_ADDRESSES=localhost:9300 \
BIND_HOST=localhost \
NAMING_BIND_HOST=localhost \
NAMING_BIND_PORT=10800 \
REMOTE_BIND_PORT=11800 \
AGENT_GRPC_BIND_PORT=11800 \
AGENT_JETTY_BIND_HOST=localhost \
AGENT_JETTY_BIND_PORT=12800 \
UI_JETTY_BIND_PORT=12800 \
UI_JETTY_BIND_HOST=localhost
ADD
skywalking-collector.tar.gz /usr/local
COPY
collectorService.sh /usr/local/skywalking-collector/bin
COPY
log4j2.xml /usr/local/skywalking-collector/config
COPY
application.yml /usr/local/skywalking-collector/config
COPY
docker-entrypoint.sh /
RUN
chmod
+x /usr/local/skywalking-collector/bin/collectorService.sh
&&
chmod
+x /docker-entrypoint.sh
EXPOSE
10800
EXPOSE
11800
EXPOSE
12800
ENTRYPOINT
["/docker-entrypoint.sh"]
CMD
["/usr/local/skywalking-collector/bin/collectorService.sh"]
apm-collector/apm-collector-boot/docker/application.yml
0 → 100644
浏览文件 @
f7700d50
cluster
:
zookeeper
:
hostPort
:
{
ZK_ADDRESSES
}
sessionTimeout
:
100000
naming
:
jetty
:
host
:
{
NAMING_BIND_HOST
}
port
:
{
NAMING_BIND_PORT
}
context_path
:
/
remote
:
gRPC
:
host
:
{
BIND_HOST
}
port
:
{
REMOTE_BIND_PORT
}
agent_gRPC
:
gRPC
:
host
:
{
BIND_HOST
}
port
:
{
AGENT_GRPC_BIND_PORT
}
agent_jetty
:
jetty
:
host
:
{
AGENT_JETTY_BIND_HOST
}
port
:
{
AGENT_JETTY_BIND_PORT
}
context_path
:
/
agent_stream
:
default
:
buffer_file_path
:
../buffer/
buffer_offset_max_file_size
:
10M
buffer_segment_max_file_size
:
500M
ui
:
jetty
:
host
:
{
UI_JETTY_BIND_HOST
}
port
:
{
UI_JETTY_BIND_PORT
}
context_path
:
/
storage
:
elasticsearch
:
cluster_name
:
{
ES_CLUSTER_NAME
}
cluster_transport_sniffer
:
true
cluster_nodes
:
{
ES_ADDRESSES
}
index_shards_number
:
2
index_replicas_number
:
0
history_delete_before_days
:
3
apm-collector/apm-collector-boot/docker/collectorService.sh
0 → 100644
浏览文件 @
f7700d50
#!/usr/bin/env sh
PRG
=
"
$0
"
PRGDIR
=
`
dirname
"
$PRG
"
`
[
-z
"
$COLLECTOR_HOME
"
]
&&
COLLECTOR_HOME
=
`
cd
"
$PRGDIR
/.."
>
/dev/null
;
pwd
`
COLLECT_LOG_DIR
=
"
${
COLLECTOR_HOME
}
/logs"
JAVA_OPTS
=
" -Xms256M -Xmx512M"
if
[
!
-d
"
${
COLLECTOR_HOME
}
/logs"
]
;
then
mkdir
-p
"
${
COLLECT_LOG_DIR
}
"
fi
_RUNJAVA
=
${
JAVA_HOME
}
/bin/java
[
-z
"
$JAVA_HOME
"
]
&&
_RUNJAVA
=
java
CLASSPATH
=
"
$COLLECTOR_HOME
/config:
$CLASSPATH
"
for
i
in
"
$COLLECTOR_HOME
"
/libs/
*
.jar
do
CLASSPATH
=
"
$i
:
$CLASSPATH
"
done
${
_RUNJAVA
}
${
JAVA_OPTS
}
-classpath
$CLASSPATH
org.skywalking.apm.collector.boot.CollectorBootStartUp
apm-collector/apm-collector-boot/docker/docker-entrypoint.sh
0 → 100644
浏览文件 @
f7700d50
#!/bin/sh
echo
"replace {ZK_ADDRESSES} to
${
ZK_ADDRESSES
}
"
eval sed
-i
-e
's/\{ZK_ADDRESSES\}/${ZK_ADDRESSES}/'
/usr/local/skywalking-collector/config/application.yml
echo
"replace {ES_CLUSTER_NAME} to
${
ES_CLUSTER_NAME
}
"
eval sed
-i
-e
's/\{ES_CLUSTER_NAME\}/${ES_CLUSTER_NAME}/'
/usr/local/skywalking-collector/config/application.yml
echo
"replace {ES_ADDRESSES} to
${
ES_ADDRESSES
}
"
eval sed
-i
-e
's/\{ES_ADDRESSES\}/${ES_ADDRESSES}/'
/usr/local/skywalking-collector/config/application.yml
echo
"replace {BIND_HOST} to
${
BIND_HOST
}
"
eval sed
-i
-e
's/\{BIND_HOST\}/${BIND_HOST}/'
/usr/local/skywalking-collector/config/application.yml
echo
"replace {NAMING_BIND_HOST} to
${
NAMING_BIND_HOST
}
"
eval sed
-i
-e
's/\{NAMING_BIND_HOST\}/${NAMING_BIND_HOST}/'
/usr/local/skywalking-collector/config/application.yml
echo
"replace {NAMING_BIND_PORT} to
${
NAMING_BIND_PORT
}
"
eval sed
-i
-e
's/\{NAMING_BIND_PORT\}/${NAMING_BIND_PORT}/'
/usr/local/skywalking-collector/config/application.yml
echo
"replace {REMOTE_BIND_PORT} to
${
REMOTE_BIND_PORT
}
"
eval sed
-i
-e
's/\{REMOTE_BIND_PORT\}/${REMOTE_BIND_PORT}/'
/usr/local/skywalking-collector/config/application.yml
echo
"replace {AGENT_GRPC_BIND_PORT} to
${
AGENT_GRPC_BIND_PORT
}
"
eval sed
-i
-e
's/\{AGENT_GRPC_BIND_PORT\}/${AGENT_GRPC_BIND_PORT}/'
/usr/local/skywalking-collector/config/application.yml
echo
"replace {AGENT_JETTY_BIND_HOST} to
${
AGENT_JETTY_BIND_HOST
}
"
eval sed
-i
-e
's/\{AGENT_JETTY_BIND_HOST\}/${AGENT_JETTY_BIND_HOST}/'
/usr/local/skywalking-collector/config/application.yml
echo
"replace {AGENT_JETTY_BIND_PORT} to
${
AGENT_JETTY_BIND_PORT
}
"
eval sed
-i
-e
's/\{AGENT_JETTY_BIND_PORT\}/${AGENT_JETTY_BIND_PORT}/'
/usr/local/skywalking-collector/config/application.yml
echo
"replace {UI_JETTY_BIND_PORT} to
${
UI_JETTY_BIND_PORT
}
"
eval sed
-i
-e
's/\{UI_JETTY_BIND_PORT\}/${UI_JETTY_BIND_PORT}/'
/usr/local/skywalking-collector/config/application.yml
echo
"replace {UI_JETTY_BIND_HOST} to
${
UI_JETTY_BIND_HOST
}
"
eval sed
-i
-e
's/\{UI_JETTY_BIND_HOST\}/${UI_JETTY_BIND_HOST}/'
/usr/local/skywalking-collector/config/application.yml
exec
"
$@
"
apm-collector/apm-collector-boot/docker/log4j2.xml
0 → 100644
浏览文件 @
f7700d50
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017, OpenSkywalking Organization All rights reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ Project repository: https://github.com/OpenSkywalking/skywalking
-->
<Configuration
status=
"info"
>
<Appenders>
<Console
name=
"Console"
target=
"SYSTEM_OUT"
>
<PatternLayout
charset=
"UTF-8"
pattern=
"%d - %c -%-4r [%t] %-5p %x - %m%n"
/>
</Console>
</Appenders>
<Loggers>
<logger
name=
"org.eclipse.jetty"
level=
"INFO"
/>
<logger
name=
"org.apache.zookeeper"
level=
"INFO"
/>
<logger
name=
"org.skywalking.apm.collector.agent.grpc.handler.JVMMetricsServiceHandler"
level=
"INFO"
/>
<logger
name=
"org.skywalking.apm.collector.stream.timer.PersistenceTimer"
level=
"INFO"
/>
<logger
name=
"io.grpc.netty"
level=
"INFO"
/>
<Root
level=
"info"
>
<AppenderRef
ref=
"Console"
/>
</Root>
</Loggers>
</Configuration>
apm-collector/apm-collector-boot/pom.xml
浏览文件 @
f7700d50
...
@@ -30,6 +30,11 @@
...
@@ -30,6 +30,11 @@
<artifactId>
apm-collector-boot
</artifactId>
<artifactId>
apm-collector-boot
</artifactId>
<packaging>
jar
</packaging>
<packaging>
jar
</packaging>
<properties>
<docker.image.name>
skywalking/skywalking-collector
</docker.image.name>
<docker.image.version>
${version}
</docker.image.version>
</properties>
<dependencies>
<dependencies>
<dependency>
<dependency>
<groupId>
org.yaml
</groupId>
<groupId>
org.yaml
</groupId>
...
@@ -148,7 +153,7 @@
...
@@ -148,7 +153,7 @@
</dependencies>
</dependencies>
<build>
<build>
<finalName>
Skywalking-C
ollector
</finalName>
<finalName>
skywalking-c
ollector
</finalName>
<plugins>
<plugins>
<plugin>
<plugin>
<artifactId>
maven-compiler-plugin
</artifactId>
<artifactId>
maven-compiler-plugin
</artifactId>
...
@@ -191,10 +196,31 @@
...
@@ -191,10 +196,31 @@
<descriptors>
<descriptors>
<descriptor>
src/main/assembly/assembly.xml
</descriptor>
<descriptor>
src/main/assembly/assembly.xml
</descriptor>
</descriptors>
</descriptors>
<outputDirectory>
${project.basedir}/../../packages
</outputDirectory>
</configuration>
</configuration>
</execution>
</execution>
</executions>
</executions>
</plugin>
</plugin>
<plugin>
<groupId>
com.spotify
</groupId>
<artifactId>
docker-maven-plugin
</artifactId>
<version>
${docker.plugin.version}
</version>
<configuration>
<skipDocker>
false
</skipDocker>
<imageName>
${docker.image.name}
</imageName>
<imageTags>
<imageTag>
${docker.image.version}
</imageTag>
</imageTags>
<dockerDirectory>
${project.basedir}/docker
</dockerDirectory>
<resources>
<resource>
<targetPath>
/
</targetPath>
<directory>
${project.basedir}/../../packages
</directory>
<include>
${build.finalName}.tar.gz
</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</plugins>
</build>
</build>
</project>
</project>
apm-sniffer/config/agent.config
浏览文件 @
f7700d50
...
@@ -17,7 +17,7 @@ agent.application_code=Your_ApplicationName
...
@@ -17,7 +17,7 @@ agent.application_code=Your_ApplicationName
# Examples:
# Examples:
# Single collector:SERVERS="127.0.0.1:8080"
# Single collector:SERVERS="127.0.0.1:8080"
# Collector cluster:SERVERS="10.2.45.126:8080,10.2.45.127:7600"
# Collector cluster:SERVERS="10.2.45.126:8080,10.2.45.127:7600"
collector
.
servers
=
127
.
0
.
0
.
1
:
1
2
800
collector
.
servers
=
127
.
0
.
0
.
1
:
1
0
800
# Logging level
# Logging level
logging
.
level
=
DEBUG
logging
.
level
=
DEBUG
docker-compose.yml
浏览文件 @
f7700d50
...
@@ -36,10 +36,11 @@ services:
...
@@ -36,10 +36,11 @@ services:
-
ZK_ADDRESSES=zookeeper-server:2181
-
ZK_ADDRESSES=zookeeper-server:2181
-
ES_ADDRESSES=es-server:9300
-
ES_ADDRESSES=es-server:9300
-
BIND_HOST=0.0.0.0
-
BIND_HOST=0.0.0.0
-
UI_BIND_HOST=skywalking-collector
-
AGENT_JETTY_BIND_HOST=skywalking-collector
-
CLUSTER_BIND_HOST=0.0.0.0
-
NAMING_BIND_HOST=skywalking-collector
-
UI_JETTY_BIND_HOST=skywalking-collector
healthcheck
:
healthcheck
:
test
:
[
"
CMD"
,
"
curl"
,
"
-f"
,
"
http://
localhost:10800/agentstream/grpc
"
]
test
:
[
"
CMD"
,
"
curl"
,
"
-f"
,
"
http://
skywalking-collector:10800/agent/gRPC
"
]
interval
:
10s
interval
:
10s
timeout
:
10s
timeout
:
10s
retries
:
5
retries
:
5
...
...
docs/README.md
浏览文件 @
f7700d50
## Documents
## Documents
[
![version
](
https://img.shields.io/badge/document--version-3.2.5--2017-green.svg
)
]()
[
![cn doc
](
https://img.shields.io/badge/document-中文-blue.svg
)
](README_ZH.md)
[
![cn doc
](
https://img.shields.io/badge/document-中文-blue.svg
)
](README_ZH.md)
*
Getting Started
*
Getting Started
...
@@ -24,4 +25,3 @@
...
@@ -24,4 +25,3 @@
*
[
Skywalking 3 Cross Process Propagation Headers Protocol, v1.0
](
en/Skywalking-3-Cross-Process-Propagation-Headers-Protocol.md
)
*
[
Skywalking 3 Cross Process Propagation Headers Protocol, v1.0
](
en/Skywalking-3-Cross-Process-Propagation-Headers-Protocol.md
)
*
FAQ
*
FAQ
\ No newline at end of file
docs/README_ZH.md
浏览文件 @
f7700d50
## 中文文档
## 中文文档
[
![version
](
https://img.shields.io/badge/document--version-3.2.5--2017-green.svg
)
]()
[
![EN doc
](
https://img.shields.io/badge/document-English-blue.svg
)
](README.md)
[
![EN doc
](
https://img.shields.io/badge/document-English-blue.svg
)
](README.md)
*
[
项目简介
](
/README_ZH.md
)
*
[
项目简介
](
/README_ZH.md
)
...
@@ -29,4 +30,4 @@
...
@@ -29,4 +30,4 @@
*
[
探针与Collector间网络协议,v3.2+
](
cn/How-to-communicate-with-the-collector-CN.md
)
*
[
探针与Collector间网络协议,v3.2+
](
cn/How-to-communicate-with-the-collector-CN.md
)
*
FAQ
*
FAQ
*
[
Trace查询有数据,但是没有拓扑图和JVM数据?
](
cn/FAQ/Why-have-traces-no-others-CN.md
)
*
[
Trace查询有数据,但是没有拓扑图和JVM数据?
](
cn/FAQ/Why-have-traces-no-others-CN.md
)
*
[
加载探针,Console被GRPC日志刷屏
](
cn/FAQ/Too-many-gRPC-logs-CN.md
)
*
[
加载探针,Console被GRPC日志刷屏
](
cn/FAQ/Too-many-gRPC-logs-CN.md
)
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录