github
/
node_exporter
mirror of https://github.com/prometheus/node_exporter
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Differentiate ErrNoData and other errors (#1323, #1723) 

Signed-off-by: Li Ling <liiling@google.com>
pull/1816/head
Li Ling 2020-09-01 16:21:36 +02:00
parent 875f437fcc
commit bf154d485b
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
collector/pressure_linux.go
View File

@ -16,7 +16,9 @@
package collector package collector
import ( import (
"errors"
"fmt" "fmt"
"os"
"github.com/go-kit/kit/log" "github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level" "github.com/go-kit/kit/log/level"
@ -88,8 +90,11 @@ func (c *pressureStatsCollector) Update(ch chan<- prometheus.Metric) error {
level.Debug(c.logger).Log("msg", "collecting statistics for resource", "resource", res) level.Debug(c.logger).Log("msg", "collecting statistics for resource", "resource", res)
vals, err := c.fs.PSIStatsForResource(res) vals, err := c.fs.PSIStatsForResource(res)
if err != nil { if err != nil {
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") if errors.Is(err, os.ErrNotExist) {
return ErrNoData 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
}
return fmt.Errorf("failed to retrieve pressure stats: %w", err)
} }
switch res { switch res {
case "cpu": case "cpu":

16
collector/rapl_linux.go
View File

@ -16,15 +16,20 @@
package collector package collector
import ( import (
"errors"
"fmt"
"os"
"strconv" "strconv"
"github.com/go-kit/kit/log" "github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/procfs/sysfs" "github.com/prometheus/procfs/sysfs"
) )
type raplCollector struct { type raplCollector struct {
fs sysfs.FS fs sysfs.FS
logger log.Logger
} }
func init() { func init() {
@ -40,7 +45,8 @@ func NewRaplCollector(logger log.Logger) (Collector, error) {
} }
collector := raplCollector{ collector := raplCollector{
fs: fs, fs: fs,
logger: logger,
} }
return &collector, nil return &collector, nil
} }
@ -50,7 +56,11 @@ func (c *raplCollector) Update(ch chan<- prometheus.Metric) error {
// nil zones are fine when platform doesn't have powercap files present. // nil zones are fine when platform doesn't have powercap files present.
zones, err := sysfs.GetRaplZones(c.fs) zones, err := sysfs.GetRaplZones(c.fs)
if err != nil { if err != nil {
return ErrNoData if errors.Is(err, os.ErrNotExist) {
level.Debug(c.logger).Log("msg", "Platform doesn't have powercap files present", "err", err)
return ErrNoData
}
return fmt.Errorf("failed to retrieve rapl stats: %w", err)
} }
for _, rz := range zones { for _, rz := range zones {