Apply v2.0.0 deprecations

* Remove deprecated collectors.
* Remove deprecated flags.
* Flip rapl label feature flag to true.

Signed-off-by: Ben Kochie <[email protected]>

Author: SuperQ

collector/diskstats_common.go

@@ -32,18 +32,10 @@ const (
 var (
 	diskLabelNames = []string{"device"}
 
-	diskstatsDeviceExcludeSet bool
-	diskstatsDeviceExclude    = kingpin.Flag(
+	diskstatsDeviceExclude = kingpin.Flag(
 		"collector.diskstats.device-exclude",
 		"Regexp of diskstats devices to exclude (mutually exclusive to device-include).",
-	).Default(diskstatsDefaultIgnoredDevices).PreAction(func(c *kingpin.ParseContext) error {
-		diskstatsDeviceExcludeSet = true
-		return nil
-	}).String()
-	oldDiskstatsDeviceExclude = kingpin.Flag(
-		"collector.diskstats.ignored-devices",
-		"DEPRECATED: Use collector.diskstats.device-exclude",
-	).Hidden().String()
+	).Default(diskstatsDefaultIgnoredDevices).String()
 
 	diskstatsDeviceInclude = kingpin.Flag("collector.diskstats.device-include", "Regexp of diskstats devices to include (mutually exclusive to device-exclude).").String()
 
@@ -93,15 +85,6 @@ var (
 )
 
 func newDiskstatsDeviceFilter(logger *slog.Logger) (deviceFilter, error) {
-	if *oldDiskstatsDeviceExclude != "" {
-		if !diskstatsDeviceExcludeSet {
-			logger.Warn("--collector.diskstats.ignored-devices is DEPRECATED and will be removed in 2.0.0, use --collector.diskstats.device-exclude")
-			*diskstatsDeviceExclude = *oldDiskstatsDeviceExclude
-		} else {
-			return deviceFilter{}, errors.New("--collector.diskstats.ignored-devices and --collector.diskstats.device-exclude are mutually exclusive")
-		}
-	}
-
 	if *diskstatsDeviceExclude != "" && *diskstatsDeviceInclude != "" {
 		return deviceFilter{}, errors.New("device-exclude & device-include are mutually exclusive")
 	}

collector/filesystem_common.go

@@ -41,10 +41,6 @@ var (
 		mountPointsExcludeSet = true
 		return nil
 	}).String()
-	oldMountPointsExcluded = kingpin.Flag(
-		"collector.filesystem.ignored-mount-points",
-		"Regexp of mount points to ignore for filesystem collector.",
-	).Hidden().String()
 	mountPointsInclude = kingpin.Flag(
 		"collector.filesystem.mount-points-include",
 		"Regexp of mount points to include for filesystem collector. (mutually exclusive to mount-points-exclude)",
@@ -58,10 +54,6 @@ var (
 		fsTypesExcludeSet = true
 		return nil
 	}).String()
-	oldFSTypesExcluded = kingpin.Flag(
-		"collector.filesystem.ignored-fs-types",
-		"Regexp of filesystem types to ignore for filesystem collector.",
-	).Hidden().String()
 	fsTypesInclude = kingpin.Flag(
 		"collector.filesystem.fs-types-include",
 		"Regexp of filesystem types to exclude for filesystem collector. (mutually exclusive to fs-types-exclude)",
@@ -228,15 +220,6 @@ func (c *filesystemCollector) Update(ch chan<- prometheus.Metric) error {
 }
 
 func newMountPointsFilter(logger *slog.Logger) (deviceFilter, error) {
-	if *oldMountPointsExcluded != "" {
-		if !mountPointsExcludeSet {
-			logger.Warn("--collector.filesystem.ignored-mount-points is DEPRECATED and will be removed in 2.0.0, use --collector.filesystem.mount-points-exclude")
-			*mountPointsExclude = *oldMountPointsExcluded
-		} else {
-			return deviceFilter{}, errors.New("--collector.filesystem.ignored-mount-points and --collector.filesystem.mount-points-exclude are mutually exclusive")
-		}
-	}
-
 	if *mountPointsInclude != "" && !mountPointsExcludeSet {
 		logger.Debug("mount-points-exclude flag not set when mount-points-include flag is set, assuming include is desired")
 		*mountPointsExclude = ""
@@ -257,15 +240,6 @@ func newMountPointsFilter(logger *slog.Logger) (deviceFilter, error) {
 }
 
 func newFSTypeFilter(logger *slog.Logger) (deviceFilter, error) {
-	if *oldFSTypesExcluded != "" {
-		if !fsTypesExcludeSet {
-			logger.Warn("--collector.filesystem.ignored-fs-types is DEPRECATED and will be removed in 2.0.0, use --collector.filesystem.fs-types-exclude")
-			*fsTypesExclude = *oldFSTypesExcluded
-		} else {
-			return deviceFilter{}, errors.New("--collector.filesystem.ignored-fs-types and --collector.filesystem.fs-types-exclude are mutually exclusive")
-		}
-	}
-
 	if *fsTypesInclude != "" && !fsTypesExcludeSet {
 		logger.Debug("fs-types-exclude flag not set when fs-types-include flag is set, assuming include is desired")
 		*fsTypesExclude = ""

collector/fixtures/e2e-64k-page-output.txt

@@ -2918,12 +2918,10 @@ node_qdisc_packets_total{device="wlan0",kind="fq"} 42
 # TYPE node_qdisc_requeues_total counter
 node_qdisc_requeues_total{device="eth0",kind="pfifo_fast"} 2
 node_qdisc_requeues_total{device="wlan0",kind="fq"} 1
-# HELP node_rapl_core_joules_total Current RAPL core value in joules
-# TYPE node_rapl_core_joules_total counter
-node_rapl_core_joules_total{index="0",path="collector/fixtures/sys/class/powercap/intel-rapl:0:0"} 118821.284256
-# HELP node_rapl_package_joules_total Current RAPL package value in joules
-# TYPE node_rapl_package_joules_total counter
-node_rapl_package_joules_total{index="0",path="collector/fixtures/sys/class/powercap/intel-rapl:0"} 240422.366267
+# HELP node_rapl_joules_total Current RAPL value in joules
+# TYPE node_rapl_joules_total counter
+node_rapl_joules_total{index="0",path="collector/fixtures/sys/class/powercap/intel-rapl:0",rapl_zone="package"} 240422.366267
+node_rapl_joules_total{index="0",path="collector/fixtures/sys/class/powercap/intel-rapl:0:0",rapl_zone="core"} 118821.284256
 # HELP node_schedstat_running_seconds_total Number of seconds CPU spent running a process.
 # TYPE node_schedstat_running_seconds_total counter
 node_schedstat_running_seconds_total{cpu="0"} 2.045936778163039e+06

collector/fixtures/e2e-output.txt

@@ -2940,12 +2940,10 @@ node_qdisc_packets_total{device="wlan0",kind="fq"} 42
 # TYPE node_qdisc_requeues_total counter
 node_qdisc_requeues_total{device="eth0",kind="pfifo_fast"} 2
 node_qdisc_requeues_total{device="wlan0",kind="fq"} 1
-# HELP node_rapl_core_joules_total Current RAPL core value in joules
-# TYPE node_rapl_core_joules_total counter
-node_rapl_core_joules_total{index="0",path="collector/fixtures/sys/class/powercap/intel-rapl:0:0"} 118821.284256
-# HELP node_rapl_package_joules_total Current RAPL package value in joules
-# TYPE node_rapl_package_joules_total counter
-node_rapl_package_joules_total{index="0",path="collector/fixtures/sys/class/powercap/intel-rapl:0"} 240422.366267
+# HELP node_rapl_joules_total Current RAPL value in joules
+# TYPE node_rapl_joules_total counter
+node_rapl_joules_total{index="0",path="collector/fixtures/sys/class/powercap/intel-rapl:0",rapl_zone="package"} 240422.366267
+node_rapl_joules_total{index="0",path="collector/fixtures/sys/class/powercap/intel-rapl:0:0",rapl_zone="core"} 118821.284256
 # HELP node_schedstat_running_seconds_total Number of seconds CPU spent running a process.
 # TYPE node_schedstat_running_seconds_total counter
 node_schedstat_running_seconds_total{cpu="0"} 2.045936778163039e+06

collector/netdev_common.go

@@ -30,12 +30,10 @@ import (
 )
 
 var (
-	netdevDeviceInclude    = kingpin.Flag("collector.netdev.device-include", "Regexp of net devices to include (mutually exclusive to device-exclude).").String()
-	oldNetdevDeviceInclude = kingpin.Flag("collector.netdev.device-whitelist", "DEPRECATED: Use collector.netdev.device-include").Hidden().String()
-	netdevDeviceExclude    = kingpin.Flag("collector.netdev.device-exclude", "Regexp of net devices to exclude (mutually exclusive to device-include).").String()
-	oldNetdevDeviceExclude = kingpin.Flag("collector.netdev.device-blacklist", "DEPRECATED: Use collector.netdev.device-exclude").Hidden().String()
-	netdevAddressInfo      = kingpin.Flag("collector.netdev.address-info", "Collect address-info for every device").Bool()
-	netdevDetailedMetrics  = kingpin.Flag("collector.netdev.enable-detailed-metrics", "Use (incompatible) metric names that provide more detailed stats on Linux").Bool()
+	netdevDeviceInclude   = kingpin.Flag("collector.netdev.device-include", "Regexp of net devices to include (mutually exclusive to device-exclude).").String()
+	netdevDeviceExclude   = kingpin.Flag("collector.netdev.device-exclude", "Regexp of net devices to exclude (mutually exclusive to device-include).").String()
+	netdevAddressInfo     = kingpin.Flag("collector.netdev.address-info", "Collect address-info for every device").Bool()
+	netdevDetailedMetrics = kingpin.Flag("collector.netdev.enable-detailed-metrics", "Use (incompatible) metric names that provide more detailed stats on Linux").Bool()
 )
 
 type netDevCollector struct {
@@ -54,24 +52,6 @@ func init() {
 
 // NewNetDevCollector returns a new Collector exposing network device stats.
 func NewNetDevCollector(logger *slog.Logger) (Collector, error) {
-	if *oldNetdevDeviceInclude != "" {
-		if *netdevDeviceInclude == "" {
-			logger.Warn("--collector.netdev.device-whitelist is DEPRECATED and will be removed in 2.0.0, use --collector.netdev.device-include")
-			*netdevDeviceInclude = *oldNetdevDeviceInclude
-		} else {
-			return nil, errors.New("--collector.netdev.device-whitelist and --collector.netdev.device-include are mutually exclusive")
-		}
-	}
-
-	if *oldNetdevDeviceExclude != "" {
-		if *netdevDeviceExclude == "" {
-			logger.Warn("--collector.netdev.device-blacklist is DEPRECATED and will be removed in 2.0.0, use --collector.netdev.device-exclude")
-			*netdevDeviceExclude = *oldNetdevDeviceExclude
-		} else {
-			return nil, errors.New("--collector.netdev.device-blacklist and --collector.netdev.device-exclude are mutually exclusive")
-		}
-	}
-
 	if *netdevDeviceExclude != "" && *netdevDeviceInclude != "" {
 		return nil, errors.New("device-exclude & device-include are mutually exclusive")
 	}

collector/ntp.go

@@ -41,11 +41,9 @@ type qdiscStatCollector struct {
 }
 
 var (
-	collectorQdisc                 = kingpin.Flag("collector.qdisc.fixtures", "test fixtures to use for qdisc collector end-to-end testing").Default("").String()
-	collectorQdiscDeviceInclude    = kingpin.Flag("collector.qdisc.device-include", "Regexp of qdisc devices to include (mutually exclusive to device-exclude).").String()
-	oldCollectorQdiskDeviceInclude = kingpin.Flag("collector.qdisk.device-include", "DEPRECATED: Use collector.qdisc.device-include").Hidden().String()
-	collectorQdiscDeviceExclude    = kingpin.Flag("collector.qdisc.device-exclude", "Regexp of qdisc devices to exclude (mutually exclusive to device-include).").String()
-	oldCollectorQdiskDeviceExclude = kingpin.Flag("collector.qdisk.device-exclude", "DEPRECATED: Use collector.qdisc.device-exclude").Hidden().String()
+	collectorQdisc              = kingpin.Flag("collector.qdisc.fixtures", "test fixtures to use for qdisc collector end-to-end testing").Default("").String()
+	collectorQdiscDeviceInclude = kingpin.Flag("collector.qdisc.device-include", "Regexp of qdisc devices to include (mutually exclusive to device-exclude).").String()
+	collectorQdiscDeviceExclude = kingpin.Flag("collector.qdisc.device-exclude", "Regexp of qdisc devices to exclude (mutually exclusive to device-include).").String()
 )
 
 func init() {
@@ -54,24 +52,6 @@ func init() {
 
 // NewQdiscStatCollector returns a new Collector exposing queuing discipline statistics.
 func NewQdiscStatCollector(logger *slog.Logger) (Collector, error) {
-	if *oldCollectorQdiskDeviceInclude != "" {
-		if *collectorQdiscDeviceInclude == "" {
-			logger.Warn("--collector.qdisk.device-include is DEPRECATED and will be removed in 2.0.0, use --collector.qdisc.device-include")
-			*collectorQdiscDeviceInclude = *oldCollectorQdiskDeviceInclude
-		} else {
-			return nil, fmt.Errorf("--collector.qdisk.device-include and --collector.qdisc.device-include are mutually exclusive")
-		}
-	}
-
-	if *oldCollectorQdiskDeviceExclude != "" {
-		if *collectorQdiscDeviceExclude == "" {
-			logger.Warn("--collector.qdisk.device-exclude is DEPRECATED and will be removed in 2.0.0, use --collector.qdisc.device-exclude")
-			*collectorQdiscDeviceExclude = *oldCollectorQdiskDeviceExclude
-		} else {
-			return nil, fmt.Errorf("--collector.qdisk.device-exclude and --collector.qdisc.device-exclude are mutually exclusive")
-		}
-	}
-
 	if *collectorQdiscDeviceExclude != "" && *collectorQdiscDeviceInclude != "" {
 		return nil, fmt.Errorf("collector.qdisc.device-include and collector.qdisc.device-exclude are mutaly exclusive")
 	}

collector/qdisc_linux.go

@@ -42,7 +42,7 @@ func init() {
 }
 
 var (
-	raplZoneLabel = kingpin.Flag("collector.rapl.enable-zone-label", "Enables service unit metric unit_start_time_seconds").Bool()
+	raplZoneLabel = kingpin.Flag("collector.rapl.enable-zone-label", "Enables service unit metric unit_start_time_seconds").Default("true").Bool()
 )
 
 // NewRaplCollector returns a new Collector exposing RAPL metrics.