Latest version

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

Author: Philldomd

pkg/probe/system_sandbox_connection.go

@@ -1,4 +1,4 @@
-// Copyright 2025 The Prometheus Authors
+// Copyright The Prometheus Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -22,9 +22,19 @@ import (
 )
 
 func probeSystemSandboxConnection(c http.FortiHTTP, _ *TargetMetadata) ([]prometheus.Metric, bool) {
-	connectionStatus := prometheus.NewDesc(
-		"fortigate_sandbox_connection_status",
-		"Sandbox connection status, (unreachable=0, reachable=1, disabled=-1)",
+	connectionStatusDisable := prometheus.NewDesc(
+		"fortigate_sandbox_connection_status_disabled",
+		"Sandbox connection status",
+		[]string{"sandbox_type"}, nil,
+	)
+	connectionStatusUreachable := prometheus.NewDesc(
+		"fortigate_sandbox_connection_status_unreachable",
+		"Sandbox connection status",
+		[]string{"sandbox_type"}, nil,
+	)
+	connectionStatusReachable := prometheus.NewDesc(
+		"fortigate_sandbox_connection_status_reachable",
+		"Sandbox connection status",
 		[]string{"sandbox_type"}, nil,
 	)
 
@@ -46,11 +56,17 @@ func probeSystemSandboxConnection(c http.FortiHTTP, _ *TargetMetadata) ([]promet
 	for _, r := range res.Results {
 		switch r.Status {
 		case "unreachable":
-			m = append(m, prometheus.MustNewConstMetric(connectionStatus, prometheus.GaugeValue, 0, r.Type))
+			m = append(m, prometheus.MustNewConstMetric(connectionStatusUreachable, prometheus.GaugeValue, 1, r.Type))
+			m = append(m, prometheus.MustNewConstMetric(connectionStatusReachable, prometheus.GaugeValue, 0, r.Type))
+			m = append(m, prometheus.MustNewConstMetric(connectionStatusDisable, prometheus.GaugeValue, 0, r.Type))
 		case "reachable":
-			m = append(m, prometheus.MustNewConstMetric(connectionStatus, prometheus.GaugeValue, 1, r.Type))
+			m = append(m, prometheus.MustNewConstMetric(connectionStatusUreachable, prometheus.GaugeValue, 0, r.Type))
+			m = append(m, prometheus.MustNewConstMetric(connectionStatusReachable, prometheus.GaugeValue, 1, r.Type))
+			m = append(m, prometheus.MustNewConstMetric(connectionStatusDisable, prometheus.GaugeValue, 0, r.Type))
 		case "disabled":
-			m = append(m, prometheus.MustNewConstMetric(connectionStatus, prometheus.GaugeValue, -1, r.Type))
+			m = append(m, prometheus.MustNewConstMetric(connectionStatusUreachable, prometheus.GaugeValue, 0, r.Type))
+			m = append(m, prometheus.MustNewConstMetric(connectionStatusReachable, prometheus.GaugeValue, 0, r.Type))
+			m = append(m, prometheus.MustNewConstMetric(connectionStatusDisable, prometheus.GaugeValue, 1, r.Type))
 		}
 	}
 	return m, true

pkg/probe/system_sandbox_connection_test.go

@@ -1,4 +1,4 @@
-// Copyright 2025 The Prometheus Authors
+// Copyright The Prometheus Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -30,9 +30,15 @@ func TestSystemSandboxConnection(t *testing.T) {
 	}
 
 	em := `
-	# HELP fortigate_sandbox_connection_status Sandbox connection status, (unreachable=0, reachable=1, disabled=-1)
-	# TYPE fortigate_sandbox_connection_status gauge
-	fortigate_sandbox_connection_status{type="appliance"} 1
+	# HELP fortigate_sandbox_connection_status_disabled Sandbox connection status
+	# TYPE fortigate_sandbox_connection_status_disabled gauge
+	fortigate_sandbox_connection_status_disabled{sandbox_type="appliance"} 0
+	# HELP fortigate_sandbox_connection_status_reachable Sandbox connection status
+	# TYPE fortigate_sandbox_connection_status_reachable gauge
+	fortigate_sandbox_connection_status_reachable{sandbox_type="appliance"} 1
+	# HELP fortigate_sandbox_connection_status_unreachable Sandbox connection status
+	# TYPE fortigate_sandbox_connection_status_unreachable gauge
+	fortigate_sandbox_connection_status_unreachable{sandbox_type="appliance"} 0
 	`
 
 	if err := testutil.GatherAndCompare(r, strings.NewReader(em)); err != nil {

pkg/probe/system_sandbox_status.go

@@ -1,4 +1,4 @@
-// Copyright 2025 The Prometheus Authors
+// Copyright The Prometheus Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -24,7 +24,7 @@ import (
 
 func probeSystemSandboxStatus(c http.FortiHTTP, _ *TargetMetadata) ([]prometheus.Metric, bool) {
 	Count := prometheus.NewDesc(
-		"fortigate_system_sandbox_status_signatures",
+		"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,
 	)