You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ta...@apache.org on 2021/12/07 00:59:20 UTC
[skywalking] branch env_typo created (now 149f456)
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a change to branch env_typo
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at 149f456 polish etcd config env vars.
This branch includes the following new commits:
new 82d7f41 polish etcd config env vars.
new 149f456 polish etcd config env vars.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking] 01/02: polish etcd config env vars.
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a commit to branch env_typo
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 82d7f4119e44fc4f55a143fee84c8e084f4cb873
Author: JaredTan95 <ji...@daocloud.io>
AuthorDate: Tue Dec 7 08:57:53 2021 +0800
polish etcd config env vars.
---
docs/en/setup/backend/backend-cluster.md | 6 +++---
oap-server/server-starter/src/main/resources/application.yml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
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}
[skywalking] 02/02: polish etcd config env vars.
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a commit to branch env_typo
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 149f4568edeaa364d95dc4856c987efc95b49bdf
Author: JaredTan95 <ji...@daocloud.io>
AuthorDate: Tue Dec 7 08:58:56 2021 +0800
polish etcd config env vars.
---
CHANGES.md | 1 +
1 file changed, 1 insertion(+)
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