Linter installed and run with --fix

Author: Philldomd

pkg/probe/network_dns_latency.go

@@ -15,17 +15,17 @@ package probe
 
 import (
 	"log"
-	"github.com/prometheus-community/fortigate_exporter/pkg/http"
+
 	"github.com/prometheus/client_golang/prometheus"
+
+	"github.com/prometheus-community/fortigate_exporter/pkg/http"
 )
 
 func probeNetworkDNSLatency(c http.FortiHTTP, _ *TargetMetadata) ([]prometheus.Metric, bool) {
-	var (
-		dnsLatency = prometheus.NewDesc(
-			"fortigate_network_dns_latency_seconds",
-			"Network dns latency",
-			[]string{"service", "ip"}, nil,
-		)
+	dnsLatency := prometheus.NewDesc(
+		"fortigate_network_dns_latency_seconds",
+		"Network dns latency",
+		[]string{"service", "ip"}, nil,
 	)
 
 	type DNSLatencty struct {
@@ -46,8 +46,8 @@ func probeNetworkDNSLatency(c http.FortiHTTP, _ *TargetMetadata) ([]prometheus.M
 	}
 	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/network_dns_latency_test.go

@@ -15,6 +15,7 @@ package probe
 import (
 	"strings"
 	"testing"
+
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/testutil"
 )
@@ -36,4 +37,4 @@ func TestNetworkDnsLatency(t *testing.T) {
 	if err := testutil.GatherAndCompare(r, strings.NewReader(em)); err != nil {
 		t.Fatalf("metric compare: err %v", err)
 	}
-}
+}

pkg/probe/system_vdom-resource.go

@@ -15,12 +15,13 @@ package probe
 
 import (
 	"log"
-	"github.com/prometheus-community/fortigate_exporter/pkg/http"
+
 	"github.com/prometheus/client_golang/prometheus"
+
+	"github.com/prometheus-community/fortigate_exporter/pkg/http"
 )
 
-func probeSystemVdomResource(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Metric, bool) {
-	
+func probeSystemVdomResource(c http.FortiHTTP, _ *TargetMetadata) ([]prometheus.Metric, bool) {
 	vdomDesc := make(map[string]*prometheus.Desc)
 	vdomDesc["cpu"] = prometheus.NewDesc(
 		"fortigate_vdom_resource_cpu_usage_ratio",
@@ -45,12 +46,12 @@ func probeSystemVdomResource(c http.FortiHTTP, meta *TargetMetadata) ([]promethe
 	vdomDesc["id"] = prometheus.NewDesc(
 		"fortigate_vdom_resource_object_id",
 		"Object Resource ID",
-		[]string{"vdom", "object"},nil,
+		[]string{"vdom", "object"}, nil,
 	)
 	vdomDesc["custom_max"] = prometheus.NewDesc(
 		"fortigate_vdom_resource_object_custom_max",
 		"Object Custom Max",
-		[]string{"vdom", "object"},nil,
+		[]string{"vdom", "object"}, nil,
 	)
 	vdomDesc["min_custom_value"] = prometheus.NewDesc(
 		"fortigate_vdom_resource_object_custom_min_value",
@@ -60,42 +61,42 @@ func probeSystemVdomResource(c http.FortiHTTP, meta *TargetMetadata) ([]promethe
 	vdomDesc["max_custom_value"] = prometheus.NewDesc(
 		"fortigate_vdom_resource_object_custom_max_value",
 		"Object Maximum custom value",
-		[]string{"vdom", "object"},nil,
+		[]string{"vdom", "object"}, nil,
 	)
 	vdomDesc["guaranteed"] = prometheus.NewDesc(
 		"fortigate_vdom_resource_object_guaranteed",
 		"Object Guaranteed",
-		[]string{"vdom", "object"},nil,
+		[]string{"vdom", "object"}, nil,
 	)
 	vdomDesc["min_guaranteed_value"] = prometheus.NewDesc(
 		"fortigate_vdom_resource_object_guaranteed_max_value",
 		"Object Minimum guaranteed value",
-		[]string{"vdom", "object"},nil,
+		[]string{"vdom", "object"}, nil,
 	)
 	vdomDesc["max_guaranteed_value"] = prometheus.NewDesc(
 		"fortigate_vdom_resource_object_guaranteed_min_value",
 		"Object Maximum guaranteed value",
-		[]string{"vdom", "object"},nil,
+		[]string{"vdom", "object"}, nil,
 	)
 	vdomDesc["global_max"] = prometheus.NewDesc(
 		"fortigate_vdom_resource_object_global_max",
 		"Object Global max",
-		[]string{"vdom", "object"},nil,
+		[]string{"vdom", "object"}, nil,
 	)
 	vdomDesc["current_usage"] = prometheus.NewDesc(
 		"fortigate_vdom_resource_object_current_usage",
 		"Object Current usage",
-		[]string{"vdom", "object"},nil,
+		[]string{"vdom", "object"}, nil,
 	)
 	vdomDesc["usage_percent"] = prometheus.NewDesc(
 		"fortigate_vdom_resource_object_usage_ratio",
 		"Object Usage percentage",
-		[]string{"vdom", "object"},nil,
+		[]string{"vdom", "object"}, nil,
 	)
 
 	type VDOMResourceResult struct {
-		Result interface{}             `json:"results"`
-		Vdom   string                  `json:"vdom"`
+		Result any    `json:"results"`
+		Vdom   string `json:"vdom"`
 	}
 
 	var res []VDOMResourceResult
@@ -117,23 +118,23 @@ func probeSystemVdomResource(c http.FortiHTTP, meta *TargetMetadata) ([]promethe
 					m = append(m, prometheus.MustNewConstMetric(vdomDesc[k], prometheus.GaugeValue, 0, result.Vdom))
 				}
 			case "session",
-			"ipsec-phase1",
-			"ipsec-phase2",
-			"ipsec-phase1-interface",
-			"ipsec-phase2-interface",
-			"dialup-tunnel",
-			"firewall-policy",
-			"firewall-address",
-			"firewall-addrgrp",
-			"custom-service",
-			"service-group",
-			"onetime-schedule",
-			"recurring-schedule",
-			"user",
-			"user-group",
-			"sslvpn",
-			"proxy",
-			"log-disk-quota":
+				"ipsec-phase1",
+				"ipsec-phase2",
+				"ipsec-phase1-interface",
+				"ipsec-phase2-interface",
+				"dialup-tunnel",
+				"firewall-policy",
+				"firewall-address",
+				"firewall-addrgrp",
+				"custom-service",
+				"service-group",
+				"onetime-schedule",
+				"recurring-schedule",
+				"user",
+				"user-group",
+				"sslvpn",
+				"proxy",
+				"log-disk-quota":
 				for val, e := range elem.(map[string]any) {
 					m = append(m, prometheus.MustNewConstMetric(vdomDesc[val], prometheus.GaugeValue, e.(float64), result.Vdom, k))
 				}