From eadc8145268be148c7911174f1bfadbd6bc8a4bd Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 18 Nov 2026 21:31:25 +0800 Subject: [PATCH] Rename the etcd configuration password env var to SW_CONFIG_ETCD_PASSWORD The etcd dynamic configuration read its password from SW_CONFIG_ETCD_password, the only lower-case environment variable in application.yml. Rename it to SW_CONFIG_ETCD_PASSWORD, and update the etcd configuration doc, the configuration vocabulary and the changelog. The lower-case name no longer has any effect. --- docs/en/changes/changes.md | 1 + docs/en/setup/backend/configuration-vocabulary.md | 2 +- docs/en/setup/backend/dynamic-config-etcd.md | 2 +- oap-server/server-starter/src/main/resources/application.yml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index bca4600dc513..4553ed81f184 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -68,6 +68,7 @@ * Fix creating an async-profiler task for a service while another one runs on it: the check that refuses it never found the running task on the JDBC and Elasticsearch storage. * Fix the async-profiler task OAP sends to an agent whose service has two tasks created within five minutes of each other: it could send the older one. * Fix alarm windows retaining empty layers after an initial metadata lookup miss. Later metrics can supply the missing layers for subsequent alarms, allowing layer-filtered `queryAlarms` queries to match the persisted layer. +* Rename the etcd dynamic configuration password environment variable from `SW_CONFIG_ETCD_password` to `SW_CONFIG_ETCD_PASSWORD`, matching every other environment variable. The lower-case name no longer has any effect, so a deployment that sets it must switch to the new name. #### UI diff --git a/docs/en/setup/backend/configuration-vocabulary.md b/docs/en/setup/backend/configuration-vocabulary.md index 7ca0184ed979..8d0736296c4c 100644 --- a/docs/en/setup/backend/configuration-vocabulary.md +++ b/docs/en/setup/backend/configuration-vocabulary.md @@ -361,7 +361,7 @@ It divided into several modules, each of which has its own settings. The followi | - | - | namespace | Namespace for SkyWalking cluster. | SW_CONFIG_ETCD_NAMESPACE | /skywalking | | - | - | authentication | Indicates whether there is authentication. | SW_CONFIG_ETCD_AUTHENTICATION | false | | - | - | user | Etcd auth username. | SW_CONFIG_ETCD_USER | | -| - | - | password | Etcd auth password. | SW_CONFIG_ETCD_password | | +| - | - | password | Etcd auth password. | SW_CONFIG_ETCD_PASSWORD | | | - | - | period | The period of data sync (in seconds). | SW_CONFIG_ETCD_PERIOD | 60 | | - | consul | hostAndPorts | Hosts and ports for Consul cluster. | SW_CONFIG_CONSUL_HOST_AND_PORTS | 1.2.3.4:8500 | | - | - | aclToken | ACL Token of Consul. Empty string means `without ACL token`. | SW_CONFIG_CONSUL_ACL_TOKEN | - | diff --git a/docs/en/setup/backend/dynamic-config-etcd.md b/docs/en/setup/backend/dynamic-config-etcd.md index 9c2d075bf46a..fb503c7f8db8 100755 --- a/docs/en/setup/backend/dynamic-config-etcd.md +++ b/docs/en/setup/backend/dynamic-config-etcd.md @@ -11,7 +11,7 @@ configuration: namespace: ${SW_CONFIG_ETCD_NAMESPACE:/skywalking} authentication: ${SW_CONFIG_ETCD_AUTHENTICATION:false} user: ${SW_CONFIG_ETCD_USER:} - password: ${SW_CONFIG_ETCD_password:} + password: ${SW_CONFIG_ETCD_PASSWORD:} ``` **NOTE**: Only the v3 protocol is supported. diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml index 2bb03e463380..6244f3531f00 100644 --- a/oap-server/server-starter/src/main/resources/application.yml +++ b/oap-server/server-starter/src/main/resources/application.yml @@ -715,7 +715,7 @@ configuration: namespace: ${SW_CONFIG_ETCD_NAMESPACE:/skywalking} authentication: ${SW_CONFIG_ETCD_AUTHENTICATION:false} user: ${SW_CONFIG_ETCD_USER:} - password: ${SW_CONFIG_ETCD_password:} + password: ${SW_CONFIG_ETCD_PASSWORD:} consul: # Consul host and ports, separated by comma, e.g. 1.2.3.4:8500,2.3.4.5:8500 hostAndPorts: ${SW_CONFIG_CONSUL_HOST_AND_PORTS:1.2.3.4:8500}