Merge branch 'main' into feature/system-ha-peer

Author: Philldomd

README.md

@@ -37,6 +37,8 @@ Supported metrics right now as follows.
 
 Global:
 
+ * _Network/Dns/Latency_
+   * `fortigate_network_dns_latency_`
  * _System/SensorInfo_
    * `fortigate_sensor_alarm_status`
    * `fortigate_sensor_fan_rpm`
@@ -442,6 +444,7 @@ To improve security, limit permissions to required ones only (least privilege pr
 |Log/Fortianalyzer/Status     | loggrp.config      |api/v2/monitor/log/fortianalyzer |
 |Log/Fortianalyzer/Queue      | loggrp.config      |api/v2/monitor/log/fortianalyzer-queue |
 |Log/DiskUsage                | loggrp.config      |api/v2/monitor/log/current-disk-usage |
+|Network/Dns/Latency          | sysgrp.cfg         |api/v2/monitor/network/dns/latency |
 |System/AvailableCertificates | *any*              |api/v2/monitor/system/available-certificates |
 |System/Fortimanager/Status   | sysgrp.cfg         |api/v2/monitor/system/fortimanager/status |
 |System/HAStatistics          | sysgrp.cfg         |api/v2/monitor/system/ha-statistics<br>api/v2/cmdb/system/ha |

pkg/probe/network_dns_latency.go

@@ -0,0 +1,53 @@
+// Copyright 2025 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
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package probe
+
+import (
+	"log"
+
+	"github.com/prometheus/client_golang/prometheus"
+
+	"github.com/prometheus-community/fortigate_exporter/pkg/http"
+)
+
+func probeNetworkDNSLatency(c http.FortiHTTP, _ *TargetMetadata) ([]prometheus.Metric, bool) {
+	dnsLatency := prometheus.NewDesc(
+		"fortigate_network_dns_latency_seconds",
+		"Network dns latency",
+		[]string{"service", "ip"}, nil,
+	)
+
+	type DNSLatencty struct {
+		Service    string  `json:"service"`
+		Latency    float64 `json:"latency"`
+		LastUpdate float64 `json:"last_update"`
+		IP         string  `json:"ip"`
+	}
+
+	type DNSLatencyResult struct {
+		Results []DNSLatencty `json:"results"`
+	}
+
+	var res DNSLatencyResult
+	if err := c.Get("api/v2/monitor/network/dns/latency", "", &res); err != nil {
+		log.Printf("Warning: %v", err)
+		return nil, false
+	}
+	m := []prometheus.Metric{}
+	for _, r := range res.Results {
+		m = append(m, prometheus.MustNewConstMetric(dnsLatency, prometheus.GaugeValue, r.Latency*0.001, r.Service, r.IP))
+	}
+
+	return m, true
+}

pkg/probe/network_dns_latency_test.go

@@ -0,0 +1,40 @@
+// Copyright 2025 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
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package probe
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/testutil"
+)
+
+func TestNetworkDnsLatency(t *testing.T) {
+	c := newFakeClient()
+	c.prepare("api/v2/monitor/network/dns/latency", "testdata/network-dns-latency.jsonnet")
+	r := prometheus.NewPedanticRegistry()
+	if !testProbe(probeNetworkDNSLatency, c, r) {
+		t.Errorf("probeNetworkDNSLatency() returned non-success")
+	}
+
+	em := `
+	# HELP fortigate_network_dns_latency_seconds Network dns latency
+	# TYPE fortigate_network_dns_latency_seconds gauge
+	fortigate_network_dns_latency_seconds{ip="8.8.8.8",service="dns_server"} 0.01
+	`
+
+	if err := testutil.GatherAndCompare(r, strings.NewReader(em)); err != nil {
+		t.Fatalf("metric compare: err %v", err)
+	}
+}

pkg/probe/probe.go

@@ -143,6 +143,7 @@ func (p *Collector) Probe(ctx context.Context, target map[string]string, hc *htt
 		{"Log/Fortianalyzer/Status", probeLogAnalyzer},
 		{"Log/Fortianalyzer/Queue", probeLogAnalyzerQueue},
 		{"Log/DiskUsage", probeLogCurrentDiskUsage},
+		{"Network/Dns/Latency", probeNetworkDNSLatency},
 		{"System/AvailableCertificates", probeSystemAvailableCertificates},
 		{"System/Fortimanager/Status", probeSystemFortimanagerStatus},
 		{"System/HAStatistics", probeSystemHAStatistics},

pkg/probe/testdata/network-dns-latency.jsonnet

@@ -0,0 +1,20 @@
+# api/v2/monitor/network/dns/latency
+{
+    "http_method": "GET",
+    "results": [
+        {
+            "service": "dns_server",
+            "latency": 10,
+            "last_update": 1040,
+            "ip": "8.8.8.8"
+        }
+    ],
+    "vdom": "root",
+    "path": "network",
+    "name": "dns",
+    "action": "latency",
+    "status": "success",
+    "serial": "FTK",
+    "version": "v7.4.8",
+    "build": 2795
+}