Align hardware export with ingest contract

audit/internal/collector/psu.go

@@ -114,7 +114,7 @@ func parseFRUBlock(block string, slotIdx int) (schema.HardwarePowerSupply, bool)
 		}
 	}
 
-	status := "OK"
+	status := statusOK
 	psu.Status = &status
 
 	return psu, true
@@ -123,9 +123,12 @@ func parseFRUBlock(block string, slotIdx int) (schema.HardwarePowerSupply, bool)
 type psuSDR struct {
 	slot         int
 	status       string
+	reason       string
 	inputPowerW  *float64
 	outputPowerW *float64
 	inputVoltage *float64
+	temperatureC *float64
+	healthPct    *float64
 }
 
 var psuSlotRe = regexp.MustCompile(`(?i)\bpsu?\s*([0-9]+)\b|\bps\s*([0-9]+)\b`)
@@ -148,10 +151,11 @@ func parsePSUSDR(raw string) map[int]psuSDR {
 		entry := out[slot]
 		entry.slot = slot
 		if entry.status == "" {
-			entry.status = "OK"
+			entry.status = statusOK
 		}
 		if state != "" && state != "ok" && state != "ns" {
-			entry.status = "FAILED"
+			entry.status = statusCritical
+			entry.reason = "PSU sensor reported non-OK state: " + state
 		}
 
 		lowerName := strings.ToLower(name)
@@ -162,6 +166,10 @@ func parsePSUSDR(raw string) map[int]psuSDR {
 			entry.outputPowerW = parseFloatPtr(value)
 		case strings.Contains(lowerName, "input voltage"), strings.Contains(lowerName, "ac input"):
 			entry.inputVoltage = parseFloatPtr(value)
+		case strings.Contains(lowerName, "temp"):
+			entry.temperatureC = parseFloatPtr(value)
+		case strings.Contains(lowerName, "health"), strings.Contains(lowerName, "remaining life"), strings.Contains(lowerName, "life remaining"):
+			entry.healthPct = parsePercentPtr(value)
 		}
 		out[slot] = entry
 	}
@@ -187,12 +195,23 @@ func mergePSUSDR(psus []schema.HardwarePowerSupply, sdr map[int]psuSDR) {
 		if entry.inputVoltage != nil {
 			psus[i].InputVoltage = entry.inputVoltage
 		}
+		if entry.temperatureC != nil {
+			psus[i].TemperatureC = entry.temperatureC
+		}
+		if entry.healthPct != nil {
+			psus[i].LifeRemainingPct = entry.healthPct
+			lifeUsed := 100 - *entry.healthPct
+			psus[i].LifeUsedPct = &lifeUsed
+		}
 		if entry.status != "" {
 			psus[i].Status = &entry.status
 		}
-		if psus[i].Status != nil && *psus[i].Status == "OK" {
+		if entry.reason != "" {
+			psus[i].ErrorDescription = &entry.reason
+		}
+		if psus[i].Status != nil && *psus[i].Status == statusOK {
 			if (entry.inputPowerW == nil && entry.outputPowerW == nil && entry.inputVoltage == nil) && entry.status == "" {
-				unknown := "UNKNOWN"
+				unknown := statusUnknown
 				psus[i].Status = &unknown
 			}
 		}