mchus/logpile
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 9 Wiki Activity

collector/redfish: collect and parse platform model fallback

Browse Source
This commit is contained in:
Michael Chus
2026-02-28 14:54:55 +03:00
parent f35cabac48
commit 1d282c4196
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/collector/redfish.go
View File

@@ -964,7 +964,10 @@ func redfishCriticalEndpoints(systemPaths, chassisPaths, managerPaths []string)
add(p) add(p)
add(joinPath(p, "/Bios")) add(joinPath(p, "/Bios"))
add(joinPath(p, "/SecureBoot")) add(joinPath(p, "/SecureBoot"))
add(joinPath(p, "/Oem/Public"))
add(joinPath(p, "/Oem/Public/FRU")) add(joinPath(p, "/Oem/Public/FRU"))
add(joinPath(p, "/Oem/Public/ThermalConfig"))
add(joinPath(p, "/ThermalConfig"))
add(joinPath(p, "/Processors")) add(joinPath(p, "/Processors"))
add(joinPath(p, "/Memory")) add(joinPath(p, "/Memory"))
add(joinPath(p, "/Storage")) add(joinPath(p, "/Storage"))
@@ -977,7 +980,10 @@ func redfishCriticalEndpoints(systemPaths, chassisPaths, managerPaths []string)
} }
for _, p := range chassisPaths { for _, p := range chassisPaths {
add(p) add(p)
add(joinPath(p, "/Oem/Public"))
add(joinPath(p, "/Oem/Public/FRU")) add(joinPath(p, "/Oem/Public/FRU"))
add(joinPath(p, "/Oem/Public/ThermalConfig"))
add(joinPath(p, "/ThermalConfig"))
add(joinPath(p, "/Power")) add(joinPath(p, "/Power"))
add(joinPath(p, "/Thermal")) add(joinPath(p, "/Thermal"))
add(joinPath(p, "/Sensors")) add(joinPath(p, "/Sensors"))
@@ -1497,7 +1503,7 @@ func parseBoardInfoFromFRUDoc(doc map[string]interface{}) models.BoardInfo {
} }
return models.BoardInfo{ return models.BoardInfo{
Manufacturer: findFirstNormalizedStringByKeys(doc, "Manufacturer", "BoardManufacturer", "Vendor"), Manufacturer: findFirstNormalizedStringByKeys(doc, "Manufacturer", "BoardManufacturer", "Vendor"),
ProductName: findFirstNormalizedStringByKeys(doc, "ProductName", "BoardName", "Model"), ProductName: findFirstNormalizedStringByKeys(doc, "ProductName", "BoardName", "PlatformId", "PlatformName", "MachineTypeModel", "Model"),
SerialNumber: findFirstNormalizedStringByKeys(doc, "SerialNumber", "BoardSerialNumber"), SerialNumber: findFirstNormalizedStringByKeys(doc, "SerialNumber", "BoardSerialNumber"),
PartNumber: findFirstNormalizedStringByKeys(doc, "PartNumber", "BoardPartNumber", "ProductPartNumber"), PartNumber: findFirstNormalizedStringByKeys(doc, "PartNumber", "BoardPartNumber", "ProductPartNumber"),
} }
@@ -2632,7 +2638,10 @@ func redfishSnapshotPrioritySeeds(systemPaths, chassisPaths, managerPaths []stri
add(p) add(p)
add(joinPath(p, "/Bios")) add(joinPath(p, "/Bios"))
add(joinPath(p, "/SecureBoot")) add(joinPath(p, "/SecureBoot"))
add(joinPath(p, "/Oem/Public"))
add(joinPath(p, "/Oem/Public/FRU")) add(joinPath(p, "/Oem/Public/FRU"))
add(joinPath(p, "/Oem/Public/ThermalConfig"))
add(joinPath(p, "/ThermalConfig"))
add(joinPath(p, "/Processors")) add(joinPath(p, "/Processors"))
add(joinPath(p, "/Memory")) add(joinPath(p, "/Memory"))
add(joinPath(p, "/EthernetInterfaces")) add(joinPath(p, "/EthernetInterfaces"))
@@ -2651,7 +2660,10 @@ func redfishSnapshotPrioritySeeds(systemPaths, chassisPaths, managerPaths []stri
} }
for _, p := range chassisPaths { for _, p := range chassisPaths {
add(p) add(p)
add(joinPath(p, "/Oem/Public"))
add(joinPath(p, "/Oem/Public/FRU")) add(joinPath(p, "/Oem/Public/FRU"))
add(joinPath(p, "/Oem/Public/ThermalConfig"))
add(joinPath(p, "/ThermalConfig"))
add(joinPath(p, "/Sensors")) add(joinPath(p, "/Sensors"))
add(joinPath(p, "/HealthSummary")) add(joinPath(p, "/HealthSummary"))
add(joinPath(p, "/ThresholdSensors")) add(joinPath(p, "/ThresholdSensors"))

12
internal/collector/redfish_replay.go
View File

@@ -56,7 +56,7 @@ func ReplayRedfishFromRawPayloads(rawPayloads map[string]any, emit ProgressFn) (
if len(fruDoc) == 0 { if len(fruDoc) == 0 {
fruDoc = chassisFRUDoc fruDoc = chassisFRUDoc
} }
boardFallbackDocs := r.collectBoardFallbackDocs(chassisPaths) boardFallbackDocs := r.collectBoardFallbackDocs(systemPaths, chassisPaths)
if emit != nil { if emit != nil {
emit(Progress{Status: "running", Progress: 55, Message: "Redfish snapshot: replay CPU/RAM/Storage..."}) emit(Progress{Status: "running", Progress: 55, Message: "Redfish snapshot: replay CPU/RAM/Storage..."})
@@ -445,7 +445,7 @@ func dedupeStrings(items []string) []string {
return out return out
} }
func (r redfishSnapshotReader) collectBoardFallbackDocs(chassisPaths []string) []map[string]interface{} { func (r redfishSnapshotReader) collectBoardFallbackDocs(systemPaths, chassisPaths []string) []map[string]interface{} {
out := make([]map[string]interface{}, 0) out := make([]map[string]interface{}, 0)
for _, chassisPath := range chassisPaths { for _, chassisPath := range chassisPaths {
for _, suffix := range []string{"/Boards", "/Backplanes"} { for _, suffix := range []string{"/Boards", "/Backplanes"} {
@@ -459,6 +459,14 @@ func (r redfishSnapshotReader) collectBoardFallbackDocs(chassisPaths []string) [
} }
} }
} }
for _, path := range append(append([]string{}, systemPaths...), chassisPaths...) {
for _, suffix := range []string{"/Oem/Public", "/Oem/Public/ThermalConfig", "/ThermalConfig"} {
docPath := joinPath(path, suffix)
if doc, err := r.getJSON(docPath); err == nil && len(doc) > 0 {
out = append(out, doc)
}
}
}
return out return out
} }

2
internal/collector/redfish_test.go
View File

@@ -705,7 +705,7 @@ func TestApplyBoardInfoFallbackFromDocs_SkipsComponentProductNames(t *testing.T)
"SerialNumber": "802C1A2507D284B001", "SerialNumber": "802C1A2507D284B001",
}, },
{ {
"ProductName": "NF5688M7", "PlatformId": "NF5688M7",
"Manufacturer": "Inspur", "Manufacturer": "Inspur",
"PartNumber": "YZMB-00001", "PartNumber": "YZMB-00001",
}, },