Merge branch 'master' of http://193.112.143.129/bltdc/dc-common

docker-skywalking/6.x/config/application.yml

@@ -15,13 +15,13 @@
 # limitations under the License.
 
 cluster:
-#  standalone:
+  standalone:
 #   Please check your ZooKeeper is 3.5+, However, it is also compatible with ZooKeeper 3.4.x. Replace the ZooKeeper 3.5+
 #   library the oap-libs folder with your ZooKeeper 3.4.x library.
 #  zookeeper:
-#    nameSpace: ${SW_NAMESPACE:""}
-#    hostPort: ${SW_CLUSTER_ZK_HOST_PORT:localhost:2181}
-#    #Retry Policy
+#    nameSpace: ${SW_NAMESPACE:"skywalking"}
+#    hostPort: ${SW_CLUSTER_ZK_HOST_PORT:172.31.255.82:2181}
+    #Retry Policy
 #    baseSleepTimeMs: ${SW_CLUSTER_ZK_SLEEP_TIME:1000} # initial amount of time to wait between retries
 #    maxRetries: ${SW_CLUSTER_ZK_MAX_RETRIES:3} # max number of times to retry
 #  kubernetes:
@@ -29,9 +29,9 @@ cluster:
 #    namespace: ${SW_CLUSTER_K8S_NAMESPACE:default}
 #    labelSelector: ${SW_CLUSTER_K8S_LABEL:app=collector,release=skywalking}
 #    uidEnvName: ${SW_CLUSTER_K8S_UID:SKYWALKING_COLLECTOR_UID}
-  consul:
-    serviceName: skywalking
-    hostPort: 172.31.255.119:8500,172.31.255.245:8500,172.31.255.177:8500
+#  consul:
+#    serviceName: skywalking
+#    hostPort: 172.31.255.119:8500
 core:
   default:
     # Mixed: Receive agent data, Level 1 aggregate, Level 2 aggregate