feat: add support for RDB current file size metric #1095
+472
−1
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| package exporter | ||
|
|
||
| import ( | ||
| "os" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| "github.com/gomodule/redigo/redis" | ||
| "github.com/prometheus/client_golang/prometheus" | ||
| log "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| func (e *Exporter) extractRdbFileSizeMetric(ch chan<- prometheus.Metric, config []interface{}) { | ||
|
Owner
There was a problem hiding this comment. I just simplified the config extraction anfd it's using a ma[string]string now which should make this code a lot simpler for instance,m you don't need to iterate over the config map any longer but can simply look up filename and directory. Please rebase and then use the config map. |
||
| if len(config) == 0 { | ||
| log.Debugf("Config is empty, cannot extract RDB file size") | ||
| return | ||
| } | ||
|
|
||
| // Validate config has even number of elements (key-value pairs) | ||
| if len(config)%2 != 0 { | ||
| log.Warnf("Invalid config format: odd number of elements (%d)", len(config)) | ||
| return | ||
| } | ||
|
|
||
| // Parse config to find dir and dbfilename | ||
| configMap := make(map[string]string) | ||
| for i := 0; i < len(config); i += 2 { | ||
| key, err := redis.String(config[i], nil) | ||
| if err != nil { | ||
| log.Warnf("Failed to parse config key at index %d: %s", i, err) | ||
| continue | ||
| } | ||
| value, err := redis.String(config[i+1], nil) | ||
| if err != nil { | ||
| log.Warnf("Failed to parse config value for key '%s': %s", key, err) | ||
| continue | ||
| } | ||
| configMap[key] = value | ||
| } | ||
|
|
||
| dir, dirOk := configMap["dir"] | ||
| dbfilename, dbfilenameOk := configMap["dbfilename"] | ||
|
|
||
| if !dirOk || !dbfilenameOk { | ||
| log.Warnf("Failed to find 'dir' or 'dbfilename' in config") | ||
| return | ||
| } | ||
|
|
||
| // Basic path validation to prevent directory traversal | ||
| if strings.Contains(dbfilename, "..") { | ||
| log.Warnf("Invalid dbfilename contains '..': %s", dbfilename) | ||
| return | ||
| } | ||
|
|
||
| rdbPath := filepath.Join(dir, dbfilename) | ||
| log.Debugf("RDB file path: %s", rdbPath) | ||
|
|
||
| fileInfo, err := os.Stat(rdbPath) | ||
| if err != nil { | ||
| if os.IsNotExist(err) { | ||
| log.Debugf("RDB file does not exist: %s", rdbPath) | ||
| // File doesn't exist, report 0 | ||
akshaykumar-vijapur marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| e.registerConstMetricGauge(ch, "rdb_current_size_bytes", 0) | ||
| return | ||
| } | ||
| if os.IsPermission(err) { | ||
| log.Warnf("Permission denied accessing RDB file: %s", rdbPath) | ||
| return | ||
| } | ||
| log.Warnf("Failed to stat RDB file %s: %s", rdbPath, err) | ||
| return | ||
| } | ||
|
|
||
| // Verify it's a regular file | ||
| if !fileInfo.Mode().IsRegular() { | ||
| log.Warnf("RDB path is not a regular file: %s (mode: %s)", rdbPath, fileInfo.Mode()) | ||
| return | ||
| } | ||
|
|
||
| fileSize := float64(fileInfo.Size()) | ||
akshaykumar-vijapur marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| log.Debugf("RDB file size: %d bytes", fileInfo.Size()) | ||
| e.registerConstMetricGauge(ch, "rdb_current_size_bytes", fileSize) | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
instead of the extra variable, call
extractRdbFileSizeMetric()right up here, after line 839