fix(diskstats): only fail on mutually exclusive when present (#3617)

R167 · web-flow · commit a73e2c4561a9 · 2026-04-08T21:56:38.000+02:00
#3603 introduced a subtle regression for existing configs where device-exclude was intentionally set to `=''` to clear the Linux default. This breaks configs that are valid (exclude is intentionally cleared). Update the mutual exclusivity check to only fail when the value is non-empty. Signed-off-by: winston <me@winstondurand.com>
diff --git a/collector/diskstats_common.go b/collector/diskstats_common.go
@@ -100,7 +100,7 @@ func newDiskstatsDeviceFilter(logger *slog.Logger) (deviceFilter, error) {
 		}
 	}
 	if *diskstatsDeviceInclude != "" {
-		if diskstatsDeviceExcludeSet {
+		if diskstatsDeviceExcludeSet && *diskstatsDeviceExclude != "" {
 			return deviceFilter{}, errors.New("device-exclude & device-include are mutually exclusive")
 		}
 		*diskstatsDeviceExclude = ""

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