fix: prevent panic when using diskstats device-include only (prometheus#3590) (prometheus#3603)

mumberrymountain · web-flow · commit aaf76b5a53b7 · 2026-04-03T16:22:46.000+02:00
Signed-off-by: Jeon Insoo &lt;mumberrymountain@gmail.com&gt;
diff --git a/collector/diskstats_common.go b/collector/diskstats_common.go
@@ -99,9 +99,11 @@ func newDiskstatsDeviceFilter(logger *slog.Logger) (deviceFilter, error) {
 			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")
+	if *diskstatsDeviceInclude != "" {
+		if diskstatsDeviceExcludeSet {
+			return deviceFilter{}, errors.New("device-exclude & device-include are mutually exclusive")
+		}
+		*diskstatsDeviceExclude = ""
 	}
 
 	if *diskstatsDeviceExclude != "" {

Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,11 @@ func newDiskstatsDeviceFilter(logger *slog.Logger) (deviceFilter, error) {`
`99`	`99`	`return deviceFilter{}, errors.New("--collector.diskstats.ignored-devices and --collector.diskstats.device-exclude are mutually exclusive")`
`100`	`100`	`}`
`101`	`101`	`}`
`102`		`-`
`103`		`- if diskstatsDeviceExclude != "" && diskstatsDeviceInclude != "" {`
`104`		`- return deviceFilter{}, errors.New("device-exclude & device-include are mutually exclusive")`
	`102`	`+ if *diskstatsDeviceInclude != "" {`
	`103`	`+ if diskstatsDeviceExcludeSet {`
	`104`	`+ return deviceFilter{}, errors.New("device-exclude & device-include are mutually exclusive")`
	`105`	`+ }`
	`106`	`+ *diskstatsDeviceExclude = ""`
`105`	`107`	`}`
`106`	`108`
`107`	`109`	`if *diskstatsDeviceExclude != "" {`