Merge branch 'surprise30-main'

czerwonk · Feb 19, 2025 · a632ce5 · a632ce5
2 parents e673222 + 563bd03
commit a632ce5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/collectors.go b/collectors.go
@@ -3,9 +3,11 @@
 package main
 
 import (
-	"github.com/czerwonk/junos_exporter/pkg/features/poe"
 	"regexp"
 
+	"github.com/czerwonk/junos_exporter/pkg/features/ddosprotection"
+	"github.com/czerwonk/junos_exporter/pkg/features/poe"
+
 	"github.com/czerwonk/junos_exporter/internal/config"
 	"github.com/czerwonk/junos_exporter/pkg/collector"
 	"github.com/czerwonk/junos_exporter/pkg/connector"
@@ -14,7 +16,6 @@ import (
 	"github.com/czerwonk/junos_exporter/pkg/features/arp"
 	"github.com/czerwonk/junos_exporter/pkg/features/bfd"
 	"github.com/czerwonk/junos_exporter/pkg/features/bgp"
-	"github.com/czerwonk/junos_exporter/pkg/features/ddosprotection"
 	"github.com/czerwonk/junos_exporter/pkg/features/environment"
 	"github.com/czerwonk/junos_exporter/pkg/features/firewall"
 	"github.com/czerwonk/junos_exporter/pkg/features/fpc"
@@ -28,6 +29,7 @@ import (
 	"github.com/czerwonk/junos_exporter/pkg/features/lacp"
 	"github.com/czerwonk/junos_exporter/pkg/features/ldp"
 	"github.com/czerwonk/junos_exporter/pkg/features/mac"
+	"github.com/czerwonk/junos_exporter/pkg/features/macsec"
 	"github.com/czerwonk/junos_exporter/pkg/features/mplslsp"
 	"github.com/czerwonk/junos_exporter/pkg/features/nat"
 	"github.com/czerwonk/junos_exporter/pkg/features/nat2"
@@ -123,6 +125,7 @@ func (c *collectors) initCollectorsForDevices(device *connector.Device, descRe *
 	c.addCollectorIfEnabledForDevice(device, "macsec", f.MACSec, macsec.NewCollector)
 	c.addCollectorIfEnabledForDevice(device, "arp", f.ARP, arp.NewCollector)
 	c.addCollectorIfEnabledForDevice(device, "poe", f.Poe, poe.NewCollector)
+	c.addCollectorIfEnabledForDevice(device, "ddosprotection", f.DDOSProtection, ddosprotection.NewCollector)
 }
 
 func (c *collectors) addCollectorIfEnabledForDevice(device *connector.Device, key string, enabled bool, newCollector func() collector.RPCCollector) {

diff --git a/main.go b/main.go
@@ -23,8 +23,6 @@ import (
 	"go.opentelemetry.io/otel/codes"
 
 	log "github.com/sirupsen/logrus"
-
-	"github.com/czerwonk/junos_exporter/internal/config"
 )
 
 const version string = "0.13.0"

diff --git a/pkg/features/macsec/collector.go b/pkg/features/macsec/collector.go
@@ -2,12 +2,13 @@
 package macsec
 
 import (
+	"strconv"
+	"strings"
+
 	"github.com/czerwonk/junos_exporter/pkg/collector"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	log "github.com/sirupsen/logrus"
-	"strconv"
-	"strings"
 )
 
 const prefix string = "junos_macsec_"
@@ -20,14 +21,6 @@ var (
 	macsecReplayProtectDesc                       *prometheus.Desc
 	macsecKeyServerOffsetDesc                     *prometheus.Desc
 	macsecEncryptionDesc                          *prometheus.Desc
-	//macsecConnectionDesc
-	macsecTXPacketCountDesc   *prometheus.Desc
-	macsecTXChannelStatusDesc *prometheus.Desc
-	macsecIncludeSCIDesc      *prometheus.Desc
-	macsecReplayProtectDesc   *prometheus.Desc
-	macsecKeyServerOffsetDesc *prometheus.Desc
-	macsecEncryptionDesc      *prometheus.Desc
-	//macsecStatsDesc
 	macsecSecureChannelTXEncryptedPacketsDesc     *prometheus.Desc
 	macsecSecureChannelTXEncryptedBytessDesc      *prometheus.Desc
 	macsecSecureChannelTXProtectedPacketsDesc     *prometheus.Desc