Add more module metrics collection

oliver006 · Sep 11, 2024 · 081482b · 081482b
1 parent 11e813c
commit 081482b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/exporter/exporter.go b/exporter/exporter.go
@@ -279,6 +279,10 @@ func NewRedisExporter(redisURI string, opts Options) (*Exporter, error) {
 			"search_bytes_collected":     "search_bytes_collected",
 			"search_total_cycles":        "search_total_cycles",
 			"search_total_ms_run":        "search_total_ms_run",
+			"search_dialect_1":           "search_dialect_1",
+			"search_dialect_2":           "search_dialect_2",
+			"search_dialect_3":           "search_dialect_3",
+			"search_dialect_4":           "search_dialect_4",
 		},
 
 		metricMapCounters: map[string]string{
@@ -433,6 +437,8 @@ func NewRedisExporter(redisURI string, opts Options) (*Exporter, error) {
 		"stream_radix_tree_keys":                             {txt: `Radix tree keys count"`, lbls: []string{"db", "stream"}},
 		"stream_radix_tree_nodes":                            {txt: `Radix tree nodes count`, lbls: []string{"db", "stream"}},
 		"up":                                                 {txt: "Information about the Redis instance"},
+		"module_info":                                        {txt: "Information about loaded Redis module", lbls: []string{"name", "ver", "api", "filters", "usedby", "using"}},
+		"search_version":                                     {txt: "Information about the RediSearch module", lbls: []string{"version"}},
 	} {
 		e.metricDescriptions[k] = newMetricDescr(opts.Namespace, k, desc.txt, desc.lbls)
 	}
@@ -711,7 +717,7 @@ func (e *Exporter) scrapeRedisHost(ch chan<- prometheus.Metric) error {
 	}
 
 	if e.options.InclModulesMetrics {
-		e.extractModuleMetrics(ch, c)
+		e.extractModulesMetrics(ch, c)
 	}
 
 	if len(e.options.LuaScript) > 0 {

diff --git a/exporter/modules.go b/exporter/modules.go
@@ -8,7 +8,7 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func (e *Exporter) extractModuleMetrics(ch chan<- prometheus.Metric, c redis.Conn) {
+func (e *Exporter) extractModulesMetrics(ch chan<- prometheus.Metric, c redis.Conn) {
 	info, err := redis.String(doRedisCmd(c, "INFO", "MODULES"))
 	if err != nil {
 		log.Errorf("extractSearchMetrics() err: %s", err)
@@ -20,9 +20,24 @@ func (e *Exporter) extractModuleMetrics(ch chan<- prometheus.Metric, c redis.Con
 		log.Debugf("info: %s", line)
 
 		split := strings.Split(line, ":")
-		if len(split) != 2 {
+		switch {
+		case split[0] == "module":
+			module := strings.Split(split[1], ",")
+			e.registerConstMetricGauge(ch, "module_info", 1,
+				// response format: 'module:name=search,ver=21005,api=1,filters=0,usedby=[],using=[ReJSON],options=[handle-io-errors]'
+				strings.Split(module[0], "=")[1],
+				strings.Split(module[1], "=")[1],
+				strings.Split(module[2], "=")[1],
+				strings.Split(module[3], "=")[1],
+				strings.Split(module[4], "=")[1],
+				strings.Split(module[5], "=")[1],
+			)
+		case split[0] == "search_version":
+			e.registerConstMetricGauge(ch, "search_version", 1, split[1])
+		case len(split) != 2:
 			continue
 		}
+
 		fieldKey := split[0]
 		fieldValue := split[1]
 

diff --git a/exporter/modules_test.go b/exporter/modules_test.go
@@ -34,6 +34,8 @@ func TestModules(t *testing.T) {
 		}()
 
 		wantedMetrics := map[string]bool{
+			"module_info":                false,
+			"search_version":             false,
 			"search_number_of_indexes":   false,
 			"search_used_memory_indexes": false,
 			"search_total_indexing_time": false,
@@ -42,6 +44,10 @@ func TestModules(t *testing.T) {
 			"search_bytes_collected":     false,
 			"search_total_cycles":        false,
 			"search_total_ms_run":        false,
+			"search_dialect_1":           false,
+			"search_dialect_2":           false,
+			"search_dialect_3":           false,
+			"search_dialect_4":           false,
 		}
 
 		for m := range chM {