Corrected data

Signed-off-by: Örnfeldt Philip (66140321) <philip.ornfeldt@forsakringskassan.se>

Author: Philldomd

pkg/probe/system_ha_peer.go

@@ -24,9 +24,9 @@ import (
 func probeSystemHaPeer (c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Metric, bool) {
 	var (
 		Priority = prometheus.NewDesc(
-			"fortigate_ha_peer_priority",
-			"Priority level of the HA peer device.",
-			[]string{"serial","vcluster","hostname","master","primary"}, nil,
+			"fortigate_ha_peer",
+			"True when the peer device is the HA primary.(true=1, false=0)",
+			[]string{"serial","vcluster","hostname","master","primary","priority"}, nil,
 		)
 	)
 
@@ -51,9 +51,14 @@ func probeSystemHaPeer (c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Me
 	m := []prometheus.Metric{}
 	for _, r := range res.Result {
 		if meta.VersionMajor >= 7 && meta.VersionMinor >= 4 {
-			m = append(m, prometheus.MustNewConstMetric(Priority, prometheus.GaugeValue, r.Priority, r.Serial, strconv.FormatInt(r.Vcluster, 10), r.Hostname, strconv.FormatBool(r.Master), strconv.FormatBool(r.Primary)))
+			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), strconv.FormatBool(r.Primary), strconv.FormatFloat(r.Priority, 'f', -1, 64)))
+			} else {
+				m = append(m, prometheus.MustNewConstMetric(Priority, prometheus.GaugeValue, 0, r.Serial, strconv.FormatInt(r.Vcluster, 10), r.Hostname, strconv.FormatBool(r.Master), strconv.FormatBool(r.Primary), strconv.FormatFloat(r.Priority, 'f', -1, 64)))
+			}
 		} else {
-			m = append(m, prometheus.MustNewConstMetric(Priority, prometheus.GaugeValue, r.Priority, r.Serial, strconv.FormatInt(r.Vcluster, 10), r.Hostname, strconv.FormatBool(r.Master), "Unsupported"))
+			m = append(m, prometheus.MustNewConstMetric(Priority, prometheus.GaugeValue, -1, "None", "0", "None", "false", "Unsupported", "false"))
+			break
 		}
 	}
 	return m, true

pkg/probe/system_ha_peer_test.go

@@ -34,10 +34,9 @@ func TestSystemHaPeerOld(t *testing.T) {
 	}
 
 	em := `
-	# HELP fortigate_ha_peer_priority Priority level of the HA peer device.
-	# TYPE fortigate_ha_peer_priority gauge
-	fortigate_ha_peer_priority{hostname="member-name-1",master="false",primary="Unsupported",serial="FGT61E4QXXXXXXXX1",vcluster="0"} 200
-	fortigate_ha_peer_priority{hostname="member-name-2",master="false",primary="Unsupported",serial="FGT61E4QXXXXXXXX2",vcluster="0"} 100
+	# HELP fortigate_ha_peer True when the peer device is the HA primary.(true=1, false=0)
+	# TYPE fortigate_ha_peer gauge
+	fortigate_ha_peer{hostname="None",master="false",primary="Unsupported",priority="false",serial="None",vcluster="0"} -1
 	`
 
 	if err := testutil.GatherAndCompare(r, strings.NewReader(em)); err != nil {
@@ -58,10 +57,10 @@ func TestSystemHaPeerAfter74(t *testing.T) {
 	}
 
 	em := `
-	# HELP fortigate_ha_peer_priority Priority level of the HA peer device.
-	# TYPE fortigate_ha_peer_priority gauge
-	fortigate_ha_peer_priority{hostname="member-name-1",master="false",primary="true",serial="FGT61E4QXXXXXXXX1",vcluster="0"} 200
-	fortigate_ha_peer_priority{hostname="member-name-2",master="false",primary="false",serial="FGT61E4QXXXXXXXX2",vcluster="0"} 100
+	# HELP fortigate_ha_peer True when the peer device is the HA primary.(true=1, false=0)
+	# TYPE fortigate_ha_peer gauge
+	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"} 0
 	`
 
 	if err := testutil.GatherAndCompare(r, strings.NewReader(em)); err != nil {