diff --git a/apm-sniffer/config/agent.config b/apm-sniffer/config/agent.config index 8616a4b04..4600bbc92 100644 --- a/apm-sniffer/config/agent.config +++ b/apm-sniffer/config/agent.config @@ -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" diff --git a/docs/en/Deploy-collector-in-cluster-mode.md b/docs/en/Deploy-collector-in-cluster-mode.md index 2cc58795e..a9fec046f 100644 --- a/docs/en/Deploy-collector-in-cluster-mode.md +++ b/docs/en/Deploy-collector-in-cluster-mode.md @@ -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` ``` diff --git a/docs/en/Deploy-collector-in-standalone-mode.md b/docs/en/Deploy-collector-in-standalone-mode.md index 7e3292d00..3697fe1f1 100644 --- a/docs/en/Deploy-collector-in-standalone-mode.md +++ b/docs/en/Deploy-collector-in-standalone-mode.md @@ -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** ## Requirements * JDK 8+ @@ -24,7 +26,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 diff --git a/docs/en/Deploy-skywalking-agent.md b/docs/en/Deploy-skywalking-agent.md index c42ee3b51..900c39f9c 100644 --- a/docs/en/Deploy-skywalking-agent.md +++ b/docs/en/Deploy-skywalking-agent.md @@ -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" ``` \ No newline at end of file diff --git a/docs/en/Quick-start.md b/docs/en/Quick-start.md index 9e604336d..64b8eacfc 100644 --- a/docs/en/Quick-start.md +++ b/docs/en/Quick-start.md @@ -1,7 +1,8 @@ # Quick start +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 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. Deploy webui server [WIP] +1. Deploy Java Agent,[doc](Deploy-skywalking-agent.md) 1. Reboot your applications, and open UI. \ No newline at end of file