Skip to content

Added power supply redundancy info to chassis_collector.go #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
be-kate wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added power supply redundancy info to chassis_collector.go #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions collector/chassis_collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ var (
ChassisNetworkAdapterLabelNames = []string{"resource", "chassis_id", "network_adapter", "network_adapter_id"}
ChassisNetworkPortLabelNames = []string{"resource", "chassis_id", "network_adapter", "network_adapter_id", "network_port", "network_port_id", "network_port_type", "network_port_speed", "network_port_connectiont_type", "network_physical_port_number"}
ChassisPhysicalSecurityLabelNames = []string{"resource", "chassis_id", "intrusion_sensor_number", "intrusion_sensor_rearm"}
ChassisPowerSupplyRedundancyLabelNames = []string{"resource", "chassis_id", "power_supply", "redundancy_id"}

ChassisLogServiceLabelNames = []string{"chassis_id", "log_service", "log_service_id", "log_service_enabled", "log_service_overwrite_policy"}
ChassisLogEntryLabelNames = []string{"chassis_id", "log_service", "log_service_id", "log_entry", "log_entry_id", "log_entry_code", "log_entry_type", "log_entry_message_id", "log_entry_sensor_number", "log_entry_sensor_type"}
Expand Down Expand Up @@ -73,6 +74,8 @@ func createChassisMetricMap() map[string]Metric {
addToMetricMap(chassisMetrics, ChassisSubsystem, "power_powersupply_power_input_watts", "measured input power, in Watts, of powersupply on this chassis", ChassisPowerSupplyLabelNames)
addToMetricMap(chassisMetrics, ChassisSubsystem, "power_powersupply_power_output_watts", "measured output power, in Watts, of powersupply on this chassis", ChassisPowerSupplyLabelNames)
addToMetricMap(chassisMetrics, ChassisSubsystem, "power_powersupply_power_capacity_watts", "power_capacity_watts of powersupply on this chassis", ChassisPowerSupplyLabelNames)
addToMetricMap(chassisMetrics, ChassisSubsystem, "power_powersupply_redundancy_state", fmt.Sprintf("powersupply redundancy state of chassis component,%s", CommonStateHelp), ChassisPowerSupplyRedundancyLabelNames)
addToMetricMap(chassisMetrics, ChassisSubsystem, "power_powersupply_redundancy_health", fmt.Sprintf("powersupply redundancy health of chassis component,%s", CommonHealthHelp), ChassisPowerSupplyRedundancyLabelNames)

addToMetricMap(chassisMetrics, ChassisSubsystem, "network_adapter_state", fmt.Sprintf("chassis network adapter state,%s", CommonStateHelp), ChassisNetworkAdapterLabelNames)
addToMetricMap(chassisMetrics, ChassisSubsystem, "network_adapter_health_state", fmt.Sprintf("chassis network adapter health state,%s", CommonHealthHelp), ChassisNetworkAdapterLabelNames)
Expand Down Expand Up @@ -205,6 +208,18 @@ func (c *ChassisCollector) Collect(ch chan<- prometheus.Metric) {
for _, chassisPowerInfoPowerSupply := range chassisPowerInfoPowerSupplies {
go parseChassisPowerInfoPowerSupply(ch, chassisID, chassisPowerInfoPowerSupply, wg5)
}

// powerRedundancy
chassisPowerInfoPowerRedundancies := chassisPowerInfo.Redundancy
if chassisPowerInfoPowerRedundancies != nil {
wg6 := &sync.WaitGroup{}
wg6.Add(len(chassisPowerInfoPowerRedundancies))
for _, chassisPowerInfoPowerRedundancy := range chassisPowerInfoPowerRedundancies {
go parseChassisPowerInfoPowerRedundancy(ch, chassisID, chassisPowerInfoPowerRedundancy, wg6)
}
} else if chassisPowerInfoPowerRedundancies == nil {
chassisLogContext.WithField("operation", "chassis.Power().chassisPowerInfo.Redundancy").Info("no power redundancy data found")
}
}

// process NetapAdapter
Expand Down Expand Up @@ -432,3 +447,16 @@ func parseNetworkPort(ch chan<- prometheus.Metric, chassisID string, networkPort
ch <- prometheus.MustNewConstMetric(chassisMetrics["chassis_network_port_health_state"].desc, prometheus.GaugeValue, networkPortHealthStateValue, chassisNetworkPortLabelValues...)
}
}

func parseChassisPowerInfoPowerRedundancy(ch chan<- prometheus.Metric, chassisID string, chassisPowerInfoPowerRedundancy redfish.Redundancy, wg *sync.WaitGroup) {
defer wg.Done()
chassisPowerInfoPowerSupplyRedundancyStatus := chassisPowerInfoPowerRedundancy
ChassisPowerSupplyRedundancyLabelvalues := []string{"power_supply", chassisID, chassisPowerInfoPowerRedundancy.Name, string(chassisPowerInfoPowerRedundancy.MemberID)}

if chassisPowerInfoPowerSupplyRedundancyStateValue, ok := parseCommonStatusState(chassisPowerInfoPowerSupplyRedundancyStatus.Status.State); ok {
ch <- prometheus.MustNewConstMetric(chassisMetrics["chassis_power_powersupply_redundancy_state"].desc, prometheus.GaugeValue, chassisPowerInfoPowerSupplyRedundancyStateValue, ChassisPowerSupplyRedundancyLabelvalues...)
}
if chassisPowerInfoPowerSupplyRedundancyHealthValue, ok := parseCommonStatusHealth(chassisPowerInfoPowerSupplyRedundancyStatus.Status.Health); ok {
ch <- prometheus.MustNewConstMetric(chassisMetrics["chassis_power_powersupply_redundancy_health"].desc, prometheus.GaugeValue, chassisPowerInfoPowerSupplyRedundancyHealthValue, ChassisPowerSupplyRedundancyLabelvalues...)
}
}