Lint error solved

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

Author: Philldomd

pkg/probe/network_dns_latency.go

@@ -15,12 +15,11 @@ package probe
 
 import (
 	"log"
-
 	"github.com/prometheus-community/fortigate_exporter/pkg/http"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func probeNetworkDnsLatency(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Metric, bool) {
+func probeNetworkDNSLatency(c http.FortiHTTP, _ *TargetMetadata) ([]prometheus.Metric, bool) {
 	var (
 		dnsLatency = prometheus.NewDesc(
 			"fortigate_network_dns_latency_seconds",
@@ -29,25 +28,25 @@ func probeNetworkDnsLatency(c http.FortiHTTP, meta *TargetMetadata) ([]prometheu
 		)
 	)
 
-	type DnsLatencty struct {
+	type DNSLatencty struct {
 		Service    string  `json:"service"`
 		Latency    float64 `json:"latency"`
 		LastUpdate float64 `json:"last_update"`
-		Ip         string  `json:"ip"`
+		IP         string  `json:"ip"`
 	}
 
-	type DnsLatencyResult struct {
-		Results []DnsLatencty `json:"results"`
+	type DNSLatencyResult struct {
+		Results []DNSLatencty `json:"results"`
 	}
 
-	var res DnsLatencyResult
+	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))
+		m = append(m, prometheus.MustNewConstMetric(dnsLatency, prometheus.GaugeValue, r.Latency * 0.001, r.Service, r.IP))
 	}
 
 	return m, true

pkg/probe/probe.go

@@ -143,7 +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},
+		{"Network/Dns/Latency", probeNetworkDNSLatency},
 		{"System/AvailableCertificates", probeSystemAvailableCertificates},
 		{"System/Fortimanager/Status", probeSystemFortimanagerStatus},
 		{"System/HAStatistics", probeSystemHAStatistics},
@@ -156,7 +156,7 @@ func (p *Collector) Probe(ctx context.Context, target map[string]string, hc *htt
 		{"System/SDNConnector", probeSystemSDNConnector},
 		{"System/SensorInfo", probeSystemSensorInfo},
 		{"System/Status", probeSystemStatus},
-		{"System/VDOMResource",probeSystemVdomResource},
+		{"System/VDOMResource", probeSystemVdomResource},
 		{"System/HAChecksum", probeSystemHAChecksum},
 		{"User/Fsso", probeUserFsso},
 		{"VPN/IPSec", probeVPNIPSec},

pkg/probe/system_vdom-resource.go

@@ -15,7 +15,6 @@ package probe
 
 import (
 	"log"
-
 	"github.com/prometheus-community/fortigate_exporter/pkg/http"
 	"github.com/prometheus/client_golang/prometheus"
 )
@@ -107,7 +106,7 @@ func probeSystemVdomResource(c http.FortiHTTP, meta *TargetMetadata) ([]promethe
 
 	m := []prometheus.Metric{}
 	for _, result := range res {
-		for k, elem := range result.Result.(map[string]interface{}) {
+		for k, elem := range result.Result.(map[string]any) {
 			switch k {
 			case "cpu", "memory", "setup_rate":
 				m = append(m, prometheus.MustNewConstMetric(vdomDesc[k], prometheus.GaugeValue, elem.(float64), result.Vdom))
@@ -135,7 +134,7 @@ func probeSystemVdomResource(c http.FortiHTTP, meta *TargetMetadata) ([]promethe
 			"sslvpn",
 			"proxy",
 			"log-disk-quota":
-				for val, e := range elem.(map[string]interface{}) {
+				for val, e := range elem.(map[string]any) {
 					m = append(m, prometheus.MustNewConstMetric(vdomDesc[val], prometheus.GaugeValue, e.(float64), result.Vdom, k))
 				}
 			default: