diff --git a/README.md b/README.md index 3a754fd4..2ce02a85 100644 --- a/README.md +++ b/README.md @@ -148,6 +148,7 @@ Prometheus uses file watches and all changes to the json file are applied immedi | check-single-keys | REDIS_EXPORTER_CHECK_SINGLE_KEYS | Comma separated list of keys to export value and length/size, eg: `db3=user_count` will export key `user_count` from db `3`. db defaults to `0` if omitted. The keys specified with this flag will be looked up directly without any glob pattern matching. Use this option if you don't need glob pattern matching; it is faster than `check-keys`. | | check-streams | REDIS_EXPORTER_CHECK_STREAMS | Comma separated list of stream-patterns to export info about streams, groups and consumers. Syntax is the same as `check-keys`. | | check-single-streams | REDIS_EXPORTER_CHECK_SINGLE_STREAMS | Comma separated list of streams to export info about streams, groups and consumers. The streams specified with this flag will be looked up directly without any glob pattern matching. Use this option if you don't need glob pattern matching; it is faster than `check-streams`. | +| streams-exclude-consumer-metrics | REDIS_EXPORTER_STREAMS_EXCLUDE_CONSUMER_METRICS | Don't collect per consumer metrics for streams (decreases amount of metrics and cardinality). | | check-keys-batch-size | REDIS_EXPORTER_CHECK_KEYS_BATCH_SIZE | Approximate number of keys to process in each execution. This is basically the COUNT option that will be passed into the SCAN command as part of the execution of the key or key group metrics, see [COUNT option](https://redis.io/commands/scan#the-count-option). Larger value speeds up scanning. Still Redis is a single-threaded app, huge `COUNT` can affect production environment. | | count-keys | REDIS_EXPORTER_COUNT_KEYS | Comma separated list of patterns to count, eg: `db3=sessions:*` will count all keys with prefix `sessions:` from db `3`. db defaults to `0` if omitted. Warning: The exporter runs SCAN to count the keys. This might not perform well on large databases. | | script | REDIS_EXPORTER_SCRIPT | Comma separated list of path(s) to Redis Lua script(s) for gathering extra metrics. | diff --git a/exporter/exporter.go b/exporter/exporter.go index 7a50edea..e4e13d7e 100644 --- a/exporter/exporter.go +++ b/exporter/exporter.go @@ -46,40 +46,41 @@ type Exporter struct { } type Options struct { - User string - Password string - Namespace string - PasswordMap map[string]string - ConfigCommandName string - CheckKeys string - CheckSingleKeys string - CheckStreams string - CheckSingleStreams string - CheckKeysBatchSize int64 - CheckKeyGroups string - MaxDistinctKeyGroups int64 - CountKeys string - LuaScript map[string][]byte - ClientCertFile string - ClientKeyFile string - CaCertFile string - InclConfigMetrics bool - DisableExportingKeyValues bool - RedactConfigMetrics bool - InclSystemMetrics bool - SkipTLSVerification bool - SetClientName bool - IsTile38 bool - IsCluster bool - ExportClientList bool - ExportClientsInclPort bool - ConnectionTimeouts time.Duration - MetricsPath string - RedisMetricsOnly bool - PingOnConnect bool - RedisPwdFile string - Registry *prometheus.Registry - BuildInfo BuildInfo + User string + Password string + Namespace string + PasswordMap map[string]string + ConfigCommandName string + CheckKeys string + CheckSingleKeys string + CheckStreams string + CheckSingleStreams string + StreamsExcludeConsumerMetrics bool + CheckKeysBatchSize int64 + CheckKeyGroups string + MaxDistinctKeyGroups int64 + CountKeys string + LuaScript map[string][]byte + ClientCertFile string + ClientKeyFile string + CaCertFile string + InclConfigMetrics bool + DisableExportingKeyValues bool + RedactConfigMetrics bool + InclSystemMetrics bool + SkipTLSVerification bool + SetClientName bool + IsTile38 bool + IsCluster bool + ExportClientList bool + ExportClientsInclPort bool + ConnectionTimeouts time.Duration + MetricsPath string + RedisMetricsOnly bool + PingOnConnect bool + RedisPwdFile string + Registry *prometheus.Registry + BuildInfo BuildInfo } // NewRedisExporter returns a new exporter of Redis metrics. diff --git a/exporter/streams.go b/exporter/streams.go index e2882d1e..e6d82c2a 100644 --- a/exporter/streams.go +++ b/exporter/streams.go @@ -205,9 +205,11 @@ func (e *Exporter) extractStreamMetrics(ch chan<- prometheus.Metric, c redis.Con e.registerConstMetricGauge(ch, "stream_group_last_delivered_id", parseStreamItemId(g.LastDeliveredId), dbLabel, k.key, g.Name) e.registerConstMetricGauge(ch, "stream_group_entries_read", float64(g.EntriesRead), dbLabel, k.key, g.Name) e.registerConstMetricGauge(ch, "stream_group_lag", float64(g.Lag), dbLabel, k.key, g.Name) - for _, c := range g.StreamGroupConsumersInfo { - e.registerConstMetricGauge(ch, "stream_group_consumer_messages_pending", float64(c.Pending), dbLabel, k.key, g.Name, c.Name) - e.registerConstMetricGauge(ch, "stream_group_consumer_idle_seconds", float64(c.Idle)/1e3, dbLabel, k.key, g.Name, c.Name) + if !e.options.StreamsExcludeConsumerMetrics { + for _, c := range g.StreamGroupConsumersInfo { + e.registerConstMetricGauge(ch, "stream_group_consumer_messages_pending", float64(c.Pending), dbLabel, k.key, g.Name, c.Name) + e.registerConstMetricGauge(ch, "stream_group_consumer_idle_seconds", float64(c.Idle)/1e3, dbLabel, k.key, g.Name, c.Name) + } } } } diff --git a/exporter/streams_test.go b/exporter/streams_test.go index e7ccd551..41746135 100644 --- a/exporter/streams_test.go +++ b/exporter/streams_test.go @@ -544,3 +544,77 @@ func TestStreamsExtractStreamMetrics(t *testing.T) { } } + +func TestStreamsExtractStreamMetricsExcludeConsumer(t *testing.T) { + if os.Getenv("TEST_REDIS_URI") == "" { + t.Skipf("TEST_REDIS_URI not set - skipping") + } + addr := os.Getenv("TEST_REDIS_URI") + e, _ := NewRedisExporter( + addr, + Options{Namespace: "test", CheckSingleStreams: dbNumStrFull + "=" + TestStreamName, StreamsExcludeConsumerMetrics: true}, + ) + c, err := redis.DialURL(addr) + if err != nil { + t.Fatalf("Couldn't connect to %#v: %#v", addr, err) + } + + setupDBKeys(t, addr) + defer deleteKeysFromDB(t, addr) + + chM := make(chan prometheus.Metric) + go func() { + e.extractStreamMetrics(chM, c) + close(chM) + }() + want := map[string]bool{ + "stream_length": false, + "stream_radix_tree_keys": false, + "stream_radix_tree_nodes": false, + "stream_last_generated_id": false, + "stream_groups": false, + "stream_max_deleted_entry_id": false, + "stream_first_entry_id": false, + "stream_last_entry_id": false, + "stream_group_consumers": false, + "stream_group_messages_pending": false, + "stream_group_last_delivered_id": false, + "stream_group_entries_read": false, + "stream_group_lag": false, + } + + dont_want := map[string]bool{ + "stream_group_consumer_messages_pending": false, + "stream_group_consumer_idle_seconds": false, + } + + for m := range chM { + for k := range want { + log.Debugf("metric: %s", m.Desc().String()) + log.Debugf("want: %s", k) + + if strings.Contains(m.Desc().String(), k) { + want[k] = true + } + } + for k := range dont_want { + log.Debugf("metric: %s", m.Desc().String()) + log.Debugf("don't want: %s", k) + + if strings.Contains(m.Desc().String(), k) { + dont_want[k] = true + } + } + } + + for k, found := range want { + if !found { + t.Errorf("didn't find %s metric, which should be collected", k) + } + } + for k, found := range dont_want { + if found { + t.Errorf("found %s metric, which shouldn't be collected", k) + } + } +} diff --git a/main.go b/main.go index 390cc54a..bc4a132b 100644 --- a/main.go +++ b/main.go @@ -57,46 +57,47 @@ func getEnvInt64(key string, defaultVal int64) int64 { func main() { var ( - redisAddr = flag.String("redis.addr", getEnv("REDIS_ADDR", "redis://localhost:6379"), "Address of the Redis instance to scrape") - redisUser = flag.String("redis.user", getEnv("REDIS_USER", ""), "User name to use for authentication (Redis ACL for Redis 6.0 and newer)") - redisPwd = flag.String("redis.password", getEnv("REDIS_PASSWORD", ""), "Password of the Redis instance to scrape") - redisPwdFile = flag.String("redis.password-file", getEnv("REDIS_PASSWORD_FILE", ""), "Password file of the Redis instance to scrape") - namespace = flag.String("namespace", getEnv("REDIS_EXPORTER_NAMESPACE", "redis"), "Namespace for metrics") - checkKeys = flag.String("check-keys", getEnv("REDIS_EXPORTER_CHECK_KEYS", ""), "Comma separated list of key-patterns to export value and length/size, searched for with SCAN") - checkSingleKeys = flag.String("check-single-keys", getEnv("REDIS_EXPORTER_CHECK_SINGLE_KEYS", ""), "Comma separated list of single keys to export value and length/size") - checkKeyGroups = flag.String("check-key-groups", getEnv("REDIS_EXPORTER_CHECK_KEY_GROUPS", ""), "Comma separated list of lua regex for grouping keys") - checkStreams = flag.String("check-streams", getEnv("REDIS_EXPORTER_CHECK_STREAMS", ""), "Comma separated list of stream-patterns to export info about streams, groups and consumers, searched for with SCAN") - checkSingleStreams = flag.String("check-single-streams", getEnv("REDIS_EXPORTER_CHECK_SINGLE_STREAMS", ""), "Comma separated list of single streams to export info about streams, groups and consumers") - countKeys = flag.String("count-keys", getEnv("REDIS_EXPORTER_COUNT_KEYS", ""), "Comma separated list of patterns to count (eg: 'db0=production_*,db3=sessions:*'), searched for with SCAN") - checkKeysBatchSize = flag.Int64("check-keys-batch-size", getEnvInt64("REDIS_EXPORTER_CHECK_KEYS_BATCH_SIZE", 1000), "Approximate number of keys to process in each execution, larger value speeds up scanning.\nWARNING: Still Redis is a single-threaded app, huge COUNT can affect production environment.") - scriptPath = flag.String("script", getEnv("REDIS_EXPORTER_SCRIPT", ""), "Comma separated list of path(s) to Redis Lua script(s) for gathering extra metrics") - listenAddress = flag.String("web.listen-address", getEnv("REDIS_EXPORTER_WEB_LISTEN_ADDRESS", ":9121"), "Address to listen on for web interface and telemetry.") - metricPath = flag.String("web.telemetry-path", getEnv("REDIS_EXPORTER_WEB_TELEMETRY_PATH", "/metrics"), "Path under which to expose metrics.") - logFormat = flag.String("log-format", getEnv("REDIS_EXPORTER_LOG_FORMAT", "txt"), "Log format, valid options are txt and json") - configCommand = flag.String("config-command", getEnv("REDIS_EXPORTER_CONFIG_COMMAND", "CONFIG"), "What to use for the CONFIG command") - connectionTimeout = flag.String("connection-timeout", getEnv("REDIS_EXPORTER_CONNECTION_TIMEOUT", "15s"), "Timeout for connection to Redis instance") - tlsClientKeyFile = flag.String("tls-client-key-file", getEnv("REDIS_EXPORTER_TLS_CLIENT_KEY_FILE", ""), "Name of the client key file (including full path) if the server requires TLS client authentication") - tlsClientCertFile = flag.String("tls-client-cert-file", getEnv("REDIS_EXPORTER_TLS_CLIENT_CERT_FILE", ""), "Name of the client certificate file (including full path) if the server requires TLS client authentication") - tlsCaCertFile = flag.String("tls-ca-cert-file", getEnv("REDIS_EXPORTER_TLS_CA_CERT_FILE", ""), "Name of the CA certificate file (including full path) if the server requires TLS client authentication") - tlsServerKeyFile = flag.String("tls-server-key-file", getEnv("REDIS_EXPORTER_TLS_SERVER_KEY_FILE", ""), "Name of the server key file (including full path) if the web interface and telemetry should use TLS") - tlsServerCertFile = flag.String("tls-server-cert-file", getEnv("REDIS_EXPORTER_TLS_SERVER_CERT_FILE", ""), "Name of the server certificate file (including full path) if the web interface and telemetry should use TLS") - tlsServerCaCertFile = flag.String("tls-server-ca-cert-file", getEnv("REDIS_EXPORTER_TLS_SERVER_CA_CERT_FILE", ""), "Name of the CA certificate file (including full path) if the web interface and telemetry should require TLS client authentication") - tlsServerMinVersion = flag.String("tls-server-min-version", getEnv("REDIS_EXPORTER_TLS_SERVER_MIN_VERSION", "TLS1.2"), "Minimum TLS version that is acceptable by the web interface and telemetry when using TLS") - maxDistinctKeyGroups = flag.Int64("max-distinct-key-groups", getEnvInt64("REDIS_EXPORTER_MAX_DISTINCT_KEY_GROUPS", 100), "The maximum number of distinct key groups with the most memory utilization to present as distinct metrics per database, the leftover key groups will be aggregated in the 'overflow' bucket") - isDebug = flag.Bool("debug", getEnvBool("REDIS_EXPORTER_DEBUG", false), "Output verbose debug information") - setClientName = flag.Bool("set-client-name", getEnvBool("REDIS_EXPORTER_SET_CLIENT_NAME", true), "Whether to set client name to redis_exporter") - isTile38 = flag.Bool("is-tile38", getEnvBool("REDIS_EXPORTER_IS_TILE38", false), "Whether to scrape Tile38 specific metrics") - isCluster = flag.Bool("is-cluster", getEnvBool("REDIS_EXPORTER_IS_CLUSTER", false), "Whether this is a redis cluster (Enable this if you need to fetch key level data on a Redis Cluster).") - exportClientList = flag.Bool("export-client-list", getEnvBool("REDIS_EXPORTER_EXPORT_CLIENT_LIST", false), "Whether to scrape Client List specific metrics") - exportClientPort = flag.Bool("export-client-port", getEnvBool("REDIS_EXPORTER_EXPORT_CLIENT_PORT", false), "Whether to include the client's port when exporting the client list. Warning: including the port increases the number of metrics generated and will make your Prometheus server take up more memory") - showVersion = flag.Bool("version", false, "Show version information and exit") - redisMetricsOnly = flag.Bool("redis-only-metrics", getEnvBool("REDIS_EXPORTER_REDIS_ONLY_METRICS", false), "Whether to also export go runtime metrics") - pingOnConnect = flag.Bool("ping-on-connect", getEnvBool("REDIS_EXPORTER_PING_ON_CONNECT", false), "Whether to ping the redis instance after connecting") - inclConfigMetrics = flag.Bool("include-config-metrics", getEnvBool("REDIS_EXPORTER_INCL_CONFIG_METRICS", false), "Whether to include all config settings as metrics") - disableExportingKeyValues = flag.Bool("disable-exporting-key-values", getEnvBool("REDIS_EXPORTER_DISABLE_EXPORTING_KEY_VALUES", false), "Whether to disable values of keys stored in redis as labels or not when using check-keys/check-single-key") - redactConfigMetrics = flag.Bool("redact-config-metrics", getEnvBool("REDIS_EXPORTER_REDACT_CONFIG_METRICS", true), "Whether to redact config settings that include potentially sensitive information like passwords") - inclSystemMetrics = flag.Bool("include-system-metrics", getEnvBool("REDIS_EXPORTER_INCL_SYSTEM_METRICS", false), "Whether to include system metrics like e.g. redis_total_system_memory_bytes") - skipTLSVerification = flag.Bool("skip-tls-verification", getEnvBool("REDIS_EXPORTER_SKIP_TLS_VERIFICATION", false), "Whether to to skip TLS verification") + redisAddr = flag.String("redis.addr", getEnv("REDIS_ADDR", "redis://localhost:6379"), "Address of the Redis instance to scrape") + redisUser = flag.String("redis.user", getEnv("REDIS_USER", ""), "User name to use for authentication (Redis ACL for Redis 6.0 and newer)") + redisPwd = flag.String("redis.password", getEnv("REDIS_PASSWORD", ""), "Password of the Redis instance to scrape") + redisPwdFile = flag.String("redis.password-file", getEnv("REDIS_PASSWORD_FILE", ""), "Password file of the Redis instance to scrape") + namespace = flag.String("namespace", getEnv("REDIS_EXPORTER_NAMESPACE", "redis"), "Namespace for metrics") + checkKeys = flag.String("check-keys", getEnv("REDIS_EXPORTER_CHECK_KEYS", ""), "Comma separated list of key-patterns to export value and length/size, searched for with SCAN") + checkSingleKeys = flag.String("check-single-keys", getEnv("REDIS_EXPORTER_CHECK_SINGLE_KEYS", ""), "Comma separated list of single keys to export value and length/size") + checkKeyGroups = flag.String("check-key-groups", getEnv("REDIS_EXPORTER_CHECK_KEY_GROUPS", ""), "Comma separated list of lua regex for grouping keys") + checkStreams = flag.String("check-streams", getEnv("REDIS_EXPORTER_CHECK_STREAMS", ""), "Comma separated list of stream-patterns to export info about streams, groups and consumers, searched for with SCAN") + checkSingleStreams = flag.String("check-single-streams", getEnv("REDIS_EXPORTER_CHECK_SINGLE_STREAMS", ""), "Comma separated list of single streams to export info about streams, groups and consumers") + streamsExcludeConsumerMetrics = flag.Bool("streams-exclude-consumer-metrics", getEnvBool("REDIS_EXPORTER_STREAMS_EXCLUDE_CONSUMER_METRICS", false), "Don't collect per consumer metrics for streams (decreases cardinality)") + countKeys = flag.String("count-keys", getEnv("REDIS_EXPORTER_COUNT_KEYS", ""), "Comma separated list of patterns to count (eg: 'db0=production_*,db3=sessions:*'), searched for with SCAN") + checkKeysBatchSize = flag.Int64("check-keys-batch-size", getEnvInt64("REDIS_EXPORTER_CHECK_KEYS_BATCH_SIZE", 1000), "Approximate number of keys to process in each execution, larger value speeds up scanning.\nWARNING: Still Redis is a single-threaded app, huge COUNT can affect production environment.") + scriptPath = flag.String("script", getEnv("REDIS_EXPORTER_SCRIPT", ""), "Comma separated list of path(s) to Redis Lua script(s) for gathering extra metrics") + listenAddress = flag.String("web.listen-address", getEnv("REDIS_EXPORTER_WEB_LISTEN_ADDRESS", ":9121"), "Address to listen on for web interface and telemetry.") + metricPath = flag.String("web.telemetry-path", getEnv("REDIS_EXPORTER_WEB_TELEMETRY_PATH", "/metrics"), "Path under which to expose metrics.") + logFormat = flag.String("log-format", getEnv("REDIS_EXPORTER_LOG_FORMAT", "txt"), "Log format, valid options are txt and json") + configCommand = flag.String("config-command", getEnv("REDIS_EXPORTER_CONFIG_COMMAND", "CONFIG"), "What to use for the CONFIG command") + connectionTimeout = flag.String("connection-timeout", getEnv("REDIS_EXPORTER_CONNECTION_TIMEOUT", "15s"), "Timeout for connection to Redis instance") + tlsClientKeyFile = flag.String("tls-client-key-file", getEnv("REDIS_EXPORTER_TLS_CLIENT_KEY_FILE", ""), "Name of the client key file (including full path) if the server requires TLS client authentication") + tlsClientCertFile = flag.String("tls-client-cert-file", getEnv("REDIS_EXPORTER_TLS_CLIENT_CERT_FILE", ""), "Name of the client certificate file (including full path) if the server requires TLS client authentication") + tlsCaCertFile = flag.String("tls-ca-cert-file", getEnv("REDIS_EXPORTER_TLS_CA_CERT_FILE", ""), "Name of the CA certificate file (including full path) if the server requires TLS client authentication") + tlsServerKeyFile = flag.String("tls-server-key-file", getEnv("REDIS_EXPORTER_TLS_SERVER_KEY_FILE", ""), "Name of the server key file (including full path) if the web interface and telemetry should use TLS") + tlsServerCertFile = flag.String("tls-server-cert-file", getEnv("REDIS_EXPORTER_TLS_SERVER_CERT_FILE", ""), "Name of the server certificate file (including full path) if the web interface and telemetry should use TLS") + tlsServerCaCertFile = flag.String("tls-server-ca-cert-file", getEnv("REDIS_EXPORTER_TLS_SERVER_CA_CERT_FILE", ""), "Name of the CA certificate file (including full path) if the web interface and telemetry should require TLS client authentication") + tlsServerMinVersion = flag.String("tls-server-min-version", getEnv("REDIS_EXPORTER_TLS_SERVER_MIN_VERSION", "TLS1.2"), "Minimum TLS version that is acceptable by the web interface and telemetry when using TLS") + maxDistinctKeyGroups = flag.Int64("max-distinct-key-groups", getEnvInt64("REDIS_EXPORTER_MAX_DISTINCT_KEY_GROUPS", 100), "The maximum number of distinct key groups with the most memory utilization to present as distinct metrics per database, the leftover key groups will be aggregated in the 'overflow' bucket") + isDebug = flag.Bool("debug", getEnvBool("REDIS_EXPORTER_DEBUG", false), "Output verbose debug information") + setClientName = flag.Bool("set-client-name", getEnvBool("REDIS_EXPORTER_SET_CLIENT_NAME", true), "Whether to set client name to redis_exporter") + isTile38 = flag.Bool("is-tile38", getEnvBool("REDIS_EXPORTER_IS_TILE38", false), "Whether to scrape Tile38 specific metrics") + isCluster = flag.Bool("is-cluster", getEnvBool("REDIS_EXPORTER_IS_CLUSTER", false), "Whether this is a redis cluster (Enable this if you need to fetch key level data on a Redis Cluster).") + exportClientList = flag.Bool("export-client-list", getEnvBool("REDIS_EXPORTER_EXPORT_CLIENT_LIST", false), "Whether to scrape Client List specific metrics") + exportClientPort = flag.Bool("export-client-port", getEnvBool("REDIS_EXPORTER_EXPORT_CLIENT_PORT", false), "Whether to include the client's port when exporting the client list. Warning: including the port increases the number of metrics generated and will make your Prometheus server take up more memory") + showVersion = flag.Bool("version", false, "Show version information and exit") + redisMetricsOnly = flag.Bool("redis-only-metrics", getEnvBool("REDIS_EXPORTER_REDIS_ONLY_METRICS", false), "Whether to also export go runtime metrics") + pingOnConnect = flag.Bool("ping-on-connect", getEnvBool("REDIS_EXPORTER_PING_ON_CONNECT", false), "Whether to ping the redis instance after connecting") + inclConfigMetrics = flag.Bool("include-config-metrics", getEnvBool("REDIS_EXPORTER_INCL_CONFIG_METRICS", false), "Whether to include all config settings as metrics") + disableExportingKeyValues = flag.Bool("disable-exporting-key-values", getEnvBool("REDIS_EXPORTER_DISABLE_EXPORTING_KEY_VALUES", false), "Whether to disable values of keys stored in redis as labels or not when using check-keys/check-single-key") + redactConfigMetrics = flag.Bool("redact-config-metrics", getEnvBool("REDIS_EXPORTER_REDACT_CONFIG_METRICS", true), "Whether to redact config settings that include potentially sensitive information like passwords") + inclSystemMetrics = flag.Bool("include-system-metrics", getEnvBool("REDIS_EXPORTER_INCL_SYSTEM_METRICS", false), "Whether to include system metrics like e.g. redis_total_system_memory_bytes") + skipTLSVerification = flag.Bool("skip-tls-verification", getEnvBool("REDIS_EXPORTER_SKIP_TLS_VERIFICATION", false), "Whether to to skip TLS verification") ) flag.Parse() @@ -157,39 +158,40 @@ func main() { exp, err := exporter.NewRedisExporter( *redisAddr, exporter.Options{ - User: *redisUser, - Password: *redisPwd, - PasswordMap: passwordMap, - Namespace: *namespace, - ConfigCommandName: *configCommand, - CheckKeys: *checkKeys, - CheckSingleKeys: *checkSingleKeys, - CheckKeysBatchSize: *checkKeysBatchSize, - CheckKeyGroups: *checkKeyGroups, - MaxDistinctKeyGroups: *maxDistinctKeyGroups, - CheckStreams: *checkStreams, - CheckSingleStreams: *checkSingleStreams, - CountKeys: *countKeys, - LuaScript: ls, - InclSystemMetrics: *inclSystemMetrics, - InclConfigMetrics: *inclConfigMetrics, - DisableExportingKeyValues: *disableExportingKeyValues, - RedactConfigMetrics: *redactConfigMetrics, - SetClientName: *setClientName, - IsTile38: *isTile38, - IsCluster: *isCluster, - ExportClientList: *exportClientList, - ExportClientsInclPort: *exportClientPort, - SkipTLSVerification: *skipTLSVerification, - ClientCertFile: *tlsClientCertFile, - ClientKeyFile: *tlsClientKeyFile, - CaCertFile: *tlsCaCertFile, - ConnectionTimeouts: to, - MetricsPath: *metricPath, - RedisMetricsOnly: *redisMetricsOnly, - PingOnConnect: *pingOnConnect, - RedisPwdFile: *redisPwdFile, - Registry: registry, + User: *redisUser, + Password: *redisPwd, + PasswordMap: passwordMap, + Namespace: *namespace, + ConfigCommandName: *configCommand, + CheckKeys: *checkKeys, + CheckSingleKeys: *checkSingleKeys, + CheckKeysBatchSize: *checkKeysBatchSize, + CheckKeyGroups: *checkKeyGroups, + MaxDistinctKeyGroups: *maxDistinctKeyGroups, + CheckStreams: *checkStreams, + CheckSingleStreams: *checkSingleStreams, + StreamsExcludeConsumerMetrics: *streamsExcludeConsumerMetrics, + CountKeys: *countKeys, + LuaScript: ls, + InclSystemMetrics: *inclSystemMetrics, + InclConfigMetrics: *inclConfigMetrics, + DisableExportingKeyValues: *disableExportingKeyValues, + RedactConfigMetrics: *redactConfigMetrics, + SetClientName: *setClientName, + IsTile38: *isTile38, + IsCluster: *isCluster, + ExportClientList: *exportClientList, + ExportClientsInclPort: *exportClientPort, + SkipTLSVerification: *skipTLSVerification, + ClientCertFile: *tlsClientCertFile, + ClientKeyFile: *tlsClientKeyFile, + CaCertFile: *tlsCaCertFile, + ConnectionTimeouts: to, + MetricsPath: *metricPath, + RedisMetricsOnly: *redisMetricsOnly, + PingOnConnect: *pingOnConnect, + RedisPwdFile: *redisPwdFile, + Registry: registry, BuildInfo: exporter.BuildInfo{ Version: BuildVersion, CommitSha: BuildCommitSha,