Added master back if minor version is equal to 4

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

Author: Philldomd

pkg/probe/system_ha_peer.go

@@ -35,6 +35,12 @@ func probeSystemHaPeer(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Met
 		[]string{"vcluster", "hostname"}, nil,
 	)
 
+	master := prometheus.NewDesc(
+		"fortigate_ha_peer_master",
+		"True when the peer device is the HA master.",
+		[]string{"vcluster", "hostname"}, nil,
+	)
+
 	type SystemHaPeer struct {
 		Serial   string  `json:"serial_no"`
 		Vcluster int64   `json:"vcluster_id"`
@@ -62,6 +68,13 @@ func probeSystemHaPeer(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Met
 			} else {
 				m = append(m, prometheus.MustNewConstMetric(primary, prometheus.GaugeValue, 0, strconv.FormatInt(r.Vcluster, 10), r.Hostname))
 			}
+			if meta.VersionMinor == 4 {
+				if r.Master {
+					m = append(m, prometheus.MustNewConstMetric(master, prometheus.GaugeValue, 1, strconv.FormatInt(r.Vcluster, 10), r.Hostname))
+				} else {
+					m = append(m, prometheus.MustNewConstMetric(master, prometheus.GaugeValue, 0, strconv.FormatInt(r.Vcluster, 10), r.Hostname))
+				}
+			}
 		} else {
 			m = append(m, prometheus.MustNewConstMetric(info, prometheus.GaugeValue, -1, "None", "0", "None", "false"))
 			break

pkg/probe/system_ha_peer_test.go

@@ -61,6 +61,10 @@ func TestSystemHaPeerAfter74(t *testing.T) {
 	# 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_master True when the peer device is the HA master.
+	# TYPE fortigate_ha_peer_master gauge
+	fortigate_ha_peer_master{hostname="member-name-1",vcluster="0"} 0
+	fortigate_ha_peer_master{hostname="member-name-2",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

pkg/probe/testdata/system-ha-peer.jsonnet

@@ -13,7 +13,8 @@
       "serial_no":"FGT61E4QXXXXXXXX2",
       "vcluster_id":0,
       "priority":100,
-      "hostname":"member-name-2"
+      "hostname":"member-name-2",
+      "master": true
     }
   ],
   "vdom":"root",