kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into fixed/855

This commit is contained in:
彭勇升 pengys 2018-03-04 00:23:33 +08:00 committed by GitHub
parent 8b366e1035 0ef48add57
commit 0e61c97213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 34 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
View File

@ -59,13 +59,4 @@
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>bintray-wu-sheng-sky-walking-repository</id>
<name>wu-sheng-sky-walking-repository</name>
<url>https://api.bintray.com/maven/wu-sheng/skywalking/org.apache.skywalking.apm-toolkit-log4j-1.x/;publish=1
</url>
</repository>
</distributionManagement>
</project>

8
apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
View File

@ -60,12 +60,4 @@
</plugins>
</build>
<distributionManagement>
<repository>
<id>bintray-wu-sheng-sky-walking-repository</id>
<name>wu-sheng-sky-walking-repository</name>
<url>https://api.bintray.com/maven/wu-sheng/skywalking/org.apache.skywalking.apm-toolkit-log4j-2.x/;publish=1
</url>
</repository>
</distributionManagement>
</project>

9
apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml
View File

@ -59,13 +59,4 @@
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>bintray-wu-sheng-sky-walking-repository</id>
<name>wu-sheng-sky-walking-repository</name>
<url>https://api.bintray.com/maven/wu-sheng/skywalking/org.apache.skywalking.apm-toolkit-logback-1.x/;publish=1
</url>
</repository>
</distributionManagement>
</project>

9
apm-application-toolkit/apm-toolkit-opentracing/pom.xml
View File

@ -42,12 +42,5 @@
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>bintray-wu-sheng-sky-walking-repository</id>
<name>wu-sheng-sky-walking-repository</name>
<url>https://api.bintray.com/maven/wu-sheng/skywalking/org.apache.skywalking.apm-toolkit-opentracing/;publish=1
</url>
</repository>
</distributionManagement>
</project>

9
apm-application-toolkit/apm-toolkit-trace/pom.xml
View File

@ -52,13 +52,4 @@
</plugins>
</build>
<distributionManagement>
<repository>
<id>bintray-wu-sheng-sky-walking-repository</id>
<name>wu-sheng-sky-walking-repository</name>
<url>
https://api.bintray.com/maven/wu-sheng/skywalking/org.apache.skywalking.apm-toolkit-trace/;publish=1
</url>
</repository>
</distributionManagement>
</project>

2
apm-sniffer/config/agent.config
View File

@ -17,7 +17,7 @@ agent.application_code=Your_ApplicationName
# agent.is_open_debugging_class = true
# Server addresses.
# Mapping to `agent_server/jetty/port` in `config/application.yml` of Collector.
# Mapping to `naming/jetty/ip:port` in `config/application.yml` of Collector.
# Examples：
# Single collector：SERVERS="127.0.0.1:8080"
# Collector cluster：SERVERS="10.2.45.126:8080,10.2.45.127:7600"

2
docs/README_ZH.md
View File

