aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kochie <superq@gmail.com>2020-06-15 08:00:35 +0200
committerJohannes 'fish' Ziemke <github@freigeist.org>2020-06-15 12:36:29 +0200
commit64ba27e7d616f4507c7ec67adcd8f17850e5cfbc (patch)
tree54f0200ecdecc4d90cbdceea64fd48d5ad579aca
parent35bfe455df207930537e2df4b93536290f239273 (diff)
downloadprometheus_node_collector-64ba27e7d616f4507c7ec67adcd8f17850e5cfbc.tar.bz2
prometheus_node_collector-64ba27e7d616f4507c7ec67adcd8f17850e5cfbc.tar.xz
prometheus_node_collector-64ba27e7d616f4507c7ec67adcd8f17850e5cfbc.zip
Fix up powersupplyclass error
Switch to go `%w` error verb and errors.Is(). Signed-off-by: Ben Kochie <superq@gmail.com>
-rw-r--r--collector/powersupplyclass.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/collector/powersupplyclass.go b/collector/powersupplyclass.go
index 368235e..309b08c 100644
--- a/collector/powersupplyclass.go
+++ b/collector/powersupplyclass.go
@@ -17,6 +17,7 @@
17package collector 17package collector
18 18
19import ( 19import (
20 "errors"
20 "fmt" 21 "fmt"
21 "os" 22 "os"
22 "regexp" 23 "regexp"
@@ -55,7 +56,7 @@ func NewPowerSupplyClassCollector(logger log.Logger) (Collector, error) {
55func (c *powerSupplyClassCollector) Update(ch chan<- prometheus.Metric) error { 56func (c *powerSupplyClassCollector) Update(ch chan<- prometheus.Metric) error {
56 powerSupplyClass, err := getPowerSupplyClassInfo(c.ignoredPattern) 57 powerSupplyClass, err := getPowerSupplyClassInfo(c.ignoredPattern)
57 if err != nil { 58 if err != nil {
58 if os.IsNotExist(err) { 59 if errors.Is(err, os.ErrNotExist) {
59 return ErrNoData 60 return ErrNoData
60 } 61 }
61 return fmt.Errorf("could not get power_supply class info: %s", err) 62 return fmt.Errorf("could not get power_supply class info: %s", err)
@@ -188,7 +189,7 @@ func getPowerSupplyClassInfo(ignore *regexp.Regexp) (sysfs.PowerSupplyClass, err
188 powerSupplyClass, err := fs.PowerSupplyClass() 189 powerSupplyClass, err := fs.PowerSupplyClass()
189 190
190 if err != nil { 191 if err != nil {
191 return powerSupplyClass, fmt.Errorf("error obtaining power_supply class info: %s", err) 192 return powerSupplyClass, fmt.Errorf("error obtaining power_supply class info: %w", err)
192 } 193 }
193 194
194 for device := range powerSupplyClass { 195 for device := range powerSupplyClass {