Reverted back old version and added new to metrics

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

Author: Philldomd

metrics.md

@@ -89,6 +89,7 @@ Per-VDOM:
  * _System/Interface/Transceivers_
    * `fortigate_inteface_transceivers_info`
  * _System/SDNConnector_
+   * `fortigate_system_sdn_connector_state`
    * `fortigate_system_sdn_connector_status`
    * `fortigate_system_sdn_connector_last_update_seconds`
  * _/System/CentralManagement/Status_

pkg/probe/system_sdn_connector.go

@@ -36,6 +36,11 @@ type SystemSDNConnector struct {
 
 func probeSystemSDNConnector(c http.FortiHTTP, _ *TargetMetadata) ([]prometheus.Metric, bool) {
 	var (
+		SDNConnectorsStatus = prometheus.NewDesc(
+			"fortigate_system_sdn_connector_status",
+			"Status of SDN connectors (0=Disabled, 1=Down, 2=Unknown, 3=Up, 4=Updating)",
+			[]string{"vdom", "name", "type"}, nil,
+		)
 		SDNConnectorsState = prometheus.NewDesc(
 			"fortigate_system_sdn_connector_state",
 			"Status of SDN connectors disabled",
@@ -66,14 +71,19 @@ func probeSystemSDNConnector(c http.FortiHTTP, _ *TargetMetadata) ([]prometheus.
 			}
 			switch sdnConn.Status {
 			case "Disabled":
+				m = append(m, prometheus.MustNewConstMetric(SDNConnectorsStatus, prometheus.GaugeValue, float64(0), r.VDOM, sdnConn.Name, sdnConn.Type))
 				t[0] = prometheus.MustNewConstMetric(SDNConnectorsState, prometheus.GaugeValue, 1.0, r.VDOM, sdnConn.Name, sdnConn.Type, sdnConn.Status)
 			case "Down":
+				m = append(m, prometheus.MustNewConstMetric(SDNConnectorsStatus, prometheus.GaugeValue, float64(1), r.VDOM, sdnConn.Name, sdnConn.Type))
 				t[1] = prometheus.MustNewConstMetric(SDNConnectorsState, prometheus.GaugeValue, 1.0, r.VDOM, sdnConn.Name, sdnConn.Type, sdnConn.Status)
 			case "Unknown":
+				m = append(m, prometheus.MustNewConstMetric(SDNConnectorsStatus, prometheus.GaugeValue, float64(2), r.VDOM, sdnConn.Name, sdnConn.Type))
 				t[2] = prometheus.MustNewConstMetric(SDNConnectorsState, prometheus.GaugeValue, 1.0, r.VDOM, sdnConn.Name, sdnConn.Type, sdnConn.Status)
 			case "Up":
+				m = append(m, prometheus.MustNewConstMetric(SDNConnectorsStatus, prometheus.GaugeValue, float64(3), r.VDOM, sdnConn.Name, sdnConn.Type))
 				t[3] = prometheus.MustNewConstMetric(SDNConnectorsState, prometheus.GaugeValue, 1.0, r.VDOM, sdnConn.Name, sdnConn.Type, sdnConn.Status)
 			case "Updating":
+				m = append(m, prometheus.MustNewConstMetric(SDNConnectorsStatus, prometheus.GaugeValue, float64(4), r.VDOM, sdnConn.Name, sdnConn.Type))
 				t[4] = prometheus.MustNewConstMetric(SDNConnectorsState, prometheus.GaugeValue, 1.0, r.VDOM, sdnConn.Name, sdnConn.Type, sdnConn.Status)
 			}
 			m = append(m, prometheus.MustNewConstMetric(SDNConnectorsLastUpdate, prometheus.GaugeValue, float64(sdnConn.LastUpdate), r.VDOM, sdnConn.Name, sdnConn.Type))

pkg/probe/system_sdn_connector_test.go

@@ -46,6 +46,10 @@ func TestSystemSDNConnector(t *testing.T) {
 	fortigate_system_sdn_connector_state{name="GCP Infra",state="Unknown",type="gcp",vdom="google"} 0
 	fortigate_system_sdn_connector_state{name="GCP Infra",state="Up",type="gcp",vdom="google"} 0
 	fortigate_system_sdn_connector_state{name="GCP Infra",state="Updating",type="gcp",vdom="google"} 0
+	# HELP fortigate_system_sdn_connector_status Status of SDN connectors (0=Disabled, 1=Down, 2=Unknown, 3=Up, 4=Updating)
+	# TYPE fortigate_system_sdn_connector_status gauge
+	fortigate_system_sdn_connector_status{name="AWS Infra",type="aws",vdom="root"} 3
+	fortigate_system_sdn_connector_status{name="GCP Infra",type="gcp",vdom="google"} 1
 	`
 
 	if err := testutil.GatherAndCompare(r, strings.NewReader(em)); err != nil {