Skip to content

Commit 8d9e669

Browse files
Merge pull request jenningsloy318#41 from iceman91176/fix_voltage_label
Fixes typo in voltage-metrics
2 parents a5b25f6 + 8497bbc commit 8d9e669

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

collector/chassis_collector.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var (
1616
ChassisLabelNames = []string{"resource", "chassis_id"}
1717
ChassisTemperatureLabelNames = []string{"resource", "chassis_id", "sensor", "sensor_id"}
1818
ChassisFanLabelNames = []string{"resource", "chassis_id", "fan", "fan_id"}
19-
ChassisPowerVotageLabelNames = []string{"resource", "chassis_id", "power_votage", "power_votage_id"}
19+
ChassisPowerVoltageLabelNames = []string{"resource", "chassis_id", "power_voltage", "power_voltage_id"}
2020
ChassisPowerSupplyLabelNames = []string{"resource", "chassis_id", "power_supply", "power_supply_id"}
2121
ChassisNetworkAdapterLabelNames = []string{"resource", "chassis_id", "network_adapter", "network_adapter_id"}
2222
ChassisNetworkPortLabelNames = []string{"resource", "chassis_id", "network_adapter", "network_adapter_id", "network_port", "network_port_id", "network_port_type", "network_port_speed"}
@@ -83,23 +83,23 @@ var (
8383
desc: prometheus.NewDesc(
8484
prometheus.BuildFQName(namespace, ChassisSubsystem, "power_voltage_state"),
8585
"power voltage state of chassis component,1(Enabled),2(Disabled),3(StandbyOffinline),4(StandbySpare),5(InTest),6(Starting),7(Absent),8(UnavailableOffline),9(Deferring),10(Quiesced),11(Updating)",
86-
ChassisPowerVotageLabelNames,
86+
ChassisPowerVoltageLabelNames,
8787
nil,
8888
),
8989
},
9090
"chassis_power_voltage_volts": {
9191
desc: prometheus.NewDesc(
9292
prometheus.BuildFQName(namespace, ChassisSubsystem, "power_voltage_volts"),
9393
"power voltage volts number of chassis component",
94-
ChassisPowerVotageLabelNames,
94+
ChassisPowerVoltageLabelNames,
9595
nil,
9696
),
9797
},
9898
"chassis_power_average_consumed_watts": {
9999
desc: prometheus.NewDesc(
100100
prometheus.BuildFQName(namespace, ChassisSubsystem, "power_average_consumed_watts"),
101101
"power wattage watts number of chassis component",
102-
ChassisPowerVotageLabelNames,
102+
ChassisPowerVoltageLabelNames,
103103
nil,
104104
),
105105
},
@@ -276,7 +276,7 @@ func (c *ChassisCollector) Collect(ch chan<- prometheus.Metric) {
276276
} else if chassisPowerInfo == nil {
277277
chassisLogContext.WithField("operation", "chassis.Power()").Info("no power data found")
278278
} else {
279-
// power votages
279+
// power voltages
280280
chassisPowerInfoVoltages := chassisPowerInfo.Voltages
281281
wg3 := &sync.WaitGroup{}
282282
wg3.Add(len(chassisPowerInfoVoltages))
@@ -385,19 +385,19 @@ func parseChassisPowerInfoVoltage(ch chan<- prometheus.Metric, chassisID string,
385385
chassisPowerInfoVoltageID := chassisPowerInfoVoltage.MemberID
386386
chassisPowerInfoVoltageNameReadingVolts := chassisPowerInfoVoltage.ReadingVolts
387387
chassisPowerInfoVoltageState := chassisPowerInfoVoltage.Status.State
388-
chassisPowerVotageLabelvalues := []string{"power_voltage", chassisID, chassisPowerInfoVoltageName, chassisPowerInfoVoltageID}
388+
chassisPowerVoltageLabelvalues := []string{"power_voltage", chassisID, chassisPowerInfoVoltageName, chassisPowerInfoVoltageID}
389389
if chassisPowerInfoVoltageStateValue, ok := parseCommonStatusState(chassisPowerInfoVoltageState); ok {
390-
ch <- prometheus.MustNewConstMetric(chassisMetrics["chassis_power_voltage_state"].desc, prometheus.GaugeValue, chassisPowerInfoVoltageStateValue, chassisPowerVotageLabelvalues...)
390+
ch <- prometheus.MustNewConstMetric(chassisMetrics["chassis_power_voltage_state"].desc, prometheus.GaugeValue, chassisPowerInfoVoltageStateValue, chassisPowerVoltageLabelvalues...)
391391
}
392-
ch <- prometheus.MustNewConstMetric(chassisMetrics["chassis_power_voltage_volts"].desc, prometheus.GaugeValue, float64(chassisPowerInfoVoltageNameReadingVolts), chassisPowerVotageLabelvalues...)
392+
ch <- prometheus.MustNewConstMetric(chassisMetrics["chassis_power_voltage_volts"].desc, prometheus.GaugeValue, float64(chassisPowerInfoVoltageNameReadingVolts), chassisPowerVoltageLabelvalues...)
393393
}
394394
func parseChassisPowerInfoPowerControl(ch chan<- prometheus.Metric, chassisID string, chassisPowerInfoPowerControl redfish.PowerControl, wg *sync.WaitGroup) {
395395
defer wg.Done()
396396
name := chassisPowerInfoPowerControl.Name
397397
id := chassisPowerInfoPowerControl.MemberID
398398
pm := chassisPowerInfoPowerControl.PowerMetrics
399-
chassisPowerVotageLabelvalues := []string{"power_wattage", chassisID, name, id}
400-
ch <- prometheus.MustNewConstMetric(chassisMetrics["chassis_power_average_consumed_watts"].desc, prometheus.GaugeValue, float64(pm.AverageConsumedWatts), chassisPowerVotageLabelvalues...)
399+
chassisPowerVoltageLabelvalues := []string{"power_wattage", chassisID, name, id}
400+
ch <- prometheus.MustNewConstMetric(chassisMetrics["chassis_power_average_consumed_watts"].desc, prometheus.GaugeValue, float64(pm.AverageConsumedWatts), chassisPowerVoltageLabelvalues...)
401401
}
402402

403403
func parseChassisPowerInfoPowerSupply(ch chan<- prometheus.Metric, chassisID string, chassisPowerInfoPowerSupply redfish.PowerSupply, wg *sync.WaitGroup) {

0 commit comments

Comments
 (0)