diff options
author | Ben Kochie <superq@gmail.com> | 2020-06-14 15:45:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-14 15:45:12 +0200 |
commit | c8c161807430e0fc6ab719ea02afdd122110a6ac (patch) | |
tree | 3e7629a5fa30bd732e065a5320969f3f0d39aea4 | |
parent | 7790f968813563cc01264ba3f91001592e55f110 (diff) | |
parent | 5fed4f01e9a617ea099d5637f59bfcbc5aa3fc26 (diff) | |
download | prometheus_node_collector-c8c161807430e0fc6ab719ea02afdd122110a6ac.tar.bz2 prometheus_node_collector-c8c161807430e0fc6ab719ea02afdd122110a6ac.tar.xz prometheus_node_collector-c8c161807430e0fc6ab719ea02afdd122110a6ac.zip |
Merge pull request #1747 from prometheus/superq/fix_powersupplyclass
Handle no data from powersupplyclass
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | collector/powersupplyclass.go | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5372bfb..62808fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -4,7 +4,7 @@ | |||
4 | * [CHANGE] | 4 | * [CHANGE] |
5 | * [FEATURE] | 5 | * [FEATURE] |
6 | * [ENHANCEMENT] | 6 | * [ENHANCEMENT] |
7 | * [BUGFIX] | 7 | * [BUGFIX] Handle no data from powersupplyclass |
8 | 8 | ||
9 | ## 1.0.0 / 2020-05-25 | 9 | ## 1.0.0 / 2020-05-25 |
10 | 10 | ||
diff --git a/collector/powersupplyclass.go b/collector/powersupplyclass.go index 988b0ee..368235e 100644 --- a/collector/powersupplyclass.go +++ b/collector/powersupplyclass.go | |||
@@ -18,6 +18,7 @@ package collector | |||
18 | 18 | ||
19 | import ( | 19 | import ( |
20 | "fmt" | 20 | "fmt" |
21 | "os" | ||
21 | "regexp" | 22 | "regexp" |
22 | 23 | ||
23 | "github.com/go-kit/kit/log" | 24 | "github.com/go-kit/kit/log" |
@@ -54,6 +55,9 @@ func NewPowerSupplyClassCollector(logger log.Logger) (Collector, error) { | |||
54 | func (c *powerSupplyClassCollector) Update(ch chan<- prometheus.Metric) error { | 55 | func (c *powerSupplyClassCollector) Update(ch chan<- prometheus.Metric) error { |
55 | powerSupplyClass, err := getPowerSupplyClassInfo(c.ignoredPattern) | 56 | powerSupplyClass, err := getPowerSupplyClassInfo(c.ignoredPattern) |
56 | if err != nil { | 57 | if err != nil { |
58 | if os.IsNotExist(err) { | ||
59 | return ErrNoData | ||
60 | } | ||
57 | return fmt.Errorf("could not get power_supply class info: %s", err) | 61 | return fmt.Errorf("could not get power_supply class info: %s", err) |
58 | } | 62 | } |
59 | for _, powerSupply := range powerSupplyClass { | 63 | for _, powerSupply := range powerSupplyClass { |