Added etcd username and userpassword from config (#4205)

* added

Signed-off-by: Henry Huang <[email protected]>

* added flags

Signed-off-by: Henry Huang <[email protected]>

* Fixed CHANGELOG entry

Signed-off-by: Marco Pracucci <[email protected]>

Co-authored-by: Marco Pracucci <[email protected]>

Author: ymhhh

CHANGELOG.md

@@ -21,6 +21,7 @@
   * Note the prior addition of a new configuration option `-alertmanager.persist-interval`. This sets the interval between persisting the current alertmanager state (notification log and silences) to object storage. See the [configuration file reference](https://cortexmetrics.io/docs/configuration/configuration-file/#alertmanager_config) for more information.
 * [ENHANCEMENT] Alertmanager: Cleanup persisted state objects from remote storage when a tenant configuration is deleted. #4167
 * [ENHANCEMENT] Storage: Added the ability to disable Open Census within GCS client (e.g `-gcs.enable-opencensus=false`). #4219
+* [ENHANCEMENT] Etcd: Added username and password to etcd config. #4205
 * [ENHANCEMENT] Alertmanager: introduced new metrics to monitor operation when using `-alertmanager.sharding-enabled`: #4149
   * `cortex_alertmanager_state_fetch_replica_state_total`
   * `cortex_alertmanager_state_fetch_replica_state_failed_total`

docs/configuration/config-file-reference.md

@@ -3689,6 +3689,14 @@ The `etcd_config` configures the etcd client. The supported CLI flags `<prefix>`
 # Skip validating server certificate.
 # CLI flag: -<prefix>.etcd.tls-insecure-skip-verify
 [tls_insecure_skip_verify: <boolean> | default = false]
+
+# Etcd username.
+# CLI flag: -<prefix>.etcd.username
+[username: <string> | default = ""]
+
+# Etcd password.
+# CLI flag: -<prefix>.etcd.password
+[password: <string> | default = ""]
 ```
 
 ### `consul_config`

pkg/ring/kv/etcd/etcd.go

@@ -26,6 +26,9 @@ type Config struct {
 	MaxRetries  int                     `yaml:"max_retries"`
 	EnableTLS   bool                    `yaml:"tls_enabled"`
 	TLS         cortex_tls.ClientConfig `yaml:",inline"`
+
+	UserName string `yaml:"username"`
+	Password string `yaml:"password"`
 }
 
 // Client implements ring.KVClient for etcd.
@@ -42,6 +45,8 @@ func (cfg *Config) RegisterFlagsWithPrefix(f *flag.FlagSet, prefix string) {
 	f.DurationVar(&cfg.DialTimeout, prefix+"etcd.dial-timeout", 10*time.Second, "The dial timeout for the etcd connection.")
 	f.IntVar(&cfg.MaxRetries, prefix+"etcd.max-retries", 10, "The maximum number of retries to do for failed ops.")
 	f.BoolVar(&cfg.EnableTLS, prefix+"etcd.tls-enabled", false, "Enable TLS.")
+	f.StringVar(&cfg.UserName, prefix+"etcd.username", "", "Etcd username.")
+	f.StringVar(&cfg.Password, prefix+"etcd.password", "", "Etcd password.")
 	cfg.TLS.RegisterFlagsWithPrefix(prefix+"etcd", f)
 }
 
@@ -87,6 +92,8 @@ func New(cfg Config, codec codec.Codec) (*Client, error) {
 		DialKeepAliveTimeout: 2 * cfg.DialTimeout,
 		PermitWithoutStream:  true,
 		TLS:                  tlsConfig,
+		Username:             cfg.UserName,
+		Password:             cfg.Password,
 	})
 	if err != nil {
 		return nil, err