@ -10,7 +10,7 @@
* [OpenTracing中文版](https://github.com/opentracing-contrib/opentracing-specification-zh)
* Application Toolkit，应用程序工具包
* [概述](cn/Application-toolkit-CN.md)
* [OpenTracing Tracer](cn/skywalking-opentracing-CN.md)
* [OpenTracing Tracer](cn/Opentracing-CN.md)
* 日志组件
* [log4j组件](cn/Application-toolkit-log4j-1.x-CN.md)
* [log4j2组件](cn/Application-toolkit-log4j-2.x-CN.md)

3
docs/cn/Deploy-collector-in-cluster-mode-CN.md → docs/cn/Deploy-backend-in-cluster-mode-CN.md
View File

@ -78,3 +78,6 @@ storage:
3. 运行`bin/startup.sh`启动。windows用户为.bat文件。
- **注意：startup.sh将会启动collector和UI两个进程，UI通过127.0.0.1:10800访问本地collector，无需额外配置。
如需保证UI负载均衡，推荐使用类nginx的HTTP代理服务。**

8
docs/cn/Deploy-collector-in-standalone-mode-CN.md → docs/cn/Deploy-backend-in-standalone-mode-CN.md
View File

@ -1,5 +1,9 @@
# 用途说明
单机模式默认使用本地H2数据库，不支持集群部署。主要用于：预览、功能测试、演示和低压力系统。如果使用单机collector用于非演示环境，你可选择使用Elasticsearch作为存储实现。
单机模式默认使用本地H2数据库，不支持集群部署。主要用于：预览、功能测试、演示和低压力系统。
如果使用单机collector用于非演示环境，你可选择使用Elasticsearch作为存储实现。
**在5.0.0-alpha版本中，暂不提供H2实现**
## 所需的第三方软件
- JDK8+
@ -14,6 +18,8 @@ Collector单机模拟启动简单，提供和集群模式相同的功能，单
1. 解压安装包`tar -xvf skywalking-collector.tar.gz`，windows用户可以选择zip包
1. 运行`bin/startup.sh`启动。windows用户为.bat文件。
- **注意：startup.sh将会启动collector和UI两个进程，UI通过127.0.0.1:10800访问本地collector，无需额外配置。**
## 使用Elastic Search代替H2存储
- 在单机模式下除了支持内置的H2数据库运行，也支持其他的存储（当前已支持的ElasticSearch 5.3），取消Storage相关配置节的注释，并修改配置。
```yaml

2
docs/cn/skywalking-opentracing-CN.md → docs/cn/Opentracing-CN.md
View File

@ -7,8 +7,6 @@
</dependency>
```
&nbsp;&nbsp;&nbsp;[ ![Download](https://api.bintray.com/packages/wu-sheng/skywalking/org.apache.skywalking.apm-toolkit-opentracing/images/download.svg) ](https://bintray.com/wu-sheng/skywalking/org.apache.skywalking.apm-toolkit-opentracing/_latestVersion)
* 使用OpenTracing的标准API和桥接器，使用手动埋点
```java
Tracer tracer = new org.apache.skywalking.apm.toolkit.opentracing.SkywalkingTracer();

8
docs/cn/Quick-start-CN.md
View File

@ -1,7 +1,7 @@
# 部署步骤
1. 部署 Collector
1. [单机模式](Deploy-collector-in-standalone-mode-CN.md)
1. [集群模式](Deploy-collector-in-cluster-mode-CN.md)
1. 部署 webui server, [doc](https://github.com/apache/incubator-skywalking-ui#quickstart)
1. 在Maven Central中下载 `org.apache.skywalking.apm-dist`. 或者本地编译程序，在`dist`目录中找到`skywalking-dist.tar.gz/.zip`.
1. 部署 Backend
1. [单机模式](Deploy-backend-in-standalone-mode-CN.md)
1. [集群模式](Deploy-backend-in-cluster-mode-CN.md)
1. 部署 Java Agent，[doc](Deploy-skywalking-agent-CN.md)
1. 重启并访问系统功能，查看UI即可。

6
docs/en/Deploy-collector-in-cluster-mode.md → docs/en/Deploy-backend-in-cluster-mode.md
View File

@ -25,7 +25,8 @@ thread_pool.bulk.queue_size: 1000
1. Run `tar -xvf skywalking-collector.tar.gz`
2. Config collector in cluster mode.
Cluster mode depends on Zookeeper register and application discovery capabilities. So, you just need to adjust the IP config items in `config/application.yml`. Change IP and port configs of agent_server, agent_stream, ui, collector_inside, replace them to the real ip or hostname which you want to use for cluster.
Cluster mode depends on Zookeeper register and application discovery capabilities. So, you just need to adjust the IP config items in `config/application.yml`. Change IP and port configs of naming, remote, agent_gRPC, agent_jetty and ui,
replace them to the real ip or hostname which you want to use for cluster.
- `config/application.yml`
```
@ -76,3 +77,6 @@ storage:
3. Run `bin/startup.sh`
- NOTICE: **In 5.0.0-alpha, startup.sh will start two processes, collector and UI, and UI uses 127.0.0.1:10800 as default.
Recommend use http proxy to access UI in product, otherwise, access any UI.**

8
docs/en/Deploy-collector-in-standalone-mode.md → docs/en/Deploy-backend-in-standalone-mode.md
View File

@ -1,7 +1,9 @@
# Usage scenario
Default standalong mode collector means don't support cluster. It uses H2 as storage layer implementation, suggest that use only for preview, test, demonstration, low throughputs and small scale system.
If you are using skywalking in a low throughputs monitoring scenario, and don't want to deploy cluster, at least, swith the storage implementation from H2 to Elasticsearch.
If you are using skywalking in a low throughputs monitoring scenario, and don't want to deploy cluster, at least, switch the storage implementation from H2 to Elasticsearch.
**H2 storage implementation is not provided in 5.0.0-alpha, so you must deploy ElasticSearch before try to start backend**
## Requirements
* JDK 8+
@ -17,6 +19,8 @@ You can simplely tar/unzip and startup if ports 10800, 11800, 12800 are free.
You should keep the `config/application.yml` as default.
- NOTICE: **In 5.0.0-alpha, startup.sh will start two processes, collector and UI, and UI uses 127.0.0.1:10800 as default.**
## Use Elastic Search instead of H2 as storage layer implementation
Even in standalone mode, collector can run with Elastic Search as storage. If so, uncomment the `storage` section in `application.yml`, set the config right. The default configs fit for collector and Elasticsearch both running in same machine, and not cluster.
@ -24,7 +28,7 @@ Even in standalone mode, collector can run with Elastic Search as storage. If so
- Modify `elasticsearch.yml`
- Set `cluster.name: CollectorDBCluster`
- Set `node.name: anyname`, this name can be any, it based on Elasticsearch.
- Add the following configurations to
- Add the following configurations
```
# The ip used for listening

2
docs/en/Deploy-skywalking-agent.md
View File

@ -42,5 +42,5 @@ CATALINA_OPTS="$CATALINA_OPTS -javaagent:/path/to/skywalking-agent/skywalking-ag
- Tomcat 8
Change the first line of `tomcat/bin/catalina.sh`.
```shell
set "CATALINA_OPTS=-javaagent:E:\apache-tomcat-8.5.20\skywalking-agent\skywalking-agent.jar -Dconfig=\skywalking\config\dir"
set "CATALINA_OPTS=-javaagent:E:\apache-tomcat-8.5.20\skywalking-agent\skywalking-agent.jar"
```

1
docs/en/Opentracing.md
View File

@ -7,7 +7,6 @@
</dependency>
```
&nbsp;&nbsp;&nbsp;[ ![Download](https://api.bintray.com/packages/wu-sheng/skywalking/org.apache.skywalking.apm-toolkit-opentracing/images/download.svg) ](https://bintray.com/wu-sheng/skywalking/org.apache.skywalking.apm-toolkit-opentracing/_latestVersion)
* Use our OpenTracing tracer implementation
```java

10
docs/en/Quick-start.md
View File

@ -1,7 +1,7 @@
# Quick start
1. Deploy Collector
1. [Standalone Mode](Deploy-collector-in-standalone-mode.md)
1. [Cluster Mode](Deploy-collector-in-cluster-mode.md)
1. Deploy webui server, [doc](https://github.com/apache/incubator-skywalking-ui#quickstart)
1. Doploy Java Agent，[doc](Deploy-skywalking-agent.md)
1. Download `org.apache.skywalking.apm-dist` in maven central. Or find `skywalking-dist.tar.gz/.zip` in `dist` folder after `mvn clean package`.
1. Deploy Backend
- [Standalone Mode](Deploy-backend-in-standalone-mode.md)
- [Cluster Mode](Deploy-backend-in-cluster-mode.md)
1. Deploy Java Agent，[doc](Deploy-skywalking-agent.md)
1. Reboot your applications, and open UI.