Version 7.6 of system status (#367)

* Version 7.6 of system status

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

* New stateset implemented

Signed-off-by: Philip Örnfeldt <philip.ornfeldt@outlook.com>

* Added entry to metric.md

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

* Typo and clarification on model information, removed labels on disk state

Signed-off-by: Philip Örnfeldt <philip.ornfeldt@outlook.com>

---------

Signed-off-by: Örnfeldt Philip (66140321) <philip.ornfeldt@forsakringskassan.se>
Signed-off-by: Philip Örnfeldt <philip.ornfeldt@outlook.com>
Co-authored-by: Sebastian Schubert <16682281+bastischubert@users.noreply.github.com>

Author: Philldomd

metrics.md

@@ -14,6 +14,7 @@ Global:
    * `fortigate_sensor_thresholds`
  * _System/Status_
    * `fortigate_version_info`
+   * `fortigate_system_status_log_disk_state`
  * _System/Transceivers_
    * `fortigate_interface_transceivers`
  * _System/Time/Clock_

pkg/probe/system_status.go

@@ -26,14 +26,28 @@ func probeSystemStatus(c http.FortiHTTP, _ *TargetMetadata) ([]prometheus.Metric
 	mVersion := prometheus.NewDesc(
 		"fortigate_version_info",
 		"System version and build information",
-		[]string{"serial", "version", "build"}, nil,
+		[]string{"serial", "version", "build", "model_name", "model_number", "model", "hostname"}, nil,
 	)
+	mLogDiskState := prometheus.NewDesc(
+		"fortigate_system_status_log_disk_state",
+		"System log disk availability state",
+		[]string{"state"}, nil,
+	)
+
+	type systemResult struct {
+		Name          string `json:"model_name"`
+		Number        string `json:"model_number"`
+		Model         string `json:"model"`
+		Hostname      string `json:"hostname"`
+		LogDiskStatus string `json:"log_disk_status"`
+	}
 
 	type systemStatus struct {
 		Status  string
 		Serial  string
 		Version string
 		Build   int64
+		Results systemResult
 	}
 	var st systemStatus
 
@@ -43,7 +57,18 @@ func probeSystemStatus(c http.FortiHTTP, _ *TargetMetadata) ([]prometheus.Metric
 	}
 
 	m := []prometheus.Metric{
-		prometheus.MustNewConstMetric(mVersion, prometheus.GaugeValue, 1.0, st.Serial, st.Version, fmt.Sprintf("%d", st.Build)),
+		prometheus.MustNewConstMetric(mLogDiskState, prometheus.GaugeValue, 0.0, "available"),
+		prometheus.MustNewConstMetric(mLogDiskState, prometheus.GaugeValue, 0.0, "need_format"),
+		prometheus.MustNewConstMetric(mLogDiskState, prometheus.GaugeValue, 0.0, "not_available"),
+	}
+	switch st.Results.LogDiskStatus {
+	case "available":
+		m[0] = prometheus.MustNewConstMetric(mLogDiskState, prometheus.GaugeValue, 1.0, st.Results.LogDiskStatus)
+	case "need_format":
+		m[1] = prometheus.MustNewConstMetric(mLogDiskState, prometheus.GaugeValue, 1.0, st.Results.LogDiskStatus)
+	case "not_available":
+		m[2] = prometheus.MustNewConstMetric(mLogDiskState, prometheus.GaugeValue, 1.0, st.Results.LogDiskStatus)
 	}
+	m = append(m, prometheus.MustNewConstMetric(mVersion, prometheus.GaugeValue, 1.0, st.Serial, st.Version, fmt.Sprintf("%d", st.Build), st.Results.Name, st.Results.Number, st.Results.Model, st.Results.Hostname))
 	return m, true
 }

pkg/probe/system_status_test.go

@@ -30,9 +30,14 @@ func TestSystemStatus(t *testing.T) {
 	}
 
 	em := `
+	# HELP fortigate_system_status_log_disk_state System log disk availability state
+	# TYPE fortigate_system_status_log_disk_state gauge
+	fortigate_system_status_log_disk_state{state="available"} 0
+	fortigate_system_status_log_disk_state{state="need_format"} 0
+	fortigate_system_status_log_disk_state{state="not_available"} 1
 	# HELP fortigate_version_info System version and build information
 	# TYPE fortigate_version_info gauge
-	fortigate_version_info{build="1112",serial="FGVMEVZFNTS3OAC8",version="v6.2.4"} 1
+	fortigate_version_info{build="1112",hostname="fgt-test-1",model="F2K60F",model_name="FortiGate",model_number="2600F",serial="FGVMEVZFNTS3OAC8",version="v6.2.4"} 1
 	`
 
 	if err := testutil.GatherAndCompare(r, strings.NewReader(em)); err != nil {

pkg/probe/testdata/status.jsonnet

@@ -2,6 +2,11 @@
 {
   "http_method":"GET",
   "results":{
+    "model_name":"FortiGate",
+    "model_number":"2600F",
+    "model":"F2K60F",
+    "hostname":"fgt-test-1",
+    "log_disk_status":"not_available"
   },
   "vdom":"root",
   "path":"system",
@@ -10,4 +15,4 @@
   "serial":"FGVMEVZFNTS3OAC8",
   "version":"v6.2.4",
   "build":1112
-}
+}