[skywalking] branch master updated: fix ETCD cluster config environment variables not working. (#8255)

[wusheng]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new f2229b6  fix ETCD cluster config environment variables not working. 
(#8255)
f2229b6 is described below

commit f2229b6f27eb2572e10951f759904470ce59bfd5
Author: Jared Tan <jian....@daocloud.io>
AuthorDate: Tue Dec 7 10:55:58 2021 +0800

    fix ETCD cluster config environment variables not working. (#8255)
---
 CHANGES.md                                                   | 1 +
 docs/en/setup/backend/backend-cluster.md                     | 6 +++---
 oap-server/server-starter/src/main/resources/application.yml | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index dc1d101..e951e95 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ Release Notes.
 
 * Fix potential NPE in OAL string match and a bug when right-hand-side 
variable includes double quotes.
 * Bump up Armeria version to fix CVE.
+* Polish ETCD cluster config environment variables.
 
 #### UI
 
diff --git a/docs/en/setup/backend/backend-cluster.md 
b/docs/en/setup/backend/backend-cluster.md
index 119a04d..bb829a9 100644
--- a/docs/en/setup/backend/backend-cluster.md
+++ b/docs/en/setup/backend/backend-cluster.md
@@ -99,10 +99,10 @@ cluster:
     # etcd cluster nodes, example: 10.0.0.1:2379,10.0.0.2:2379,10.0.0.3:2379
     endpoints: ${SW_CLUSTER_ETCD_ENDPOINTS:localhost:2379}
     namespace: ${SW_CLUSTER_ETCD_NAMESPACE:/skywalking}
-    serviceName: ${SW_SCLUSTER_ETCD_ERVICE_NAME:"SkyWalking_OAP_Cluster"}
+    serviceName: ${SW_CLUSTER_ETCD_SERVICE_NAME:"SkyWalking_OAP_Cluster"}
     authentication: ${SW_CLUSTER_ETCD_AUTHENTICATION:false}
-    user: ${SW_SCLUSTER_ETCD_USER:}
-    password: ${SW_SCLUSTER_ETCD_PASSWORD:}
+    user: ${SW_CLUSTER_ETCD_USER:}
+    password: ${SW_CLUSTER_ETCD_PASSWORD:}
 ```
 
 Same as the Zookeeper coordinator,
diff --git a/oap-server/server-starter/src/main/resources/application.yml 
b/oap-server/server-starter/src/main/resources/application.yml
index 631be41..b9a99c0 100755
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -41,10 +41,10 @@ cluster:
     # etcd cluster nodes, example: 10.0.0.1:2379,10.0.0.2:2379,10.0.0.3:2379
     endpoints: ${SW_CLUSTER_ETCD_ENDPOINTS:localhost:2379}
     namespace: ${SW_CLUSTER_ETCD_NAMESPACE:/skywalking}
-    serviceName: ${SW_SCLUSTER_ETCD_ERVICE_NAME:"SkyWalking_OAP_Cluster"}
+    serviceName: ${SW_CLUSTER_ETCD_SERVICE_NAME:"SkyWalking_OAP_Cluster"}
     authentication: ${SW_CLUSTER_ETCD_AUTHENTICATION:false}
-    user: ${SW_SCLUSTER_ETCD_USER:}
-    password: ${SW_SCLUSTER_ETCD_PASSWORD:}
+    user: ${SW_CLUSTER_ETCD_USER:}
+    password: ${SW_CLUSTER_ETCD_PASSWORD:}
   nacos:
     serviceName: ${SW_SERVICE_NAME:"SkyWalking_OAP_Cluster"}
     hostPort: ${SW_CLUSTER_NACOS_HOST_PORT:localhost:8848}