Correct testdata and fixes

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

Author: Philldomd

pkg/probe/system_sandbox_status.go

@@ -15,42 +15,57 @@ package probe
 
 import (
 	"log"
+	"strconv"
 
 	"github.com/prometheus-community/fortigate_exporter/pkg/http"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func probeSystemSandboxStatus(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Metric, bool) {
+func probeSystemSandboxStatus (c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Metric, bool) {
 	var (
-		signatureCount = prometheus.NewDesc(
-			"fortigate_sandbox_status_signature_count",
-			"Sandbox signature counts",
-			[]string{"server", "region", "version", "type"}, nil,
+		Count = prometheus.NewDesc(
+			"fortigate_system_sandbox_status_signatures_count",
+			"The number of signatures that have been loaded on the FortiSandbox.",
+			[]string{"configured", "type", "cloud_region", "server", "malware_package_version", "signatures_loaded", "vdom"}, nil,
 		)
 	)
 
 	type SystemSandboxStatus struct {
-		Server  string  `json:"server"`
-		Type    string  `json:"type"`
-		Region  string  `json:"cloud_region"`
-		Version string  `json:"malware_package_version"`
-		Count   float64 `json:"signatures_count"`
+		Configured bool    `json:"configured"`
+		Type       string  `json:"type"`
+		Cloud      string  `json:"cloud_region"`
+		Server     string  `json:"server"`
+		MPV        string  `json:"malware_package_version"`
+		Loaded     bool    `json:"signatures_loaded"`
+		Count      float64 `json:"signatures_count"`
 	}
 
 	type SystemSandboxStatusResult struct {
-		Results []SystemSandboxStatus `json:"results"`
+		Result SystemSandboxStatus `json:"results"`
+		VDOM   string              `json:"vdom"`
 	}
 
 	var res SystemSandboxStatusResult
-	if err := c.Get("api/v2/monitor/system/sandbox/status","", &res); err != nil {
+	if err := c.Get("api/v2/monitor/system/sandbox/status", "", &res); err != nil {
 		log.Printf("Warning: %v", err)
 		return nil, false
 	}
-
 	m := []prometheus.Metric{}
-	for _, r := range res.Results {
-		m = append(m, prometheus.MustNewConstMetric(signatureCount, prometheus.GaugeValue, r.Count, r.Server, r.Region, r.Version, r.Type))
+	cloude := "null"
+	if res.Result.Cloud != "" {
+		cloude = res.Result.Cloud
 	}
-
+	m = append(m, prometheus.MustNewConstMetric(
+		Count,
+		prometheus.GaugeValue,
+		res.Result.Count,
+		strconv.FormatBool(res.Result.Configured),
+		res.Result.Type,
+		cloude,
+		res.Result.Server,
+		res.Result.MPV,
+		strconv.FormatBool(res.Result.Loaded),
+		res.VDOM),
+	)
 	return m, true
 }

pkg/probe/system_sandbox_status_test.go

@@ -21,7 +21,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/testutil"
 )
 
-func TestSystemSandboxStatus(t *testing.T) {
+func TestSandboxStatus(t *testing.T) {
 	c := newFakeClient()
 	c.prepare("api/v2/monitor/system/sandbox/status", "testdata/system-sandbox-status.jsonnet")
 	r := prometheus.NewPedanticRegistry()
@@ -30,9 +30,9 @@ func TestSystemSandboxStatus(t *testing.T) {
 	}
 
 	em := `
-	# HELP fortigate_sandbox_status_signature_count Sandbox signature counts
-	# TYPE fortigate_sandbox_status_signature_count gauge
-	fortigate_sandbox_status_signature_count{region="Sweden",server="127.0.0.1",type="cloud",version="v17.0.3"} 252891
+	# HELP fortigate_system_sandbox_status_signatures_count The number of signatures that have been loaded on the FortiSandbox.
+	# TYPE fortigate_system_sandbox_status_signatures_count gauge
+	fortigate_system_sandbox_status_signatures_count{cloud_region="null",configured="true",malware_package_version="5.125",server="0.0.0.0",signatures_loaded="false",type="appliance",vdom="root"} 0
 	`
 
 	if err := testutil.GatherAndCompare(r, strings.NewReader(em)); err != nil {

pkg/probe/testdata/system-sandbox-status.jsonnet

@@ -1,23 +1,20 @@
-# api/v2/monitor/system/sandbox/status
 {
   "http_method":"GET",
-  "results":[
-      {
-        "configured": true,
-        "type": "cloud",
-        "cloud_region": "Sweden",
-        "server": "127.0.0.1",
-        "malware_package_version": "v17.0.3",
-        "signatures_loaded": true,
-        "signatures_count": 252891
-      }
-  ],
-  "vdom":"google",
+  "results": {
+    "configured":true,
+    "type":"appliance",
+    "cloud_region":"",
+    "server":"0.0.0.0",
+    "malware_package_version":"5.125",
+    "signatures_loaded":false,
+    "signatures_count":0
+  },
+  "vdom":"root",
   "path":"system",
-  "name":"sdn-connector",
+  "name":"sandbox",
   "action":"status",
   "status":"success",
-  "serial":"FGABCDEF12345678",
-  "version":"v7.0.9",
-  "build":444
+  "serial":"g43sags54rh5es",
+  "version":"v7.4.8",
+  "build":2795
 }