Skip to content

simplify config extraction #1109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oliver006 merged 2 commits into from
Apr 7, 2026
+5 −38
Merged

simplify config extraction #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55be752
simplify config extraction
oliver006 Apr 7, 2026
50f9b5c
same for sentinel config
oliver006 Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 3 additions & 19 deletions exporter/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,24 +696,8 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
ch <- e.targetScrapeRequestErrors
}

func (e *Exporter) extractConfigMetrics(ch chan<- prometheus.Metric, config []any) (dbCount int, err error) {
if len(config)%2 != 0 {
return 0, fmt.Errorf("invalid config: %#v", config)
}

for pos := 0; pos < len(config)/2; pos++ {
strKey, err := redis.String(config[pos*2], nil)
if err != nil {
log.Errorf("invalid config key name, err: %s, skipped", err)
continue
}

strVal, err := redis.String(config[pos*2+1], nil)
if err != nil {
log.Debugf("invalid config value for key name %s, err: %s, skipped", strKey, err)
continue
}

func (e *Exporter) extractConfigMetrics(ch chan<- prometheus.Metric, config map[string]string) (dbCount int, err error) {
for strKey, strVal := range config {
if strKey == "databases" {
if dbCount, err = strconv.Atoi(strVal); err != nil {
return 0, fmt.Errorf("invalid config value for key databases: %#v", strVal)
Expand Down Expand Up @@ -827,7 +811,7 @@ func (e *Exporter) scrapeRedisHost(ch chan<- prometheus.Metric) error {
if e.options.ConfigCommandName == "-" {
log.Debugf("Skipping extractConfigMetrics()")
} else {
if config, err := redis.Values(doRedisCmd(c, e.options.ConfigCommandName, "GET", "*")); err == nil {
if config, err := redis.StringMap(doRedisCmd(c, e.options.ConfigCommandName, "GET", "*")); err == nil {
dbCount, err = e.extractConfigMetrics(ch, config)
if err != nil {
log.Errorf("Redis extractConfigMetrics() err: %s", err)
Expand Down
21 changes: 2 additions & 19 deletions exporter/sentinels.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,32 +107,15 @@ func (e *Exporter) extractSentinelConfig(ch chan<- prometheus.Metric, c redis.Co
if !e.options.InclConfigMetrics {
return
}
sentinelConfig, err := redis.Values(doRedisCmd(c, "SENTINEL", "config", "get", "*"))
sentinelConfig, err := redis.StringMap(doRedisCmd(c, "SENTINEL", "config", "get", "*"))
if err != nil {
log.Errorf("Error getting sentinel config: %s", err)
return
}

if len(sentinelConfig)%2 != 0 {
log.Errorf("Invalid sentinel config, got: %#v", sentinelConfig)
return
}

log.Debugf("Sentinel config: %v", sentinelConfig)

for pos := 0; pos < len(sentinelConfig)/2; pos++ {
strKey, err := redis.String(sentinelConfig[pos*2], nil)
if err != nil {
log.Errorf("invalid sentinel config key name, err: %s, skipped", err)
continue
}

strVal, err := redis.String(sentinelConfig[pos*2+1], nil)
if err != nil {
log.Debugf("invalid sentinel config value for key name %s, err: %s, skipped", strKey, err)
continue
}

for strKey, strVal := range sentinelConfig {
e.registerConstMetricGauge(ch, "sentinel_config_key_value", 1.0, strKey, strVal)
if val, err := strconv.ParseFloat(strVal, 64); err == nil {
e.registerConstMetricGauge(ch, "sentinel_config_value", val, strKey)
Expand Down
Loading