Skip to content

Commit 99212a1

Browse files
committed
improve metrics and remove old configurations
1 parent e3abf70 commit 99212a1

File tree

6 files changed

+368
-434
lines changed

6 files changed

+368
-434
lines changed

hwmon-configurations/hwmon_as4610-54t.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

hwmon-configurations/hwmon_sn2410.yml

Lines changed: 0 additions & 82 deletions
This file was deleted.

hwmon-configurations/hwmon_sn2700.yml

Lines changed: 0 additions & 84 deletions
This file was deleted.

hwmon/collector.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ var (
3939
currentCriticalMaxValue *prometheus.Desc
4040
currentDesc *prometheus.Desc
4141

42-
powerPresent *prometheus.Desc
43-
powerAllOk *prometheus.Desc
42+
powerWatt *prometheus.Desc
43+
powerPresent *prometheus.Desc
44+
powerAllOk *prometheus.Desc
45+
powerAllOkPrev *prometheus.Desc
4446

4547
rawValueDesc *prometheus.Desc
4648
)
@@ -79,8 +81,10 @@ func init() {
7981
currentCriticalMaxValue = prometheus.NewDesc(prefix+"current_critical_max_ampere", "Current critical high value. Unit: Ampere", sensorLabels, nil)
8082
currentDesc = prometheus.NewDesc(prefix+"current_ampere", "Current input value. Unit: Ampere", sensorLabels, nil)
8183

82-
powerPresent = prometheus.NewDesc(prefix+"power_present", "Is Power Present. 1 = present, 0 = missing", sensorLabels, nil)
83-
powerAllOk = prometheus.NewDesc(prefix+"power_all_ok", "Is PSU Ok. 1 = OK, 0 = KO", sensorLabels, nil)
84+
powerWatt = prometheus.NewDesc(prefix+"power_watt", "Current Usage. Unit: Watt ", sensorLabels, nil)
85+
powerPresent = prometheus.NewDesc(prefix+"power_present", "Is Power Present. 1 = present, 0 = missing", sensorLabels, nil)
86+
powerAllOk = prometheus.NewDesc(prefix+"power_all_ok", "Is PSU Ok. 1 = OK, 0 = BAD, -1 = POWERED OFF, -2 NOT DETECTED", sensorLabels, nil)
87+
powerAllOkPrev = prometheus.NewDesc(prefix+"power_all_ok_prev", "Is PSU Ok (Previous State). 1 = OK, 0 = BAD, -1 = POWERED OFF, -2 NOT DETECTED", sensorLabels, nil)
8488

8589
rawValueDesc = prometheus.NewDesc(prefix+"raw_sensor_reading", "Arbitrary sensor reading, see labels on how to interpret this value", []string{"description"}, nil)
8690
}
@@ -126,8 +130,10 @@ func (*Collector) Describe(ch chan<- *prometheus.Desc) {
126130
ch <- currentCriticalMaxValue
127131
ch <- currentDesc
128132

133+
ch <- powerWatt
129134
ch <- powerPresent
130135
ch <- powerAllOk
136+
ch <- powerAllOkPrev
131137
}
132138

133139
func (*Collector) Name() string {

0 commit comments

Comments
 (0)