Add sentinel_peer_info metric for Sentinel peer discovery

exporter/exporter.go

@@ -71,6 +71,7 @@ type Options struct {
 	InclConfigMetrics              bool
 	InclModulesMetrics             bool
 	InclSearchIndexesMetrics       bool
+	InclSentinelPeerInfo           bool
 	CheckSearchIndexes             string
 	DisableExportingKeyValues      bool
 	ExcludeLatencyHistogramMetrics bool
@@ -569,6 +570,7 @@ func NewRedisExporter(uri string, opts Options) (*Exporter, error) {
 		"search_index_number_of_uses_total":                  {txt: "Number of times the index has been used", lbls: []string{"index_name"}},
 		"search_index_cleaning":                              {txt: "Index deletion flag. A value of 1 indicates index deletion is in progress", lbls: []string{"index_name"}},
 		"sentinel_master_ckquorum_status":                    {txt: "Master ckquorum status", lbls: []string{"master_name", "message"}},
+		"sentinel_peer_info":                                 {txt: "Other Sentinel peers discovered via SENTINEL SENTINELS (one scrape from one Sentinel)", lbls: []string{"master_name", "master_address", "name", "ip", "port", "runid", "flags"}},
 		"sentinel_master_ok_sentinels":                       {txt: "The number of okay sentinels monitoring this master", lbls: []string{"master_name", "master_address"}},
 		"sentinel_master_ok_slaves":                          {txt: "The number of okay slaves of the master", lbls: []string{"master_name", "master_address"}},
 		"sentinel_master_sentinels":                          {txt: "The number of sentinels monitoring this master", lbls: []string{"master_name", "master_address"}},

exporter/info_test.go

@@ -43,7 +43,6 @@ func TestKeyspaceStringParser(t *testing.T) {
 		},
 	}
 
-	log.SetLevel(log.DebugLevel)
 	for _, tst := range tsts {
 		if kt, kx, ttl, kc, ok := parseDBKeyspaceString(tst.db, tst.stats); true {
 

exporter/sentinels.go

@@ -144,6 +144,13 @@ func (e *Exporter) processSentinelSentinels(ch chan<- prometheus.Metric, sentine
 
 	// If we are here then this master is in ok state
 	masterOkSentinels := 1
+	hasMasterLabels := len(labels) >= 2
+	masterName := ""
+	masterAddr := ""
+	if hasMasterLabels {
+		masterName = labels[0]
+		masterAddr = labels[1]
+	}
 
 	for _, sentinelDetail := range sentinelDetails {
 		sentinelDetailMap, err := redis.StringMap(sentinelDetail, nil)
@@ -152,14 +159,39 @@ func (e *Exporter) processSentinelSentinels(ch chan<- prometheus.Metric, sentine
 			continue
 		}
 
-		sentinelFlags, ok := sentinelDetailMap["flags"]
-		if !ok {
+		name := ""
+		if v, ok := sentinelDetailMap["name"]; ok {
+			name = v
+		}
+		ip := ""
+		if v, ok := sentinelDetailMap["ip"]; ok {
+			ip = v
+		}
+		port := ""
+		if v, ok := sentinelDetailMap["port"]; ok {
+			port = v
+		}
+		runid := ""
+		if v, ok := sentinelDetailMap["runid"]; ok {
+			runid = v
+		}
+		flags := ""
+		flagsFound := false
+		if v, ok := sentinelDetailMap["flags"]; ok {
+			flags = v
+			flagsFound = true
+		}
+		if e.options.InclSentinelPeerInfo && hasMasterLabels {
+			e.registerConstMetricGauge(ch, "sentinel_peer_info", 1, masterName, masterAddr, name, ip, port, runid, flags)
+		}
+
+		if !flagsFound {
 			continue
 		}
-		if strings.Contains(sentinelFlags, "o_down") {
+		if strings.Contains(flags, "o_down") {
 			continue
 		}
-		if strings.Contains(sentinelFlags, "s_down") {
+		if strings.Contains(flags, "s_down") {
 			continue
 		}
 		masterOkSentinels = masterOkSentinels + 1
@@ -188,7 +220,9 @@ func (e *Exporter) processSentinelSlaves(ch chan<- prometheus.Metric, slaveDetai
 		}
 		masterOkSlaves = masterOkSlaves + 1
 	}
-	e.registerConstMetricGauge(ch, "sentinel_master_ok_slaves", float64(masterOkSlaves), labels...)
+	if len(labels) >= 2 {
+		e.registerConstMetricGauge(ch, "sentinel_master_ok_slaves", float64(masterOkSlaves), labels...)
+	}
 }
 
 /*