New metrics for ha peer

Signed-off-by: Örnfeldt Philip (66140321) <[email protected]>

Author: Philldomd

pkg/probe/system_ha_peer.go

@@ -23,10 +23,16 @@ import (
 )
 
 func probeSystemHaPeer(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Metric, bool) {
-	Priority := prometheus.NewDesc(
-		"fortigate_ha_peer",
+	Info := prometheus.NewDesc(
+		"fortigate_ha_peer_info",
+		"Information about the ha peer.",
+		[]string{"serial", "vcluster", "hostname", "priority"}, nil,
+	)
+
+	Primary := prometheus.NewDesc(
+		"fortigate_ha_peer_primary",
 		"True when the peer device is the HA primary.",
-		[]string{"serial", "vcluster", "hostname", "master", "primary", "priority"}, nil,
+		[]string{"vcluster", "hostname"}, nil,
 	)
 
 	type SystemHaPeer struct {
@@ -50,15 +56,14 @@ func probeSystemHaPeer(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Met
 	m := []prometheus.Metric{}
 	for _, r := range res.Result {
 		if meta.VersionMajor >= 7 && meta.VersionMinor >= 4 {
+			m = append(m, prometheus.MustNewConstMetric(Info, prometheus.GaugeValue, 1, r.Serial, strconv.FormatInt(r.Vcluster, 10), r.Hostname, strconv.FormatFloat(r.Priority, 'f', -1, 64)))
 			if r.Primary {
-				m = append(m, prometheus.MustNewConstMetric(Priority, prometheus.GaugeValue, 1, r.Serial, strconv.FormatInt(r.Vcluster, 10), r.Hostname, strconv.FormatBool(r.Master), "true", strconv.FormatFloat(r.Priority, 'f', -1, 64)))
-				m = append(m, prometheus.MustNewConstMetric(Priority, prometheus.GaugeValue, 0, r.Serial, strconv.FormatInt(r.Vcluster, 10), r.Hostname, strconv.FormatBool(r.Master), "false", strconv.FormatFloat(r.Priority, 'f', -1, 64)))
+				m = append(m, prometheus.MustNewConstMetric(Primary, prometheus.GaugeValue, 1, strconv.FormatInt(r.Vcluster, 10), r.Hostname))
 			} else {
-				m = append(m, prometheus.MustNewConstMetric(Priority, prometheus.GaugeValue, 0, r.Serial, strconv.FormatInt(r.Vcluster, 10), r.Hostname, strconv.FormatBool(r.Master), "true", strconv.FormatFloat(r.Priority, 'f', -1, 64)))
-				m = append(m, prometheus.MustNewConstMetric(Priority, prometheus.GaugeValue, 1, r.Serial, strconv.FormatInt(r.Vcluster, 10), r.Hostname, strconv.FormatBool(r.Master), "false", strconv.FormatFloat(r.Priority, 'f', -1, 64)))
+				m = append(m, prometheus.MustNewConstMetric(Primary, prometheus.GaugeValue, 0, strconv.FormatInt(r.Vcluster, 10), r.Hostname))
 			}
 		} else {
-			m = append(m, prometheus.MustNewConstMetric(Priority, prometheus.GaugeValue, -1, "None", "0", "None", "false", "Unsupported", "false"))
+			m = append(m, prometheus.MustNewConstMetric(Info, prometheus.GaugeValue, -1, "None", "0", "None", "false"))
 			break
 		}
 	}

pkg/probe/system_ha_peer_test.go

@@ -34,9 +34,9 @@ func TestSystemHaPeerOld(t *testing.T) {
 	}
 
 	em := `
-	# HELP fortigate_ha_peer True when the peer device is the HA primary.
-	# TYPE fortigate_ha_peer gauge
-	fortigate_ha_peer{hostname="None",master="false",primary="Unsupported",priority="false",serial="None",vcluster="0"} -1
+	# HELP fortigate_ha_peer_info Information about the ha peer.
+	# TYPE fortigate_ha_peer_info gauge
+	fortigate_ha_peer_info{hostname="None",priority="false",serial="None",vcluster="0"} -1
 	`
 
 	if err := testutil.GatherAndCompare(r, strings.NewReader(em)); err != nil {
@@ -57,12 +57,14 @@ func TestSystemHaPeerAfter74(t *testing.T) {
 	}
 
 	em := `
-	# HELP fortigate_ha_peer True when the peer device is the HA primary.
-	# TYPE fortigate_ha_peer gauge
-	fortigate_ha_peer{hostname="member-name-1",master="false",primary="false",priority="200",serial="FGT61E4QXXXXXXXX1",vcluster="0"} 0
-	fortigate_ha_peer{hostname="member-name-1",master="false",primary="true",priority="200",serial="FGT61E4QXXXXXXXX1",vcluster="0"} 1
-	fortigate_ha_peer{hostname="member-name-2",master="false",primary="false",priority="100",serial="FGT61E4QXXXXXXXX2",vcluster="0"} 1
-	fortigate_ha_peer{hostname="member-name-2",master="false",primary="true",priority="100",serial="FGT61E4QXXXXXXXX2",vcluster="0"} 0
+	# HELP fortigate_ha_peer_info Information about the ha peer.
+	# TYPE fortigate_ha_peer_info gauge
+	fortigate_ha_peer_info{hostname="member-name-1",priority="200",serial="FGT61E4QXXXXXXXX1",vcluster="0"} 1
+	fortigate_ha_peer_info{hostname="member-name-2",priority="100",serial="FGT61E4QXXXXXXXX2",vcluster="0"} 1
+	# HELP fortigate_ha_peer_primary True when the peer device is the HA primary.
+	# TYPE fortigate_ha_peer_primary gauge
+	fortigate_ha_peer_primary{hostname="member-name-1",vcluster="0"} 1
+	fortigate_ha_peer_primary{hostname="member-name-2",vcluster="0"} 0
 	`
 
 	if err := testutil.GatherAndCompare(r, strings.NewReader(em)); err != nil {