From 99acbea1bad04a00a4c292b7b09770e857df0bc1 Mon Sep 17 00:00:00 2001 From: wusheng Date: Mon, 17 Apr 2017 16:15:13 +0800 Subject: [PATCH] =?UTF-8?q?Adjust=20comments=20of=20=E2=80=9Ccollector.con?= =?UTF-8?q?fig=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collector/worker/config/EsConfig.java | 4 +- .../src/main/resources/collector.config | 83 ++++--------------- 2 files changed, 20 insertions(+), 67 deletions(-) diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfig.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfig.java index dae5f3f5c..1f579a6f9 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfig.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfig.java @@ -1,5 +1,7 @@ package com.a.eye.skywalking.collector.worker.config; +import static com.a.eye.skywalking.collector.worker.config.EsConfig.IndexInitMode.AUTO; + /** * @author pengys5 */ @@ -18,7 +20,7 @@ public class EsConfig { public static class Index { public static class Initialize { - public static IndexInitMode mode; + public static IndexInitMode mode = AUTO; } public static class Shards { diff --git a/skywalking-collector/skywalking-collector-worker/src/main/resources/collector.config b/skywalking-collector/skywalking-collector-worker/src/main/resources/collector.config index dfe77c631..54ebbc1a0 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/resources/collector.config +++ b/skywalking-collector/skywalking-collector-worker/src/main/resources/collector.config @@ -1,15 +1,11 @@ -# The remote server should connect to, hostname can be either hostname or IP address. -# Suggestion: set the real ip address. +# "hostname" and "port" are used to receive internal messages from other nodes of cluster。 +# Hostname can be either hostname or IP address. cluster.current.hostname=127.0.0.1 +# Listening port. cluster.current.port=11800 -# The roles of this member. List of strings, e.g. roles = A, B -# In the future, the roles are part of the membership information and can be used by -# routers or other services to distribute work to certain member types, -# e.g. front-end and back-end nodes. -# In this version, all members has same roles, each of them will listen others status, -# because of network trouble or member jvm crash or every reason led to not reachable, -# the routers will stop to sending the message to the untouchable member. +# In this version, all members have same roles, and everyone of them is listening the status of others. +# The routers do not send message to nodes, which is unreachable, caused by network trouble, jvm crash or any other reasons. cluster.current.roles=WorkersListener # Initial contact points of the cluster, e.g. seed_nodes = 127.0.0.1:11800, 127.0.0.1:11801. @@ -19,77 +15,32 @@ cluster.current.roles=WorkersListener # This is akka configuration, see: http://doc.akka.io/docs/akka/2.4/general/configuration.html cluster.seed_nodes=127.0.0.1:11800 -# elasticsearch configuration, config/elasticsearch.yml, see cluster.name +# elasticsearch configuration, see cluster.name in "config/elasticsearch.yml" es.cluster.name=CollectorDBCluster es.cluster.transport.sniffer=true -# The elasticsearch nodes of cluster, comma separated, e.g. nodes=ip:port, ip:port +# The elasticsearch nodes of cluster, separated by comma, e.g. nodes=ip:port, ip:port es.cluster.nodes=127.0.0.1:9300 -# Automatic create elasticsearch index +# Initialized mode of elasticsearch index, default is auto. # Options: auto, forced, manual -# auto: just create new index when index not created. -# forced: delete the index then create +# auto: create index when it doesn't exist. +# forced: delete and create. +# manual: do nothing. es.index.initialize.mode=auto +# Config of shards or replicas in Elasticsearch. es.index.shards.number=2 es.index.replicas.number=0 -# You can configure a host either as a host name or IP address to identify a specific network -# interface on which to listen. -# Be used for web ui get the view data or agent post the trace segment. +# "hostname", "port" and "contextPath" are used to provide HTTP RESTful services. +# RESTful services include "receive segment" and "webui query services". http.hostname=127.0.0.1 -# The TCP/IP port on which the connector listens for connections. http.port=12800 -# The contextPath is a URL prefix that identifies which context a HTTP request is destined for. +# Web context path http.contextPath=/ -# The analysis worker max cache size, when worker data size reach the size, -# then worker will send all cached data to the next worker and clear the cache. +# Cache size of analysis worker. The value determines whether sending to next worker and clear, or not. cache.analysis.size=1024 -# The persistence worker max cache size, same of "cache.analysis.size" ability. +# Cache size of persistence worker. The value determines whether save data and clear, or not. cache.persistence.size=1024 -WorkerNum.Node.NodeCompAgg.Value=10 -WorkerNum.Node.NodeMappingDayAgg.Value=10 -WorkerNum.Node.NodeMappingHourAgg.Value=10 -WorkerNum.Node.NodeMappingMinuteAgg.Value=10 - -WorkerNum.NodeRef.NodeRefDayAgg.Value=10 -WorkerNum.NodeRef.NodeRefHourAgg.Value=10 -WorkerNum.NodeRef.NodeRefMinuteAgg.Value=10 -WorkerNum.NodeRef.NodeRefResSumDayAgg.Value=10 -WorkerNum.NodeRef.NodeRefResSumHourAgg.Value=10 -WorkerNum.NodeRef.NodeRefResSumMinuteAgg.Value=10 - -WorkerNum.GlobalTrace.GlobalTraceAgg.Value=10 - -Queue.GlobalTrace.GlobalTraceSave.Size=1024 -Queue.GlobalTrace.GlobalTraceAnalysis.Size=1024 - -Queue.Segment.SegmentPost.Size=1024 -Queue.Segment.SegmentCostSave.Size=1024 -Queue.Segment.SegmentSave.Size=1024 -Queue.Segment.SegmentExceptionSave.Size=1024 - -Queue.Node.NodeCompAnalysis.Size=1024 -Queue.Node.NodeMappingDayAnalysis.Size=1024 -Queue.Node.NodeMappingHourAnalysis.Size=1024 -Queue.Node.NodeMappingMinuteAnalysis.Size=1024 -Queue.Node.NodeCompSave.Size=1024 -Queue.Node.NodeMappingDaySave.Size=1024 -Queue.Node.NodeMappingHourSave.Size=1024 -Queue.Node.NodeMappingMinuteSave.Size=1024 - -Queue.NodeRef.NodeRefDayAnalysis.Size=1024 -Queue.NodeRef.NodeRefHourAnalysis.Size=1024 -Queue.NodeRef.NodeRefMinuteAnalysis.Size=1024 -Queue.NodeRef.NodeRefDaySave.Size=1024 -Queue.NodeRef.NodeRefHourSave.Size=1024 -Queue.NodeRef.NodeRefMinuteSave.Size=1024 -Queue.NodeRef.NodeRefResSumDaySave.Size=1024 -Queue.NodeRef.NodeRefResSumHourSave.Size=1024 -Queue.NodeRef.NodeRefResSumMinuteSave.Size=1024 -Queue.NodeRef.NodeRefResSumDayAnalysis.Size=1024 -Queue.NodeRef.NodeRefResSumHourAnalysis.Size=1024 -Queue.NodeRef.NodeRefResSumMinuteAnalysis.Size=1024 -