Merge pull request #1983 from prometheus/superq/ENOTSUP

Handle errors from disabled PSI subsystem

CHANGELOG.md

@@ -5,6 +5,8 @@
 * [ENHANCEMENT]
 * [BUGFIX]
 
+* [BUGFIX] Handle errors from disabled PSI subsystem #1983
+
 ## 1.1.1 / 2021-02-12
 
 * [BUGFIX] Fix ineffassign issue #1957

collector/pressure_linux.go

@@ -19,6 +19,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"syscall"
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
@@ -94,6 +95,10 @@ func (c *pressureStatsCollector) Update(ch chan<- prometheus.Metric) error {
 				level.Debug(c.logger).Log("msg", "pressure information is unavailable, you need a Linux kernel >= 4.20 and/or CONFIG_PSI enabled for your kernel")
 				return ErrNoData
 			}
+			if errors.Is(err, syscall.ENOTSUP) {
+				level.Debug(c.logger).Log("msg", "pressure information is disabled, add psi=1 kernel command line to enable it")
+				return ErrNoData
+			}
 			return fmt.Errorf("failed to retrieve pressure stats: %w", err)
 		}
 		switch res {