From d9b2634324aa93a4b680f732359185eb02528ab7 Mon Sep 17 00:00:00 2001
From: Ben Kochie <superq@gmail.com>
Date: Wed, 28 Sep 2022 15:00:37 +0200
Subject: [PATCH] Fix diskstats exclude flags (#2487)

Correctly handle the new `collector.diskstats.device-exclude` flag to
avoid errors when using the old `collector.diskstats.ignored-devices`
flag.

Fixes: https://github.com/prometheus/node_exporter/issues/2486

Signed-off-by: Ben Kochie <superq@gmail.com>
---
 collector/diskstats_common.go | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/collector/diskstats_common.go b/collector/diskstats_common.go
index 6d1f3361..09ba917c 100644
--- a/collector/diskstats_common.go
+++ b/collector/diskstats_common.go
@@ -33,9 +33,20 @@ const (
 var (
 	diskLabelNames = []string{"device"}
 
-	diskstatsDeviceExclude    = kingpin.Flag("collector.diskstats.device-exclude", "Regexp of diskstats devices to exclude (mutually exclusive to device-include).").Default(diskstatsDefaultIgnoredDevices).String()
-	oldDiskstatsDeviceExclude = kingpin.Flag("collector.diskstats.ignored-devices", "DEPRECATED: Use collector.diskstats.device-exclude").String()
-	diskstatsDeviceInclude    = kingpin.Flag("collector.diskstats.device-include", "Regexp of diskstats devices to include (mutually exclusive to device-exclude).").String()
+	diskstatsDeviceExcludeSet bool
+	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()
+
+	diskstatsDeviceInclude = kingpin.Flag("collector.diskstats.device-include", "Regexp of diskstats devices to include (mutually exclusive to device-exclude).").String()
 
 	readsCompletedDesc = prometheus.NewDesc(
 		prometheus.BuildFQName(namespace, diskSubsystem, "reads_completed_total"),
@@ -84,7 +95,7 @@ var (
 
 func newDiskstatsDeviceFilter(logger log.Logger) (deviceFilter, error) {
 	if *oldDiskstatsDeviceExclude != "" {
-		if *diskstatsDeviceExclude == "" {
+		if !diskstatsDeviceExcludeSet {
 			level.Warn(logger).Log("msg", "--collector.diskstats.ignored-devices is DEPRECATED and will be removed in 2.0.0, use --collector.diskstats.device-exclude")
 			*diskstatsDeviceExclude = *oldDiskstatsDeviceExclude
 		} else {