fix: fomat and add pcie_device_partnumber to fix jenningsloy318#57

Author: jenningsloy318

collector/chassis_collector.go

@@ -2,7 +2,7 @@ package collector
 
 import (
 	"fmt"
-        "math"
+	"math"
 	"strings"
 	"sync"
 
@@ -285,7 +285,7 @@ var (
 	}
 )
 
-//ChassisCollector implements the prometheus.Collector.
+// ChassisCollector implements the prometheus.Collector.
 type ChassisCollector struct {
 	redfishClient         *gofish.APIClient
 	metrics               map[string]chassisMetric
@@ -490,16 +490,16 @@ func parseChassisFan(ch chan<- prometheus.Metric, chassisID string, chassisFan r
 
 	chassisFanPercentage := chassisFanRPM
 	if chassisFanUnit != redfish.PercentReadingUnits {
-                // Some vendors (e.g. PowerEdge C6420) report null RPMs for Min/Max, as well as Lower/UpperFatal, 
-                // but provide Lower/UpperCritical, so use largest non-null for max. However, we can't know if 
-                // min is null (reported as zero by gofish) or just zero, so we'll have to assume a min of zero 
-                // if Min is not reported...
-                min := chassisFanRPMMin
-                max := math.Max(math.Max(chassisFanRPMMax, chassisFanRPMUpperFatalThreshold), chassisFanRPMUpperCriticalThreshold)
-                chassisFanPercentage = 0
-                if max != 0 {
-                        chassisFanPercentage = float64((chassisFanRPM+min)/max) * 100
-                }
+		// Some vendors (e.g. PowerEdge C6420) report null RPMs for Min/Max, as well as Lower/UpperFatal,
+		// but provide Lower/UpperCritical, so use largest non-null for max. However, we can't know if
+		// min is null (reported as zero by gofish) or just zero, so we'll have to assume a min of zero
+		// if Min is not reported...
+		min := chassisFanRPMMin
+		max := math.Max(math.Max(chassisFanRPMMax, chassisFanRPMUpperFatalThreshold), chassisFanRPMUpperCriticalThreshold)
+		chassisFanPercentage = 0
+		if max != 0 {
+			chassisFanPercentage = float64((chassisFanRPM+min)/max) * 100
+		}
 	}
 
 	//			chassisFanStatusLabelNames :=[]string{BaseLabelNames,"fan_name","fan_member_id")

collector/manager_collector.go

@@ -14,7 +14,7 @@ type managerMetric struct {
 	desc *prometheus.Desc
 }
 
-//ManagerSubmanager is the manager subsystem
+// ManagerSubmanager is the manager subsystem
 var (
 	ManagerSubmanager = "manager"
 	ManagerLabelNames = []string{"manager_id", "name", "model", "type"}
@@ -46,7 +46,7 @@ var (
 	}
 )
 
-//ManagerCollector implemented prometheus.Collector
+// ManagerCollector implemented prometheus.Collector
 type ManagerCollector struct {
 	redfishClient           *gofish.APIClient
 	metrics                 map[string]managerMetric

collector/system_collector.go

@@ -26,7 +26,7 @@ var (
 	SystemDeviceLabelNames            = []string{"hostname", "resource", "device"}
 	SystemDriveLabelNames             = []string{"hostname", "resource", "drive", "drive_id"}
 	SystemStorageControllerLabelNames = []string{"hostname", "resource", "storage_controller", "storage_controller_id"}
-	SystemPCIeDeviceLabelNames        = []string{"hostname", "resource", "pcie_device", "pcie_device_id"}
+	SystemPCIeDeviceLabelNames        = []string{"hostname", "resource", "pcie_device", "pcie_device_id", "pcie_device_partnumber"}
 	SystemNetworkInterfaceLabelNames  = []string{"hostname", "resource", "network_interface", "network_interface_id"}
 	SystemEthernetInterfaceLabelNames = []string{"hostname", "resource", "ethernet_interface", "ethernet_interface_id", "ethernet_interface_speed"}
 	systemMetrics                     = map[string]systemMetric{
@@ -673,7 +673,8 @@ func parsePcieDevice(ch chan<- prometheus.Metric, systemHostName string, pcieDev
 	pcieDeviceID := pcieDevice.ID
 	pcieDeviceState := pcieDevice.Status.State
 	pcieDeviceHealthState := pcieDevice.Status.Health
-	systemPCIeDeviceLabelValues := []string{systemHostName, "pcie_device", pcieDeviceName, pcieDeviceID}
+	pcieDevicePartNumber := pcieDevice.PartNumber
+	systemPCIeDeviceLabelValues := []string{systemHostName, "pcie_device", pcieDeviceName, pcieDeviceID, pcieDevicePartNumber}
 
 	if pcieStateVaule, ok := parseCommonStatusState(pcieDeviceState); ok {
 		ch <- prometheus.MustNewConstMetric(systemMetrics["system_pcie_device_state"].desc, prometheus.GaugeValue, pcieStateVaule, systemPCIeDeviceLabelValues...)

main.go

@@ -30,7 +30,7 @@ var (
 		"config.file",
 		"Path to configuration file.",
 	).String()
-	webConfig   = webflag.AddFlags(kingpin.CommandLine)
+	webConfig     = webflag.AddFlags(kingpin.CommandLine)
 	listenAddress = kingpin.Flag(
 		"web.listen-address",
 		"Address to listen on for web interface and telemetry.",