fix hostname label in device_info

Comcast · Apr 24, 2024 · 704fd52 · 704fd52
1 parent 67a6ae7
commit 704fd52
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/exporter/exporter.go b/exporter/exporter.go
@@ -79,15 +79,15 @@ var (
 // Exporter collects chassis manager stats from the given URI and exports them using
 // the prometheus metrics package.
 type Exporter struct {
-	ctx         context.Context
-	mutex       sync.RWMutex
-	pool        *pool.Pool
-	client      *retryablehttp.Client
-	host        string
-	url         string
-	credProfile string
-	biosVersion string
-
+	ctx                 context.Context
+	mutex               sync.RWMutex
+	pool                *pool.Pool
+	client              *retryablehttp.Client
+	host                string
+	url                 string
+	credProfile         string
+	biosVersion         string
+	systemHostname      string
 	ChassisSerialNumber string
 	DeviceMetrics       *map[string]*metrics
 	Model               string
@@ -255,6 +255,7 @@ func NewExporter(ctx context.Context, target, uri, profile, model string, exclud
 		}
 		exp.biosVersion = sysResp.BiosVersion
 		exp.ChassisSerialNumber = sysResp.SerialNumber
+		exp.systemHostname = sysResp.SystemHostname
 
 		// call /redfish/v1/Systems/XXXXX/ for memory summary and smart storage batteries
 		// TODO: do not assume 1 systems endpoint

diff --git a/exporter/exporter_test.go b/exporter/exporter_test.go
@@ -38,7 +38,7 @@ const (
 	GoodDeviceInfoExpected = `
         # HELP redfish_device_info Current snapshot of device firmware information
         # TYPE redfish_device_info gauge
-        redfish_device_info{biosVersion="U99 v0.00 (xx/xx/xxxx)",chassisModel="model a",chassisSerialNumber="SN98765",firmwareVersion="iLO 5 v2.65",name="test description"} 1
+        redfish_device_info{biosVersion="U99 v0.00 (xx/xx/xxxx)",chassisModel="model a",chassisSerialNumber="SN98765",firmwareVersion="iLO 5 v2.65",name="hostname123"} 1
 	`
 	GoodCPUStatusExpected = `
         # HELP redfish_cpu_status Current cpu status 1 = OK, 0 = BAD
@@ -1110,6 +1110,7 @@ func Test_Exporter_Metrics_Handling(t *testing.T) {
 		host:                "fishymetrics.com",
 		Model:               "model a",
 		biosVersion:         "U99 v0.00 (xx/xx/xxxx)",
+		systemHostname:      "hostname123",
 		ChassisSerialNumber: "SN98765",
 		DeviceMetrics:       NewDeviceMetrics(),
 	}

diff --git a/exporter/handlers.go b/exporter/handlers.go
@@ -71,7 +71,7 @@ func (e *Exporter) exportFirmwareMetrics(body []byte) error {
 		return fmt.Errorf("Error Unmarshalling FirmwareMetrics - " + err.Error())
 	}
 
-	(*dm)["deviceInfo"].WithLabelValues(mgr.Description, e.ChassisSerialNumber, e.Model, mgr.FirmwareVersion, e.biosVersion).Set(1.0)
+	(*dm)["deviceInfo"].WithLabelValues(e.systemHostname, e.ChassisSerialNumber, e.Model, mgr.FirmwareVersion, e.biosVersion).Set(1.0)
 
 	return nil
 }

diff --git a/oem/system.go b/oem/system.go
@@ -21,11 +21,11 @@ package oem
 // ServerManager contains the BIOS version and Serial number of the chassis,
 // we will also collect memory summary and storage battery metrics if present
 type System struct {
-	BiosVersion   string        `json:"BiosVersion"`
-	SerialNumber  string        `json:"SerialNumber"`
-	IloServerName string        `json:"HostName"`
-	Oem           OemSys        `json:"Oem"`
-	MemorySummary MemorySummary `json:"MemorySummary"`
+	BiosVersion    string        `json:"BiosVersion"`
+	SerialNumber   string        `json:"SerialNumber"`
+	SystemHostname string        `json:"HostName"`
+	Oem            OemSys        `json:"Oem"`
+	MemorySummary  MemorySummary `json:"MemorySummary"`
 }
 
 type OemSys struct {