Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c47c34fd11 | ||
|
|
d8c3256e41 | ||
|
|
1b2d978d29 | ||
|
|
0f310d57c4 |
@@ -30,6 +30,7 @@ All modes converge on the same normalized hardware model and exporter pipeline.
|
|||||||
- Reanimator Easy Bee support bundles
|
- Reanimator Easy Bee support bundles
|
||||||
- H3C SDS G5/G6
|
- H3C SDS G5/G6
|
||||||
- Inspur / Kaytus
|
- Inspur / Kaytus
|
||||||
|
- HPE iLO AHS
|
||||||
- NVIDIA HGX Field Diagnostics
|
- NVIDIA HGX Field Diagnostics
|
||||||
- NVIDIA Bug Report
|
- NVIDIA Bug Report
|
||||||
- Unraid
|
- Unraid
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ When `vendor_id` and `device_id` are known but the model name is missing or gene
|
|||||||
| `easy_bee` | `bee-support-*.tar.gz` | Imports embedded `export/bee-audit.json` snapshot from reanimator-easy-bee bundles |
|
| `easy_bee` | `bee-support-*.tar.gz` | Imports embedded `export/bee-audit.json` snapshot from reanimator-easy-bee bundles |
|
||||||
| `h3c_g5` | H3C SDS G5 bundles | INI/XML/CSV-driven hardware and event parsing |
|
| `h3c_g5` | H3C SDS G5 bundles | INI/XML/CSV-driven hardware and event parsing |
|
||||||
| `h3c_g6` | H3C SDS G6 bundles | Similar flow with G6-specific files |
|
| `h3c_g6` | H3C SDS G6 bundles | Similar flow with G6-specific files |
|
||||||
|
| `hpe_ilo_ahs` | HPE iLO Active Health System (`.ahs`) | Proprietary `ABJR` container with gzip-compressed `zbb` members; parser combines SMBIOS-style inventory strings and embedded Redfish storage JSON |
|
||||||
| `inspur` | onekeylog archives | FRU/SDR plus optional Redis enrichment |
|
| `inspur` | onekeylog archives | FRU/SDR plus optional Redis enrichment |
|
||||||
| `nvidia` | HGX Field Diagnostics | GPU- and fabric-heavy diagnostic input |
|
| `nvidia` | HGX Field Diagnostics | GPU- and fabric-heavy diagnostic input |
|
||||||
| `nvidia_bug_report` | `nvidia-bug-report-*.log.gz` | dmidecode, lspci, NVIDIA driver sections |
|
| `nvidia_bug_report` | `nvidia-bug-report-*.log.gz` | dmidecode, lspci, NVIDIA driver sections |
|
||||||
@@ -121,6 +122,32 @@ with content markers (e.g. `Unraid kernel build`, parity data markers).
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
### HPE iLO AHS (`hpe_ilo_ahs`)
|
||||||
|
|
||||||
|
**Status:** Ready (v1.0.0). Tested on HPE ProLiant Gen11 `.ahs` export from iLO 6.
|
||||||
|
|
||||||
|
**Archive format:** `.ahs` single-file Active Health System export.
|
||||||
|
|
||||||
|
**Detection:** Single-file input with `ABJR` container header and HPE AHS member names
|
||||||
|
such as `CUST_INFO.DAT`, `*.zbb`, `ilo_boot_support.zbb`.
|
||||||
|
|
||||||
|
**Extracted data (current):**
|
||||||
|
- System board identity (manufacturer, model, serial, part number)
|
||||||
|
- iLO / System ROM / SPS top-level firmware
|
||||||
|
- CPU inventory (model-level)
|
||||||
|
- Memory DIMM inventory for populated slots
|
||||||
|
- PSU inventory
|
||||||
|
- PCIe / OCP NIC inventory from SMBIOS-style slot records
|
||||||
|
- Storage controller and physical drives from embedded Redfish JSON inside `zbb` members
|
||||||
|
- Basic iLO event log entries with timestamps when present
|
||||||
|
|
||||||
|
**Implementation note:** The format is proprietary. Parser support is intentionally hybrid:
|
||||||
|
container parsing (`ABJR` + gzip) plus structured extraction from embedded Redfish objects and
|
||||||
|
printable SMBIOS/FRU payloads. This is sufficient for inventory-grade parsing without decoding the
|
||||||
|
entire internal `zbb` schema.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
### Generic text fallback (`generic`)
|
### Generic text fallback (`generic`)
|
||||||
|
|
||||||
**Status:** Ready (v1.0.0).
|
**Status:** Ready (v1.0.0).
|
||||||
@@ -141,6 +168,7 @@ with content markers (e.g. `Unraid kernel build`, parity data markers).
|
|||||||
|--------|----|--------|-----------|
|
|--------|----|--------|-----------|
|
||||||
| Dell TSR | `dell` | Ready | TSR nested zip archives |
|
| Dell TSR | `dell` | Ready | TSR nested zip archives |
|
||||||
| Reanimator Easy Bee | `easy_bee` | Ready | `bee-support-*.tar.gz` support bundles |
|
| Reanimator Easy Bee | `easy_bee` | Ready | `bee-support-*.tar.gz` support bundles |
|
||||||
|
| HPE iLO AHS | `hpe_ilo_ahs` | Ready | iLO 6 `.ahs` exports |
|
||||||
| Inspur / Kaytus | `inspur` | Ready | KR4268X2 onekeylog |
|
| Inspur / Kaytus | `inspur` | Ready | KR4268X2 onekeylog |
|
||||||
| NVIDIA HGX Field Diag | `nvidia` | Ready | Various HGX servers |
|
| NVIDIA HGX Field Diag | `nvidia` | Ready | Various HGX servers |
|
||||||
| NVIDIA Bug Report | `nvidia_bug_report` | Ready | H100 systems |
|
| NVIDIA Bug Report | `nvidia_bug_report` | Ready | H100 systems |
|
||||||
|
|||||||
@@ -258,6 +258,9 @@ at parse time before storing in any model struct. Use the regex
|
|||||||
**Date:** 2026-03-12
|
**Date:** 2026-03-12
|
||||||
**Context:** `shouldAdaptiveNVMeProbe` was introduced in `2fa4a12` to recover NVMe drives on
|
**Context:** `shouldAdaptiveNVMeProbe` was introduced in `2fa4a12` to recover NVMe drives on
|
||||||
Supermicro BMCs that expose empty `Drives` collections but serve disks at direct `Disk.Bay.N`
|
Supermicro BMCs that expose empty `Drives` collections but serve disks at direct `Disk.Bay.N`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
paths. The function returns `true` for any chassis with an empty `Members` array. On
|
paths. The function returns `true` for any chassis with an empty `Members` array. On
|
||||||
Supermicro HGX systems (SYS-A21GE-NBRT and similar) ~35 sub-chassis (GPU, NVSwitch,
|
Supermicro HGX systems (SYS-A21GE-NBRT and similar) ~35 sub-chassis (GPU, NVSwitch,
|
||||||
PCIeRetimer, ERoT, IRoT, BMC, FPGA) all carry `ChassisType=Module/Component/Zone` and
|
PCIeRetimer, ERoT, IRoT, BMC, FPGA) all carry `ChassisType=Module/Component/Zone` and
|
||||||
@@ -976,3 +979,69 @@ the producer utility and archive importer.
|
|||||||
- Adding support required only a thin archive adapter instead of a full hardware parser.
|
- Adding support required only a thin archive adapter instead of a full hardware parser.
|
||||||
- If the upstream utility changes the embedded snapshot schema, the `easy_bee` adapter is the
|
- If the upstream utility changes the embedded snapshot schema, the `easy_bee` adapter is the
|
||||||
only place that must be updated.
|
only place that must be updated.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ADL-038 — HPE AHS parser uses hybrid extraction instead of full `zbb` schema decoding
|
||||||
|
|
||||||
|
**Date:** 2026-03-30
|
||||||
|
**Context:** HPE iLO Active Health System exports (`.ahs`) are proprietary `ABJR` containers
|
||||||
|
with gzip-compressed `zbb` payloads. The sample inventory data contains two practical signal
|
||||||
|
families: printable SMBIOS/FRU-style strings and embedded Redfish JSON subtrees, especially for
|
||||||
|
storage controllers and drives. Full `zbb` binary schema decoding is not documented and would add
|
||||||
|
significant complexity before proving user value.
|
||||||
|
**Decision:** Support HPE AHS with a hybrid parser:
|
||||||
|
- decode the outer `ABJR` container
|
||||||
|
- gunzip embedded members when applicable
|
||||||
|
- extract inventory from printable SMBIOS/FRU payloads
|
||||||
|
- extract storage/controller/backplane details from embedded Redfish JSON objects
|
||||||
|
- enrich firmware and PSU inventory from auxiliary package payloads such as `bcert.pkg`
|
||||||
|
- do not attempt complete semantic decoding of the internal `zbb` record format
|
||||||
|
**Consequences:**
|
||||||
|
- Parser reaches inventory-grade usefulness quickly for HPE `.ahs` uploads.
|
||||||
|
- Storage inventory is stronger than text-only parsing because it reuses structured Redfish data when present.
|
||||||
|
- Auxiliary package payloads can supply missing firmware/PSU fields even when the main SMBIOS-like blob is incomplete.
|
||||||
|
- Future deeper `zbb` decoding can be added incrementally without replacing the current parser contract.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ADL-039 — Canonical inventory keeps DIMMs with unknown capacity when identity is known
|
||||||
|
|
||||||
|
**Date:** 2026-03-30
|
||||||
|
**Context:** Some sources, notably HPE iLO AHS SMBIOS-like blobs, expose installed DIMM identity
|
||||||
|
(slot, serial, part number, manufacturer) but do not include capacity. The parser already extracts
|
||||||
|
those modules into `Hardware.Memory`, but canonical device building and export previously dropped
|
||||||
|
them because `size_mb == 0`.
|
||||||
|
**Decision:** Treat a DIMM as installed inventory when `present=true` and it has identifying
|
||||||
|
memory fields such as serial number or part number, even if `size_mb` is unknown.
|
||||||
|
**Consequences:**
|
||||||
|
- HPE AHS uploads now show real installed memory modules instead of hiding them.
|
||||||
|
- Empty slots still stay filtered because they lack inventory identity or are marked absent.
|
||||||
|
- Specification/export can include "size unknown" memory entries without inventing capacity data.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ADL-040 — HPE Redfish normalization prefers chassis `Devices/*` over generic PCIe topology labels
|
||||||
|
|
||||||
|
**Date:** 2026-03-30
|
||||||
|
**Context:** HPE ProLiant Gen11 Redfish snapshots expose parallel inventory trees. `Chassis/*/PCIeDevices/*`
|
||||||
|
is good for topology presence, but often reports only generic `DeviceType` values such as
|
||||||
|
`SingleFunction`. `Chassis/*/Devices/*` carries the concrete slot label, richer device type, and
|
||||||
|
product-vs-spare part identifiers for the same physical NIC/controller. Replay fallback over empty
|
||||||
|
storage volume collections can also discover `Volumes/Capabilities` children, which are not real
|
||||||
|
logical volumes.
|
||||||
|
|
||||||
|
**Decision:**
|
||||||
|
- Treat Redfish `SKU` as a valid fallback for `hardware.board.part_number` when `PartNumber` is empty.
|
||||||
|
- Ignore `Volumes/Capabilities` documents during logical-volume parsing.
|
||||||
|
- Enrich `Chassis/*/PCIeDevices/*` entries with matching `Chassis/*/Devices/*` documents by
|
||||||
|
serial/name/part identity.
|
||||||
|
- Keep `pcie.device_class` semantic; do not replace it with model or part-number strings when
|
||||||
|
Redfish exposes only generic topology labels.
|
||||||
|
|
||||||
|
**Consequences:**
|
||||||
|
- HPE Redfish imports now keep the server SKU in `hardware.board.part_number`.
|
||||||
|
- Empty volume collections no longer produce fake `Capabilities` volume records.
|
||||||
|
- HPE PCIe inventory gets better slot labels like `OCP 3.0 Slot 15` plus concrete classes such as
|
||||||
|
`LOM/NIC` or `SAS/SATA Storage Controller`.
|
||||||
|
- `part_number` remains available separately for model identity, without polluting the class field.
|
||||||
|
|||||||
@@ -1513,16 +1513,13 @@ func (c *RedfishConnector) collectPCIeDevices(ctx context.Context, client *http.
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *RedfishConnector) getChassisScopedPCIeSupplementalDocs(ctx context.Context, client *http.Client, req Request, baseURL string, doc map[string]interface{}) []map[string]interface{} {
|
func (c *RedfishConnector) getChassisScopedPCIeSupplementalDocs(ctx context.Context, client *http.Client, req Request, baseURL string, doc map[string]interface{}) []map[string]interface{} {
|
||||||
if !looksLikeNVSwitchPCIeDoc(doc) {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
docPath := normalizeRedfishPath(asString(doc["@odata.id"]))
|
docPath := normalizeRedfishPath(asString(doc["@odata.id"]))
|
||||||
chassisPath := chassisPathForPCIeDoc(docPath)
|
chassisPath := chassisPathForPCIeDoc(docPath)
|
||||||
if chassisPath == "" {
|
if chassisPath == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
out := make([]map[string]interface{}, 0, 4)
|
out := make([]map[string]interface{}, 0, 6)
|
||||||
seen := make(map[string]struct{})
|
seen := make(map[string]struct{})
|
||||||
add := func(path string) {
|
add := func(path string) {
|
||||||
path = normalizeRedfishPath(path)
|
path = normalizeRedfishPath(path)
|
||||||
@@ -1540,8 +1537,19 @@ func (c *RedfishConnector) getChassisScopedPCIeSupplementalDocs(ctx context.Cont
|
|||||||
out = append(out, supplementalDoc)
|
out = append(out, supplementalDoc)
|
||||||
}
|
}
|
||||||
|
|
||||||
add(joinPath(chassisPath, "/EnvironmentMetrics"))
|
if looksLikeNVSwitchPCIeDoc(doc) {
|
||||||
add(joinPath(chassisPath, "/ThermalSubsystem/ThermalMetrics"))
|
add(joinPath(chassisPath, "/EnvironmentMetrics"))
|
||||||
|
add(joinPath(chassisPath, "/ThermalSubsystem/ThermalMetrics"))
|
||||||
|
}
|
||||||
|
deviceDocs, err := c.getCollectionMembers(ctx, client, req, baseURL, joinPath(chassisPath, "/Devices"))
|
||||||
|
if err == nil {
|
||||||
|
for _, deviceDoc := range deviceDocs {
|
||||||
|
if !redfishPCIeMatchesChassisDeviceDoc(doc, deviceDoc) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
add(asString(deviceDoc["@odata.id"]))
|
||||||
|
}
|
||||||
|
}
|
||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1606,6 +1614,7 @@ func (c *RedfishConnector) collectRawRedfishTree(ctx context.Context, client *ht
|
|||||||
crawlStart := time.Now()
|
crawlStart := time.Now()
|
||||||
memoryClient := c.httpClientWithTimeout(req, redfishSnapshotMemoryRequestTimeout())
|
memoryClient := c.httpClientWithTimeout(req, redfishSnapshotMemoryRequestTimeout())
|
||||||
memoryGate := make(chan struct{}, redfishSnapshotMemoryConcurrency())
|
memoryGate := make(chan struct{}, redfishSnapshotMemoryConcurrency())
|
||||||
|
postProbeClient := c.httpClientWithTimeout(req, redfishSnapshotPostProbeRequestTimeout())
|
||||||
branchLimiter := newRedfishSnapshotBranchLimiter(redfishSnapshotBranchConcurrency())
|
branchLimiter := newRedfishSnapshotBranchLimiter(redfishSnapshotBranchConcurrency())
|
||||||
branchRetryPause := redfishSnapshotBranchRequeueBackoff()
|
branchRetryPause := redfishSnapshotBranchRequeueBackoff()
|
||||||
timings := newRedfishPathTimingCollector(4)
|
timings := newRedfishPathTimingCollector(4)
|
||||||
@@ -1908,7 +1917,7 @@ func (c *RedfishConnector) collectRawRedfishTree(ctx context.Context, client *ht
|
|||||||
ETASeconds: int(estimateProgressETA(postProbeStart, i, len(postProbeCollections), 3*time.Second).Seconds()),
|
ETASeconds: int(estimateProgressETA(postProbeStart, i, len(postProbeCollections), 3*time.Second).Seconds()),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
for childPath, doc := range c.probeDirectRedfishCollectionChildren(ctx, client, req, baseURL, path) {
|
for childPath, doc := range c.probeDirectRedfishCollectionChildren(ctx, postProbeClient, req, baseURL, path) {
|
||||||
if _, exists := out[childPath]; exists {
|
if _, exists := out[childPath]; exists {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -2158,6 +2167,12 @@ func shouldAdaptivePostProbeCollectionPath(path string, collectionDoc map[string
|
|||||||
if len(memberRefs) == 0 {
|
if len(memberRefs) == 0 {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
// If the collection reports an explicit non-zero member count that already
|
||||||
|
// matches the number of discovered member refs, every member is accounted
|
||||||
|
// for and numeric probing cannot find anything new.
|
||||||
|
if odataCount := asInt(collectionDoc["Members@odata.count"]); odataCount > 0 && odataCount == len(memberRefs) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
return redfishCollectionHasNumericMemberRefs(memberRefs)
|
return redfishCollectionHasNumericMemberRefs(memberRefs)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2350,6 +2365,18 @@ func redfishSnapshotRequestTimeout() time.Duration {
|
|||||||
return 12 * time.Second
|
return 12 * time.Second
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func redfishSnapshotPostProbeRequestTimeout() time.Duration {
|
||||||
|
if v := strings.TrimSpace(os.Getenv("LOGPILE_REDFISH_POSTPROBE_TIMEOUT")); v != "" {
|
||||||
|
if d, err := time.ParseDuration(v); err == nil && d > 0 {
|
||||||
|
return d
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Post-probe probes non-existent numeric paths expecting fast 404s.
|
||||||
|
// A short timeout prevents BMCs that hang on unknown paths from stalling
|
||||||
|
// the entire collection for minutes (e.g. HPE iLO on NetworkAdapters Ports).
|
||||||
|
return 4 * time.Second
|
||||||
|
}
|
||||||
|
|
||||||
func redfishSnapshotWorkers(tuning redfishprofile.AcquisitionTuning) int {
|
func redfishSnapshotWorkers(tuning redfishprofile.AcquisitionTuning) int {
|
||||||
if tuning.SnapshotWorkers >= 1 && tuning.SnapshotWorkers <= 16 {
|
if tuning.SnapshotWorkers >= 1 && tuning.SnapshotWorkers <= 16 {
|
||||||
return tuning.SnapshotWorkers
|
return tuning.SnapshotWorkers
|
||||||
@@ -2852,6 +2879,8 @@ func shouldCrawlPath(path string) bool {
|
|||||||
"/GetServerAllUSBStatus",
|
"/GetServerAllUSBStatus",
|
||||||
"/Oem/Public/KVM",
|
"/Oem/Public/KVM",
|
||||||
"/SecureBoot/SecureBootDatabases",
|
"/SecureBoot/SecureBootDatabases",
|
||||||
|
// HPE iLO WorkloadPerformanceAdvisor — operational/advisory data, not inventory.
|
||||||
|
"/WorkloadPerformanceAdvisor",
|
||||||
} {
|
} {
|
||||||
if strings.Contains(normalized, part) {
|
if strings.Contains(normalized, part) {
|
||||||
return false
|
return false
|
||||||
@@ -3413,8 +3442,11 @@ func parseBoardInfo(system map[string]interface{}) models.BoardInfo {
|
|||||||
asString(system["Name"]),
|
asString(system["Name"]),
|
||||||
)),
|
)),
|
||||||
SerialNumber: normalizeRedfishIdentityField(asString(system["SerialNumber"])),
|
SerialNumber: normalizeRedfishIdentityField(asString(system["SerialNumber"])),
|
||||||
PartNumber: normalizeRedfishIdentityField(asString(system["PartNumber"])),
|
PartNumber: normalizeRedfishIdentityField(firstNonEmpty(
|
||||||
UUID: normalizeRedfishIdentityField(asString(system["UUID"])),
|
asString(system["PartNumber"]),
|
||||||
|
asString(system["SKU"]),
|
||||||
|
)),
|
||||||
|
UUID: normalizeRedfishIdentityField(asString(system["UUID"])),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3797,6 +3829,22 @@ func parseStorageVolume(doc map[string]interface{}, controller string) models.St
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func redfishVolumeCapabilitiesDoc(doc map[string]interface{}) bool {
|
||||||
|
if len(doc) == 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if strings.Contains(strings.ToLower(strings.TrimSpace(asString(doc["@odata.type"]))), "collectioncapabilities") {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
path := strings.ToLower(normalizeRedfishPath(asString(doc["@odata.id"])))
|
||||||
|
if strings.HasSuffix(path, "/volumes/capabilities") {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
id := strings.TrimSpace(asString(doc["Id"]))
|
||||||
|
name := strings.ToLower(strings.TrimSpace(asString(doc["Name"])))
|
||||||
|
return strings.EqualFold(id, "Capabilities") || strings.Contains(name, "capabilities for volumecollection")
|
||||||
|
}
|
||||||
|
|
||||||
func parseNIC(doc map[string]interface{}) models.NetworkAdapter {
|
func parseNIC(doc map[string]interface{}) models.NetworkAdapter {
|
||||||
vendorID := asHexOrInt(doc["VendorId"])
|
vendorID := asHexOrInt(doc["VendorId"])
|
||||||
deviceID := asHexOrInt(doc["DeviceId"])
|
deviceID := asHexOrInt(doc["DeviceId"])
|
||||||
@@ -4335,6 +4383,39 @@ func redfishFirstBoolAcrossDocs(docs []map[string]interface{}, keys ...string) *
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func redfishFirstString(doc map[string]interface{}, keys ...string) string {
|
||||||
|
for _, key := range keys {
|
||||||
|
if v, ok := redfishLookupValue(doc, key); ok {
|
||||||
|
if s := strings.TrimSpace(asString(v)); s != "" {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func redfishFirstStringAcrossDocs(docs []map[string]interface{}, keys ...string) string {
|
||||||
|
for _, doc := range docs {
|
||||||
|
if v := redfishFirstString(doc, keys...); v != "" {
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func redfishFirstLocationAcrossDocs(docs []map[string]interface{}, keys ...string) string {
|
||||||
|
for _, doc := range docs {
|
||||||
|
for _, key := range keys {
|
||||||
|
if v, ok := redfishLookupValue(doc, key); ok {
|
||||||
|
if loc := redfishLocationLabel(v); loc != "" {
|
||||||
|
return loc
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
func redfishLookupValue(doc map[string]interface{}, key string) (any, bool) {
|
func redfishLookupValue(doc map[string]interface{}, key string) (any, bool) {
|
||||||
if doc == nil || strings.TrimSpace(key) == "" {
|
if doc == nil || strings.TrimSpace(key) == "" {
|
||||||
return nil, false
|
return nil, false
|
||||||
@@ -4516,8 +4597,9 @@ func parsePCIeDevice(doc map[string]interface{}, functionDocs []map[string]inter
|
|||||||
}
|
}
|
||||||
|
|
||||||
func parsePCIeDeviceWithSupplementalDocs(doc map[string]interface{}, functionDocs []map[string]interface{}, supplementalDocs []map[string]interface{}) models.PCIeDevice {
|
func parsePCIeDeviceWithSupplementalDocs(doc map[string]interface{}, functionDocs []map[string]interface{}, supplementalDocs []map[string]interface{}) models.PCIeDevice {
|
||||||
|
supplementalSlot := redfishFirstLocationAcrossDocs(supplementalDocs, "Slot", "Location", "PhysicalLocation")
|
||||||
dev := models.PCIeDevice{
|
dev := models.PCIeDevice{
|
||||||
Slot: firstNonEmpty(redfishLocationLabel(doc["Slot"]), redfishLocationLabel(doc["Location"]), asString(doc["Name"]), asString(doc["Id"])),
|
Slot: firstNonEmpty(redfishLocationLabel(doc["Slot"]), redfishLocationLabel(doc["Location"]), supplementalSlot, asString(doc["Name"]), asString(doc["Id"])),
|
||||||
BDF: sanitizeRedfishBDF(asString(doc["BDF"])),
|
BDF: sanitizeRedfishBDF(asString(doc["BDF"])),
|
||||||
DeviceClass: asString(doc["DeviceType"]),
|
DeviceClass: asString(doc["DeviceType"]),
|
||||||
Manufacturer: asString(doc["Manufacturer"]),
|
Manufacturer: asString(doc["Manufacturer"]),
|
||||||
@@ -4557,6 +4639,9 @@ func parsePCIeDeviceWithSupplementalDocs(doc map[string]interface{}, functionDoc
|
|||||||
dev.MaxLinkSpeed = firstNonEmpty(asString(fn["MaxLinkSpeedGTs"]), asString(fn["MaxLinkSpeed"]))
|
dev.MaxLinkSpeed = firstNonEmpty(asString(fn["MaxLinkSpeedGTs"]), asString(fn["MaxLinkSpeed"]))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if dev.DeviceClass == "" || isGenericPCIeClassLabel(dev.DeviceClass) {
|
||||||
|
dev.DeviceClass = firstNonEmpty(redfishFirstStringAcrossDocs(supplementalDocs, "DeviceType"), dev.DeviceClass)
|
||||||
|
}
|
||||||
|
|
||||||
if dev.DeviceClass == "" {
|
if dev.DeviceClass == "" {
|
||||||
dev.DeviceClass = "PCIe device"
|
dev.DeviceClass = "PCIe device"
|
||||||
@@ -4567,15 +4652,22 @@ func parsePCIeDeviceWithSupplementalDocs(doc map[string]interface{}, functionDoc
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if isGenericPCIeClassLabel(dev.DeviceClass) {
|
if isGenericPCIeClassLabel(dev.DeviceClass) {
|
||||||
// Redfish DeviceType (e.g. MultiFunction/Simulated) is a topology attribute,
|
dev.DeviceClass = "PCIe device"
|
||||||
// not a user-facing device name. Prefer model/part labels when class cannot be resolved.
|
|
||||||
dev.DeviceClass = firstNonEmpty(asString(doc["Model"]), dev.PartNumber, dev.DeviceClass)
|
|
||||||
}
|
}
|
||||||
if strings.TrimSpace(dev.Manufacturer) == "" {
|
if strings.TrimSpace(dev.Manufacturer) == "" {
|
||||||
dev.Manufacturer = pciids.VendorName(dev.VendorID)
|
dev.Manufacturer = firstNonEmpty(
|
||||||
|
redfishFirstStringAcrossDocs(supplementalDocs, "Manufacturer"),
|
||||||
|
pciids.VendorName(dev.VendorID),
|
||||||
|
)
|
||||||
}
|
}
|
||||||
if strings.TrimSpace(dev.PartNumber) == "" {
|
if strings.TrimSpace(dev.PartNumber) == "" {
|
||||||
dev.PartNumber = pciids.DeviceName(dev.VendorID, dev.DeviceID)
|
dev.PartNumber = firstNonEmpty(
|
||||||
|
redfishFirstStringAcrossDocs(supplementalDocs, "ProductPartNumber", "PartNumber"),
|
||||||
|
pciids.DeviceName(dev.VendorID, dev.DeviceID),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
if normalizeRedfishIdentityField(dev.SerialNumber) == "" {
|
||||||
|
dev.SerialNumber = redfishFirstStringAcrossDocs(supplementalDocs, "SerialNumber")
|
||||||
}
|
}
|
||||||
return dev
|
return dev
|
||||||
}
|
}
|
||||||
@@ -4678,6 +4770,70 @@ func isGenericPCIeClassLabel(v string) bool {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func redfishPCIeMatchesChassisDeviceDoc(doc, deviceDoc map[string]interface{}) bool {
|
||||||
|
if len(doc) == 0 || len(deviceDoc) == 0 || redfishChassisDeviceDocLooksEmpty(deviceDoc) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
docSerial := normalizeRedfishIdentityField(findFirstNormalizedStringByKeys(doc, "SerialNumber"))
|
||||||
|
deviceSerial := normalizeRedfishIdentityField(findFirstNormalizedStringByKeys(deviceDoc, "SerialNumber"))
|
||||||
|
if docSerial != "" && deviceSerial != "" && strings.EqualFold(docSerial, deviceSerial) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
docTokens := redfishPCIeMatchTokens(doc)
|
||||||
|
deviceTokens := redfishPCIeMatchTokens(deviceDoc)
|
||||||
|
if len(docTokens) == 0 || len(deviceTokens) == 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, token := range docTokens {
|
||||||
|
for _, candidate := range deviceTokens {
|
||||||
|
if strings.EqualFold(token, candidate) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func redfishPCIeMatchTokens(doc map[string]interface{}) []string {
|
||||||
|
if len(doc) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
rawValues := []string{
|
||||||
|
asString(doc["Name"]),
|
||||||
|
asString(doc["Model"]),
|
||||||
|
asString(doc["PartNumber"]),
|
||||||
|
asString(doc["ProductPartNumber"]),
|
||||||
|
}
|
||||||
|
out := make([]string, 0, len(rawValues))
|
||||||
|
seen := make(map[string]struct{}, len(rawValues))
|
||||||
|
for _, raw := range rawValues {
|
||||||
|
value := normalizeRedfishIdentityField(raw)
|
||||||
|
if value == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
key := strings.ToLower(value)
|
||||||
|
if _, ok := seen[key]; ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
seen[key] = struct{}{}
|
||||||
|
out = append(out, value)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func redfishChassisDeviceDocLooksEmpty(doc map[string]interface{}) bool {
|
||||||
|
name := strings.ToLower(strings.TrimSpace(asString(doc["Name"])))
|
||||||
|
if strings.HasPrefix(name, "empty slot") {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if strings.ToLower(strings.TrimSpace(asString(doc["DeviceType"]))) != "unknown" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return normalizeRedfishIdentityField(asString(doc["PartNumber"])) == "" &&
|
||||||
|
normalizeRedfishIdentityField(asString(doc["ProductPartNumber"])) == "" &&
|
||||||
|
normalizeRedfishIdentityField(findFirstNormalizedStringByKeys(doc, "SerialNumber")) == ""
|
||||||
|
}
|
||||||
|
|
||||||
func buildBDFfromOemPublic(doc map[string]interface{}) string {
|
func buildBDFfromOemPublic(doc map[string]interface{}) string {
|
||||||
if len(doc) == 0 {
|
if len(doc) == 0 {
|
||||||
return ""
|
return ""
|
||||||
@@ -5047,6 +5203,16 @@ func isVirtualStorageDrive(doc map[string]interface{}) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// isAbsentDriveDoc returns true when the drive document represents an empty bay
|
||||||
|
// with no installed media (Status.State == "Absent"). These should be excluded
|
||||||
|
// from the storage inventory.
|
||||||
|
func isAbsentDriveDoc(doc map[string]interface{}) bool {
|
||||||
|
if status, ok := doc["Status"].(map[string]interface{}); ok {
|
||||||
|
return strings.EqualFold(asString(status["State"]), "Absent")
|
||||||
|
}
|
||||||
|
return strings.EqualFold(asString(doc["Status"]), "Absent")
|
||||||
|
}
|
||||||
|
|
||||||
func looksLikeDrive(doc map[string]interface{}) bool {
|
func looksLikeDrive(doc map[string]interface{}) bool {
|
||||||
if asString(doc["MediaType"]) != "" {
|
if asString(doc["MediaType"]) != "" {
|
||||||
return true
|
return true
|
||||||
@@ -5095,6 +5261,9 @@ func classifyStorageType(doc map[string]interface{}) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func looksLikeVolume(doc map[string]interface{}) bool {
|
func looksLikeVolume(doc map[string]interface{}) bool {
|
||||||
|
if redfishVolumeCapabilitiesDoc(doc) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
if asString(doc["RAIDType"]) != "" || asString(doc["VolumeType"]) != "" {
|
if asString(doc["RAIDType"]) != "" || asString(doc["VolumeType"]) != "" {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -96,6 +96,7 @@ func ReplayRedfishFromRawPayloads(rawPayloads map[string]any, emit ProgressFn) (
|
|||||||
networkProtocolDoc, _ := r.getJSON(joinPath(primaryManager, "/NetworkProtocol"))
|
networkProtocolDoc, _ := r.getJSON(joinPath(primaryManager, "/NetworkProtocol"))
|
||||||
firmware := parseFirmware(systemDoc, biosDoc, managerDoc, networkProtocolDoc)
|
firmware := parseFirmware(systemDoc, biosDoc, managerDoc, networkProtocolDoc)
|
||||||
firmware = dedupeFirmwareInfo(append(firmware, r.collectFirmwareInventory()...))
|
firmware = dedupeFirmwareInfo(append(firmware, r.collectFirmwareInventory()...))
|
||||||
|
firmware = filterStorageDriveFirmware(firmware, storageDevices)
|
||||||
bmcManagementSummary := r.collectBMCManagementSummary(managerPaths)
|
bmcManagementSummary := r.collectBMCManagementSummary(managerPaths)
|
||||||
boardInfo.BMCMACAddress = strings.TrimSpace(firstNonEmpty(
|
boardInfo.BMCMACAddress = strings.TrimSpace(firstNonEmpty(
|
||||||
asString(bmcManagementSummary["mac_address"]),
|
asString(bmcManagementSummary["mac_address"]),
|
||||||
@@ -498,6 +499,10 @@ func (r redfishSnapshotReader) collectFirmwareInventory() []models.FirmwareInfo
|
|||||||
if strings.TrimSpace(version) == "" {
|
if strings.TrimSpace(version) == "" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
// Skip placeholder version strings that carry no useful information.
|
||||||
|
if strings.EqualFold(strings.TrimSpace(version), "N/A") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
name := firmwareInventoryDeviceName(doc)
|
name := firmwareInventoryDeviceName(doc)
|
||||||
name = strings.TrimSpace(name)
|
name = strings.TrimSpace(name)
|
||||||
if name == "" {
|
if name == "" {
|
||||||
@@ -550,6 +555,32 @@ func dedupeFirmwareInfo(items []models.FirmwareInfo) []models.FirmwareInfo {
|
|||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// filterStorageDriveFirmware removes from fw any entries whose DeviceName+Version
|
||||||
|
// already appear as a storage drive's Model+Firmware. Drive firmware is already
|
||||||
|
// represented in the Storage section and should not be duplicated in the general
|
||||||
|
// firmware list.
|
||||||
|
func filterStorageDriveFirmware(fw []models.FirmwareInfo, storage []models.Storage) []models.FirmwareInfo {
|
||||||
|
if len(storage) == 0 {
|
||||||
|
return fw
|
||||||
|
}
|
||||||
|
driveFW := make(map[string]struct{}, len(storage))
|
||||||
|
for _, d := range storage {
|
||||||
|
model := strings.ToLower(strings.TrimSpace(d.Model))
|
||||||
|
rev := strings.ToLower(strings.TrimSpace(d.Firmware))
|
||||||
|
if model != "" && rev != "" {
|
||||||
|
driveFW[model+"|"+rev] = struct{}{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out := fw[:0:0]
|
||||||
|
for _, f := range fw {
|
||||||
|
key := strings.ToLower(strings.TrimSpace(f.DeviceName)) + "|" + strings.ToLower(strings.TrimSpace(f.Version))
|
||||||
|
if _, skip := driveFW[key]; !skip {
|
||||||
|
out = append(out, f)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
func (r redfishSnapshotReader) collectThresholdSensors(chassisPaths []string) []models.SensorReading {
|
func (r redfishSnapshotReader) collectThresholdSensors(chassisPaths []string) []models.SensorReading {
|
||||||
out := make([]models.SensorReading, 0)
|
out := make([]models.SensorReading, 0)
|
||||||
seen := make(map[string]struct{})
|
seen := make(map[string]struct{})
|
||||||
@@ -1261,6 +1292,12 @@ func (r redfishSnapshotReader) collectProcessors(systemPath string) []models.CPU
|
|||||||
!strings.EqualFold(pt, "CPU") && !strings.EqualFold(pt, "General") {
|
!strings.EqualFold(pt, "CPU") && !strings.EqualFold(pt, "General") {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
// Skip absent processor sockets — empty slots with no CPU installed.
|
||||||
|
if status, ok := doc["Status"].(map[string]interface{}); ok {
|
||||||
|
if strings.EqualFold(asString(status["State"]), "Absent") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
cpu := parseCPUs([]map[string]interface{}{doc})[0]
|
cpu := parseCPUs([]map[string]interface{}{doc})[0]
|
||||||
if cpu.Socket == 0 && socketIdx > 0 && strings.TrimSpace(asString(doc["Socket"])) == "" {
|
if cpu.Socket == 0 && socketIdx > 0 && strings.TrimSpace(asString(doc["Socket"])) == "" {
|
||||||
cpu.Socket = socketIdx
|
cpu.Socket = socketIdx
|
||||||
@@ -1287,6 +1324,10 @@ func (r redfishSnapshotReader) collectMemory(systemPath string) []models.MemoryD
|
|||||||
out := make([]models.MemoryDIMM, 0, len(memberDocs))
|
out := make([]models.MemoryDIMM, 0, len(memberDocs))
|
||||||
for _, doc := range memberDocs {
|
for _, doc := range memberDocs {
|
||||||
dimm := parseMemory([]map[string]interface{}{doc})[0]
|
dimm := parseMemory([]map[string]interface{}{doc})[0]
|
||||||
|
// Skip empty DIMM slots — no installed memory.
|
||||||
|
if !dimm.Present {
|
||||||
|
continue
|
||||||
|
}
|
||||||
supplementalDocs := r.getLinkedSupplementalDocs(doc, "MemoryMetrics", "EnvironmentMetrics", "Metrics")
|
supplementalDocs := r.getLinkedSupplementalDocs(doc, "MemoryMetrics", "EnvironmentMetrics", "Metrics")
|
||||||
if len(supplementalDocs) > 0 {
|
if len(supplementalDocs) > 0 {
|
||||||
dimm.Details = mergeGenericDetails(dimm.Details, redfishMemoryDetailsAcrossDocs(doc, supplementalDocs...))
|
dimm.Details = mergeGenericDetails(dimm.Details, redfishMemoryDetailsAcrossDocs(doc, supplementalDocs...))
|
||||||
|
|||||||
@@ -143,24 +143,33 @@ func (r redfishSnapshotReader) collectPCIeDevices(systemPaths, chassisPaths []st
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r redfishSnapshotReader) getChassisScopedPCIeSupplementalDocs(doc map[string]interface{}) []map[string]interface{} {
|
func (r redfishSnapshotReader) getChassisScopedPCIeSupplementalDocs(doc map[string]interface{}) []map[string]interface{} {
|
||||||
if !looksLikeNVSwitchPCIeDoc(doc) {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
docPath := normalizeRedfishPath(asString(doc["@odata.id"]))
|
docPath := normalizeRedfishPath(asString(doc["@odata.id"]))
|
||||||
chassisPath := chassisPathForPCIeDoc(docPath)
|
chassisPath := chassisPathForPCIeDoc(docPath)
|
||||||
if chassisPath == "" {
|
if chassisPath == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
out := make([]map[string]interface{}, 0, 4)
|
|
||||||
for _, path := range []string{
|
out := make([]map[string]interface{}, 0, 6)
|
||||||
joinPath(chassisPath, "/EnvironmentMetrics"),
|
if looksLikeNVSwitchPCIeDoc(doc) {
|
||||||
joinPath(chassisPath, "/ThermalSubsystem/ThermalMetrics"),
|
for _, path := range []string{
|
||||||
} {
|
joinPath(chassisPath, "/EnvironmentMetrics"),
|
||||||
supplementalDoc, err := r.getJSON(path)
|
joinPath(chassisPath, "/ThermalSubsystem/ThermalMetrics"),
|
||||||
if err != nil || len(supplementalDoc) == 0 {
|
} {
|
||||||
continue
|
supplementalDoc, err := r.getJSON(path)
|
||||||
|
if err != nil || len(supplementalDoc) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out = append(out, supplementalDoc)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
deviceDocs, err := r.getCollectionMembers(joinPath(chassisPath, "/Devices"))
|
||||||
|
if err == nil {
|
||||||
|
for _, deviceDoc := range deviceDocs {
|
||||||
|
if !redfishPCIeMatchesChassisDeviceDoc(doc, deviceDoc) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out = append(out, deviceDoc)
|
||||||
}
|
}
|
||||||
out = append(out, supplementalDoc)
|
|
||||||
}
|
}
|
||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,13 +14,16 @@ func (r redfishSnapshotReader) collectStorage(systemPath string, plan redfishpro
|
|||||||
driveDocs, err := r.getCollectionMembers(driveCollectionPath)
|
driveDocs, err := r.getCollectionMembers(driveCollectionPath)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
for _, driveDoc := range driveDocs {
|
for _, driveDoc := range driveDocs {
|
||||||
if !isVirtualStorageDrive(driveDoc) {
|
if !isAbsentDriveDoc(driveDoc) && !isVirtualStorageDrive(driveDoc) {
|
||||||
supplementalDocs := r.getLinkedSupplementalDocs(driveDoc, "DriveMetrics", "EnvironmentMetrics", "Metrics")
|
supplementalDocs := r.getLinkedSupplementalDocs(driveDoc, "DriveMetrics", "EnvironmentMetrics", "Metrics")
|
||||||
out = append(out, parseDriveWithSupplementalDocs(driveDoc, supplementalDocs...))
|
out = append(out, parseDriveWithSupplementalDocs(driveDoc, supplementalDocs...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if len(driveDocs) == 0 {
|
if len(driveDocs) == 0 {
|
||||||
for _, driveDoc := range r.probeDirectDiskBayChildren(driveCollectionPath) {
|
for _, driveDoc := range r.probeDirectDiskBayChildren(driveCollectionPath) {
|
||||||
|
if isAbsentDriveDoc(driveDoc) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
supplementalDocs := r.getLinkedSupplementalDocs(driveDoc, "DriveMetrics", "EnvironmentMetrics", "Metrics")
|
supplementalDocs := r.getLinkedSupplementalDocs(driveDoc, "DriveMetrics", "EnvironmentMetrics", "Metrics")
|
||||||
out = append(out, parseDriveWithSupplementalDocs(driveDoc, supplementalDocs...))
|
out = append(out, parseDriveWithSupplementalDocs(driveDoc, supplementalDocs...))
|
||||||
}
|
}
|
||||||
@@ -43,7 +46,7 @@ func (r redfishSnapshotReader) collectStorage(systemPath string, plan redfishpro
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if !isVirtualStorageDrive(driveDoc) {
|
if !isAbsentDriveDoc(driveDoc) && !isVirtualStorageDrive(driveDoc) {
|
||||||
supplementalDocs := r.getLinkedSupplementalDocs(driveDoc, "DriveMetrics", "EnvironmentMetrics", "Metrics")
|
supplementalDocs := r.getLinkedSupplementalDocs(driveDoc, "DriveMetrics", "EnvironmentMetrics", "Metrics")
|
||||||
out = append(out, parseDriveWithSupplementalDocs(driveDoc, supplementalDocs...))
|
out = append(out, parseDriveWithSupplementalDocs(driveDoc, supplementalDocs...))
|
||||||
}
|
}
|
||||||
@@ -51,7 +54,7 @@ func (r redfishSnapshotReader) collectStorage(systemPath string, plan redfishpro
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if looksLikeDrive(member) {
|
if looksLikeDrive(member) {
|
||||||
if isVirtualStorageDrive(member) {
|
if isAbsentDriveDoc(member) || isVirtualStorageDrive(member) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
supplementalDocs := r.getLinkedSupplementalDocs(member, "DriveMetrics", "EnvironmentMetrics", "Metrics")
|
supplementalDocs := r.getLinkedSupplementalDocs(member, "DriveMetrics", "EnvironmentMetrics", "Metrics")
|
||||||
@@ -63,14 +66,14 @@ func (r redfishSnapshotReader) collectStorage(systemPath string, plan redfishpro
|
|||||||
driveDocs, err := r.getCollectionMembers(joinPath(enclosurePath, "/Drives"))
|
driveDocs, err := r.getCollectionMembers(joinPath(enclosurePath, "/Drives"))
|
||||||
if err == nil {
|
if err == nil {
|
||||||
for _, driveDoc := range driveDocs {
|
for _, driveDoc := range driveDocs {
|
||||||
if looksLikeDrive(driveDoc) && !isVirtualStorageDrive(driveDoc) {
|
if looksLikeDrive(driveDoc) && !isAbsentDriveDoc(driveDoc) && !isVirtualStorageDrive(driveDoc) {
|
||||||
supplementalDocs := r.getLinkedSupplementalDocs(driveDoc, "DriveMetrics", "EnvironmentMetrics", "Metrics")
|
supplementalDocs := r.getLinkedSupplementalDocs(driveDoc, "DriveMetrics", "EnvironmentMetrics", "Metrics")
|
||||||
out = append(out, parseDriveWithSupplementalDocs(driveDoc, supplementalDocs...))
|
out = append(out, parseDriveWithSupplementalDocs(driveDoc, supplementalDocs...))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if len(driveDocs) == 0 {
|
if len(driveDocs) == 0 {
|
||||||
for _, driveDoc := range r.probeDirectDiskBayChildren(joinPath(enclosurePath, "/Drives")) {
|
for _, driveDoc := range r.probeDirectDiskBayChildren(joinPath(enclosurePath, "/Drives")) {
|
||||||
if isVirtualStorageDrive(driveDoc) {
|
if isAbsentDriveDoc(driveDoc) || isVirtualStorageDrive(driveDoc) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
out = append(out, parseDrive(driveDoc))
|
out = append(out, parseDrive(driveDoc))
|
||||||
@@ -83,7 +86,7 @@ func (r redfishSnapshotReader) collectStorage(systemPath string, plan redfishpro
|
|||||||
|
|
||||||
if len(plan.KnownStorageDriveCollections) > 0 {
|
if len(plan.KnownStorageDriveCollections) > 0 {
|
||||||
for _, driveDoc := range r.collectKnownStorageMembers(systemPath, plan.KnownStorageDriveCollections) {
|
for _, driveDoc := range r.collectKnownStorageMembers(systemPath, plan.KnownStorageDriveCollections) {
|
||||||
if looksLikeDrive(driveDoc) && !isVirtualStorageDrive(driveDoc) {
|
if looksLikeDrive(driveDoc) && !isAbsentDriveDoc(driveDoc) && !isVirtualStorageDrive(driveDoc) {
|
||||||
supplementalDocs := r.getLinkedSupplementalDocs(driveDoc, "DriveMetrics", "EnvironmentMetrics", "Metrics")
|
supplementalDocs := r.getLinkedSupplementalDocs(driveDoc, "DriveMetrics", "EnvironmentMetrics", "Metrics")
|
||||||
out = append(out, parseDriveWithSupplementalDocs(driveDoc, supplementalDocs...))
|
out = append(out, parseDriveWithSupplementalDocs(driveDoc, supplementalDocs...))
|
||||||
}
|
}
|
||||||
@@ -98,7 +101,7 @@ func (r redfishSnapshotReader) collectStorage(systemPath string, plan redfishpro
|
|||||||
}
|
}
|
||||||
for _, devAny := range devices {
|
for _, devAny := range devices {
|
||||||
devDoc, ok := devAny.(map[string]interface{})
|
devDoc, ok := devAny.(map[string]interface{})
|
||||||
if !ok || !looksLikeDrive(devDoc) || isVirtualStorageDrive(devDoc) {
|
if !ok || !looksLikeDrive(devDoc) || isAbsentDriveDoc(devDoc) || isVirtualStorageDrive(devDoc) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
out = append(out, parseDrive(devDoc))
|
out = append(out, parseDrive(devDoc))
|
||||||
@@ -112,7 +115,7 @@ func (r redfishSnapshotReader) collectStorage(systemPath string, plan redfishpro
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
for _, driveDoc := range driveDocs {
|
for _, driveDoc := range driveDocs {
|
||||||
if !looksLikeDrive(driveDoc) || isVirtualStorageDrive(driveDoc) {
|
if !looksLikeDrive(driveDoc) || isAbsentDriveDoc(driveDoc) || isVirtualStorageDrive(driveDoc) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
out = append(out, parseDrive(driveDoc))
|
out = append(out, parseDrive(driveDoc))
|
||||||
@@ -124,7 +127,7 @@ func (r redfishSnapshotReader) collectStorage(systemPath string, plan redfishpro
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
for _, driveDoc := range r.probeSupermicroNVMeDiskBays(chassisPath) {
|
for _, driveDoc := range r.probeSupermicroNVMeDiskBays(chassisPath) {
|
||||||
if !looksLikeDrive(driveDoc) || isVirtualStorageDrive(driveDoc) {
|
if !looksLikeDrive(driveDoc) || isAbsentDriveDoc(driveDoc) || isVirtualStorageDrive(driveDoc) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
out = append(out, parseDrive(driveDoc))
|
out = append(out, parseDrive(driveDoc))
|
||||||
|
|||||||
@@ -1316,6 +1316,23 @@ func TestParsePCIeDevice_PrefersFunctionClassOverDeviceType(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestParsePCIeDevice_DoesNotPromotePartNumberToDeviceClass(t *testing.T) {
|
||||||
|
doc := map[string]interface{}{
|
||||||
|
"Id": "NIC1",
|
||||||
|
"DeviceType": "SingleFunction",
|
||||||
|
"Model": "MCX75310AAS-NEAT",
|
||||||
|
"PartNumber": "MCX75310AAS-NEAT",
|
||||||
|
}
|
||||||
|
|
||||||
|
got := parsePCIeDevice(doc, nil)
|
||||||
|
if got.DeviceClass != "PCIe device" {
|
||||||
|
t.Fatalf("expected generic PCIe class fallback, got %q", got.DeviceClass)
|
||||||
|
}
|
||||||
|
if got.PartNumber != "MCX75310AAS-NEAT" {
|
||||||
|
t.Fatalf("expected part number to stay intact, got %q", got.PartNumber)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestParsePCIeComponents_DoNotTreatNumericFunctionIDAsBDF(t *testing.T) {
|
func TestParsePCIeComponents_DoNotTreatNumericFunctionIDAsBDF(t *testing.T) {
|
||||||
pcieFn := parsePCIeFunction(map[string]interface{}{
|
pcieFn := parsePCIeFunction(map[string]interface{}{
|
||||||
"Id": "1",
|
"Id": "1",
|
||||||
@@ -2160,6 +2177,94 @@ func TestReplayCollectStorage_UsesKnownControllerRecoveryWhenEnabled(t *testing.
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestReplayCollectStorageVolumes_SkipsVolumeCapabilitiesFallbackMember(t *testing.T) {
|
||||||
|
r := redfishSnapshotReader{tree: map[string]interface{}{
|
||||||
|
"/redfish/v1/Systems/1/Storage": map[string]interface{}{
|
||||||
|
"Members": []interface{}{
|
||||||
|
map[string]interface{}{"@odata.id": "/redfish/v1/Systems/1/Storage/DE00A000"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"/redfish/v1/Systems/1/Storage/DE00A000": map[string]interface{}{
|
||||||
|
"Id": "DE00A000",
|
||||||
|
"Volumes": map[string]interface{}{"@odata.id": "/redfish/v1/Systems/1/Storage/DE00A000/Volumes"},
|
||||||
|
},
|
||||||
|
"/redfish/v1/Systems/1/Storage/DE00A000/Volumes": map[string]interface{}{
|
||||||
|
"@odata.id": "/redfish/v1/Systems/1/Storage/DE00A000/Volumes",
|
||||||
|
"@odata.type": "#VolumeCollection.VolumeCollection",
|
||||||
|
"Members": []interface{}{},
|
||||||
|
"Members@odata.count": 0,
|
||||||
|
"Name": "MR Volume Collection",
|
||||||
|
},
|
||||||
|
"/redfish/v1/Systems/1/Storage/DE00A000/Volumes/Capabilities": map[string]interface{}{
|
||||||
|
"@odata.id": "/redfish/v1/Systems/1/Storage/DE00A000/Volumes/Capabilities",
|
||||||
|
"@odata.type": "#Volume.v1_9_0.Volume",
|
||||||
|
"Id": "Capabilities",
|
||||||
|
"Name": "Capabilities for VolumeCollection",
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
|
||||||
|
got := r.collectStorageVolumes("/redfish/v1/Systems/1", testAnalysisPlan(redfishprofile.AnalysisDirectives{}))
|
||||||
|
if len(got) != 0 {
|
||||||
|
t.Fatalf("expected capabilities-only volume collection to stay empty, got %+v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestReplayCollectPCIeDevices_UsesChassisDeviceSupplementalDocs(t *testing.T) {
|
||||||
|
r := redfishSnapshotReader{tree: map[string]interface{}{
|
||||||
|
"/redfish/v1/Chassis/1/PCIeDevices": map[string]interface{}{
|
||||||
|
"Members": []interface{}{
|
||||||
|
map[string]interface{}{"@odata.id": "/redfish/v1/Chassis/1/PCIeDevices/2"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"/redfish/v1/Chassis/1/PCIeDevices/2": map[string]interface{}{
|
||||||
|
"@odata.id": "/redfish/v1/Chassis/1/PCIeDevices/2",
|
||||||
|
"Name": "BCM 5719 1Gb 4p BASE-T OCP Adptr",
|
||||||
|
"Model": "P51183-001",
|
||||||
|
"PartNumber": "P51183-001",
|
||||||
|
"Manufacturer": "Broadcom",
|
||||||
|
"SerialNumber": "1CH0150001",
|
||||||
|
"DeviceType": "SingleFunction",
|
||||||
|
},
|
||||||
|
"/redfish/v1/Chassis/1/Devices": map[string]interface{}{
|
||||||
|
"Members": []interface{}{
|
||||||
|
map[string]interface{}{"@odata.id": "/redfish/v1/Chassis/1/Devices/2"},
|
||||||
|
map[string]interface{}{"@odata.id": "/redfish/v1/Chassis/1/Devices/4"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"/redfish/v1/Chassis/1/Devices/2": map[string]interface{}{
|
||||||
|
"@odata.id": "/redfish/v1/Chassis/1/Devices/2",
|
||||||
|
"Name": "BCM 5719 1Gb 4p BASE-T OCP Adptr",
|
||||||
|
"DeviceType": "LOM/NIC",
|
||||||
|
"Manufacturer": "Broadcom",
|
||||||
|
"PartNumber": "BCM95719N1905HC",
|
||||||
|
"ProductPartNumber": "P51183-001",
|
||||||
|
"SerialNumber": "1CH0150001",
|
||||||
|
"Location": "OCP 3.0 Slot 15",
|
||||||
|
},
|
||||||
|
"/redfish/v1/Chassis/1/Devices/4": map[string]interface{}{
|
||||||
|
"@odata.id": "/redfish/v1/Chassis/1/Devices/4",
|
||||||
|
"Name": "Empty slot 2",
|
||||||
|
"DeviceType": "Unknown",
|
||||||
|
"Location": "PCI-E Slot 2",
|
||||||
|
"SerialNumber": "",
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
|
||||||
|
got := r.collectPCIeDevices(nil, []string{"/redfish/v1/Chassis/1"})
|
||||||
|
if len(got) != 1 {
|
||||||
|
t.Fatalf("expected one PCIe device, got %d", len(got))
|
||||||
|
}
|
||||||
|
if got[0].Slot != "OCP 3.0 Slot 15" {
|
||||||
|
t.Fatalf("expected chassis device location to override weak slot label, got %+v", got[0])
|
||||||
|
}
|
||||||
|
if got[0].DeviceClass != "LOM/NIC" {
|
||||||
|
t.Fatalf("expected chassis device type to enrich class, got %+v", got[0])
|
||||||
|
}
|
||||||
|
if got[0].DeviceClass == "P51183-001" {
|
||||||
|
t.Fatalf("device class should not degrade into part number: %+v", got[0])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestReplayCollectGPUs_DoesNotCollapseOnPlaceholderSerialAndSkipsNIC(t *testing.T) {
|
func TestReplayCollectGPUs_DoesNotCollapseOnPlaceholderSerialAndSkipsNIC(t *testing.T) {
|
||||||
r := redfishSnapshotReader{tree: map[string]interface{}{
|
r := redfishSnapshotReader{tree: map[string]interface{}{
|
||||||
"/redfish/v1/Chassis/1/PCIeDevices": map[string]interface{}{
|
"/redfish/v1/Chassis/1/PCIeDevices": map[string]interface{}{
|
||||||
@@ -2240,6 +2345,18 @@ func TestParseBoardInfo_NormalizesNullPlaceholders(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestParseBoardInfo_UsesSKUAsPartNumberFallback(t *testing.T) {
|
||||||
|
got := parseBoardInfo(map[string]interface{}{
|
||||||
|
"Manufacturer": "HPE",
|
||||||
|
"Model": "ProLiant DL380 Gen11",
|
||||||
|
"SerialNumber": "CZ2D1X0GS4",
|
||||||
|
"SKU": "P52560-421",
|
||||||
|
})
|
||||||
|
if got.PartNumber != "P52560-421" {
|
||||||
|
t.Fatalf("expected SKU to populate part number, got %q", got.PartNumber)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestShouldCrawlPath_SkipsJsonSchemas(t *testing.T) {
|
func TestShouldCrawlPath_SkipsJsonSchemas(t *testing.T) {
|
||||||
if shouldCrawlPath("/redfish/v1/JsonSchemas") {
|
if shouldCrawlPath("/redfish/v1/JsonSchemas") {
|
||||||
t.Fatalf("expected /JsonSchemas to be skipped")
|
t.Fatalf("expected /JsonSchemas to be skipped")
|
||||||
|
|||||||
67
internal/collector/redfishprofile/profile_hpe.go
Normal file
67
internal/collector/redfishprofile/profile_hpe.go
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
package redfishprofile
|
||||||
|
|
||||||
|
func hpeProfile() Profile {
|
||||||
|
return staticProfile{
|
||||||
|
name: "hpe",
|
||||||
|
priority: 20,
|
||||||
|
safeForFallback: true,
|
||||||
|
matchFn: func(s MatchSignals) int {
|
||||||
|
score := 0
|
||||||
|
if containsFold(s.SystemManufacturer, "hpe") ||
|
||||||
|
containsFold(s.SystemManufacturer, "hewlett packard") ||
|
||||||
|
containsFold(s.ChassisManufacturer, "hpe") ||
|
||||||
|
containsFold(s.ChassisManufacturer, "hewlett packard") {
|
||||||
|
score += 80
|
||||||
|
}
|
||||||
|
for _, ns := range s.OEMNamespaces {
|
||||||
|
if containsFold(ns, "hpe") {
|
||||||
|
score += 30
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if containsFold(s.ServiceRootProduct, "ilo") {
|
||||||
|
score += 30
|
||||||
|
}
|
||||||
|
if containsFold(s.ManagerManufacturer, "hpe") || containsFold(s.ManagerManufacturer, "ilo") {
|
||||||
|
score += 20
|
||||||
|
}
|
||||||
|
return min(score, 100)
|
||||||
|
},
|
||||||
|
extendAcquisition: func(plan *AcquisitionPlan, _ MatchSignals) {
|
||||||
|
// HPE ProLiant SmartStorage RAID controller inventory is not reachable
|
||||||
|
// via standard Redfish Storage paths — it requires the HPE OEM SmartStorage tree.
|
||||||
|
ensureScopedPathPolicy(plan, AcquisitionScopedPathPolicy{
|
||||||
|
SystemCriticalSuffixes: []string{
|
||||||
|
"/SmartStorage",
|
||||||
|
"/SmartStorageConfig",
|
||||||
|
},
|
||||||
|
ManagerCriticalSuffixes: []string{
|
||||||
|
"/LicenseService",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
// HPE iLO responds more slowly than average BMCs under load; give the
|
||||||
|
// ETA estimator a realistic baseline so progress reports are accurate.
|
||||||
|
ensureETABaseline(plan, AcquisitionETABaseline{
|
||||||
|
DiscoverySeconds: 12,
|
||||||
|
SnapshotSeconds: 180,
|
||||||
|
PrefetchSeconds: 30,
|
||||||
|
CriticalPlanBSeconds: 40,
|
||||||
|
ProfilePlanBSeconds: 25,
|
||||||
|
})
|
||||||
|
ensureRecoveryPolicy(plan, AcquisitionRecoveryPolicy{
|
||||||
|
EnableProfilePlanB: true,
|
||||||
|
})
|
||||||
|
// HPE iLO starts throttling under high request rates. Setting a higher
|
||||||
|
// latency tolerance prevents the adaptive throttler from treating normal
|
||||||
|
// iLO slowness as a reason to stall the collection.
|
||||||
|
ensureRatePolicy(plan, AcquisitionRatePolicy{
|
||||||
|
TargetP95LatencyMS: 1200,
|
||||||
|
ThrottleP95LatencyMS: 2500,
|
||||||
|
MinSnapshotWorkers: 2,
|
||||||
|
MinPrefetchWorkers: 1,
|
||||||
|
DisablePrefetchOnErrors: true,
|
||||||
|
})
|
||||||
|
addPlanNote(plan, "hpe ilo acquisition extensions enabled")
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -55,6 +55,7 @@ func BuiltinProfiles() []Profile {
|
|||||||
msiProfile(),
|
msiProfile(),
|
||||||
supermicroProfile(),
|
supermicroProfile(),
|
||||||
dellProfile(),
|
dellProfile(),
|
||||||
|
hpeProfile(),
|
||||||
inspurGroupOEMPlatformsProfile(),
|
inspurGroupOEMPlatformsProfile(),
|
||||||
hgxProfile(),
|
hgxProfile(),
|
||||||
xfusionProfile(),
|
xfusionProfile(),
|
||||||
|
|||||||
@@ -43,13 +43,13 @@ func ConvertToReanimator(result *models.AnalysisResult) (*ReanimatorExport, erro
|
|||||||
TargetHost: targetHost,
|
TargetHost: targetHost,
|
||||||
CollectedAt: collectedAt,
|
CollectedAt: collectedAt,
|
||||||
Hardware: ReanimatorHardware{
|
Hardware: ReanimatorHardware{
|
||||||
Board: convertBoard(result.Hardware.BoardInfo),
|
Board: convertBoard(result.Hardware.BoardInfo),
|
||||||
Firmware: dedupeFirmware(convertFirmware(result.Hardware.Firmware)),
|
Firmware: dedupeFirmware(convertFirmware(result.Hardware.Firmware)),
|
||||||
CPUs: dedupeCPUs(convertCPUsFromDevices(devices, collectedAt, result.Hardware.BoardInfo.SerialNumber, buildCPUMicrocodeBySocket(result.Hardware.Firmware))),
|
CPUs: dedupeCPUs(convertCPUsFromDevices(devices, collectedAt, result.Hardware.BoardInfo.SerialNumber, buildCPUMicrocodeBySocket(result.Hardware.Firmware))),
|
||||||
Memory: dedupeMemory(convertMemoryFromDevices(devices, collectedAt)),
|
Memory: dedupeMemory(convertMemoryFromDevices(devices, collectedAt)),
|
||||||
Storage: dedupeStorage(convertStorageFromDevices(devices, collectedAt)),
|
Storage: dedupeStorage(convertStorageFromDevices(devices, collectedAt)),
|
||||||
PCIeDevices: dedupePCIe(convertPCIeFromDevices(devices, collectedAt)),
|
PCIeDevices: dedupePCIe(convertPCIeFromDevices(devices, collectedAt)),
|
||||||
PowerSupplies: dedupePSUs(convertPSUsFromDevices(devices, collectedAt)),
|
PowerSupplies: dedupePSUs(convertPSUsFromDevices(devices, collectedAt)),
|
||||||
Sensors: convertSensors(result.Sensors),
|
Sensors: convertSensors(result.Sensors),
|
||||||
EventLogs: convertEventLogs(result.Events, collectedAt),
|
EventLogs: convertEventLogs(result.Events, collectedAt),
|
||||||
},
|
},
|
||||||
@@ -669,7 +669,17 @@ func convertMemoryFromDevices(devices []models.HardwareDevice, collectedAt strin
|
|||||||
}
|
}
|
||||||
present := boolFromPresentPtr(d.Present, true)
|
present := boolFromPresentPtr(d.Present, true)
|
||||||
status := normalizeStatus(d.Status, true)
|
status := normalizeStatus(d.Status, true)
|
||||||
if !present || d.SizeMB == 0 || status == "Empty" || strings.TrimSpace(d.SerialNumber) == "" {
|
mem := models.MemoryDIMM{
|
||||||
|
Present: present,
|
||||||
|
SizeMB: d.SizeMB,
|
||||||
|
Type: d.Type,
|
||||||
|
Description: stringFromDetailMap(d.Details, "description"),
|
||||||
|
Manufacturer: d.Manufacturer,
|
||||||
|
SerialNumber: d.SerialNumber,
|
||||||
|
PartNumber: d.PartNumber,
|
||||||
|
Status: d.Status,
|
||||||
|
}
|
||||||
|
if !mem.IsInstalledInventory() || status == "Empty" || strings.TrimSpace(d.SerialNumber) == "" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
meta := buildStatusMeta(status, d.StatusCheckedAt, d.StatusChangedAt, d.StatusHistory, d.ErrorDescription, collectedAt)
|
meta := buildStatusMeta(status, d.StatusCheckedAt, d.StatusChangedAt, d.StatusHistory, d.ErrorDescription, collectedAt)
|
||||||
@@ -1334,7 +1344,7 @@ func convertMemory(memory []models.MemoryDIMM, collectedAt string) []ReanimatorM
|
|||||||
|
|
||||||
result := make([]ReanimatorMemory, 0, len(memory))
|
result := make([]ReanimatorMemory, 0, len(memory))
|
||||||
for _, mem := range memory {
|
for _, mem := range memory {
|
||||||
if !mem.Present || mem.SizeMB == 0 || normalizeStatus(mem.Status, true) == "Empty" || strings.TrimSpace(mem.SerialNumber) == "" {
|
if !mem.IsInstalledInventory() || normalizeStatus(mem.Status, true) == "Empty" || strings.TrimSpace(mem.SerialNumber) == "" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
status := normalizeStatus(mem.Status, true)
|
status := normalizeStatus(mem.Status, true)
|
||||||
|
|||||||
@@ -259,6 +259,29 @@ func TestConvertMemory(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestConvertMemory_KeepsInstalledDIMMWithUnknownSize(t *testing.T) {
|
||||||
|
memory := []models.MemoryDIMM{
|
||||||
|
{
|
||||||
|
Slot: "PROC 1 DIMM 3",
|
||||||
|
Present: true,
|
||||||
|
SizeMB: 0,
|
||||||
|
Manufacturer: "Hynix",
|
||||||
|
PartNumber: "HMCG88AEBRA115N",
|
||||||
|
SerialNumber: "2B5F92C6",
|
||||||
|
Status: "OK",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
result := convertMemory(memory, "2026-03-30T10:00:00Z")
|
||||||
|
|
||||||
|
if len(result) != 1 {
|
||||||
|
t.Fatalf("expected 1 inventory-only DIMM, got %d", len(result))
|
||||||
|
}
|
||||||
|
if result[0].PartNumber != "HMCG88AEBRA115N" || result[0].SerialNumber != "2B5F92C6" || result[0].SizeMB != 0 {
|
||||||
|
t.Fatalf("unexpected converted memory: %+v", result[0])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestConvertToReanimator_CPUSerialIsNotSynthesizedAndSocketIsDeduped(t *testing.T) {
|
func TestConvertToReanimator_CPUSerialIsNotSynthesizedAndSocketIsDeduped(t *testing.T) {
|
||||||
input := &models.AnalysisResult{
|
input := &models.AnalysisResult{
|
||||||
Filename: "cpu-dedupe.json",
|
Filename: "cpu-dedupe.json",
|
||||||
|
|||||||
29
internal/models/memory.go
Normal file
29
internal/models/memory.go
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
package models
|
||||||
|
|
||||||
|
import "strings"
|
||||||
|
|
||||||
|
// HasInventoryIdentity reports whether the DIMM has enough identifying
|
||||||
|
// inventory data to treat it as a populated module even when size is unknown.
|
||||||
|
func (m MemoryDIMM) HasInventoryIdentity() bool {
|
||||||
|
return strings.TrimSpace(m.SerialNumber) != "" ||
|
||||||
|
strings.TrimSpace(m.PartNumber) != "" ||
|
||||||
|
strings.TrimSpace(m.Type) != "" ||
|
||||||
|
strings.TrimSpace(m.Technology) != "" ||
|
||||||
|
strings.TrimSpace(m.Description) != ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsInstalledInventory reports whether the DIMM represents an installed module
|
||||||
|
// that should be kept in canonical inventory and exports.
|
||||||
|
func (m MemoryDIMM) IsInstalledInventory() bool {
|
||||||
|
if !m.Present {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
status := strings.ToLower(strings.TrimSpace(m.Status))
|
||||||
|
switch status {
|
||||||
|
case "empty", "absent", "not installed":
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return m.SizeMB > 0 || m.HasInventoryIdentity()
|
||||||
|
}
|
||||||
@@ -19,6 +19,7 @@ const maxZipArchiveSize = 50 * 1024 * 1024
|
|||||||
const maxGzipDecompressedSize = 50 * 1024 * 1024
|
const maxGzipDecompressedSize = 50 * 1024 * 1024
|
||||||
|
|
||||||
var supportedArchiveExt = map[string]struct{}{
|
var supportedArchiveExt = map[string]struct{}{
|
||||||
|
".ahs": {},
|
||||||
".gz": {},
|
".gz": {},
|
||||||
".tgz": {},
|
".tgz": {},
|
||||||
".tar": {},
|
".tar": {},
|
||||||
@@ -45,6 +46,8 @@ func ExtractArchive(archivePath string) ([]ExtractedFile, error) {
|
|||||||
ext := strings.ToLower(filepath.Ext(archivePath))
|
ext := strings.ToLower(filepath.Ext(archivePath))
|
||||||
|
|
||||||
switch ext {
|
switch ext {
|
||||||
|
case ".ahs":
|
||||||
|
return extractSingleFile(archivePath)
|
||||||
case ".gz", ".tgz":
|
case ".gz", ".tgz":
|
||||||
return extractTarGz(archivePath)
|
return extractTarGz(archivePath)
|
||||||
case ".tar", ".sds":
|
case ".tar", ".sds":
|
||||||
@@ -66,6 +69,8 @@ func ExtractArchiveFromReader(r io.Reader, filename string) ([]ExtractedFile, er
|
|||||||
ext := strings.ToLower(filepath.Ext(filename))
|
ext := strings.ToLower(filepath.Ext(filename))
|
||||||
|
|
||||||
switch ext {
|
switch ext {
|
||||||
|
case ".ahs":
|
||||||
|
return extractSingleFileFromReader(r, filename)
|
||||||
case ".gz", ".tgz":
|
case ".gz", ".tgz":
|
||||||
return extractTarGzFromReader(r, filename)
|
return extractTarGzFromReader(r, filename)
|
||||||
case ".tar", ".sds":
|
case ".tar", ".sds":
|
||||||
|
|||||||
@@ -76,6 +76,7 @@ func TestIsSupportedArchiveFilename(t *testing.T) {
|
|||||||
name string
|
name string
|
||||||
want bool
|
want bool
|
||||||
}{
|
}{
|
||||||
|
{name: "HPE_CZ2D1X0GS3_20260330.ahs", want: true},
|
||||||
{name: "dump.tar.gz", want: true},
|
{name: "dump.tar.gz", want: true},
|
||||||
{name: "nvidia-bug-report-1651124000923.log.gz", want: true},
|
{name: "nvidia-bug-report-1651124000923.log.gz", want: true},
|
||||||
{name: "snapshot.zip", want: true},
|
{name: "snapshot.zip", want: true},
|
||||||
@@ -124,3 +125,20 @@ func TestExtractArchiveFromReaderSDS(t *testing.T) {
|
|||||||
t.Fatalf("expected bmc/pack.info, got %q", files[0].Path)
|
t.Fatalf("expected bmc/pack.info, got %q", files[0].Path)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestExtractArchiveFromReaderAHS(t *testing.T) {
|
||||||
|
payload := []byte("ABJRtest")
|
||||||
|
files, err := ExtractArchiveFromReader(bytes.NewReader(payload), "sample.ahs")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("extract ahs from reader: %v", err)
|
||||||
|
}
|
||||||
|
if len(files) != 1 {
|
||||||
|
t.Fatalf("expected 1 extracted file, got %d", len(files))
|
||||||
|
}
|
||||||
|
if files[0].Path != "sample.ahs" {
|
||||||
|
t.Fatalf("expected sample.ahs, got %q", files[0].Path)
|
||||||
|
}
|
||||||
|
if string(files[0].Content) != string(payload) {
|
||||||
|
t.Fatalf("content mismatch")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
1706
internal/parser/vendors/hpe_ilo_ahs/parser.go
vendored
Normal file
1706
internal/parser/vendors/hpe_ilo_ahs/parser.go
vendored
Normal file
File diff suppressed because it is too large
Load Diff
316
internal/parser/vendors/hpe_ilo_ahs/parser_test.go
vendored
Normal file
316
internal/parser/vendors/hpe_ilo_ahs/parser_test.go
vendored
Normal file
@@ -0,0 +1,316 @@
|
|||||||
|
package hpe_ilo_ahs
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"compress/gzip"
|
||||||
|
"encoding/binary"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"git.mchus.pro/mchus/logpile/internal/parser"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestDetectAHS(t *testing.T) {
|
||||||
|
p := &Parser{}
|
||||||
|
score := p.Detect([]parser.ExtractedFile{{
|
||||||
|
Path: "HPE_CZ2D1X0GS3_20260330.ahs",
|
||||||
|
Content: makeAHSArchive(t, []ahsTestEntry{{Name: "CUST_INFO.DAT", Payload: []byte("x")}}),
|
||||||
|
}})
|
||||||
|
if score < 80 {
|
||||||
|
t.Fatalf("expected high confidence detect, got %d", score)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseAHSInventory(t *testing.T) {
|
||||||
|
p := &Parser{}
|
||||||
|
content := makeAHSArchive(t, []ahsTestEntry{
|
||||||
|
{Name: "CUST_INFO.DAT", Payload: make([]byte, 16)},
|
||||||
|
{Name: "0000088-2026-03-30.zbb", Payload: gzipBytes(t, []byte(sampleInventoryBlob()))},
|
||||||
|
{Name: "bcert.pkg", Payload: []byte(sampleBCertBlob())},
|
||||||
|
})
|
||||||
|
|
||||||
|
result, err := p.Parse([]parser.ExtractedFile{{
|
||||||
|
Path: "HPE_CZ2D1X0GS3_20260330.ahs",
|
||||||
|
Content: content,
|
||||||
|
}})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse failed: %v", err)
|
||||||
|
}
|
||||||
|
if result.Hardware == nil {
|
||||||
|
t.Fatalf("expected hardware section")
|
||||||
|
}
|
||||||
|
|
||||||
|
board := result.Hardware.BoardInfo
|
||||||
|
if board.Manufacturer != "HPE" {
|
||||||
|
t.Fatalf("unexpected board manufacturer: %q", board.Manufacturer)
|
||||||
|
}
|
||||||
|
if board.ProductName != "ProLiant DL380 Gen11" {
|
||||||
|
t.Fatalf("unexpected board product: %q", board.ProductName)
|
||||||
|
}
|
||||||
|
if board.SerialNumber != "CZ2D1X0GS3" {
|
||||||
|
t.Fatalf("unexpected board serial: %q", board.SerialNumber)
|
||||||
|
}
|
||||||
|
if board.PartNumber != "P52560-421" {
|
||||||
|
t.Fatalf("unexpected board part number: %q", board.PartNumber)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(result.Hardware.CPUs) != 1 || result.Hardware.CPUs[0].Model != "Intel(R) Xeon(R) Gold 6444Y" {
|
||||||
|
t.Fatalf("unexpected CPUs: %+v", result.Hardware.CPUs)
|
||||||
|
}
|
||||||
|
if len(result.Hardware.Memory) != 1 {
|
||||||
|
t.Fatalf("expected one DIMM, got %d", len(result.Hardware.Memory))
|
||||||
|
}
|
||||||
|
if result.Hardware.Memory[0].PartNumber != "HMCG88AEBRA115N" {
|
||||||
|
t.Fatalf("unexpected DIMM part number: %q", result.Hardware.Memory[0].PartNumber)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(result.Hardware.NetworkAdapters) != 2 {
|
||||||
|
t.Fatalf("expected two network adapters, got %d", len(result.Hardware.NetworkAdapters))
|
||||||
|
}
|
||||||
|
if len(result.Hardware.PowerSupply) != 1 {
|
||||||
|
t.Fatalf("expected one PSU, got %d", len(result.Hardware.PowerSupply))
|
||||||
|
}
|
||||||
|
if result.Hardware.PowerSupply[0].SerialNumber != "5XUWB0C4DJG4BV" {
|
||||||
|
t.Fatalf("unexpected PSU serial: %q", result.Hardware.PowerSupply[0].SerialNumber)
|
||||||
|
}
|
||||||
|
if result.Hardware.PowerSupply[0].Firmware != "2.00" {
|
||||||
|
t.Fatalf("unexpected PSU firmware: %q", result.Hardware.PowerSupply[0].Firmware)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(result.Hardware.Storage) != 1 {
|
||||||
|
t.Fatalf("expected one physical drive, got %d", len(result.Hardware.Storage))
|
||||||
|
}
|
||||||
|
drive := result.Hardware.Storage[0]
|
||||||
|
if drive.Model != "SAMSUNGMZ7L3480HCHQ-00A07" {
|
||||||
|
t.Fatalf("unexpected drive model: %q", drive.Model)
|
||||||
|
}
|
||||||
|
if drive.SerialNumber != "S664NC0Y502720" {
|
||||||
|
t.Fatalf("unexpected drive serial: %q", drive.SerialNumber)
|
||||||
|
}
|
||||||
|
if drive.SizeGB != 480 {
|
||||||
|
t.Fatalf("unexpected drive size: %d", drive.SizeGB)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(result.Hardware.Firmware) == 0 {
|
||||||
|
t.Fatalf("expected firmware inventory")
|
||||||
|
}
|
||||||
|
foundILO := false
|
||||||
|
foundControllerFW := false
|
||||||
|
foundNICFW := false
|
||||||
|
foundBackplaneFW := false
|
||||||
|
for _, item := range result.Hardware.Firmware {
|
||||||
|
if item.DeviceName == "iLO 6" && item.Version == "v1.63p20" {
|
||||||
|
foundILO = true
|
||||||
|
}
|
||||||
|
if item.DeviceName == "HPE MR408i-o Gen11" && item.Version == "52.26.3-5379" {
|
||||||
|
foundControllerFW = true
|
||||||
|
}
|
||||||
|
if item.DeviceName == "BCM 5719 1Gb 4p BASE-T OCP Adptr" && item.Version == "20.28.41" {
|
||||||
|
foundNICFW = true
|
||||||
|
}
|
||||||
|
if item.DeviceName == "8 SFF 24G x1NVMe/SAS UBM3 BC BP" && item.Version == "1.24" {
|
||||||
|
foundBackplaneFW = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !foundILO {
|
||||||
|
t.Fatalf("expected iLO firmware entry")
|
||||||
|
}
|
||||||
|
if !foundControllerFW {
|
||||||
|
t.Fatalf("expected controller firmware entry")
|
||||||
|
}
|
||||||
|
if !foundNICFW {
|
||||||
|
t.Fatalf("expected broadcom firmware entry")
|
||||||
|
}
|
||||||
|
if !foundBackplaneFW {
|
||||||
|
t.Fatalf("expected backplane firmware entry")
|
||||||
|
}
|
||||||
|
|
||||||
|
broadcomFound := false
|
||||||
|
backplaneFound := false
|
||||||
|
for _, nic := range result.Hardware.NetworkAdapters {
|
||||||
|
if nic.SerialNumber == "1CH0150001" && nic.Firmware == "20.28.41" {
|
||||||
|
broadcomFound = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, dev := range result.Hardware.Devices {
|
||||||
|
if dev.DeviceClass == "storage_backplane" && dev.Firmware == "1.24" {
|
||||||
|
backplaneFound = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !broadcomFound {
|
||||||
|
t.Fatalf("expected broadcom adapter firmware to be enriched")
|
||||||
|
}
|
||||||
|
if !backplaneFound {
|
||||||
|
t.Fatalf("expected backplane canonical device")
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(result.Hardware.Devices) < 6 {
|
||||||
|
t.Fatalf("expected canonical devices, got %d", len(result.Hardware.Devices))
|
||||||
|
}
|
||||||
|
if len(result.Events) == 0 {
|
||||||
|
t.Fatalf("expected parsed events")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseExampleAHS(t *testing.T) {
|
||||||
|
path := filepath.Join("..", "..", "..", "..", "example", "HPE_CZ2D1X0GS3_20260330.ahs")
|
||||||
|
content, err := os.ReadFile(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Skipf("example fixture unavailable: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
p := &Parser{}
|
||||||
|
result, err := p.Parse([]parser.ExtractedFile{{
|
||||||
|
Path: filepath.Base(path),
|
||||||
|
Content: content,
|
||||||
|
}})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse example failed: %v", err)
|
||||||
|
}
|
||||||
|
if result.Hardware == nil {
|
||||||
|
t.Fatalf("expected hardware section")
|
||||||
|
}
|
||||||
|
|
||||||
|
board := result.Hardware.BoardInfo
|
||||||
|
if board.ProductName != "ProLiant DL380 Gen11" {
|
||||||
|
t.Fatalf("unexpected board product: %q", board.ProductName)
|
||||||
|
}
|
||||||
|
if board.SerialNumber != "CZ2D1X0GS3" {
|
||||||
|
t.Fatalf("unexpected board serial: %q", board.SerialNumber)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(result.Hardware.Storage) < 2 {
|
||||||
|
t.Fatalf("expected at least two drives, got %d", len(result.Hardware.Storage))
|
||||||
|
}
|
||||||
|
if len(result.Hardware.PowerSupply) != 2 {
|
||||||
|
t.Fatalf("expected exactly two PSUs, got %d: %+v", len(result.Hardware.PowerSupply), result.Hardware.PowerSupply)
|
||||||
|
}
|
||||||
|
|
||||||
|
foundController := false
|
||||||
|
foundBackplaneFW := false
|
||||||
|
foundNICFW := false
|
||||||
|
for _, device := range result.Hardware.Devices {
|
||||||
|
if device.Model == "HPE MR408i-o Gen11" && device.SerialNumber == "PXSFQ0BBIJY3B3" {
|
||||||
|
foundController = true
|
||||||
|
}
|
||||||
|
if device.DeviceClass == "storage_backplane" && device.Firmware == "1.24" {
|
||||||
|
foundBackplaneFW = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !foundController {
|
||||||
|
t.Fatalf("expected MR408i-o controller in canonical devices")
|
||||||
|
}
|
||||||
|
for _, fw := range result.Hardware.Firmware {
|
||||||
|
if fw.DeviceName == "BCM 5719 1Gb 4p BASE-T OCP Adptr" && fw.Version == "20.28.41" {
|
||||||
|
foundNICFW = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !foundBackplaneFW {
|
||||||
|
t.Fatalf("expected backplane device in canonical devices")
|
||||||
|
}
|
||||||
|
if !foundNICFW {
|
||||||
|
t.Fatalf("expected broadcom firmware from bcert/pkg lockdown")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type ahsTestEntry struct {
|
||||||
|
Name string
|
||||||
|
Payload []byte
|
||||||
|
Flag uint32
|
||||||
|
}
|
||||||
|
|
||||||
|
func makeAHSArchive(t *testing.T, entries []ahsTestEntry) []byte {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
var buf bytes.Buffer
|
||||||
|
for _, entry := range entries {
|
||||||
|
header := make([]byte, ahsHeaderSize)
|
||||||
|
copy(header[:4], []byte("ABJR"))
|
||||||
|
binary.LittleEndian.PutUint16(header[4:6], 0x0300)
|
||||||
|
binary.LittleEndian.PutUint16(header[6:8], 0x0002)
|
||||||
|
binary.LittleEndian.PutUint32(header[8:12], uint32(len(entry.Payload)))
|
||||||
|
flag := entry.Flag
|
||||||
|
if flag == 0 {
|
||||||
|
flag = 0x80000002
|
||||||
|
if len(entry.Payload) >= 2 && entry.Payload[0] == 0x1f && entry.Payload[1] == 0x8b {
|
||||||
|
flag = 0x80000001
|
||||||
|
}
|
||||||
|
}
|
||||||
|
binary.LittleEndian.PutUint32(header[16:20], flag)
|
||||||
|
copy(header[20:52], []byte(entry.Name))
|
||||||
|
buf.Write(header)
|
||||||
|
buf.Write(entry.Payload)
|
||||||
|
}
|
||||||
|
return buf.Bytes()
|
||||||
|
}
|
||||||
|
|
||||||
|
func gzipBytes(t *testing.T, payload []byte) []byte {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
var buf bytes.Buffer
|
||||||
|
zw := gzip.NewWriter(&buf)
|
||||||
|
if _, err := zw.Write(payload); err != nil {
|
||||||
|
t.Fatalf("gzip payload: %v", err)
|
||||||
|
}
|
||||||
|
if err := zw.Close(); err != nil {
|
||||||
|
t.Fatalf("close gzip writer: %v", err)
|
||||||
|
}
|
||||||
|
return buf.Bytes()
|
||||||
|
}
|
||||||
|
|
||||||
|
func sampleInventoryBlob() string {
|
||||||
|
return stringsJoin(
|
||||||
|
"iLO 6 v1.63p20 built on Sep 13 2024",
|
||||||
|
"HPE",
|
||||||
|
"ProLiant DL380 Gen11",
|
||||||
|
"CZ2D1X0GS3",
|
||||||
|
"P52560-421",
|
||||||
|
"Proc 1",
|
||||||
|
"Intel(R) Corporation",
|
||||||
|
"Intel(R) Xeon(R) Gold 6444Y",
|
||||||
|
"PROC 1 DIMM 3",
|
||||||
|
"Hynix",
|
||||||
|
"HMCG88AEBRA115N",
|
||||||
|
"2B5F92C6",
|
||||||
|
"Power Supply 1",
|
||||||
|
"5XUWB0C4DJG4BV",
|
||||||
|
"P03178-B21",
|
||||||
|
"PciRoot(0x1)/Pci(0x5,0x0)/Pci(0x0,0x0)",
|
||||||
|
"NIC.Slot.1.1",
|
||||||
|
"Network Controller",
|
||||||
|
"Slot 1",
|
||||||
|
"MCX512A-ACAT",
|
||||||
|
"MT2230478382",
|
||||||
|
"PciRoot(0x3)/Pci(0x1,0x0)/Pci(0x0,0x0)",
|
||||||
|
"OCP.Slot.15.1",
|
||||||
|
"Broadcom NetXtreme Gigabit Ethernet - NIC",
|
||||||
|
"OCP Slot 15",
|
||||||
|
"P51183-001",
|
||||||
|
"1CH0150001",
|
||||||
|
"20.28.41",
|
||||||
|
"System ROM",
|
||||||
|
"v2.22 (06/19/2024)",
|
||||||
|
"03/30/2026 09:47:33",
|
||||||
|
"iLO network link down.",
|
||||||
|
`{"@odata.id":"/redfish/v1/Systems/1/Storage/DE00A000/Controllers/0","@odata.type":"#StorageController.v1_7_0.StorageController","Id":"0","Name":"HPE MR408i-o Gen11","FirmwareVersion":"52.26.3-5379","Manufacturer":"HPE","Model":"HPE MR408i-o Gen11","PartNumber":"P58543-001","SKU":"P58335-B21","SerialNumber":"PXSFQ0BBIJY3B3","Status":{"State":"Enabled","Health":"OK"},"Location":{"PartLocation":{"ServiceLabel":"Slot=14","LocationType":"Slot","LocationOrdinalValue":14}},"PCIeInterface":{"PCIeType":"Gen4","LanesInUse":8}}`,
|
||||||
|
`{"@odata.id":"/redfish/v1/Fabrics/DE00A000","@odata.type":"#Fabric.v1_3_0.Fabric","Id":"DE00A000","Name":"8 SFF 24G x1NVMe/SAS UBM3 BC BP","FabricType":"MultiProtocol"}`,
|
||||||
|
`{"@odata.id":"/redfish/v1/Fabrics/DE00A000/Switches/1","@odata.type":"#Switch.v1_9_1.Switch","Id":"1","Name":"Direct Attached","Model":"UBM3","FirmwareVersion":"1.24","SupportedProtocols":["SAS","SATA","NVMe"],"SwitchType":"MultiProtocol","Status":{"State":"Enabled","Health":"OK"}}`,
|
||||||
|
`{"@odata.id":"/redfish/v1/Chassis/DE00A000/Drives/0","@odata.type":"#Drive.v1_17_0.Drive","Id":"0","Name":"480GB 6G SATA SSD","Status":{"State":"StandbyOffline","Health":"OK"},"PhysicalLocation":{"PartLocation":{"ServiceLabel":"Slot=14:Port=1:Box=3:Bay=1","LocationType":"Bay","LocationOrdinalValue":1}},"CapacityBytes":480103981056,"MediaType":"SSD","Model":"SAMSUNGMZ7L3480HCHQ-00A07","Protocol":"SATA","Revision":"JXTC604Q","SerialNumber":"S664NC0Y502720","PredictedMediaLifeLeftPercent":100}`,
|
||||||
|
`{"@odata.id":"/redfish/v1/Chassis/DE00A000/Drives/64515","@odata.type":"#Drive.v1_17_0.Drive","Id":"64515","Name":"Empty Bay","Status":{"State":"Absent","Health":"OK"}}`,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func sampleBCertBlob() string {
|
||||||
|
return `<BC><MfgRecord><PowerSupplySlot id="0"><Present>Yes</Present><SerialNumber>5XUWB0C4DJG4BV</SerialNumber><FirmwareVersion>2.00</FirmwareVersion><SparePartNumber>P44412-001</SparePartNumber></PowerSupplySlot><FirmwareLockdown><SystemProgrammableLogicDevice>0x12</SystemProgrammableLogicDevice><ServerPlatformServicesSPSFirmware>6.1.4.47</ServerPlatformServicesSPSFirmware><STMicroGen11TPM>1.512</STMicroGen11TPM><HPEMR408i-oGen11>52.26.3-5379</HPEMR408i-oGen11><UBM3>UBM3/1.24</UBM3><BCM57191Gb4pBASE-TOCP3>20.28.41</BCM57191Gb4pBASE-TOCP3></FirmwareLockdown></MfgRecord></BC>`
|
||||||
|
}
|
||||||
|
|
||||||
|
func stringsJoin(parts ...string) string {
|
||||||
|
return string(bytes.Join(func() [][]byte {
|
||||||
|
out := make([][]byte, 0, len(parts))
|
||||||
|
for _, part := range parts {
|
||||||
|
out = append(out, []byte(part))
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}(), []byte{0}))
|
||||||
|
}
|
||||||
1
internal/parser/vendors/vendors.go
vendored
1
internal/parser/vendors/vendors.go
vendored
@@ -7,6 +7,7 @@ import (
|
|||||||
_ "git.mchus.pro/mchus/logpile/internal/parser/vendors/dell"
|
_ "git.mchus.pro/mchus/logpile/internal/parser/vendors/dell"
|
||||||
_ "git.mchus.pro/mchus/logpile/internal/parser/vendors/easy_bee"
|
_ "git.mchus.pro/mchus/logpile/internal/parser/vendors/easy_bee"
|
||||||
_ "git.mchus.pro/mchus/logpile/internal/parser/vendors/h3c"
|
_ "git.mchus.pro/mchus/logpile/internal/parser/vendors/h3c"
|
||||||
|
_ "git.mchus.pro/mchus/logpile/internal/parser/vendors/hpe_ilo_ahs"
|
||||||
_ "git.mchus.pro/mchus/logpile/internal/parser/vendors/inspur"
|
_ "git.mchus.pro/mchus/logpile/internal/parser/vendors/inspur"
|
||||||
_ "git.mchus.pro/mchus/logpile/internal/parser/vendors/nvidia"
|
_ "git.mchus.pro/mchus/logpile/internal/parser/vendors/nvidia"
|
||||||
_ "git.mchus.pro/mchus/logpile/internal/parser/vendors/nvidia_bug_report"
|
_ "git.mchus.pro/mchus/logpile/internal/parser/vendors/nvidia_bug_report"
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ func BuildHardwareDevices(hw *models.HardwareConfig) []models.HardwareDevice {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, mem := range hw.Memory {
|
for _, mem := range hw.Memory {
|
||||||
if !mem.Present || mem.SizeMB == 0 {
|
if !mem.IsInstalledInventory() {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
present := mem.Present
|
present := mem.Present
|
||||||
|
|||||||
@@ -90,6 +90,63 @@ func TestBuildHardwareDevices_MemorySameSerialDifferentSlots_NotDeduped(t *testi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestBuildHardwareDevices_ZeroSizeMemoryWithInventoryIsIncluded(t *testing.T) {
|
||||||
|
hw := &models.HardwareConfig{
|
||||||
|
Memory: []models.MemoryDIMM{
|
||||||
|
{
|
||||||
|
Slot: "PROC 1 DIMM 3",
|
||||||
|
Location: "PROC 1 DIMM 3",
|
||||||
|
Present: true,
|
||||||
|
SizeMB: 0,
|
||||||
|
Manufacturer: "Hynix",
|
||||||
|
SerialNumber: "2B5F92C6",
|
||||||
|
PartNumber: "HMCG88AEBRA115N",
|
||||||
|
Status: "ok",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
devices := BuildHardwareDevices(hw)
|
||||||
|
memoryCount := 0
|
||||||
|
for _, d := range devices {
|
||||||
|
if d.Kind != models.DeviceKindMemory {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
memoryCount++
|
||||||
|
if d.Slot != "PROC 1 DIMM 3" || d.PartNumber != "HMCG88AEBRA115N" || d.SerialNumber != "2B5F92C6" {
|
||||||
|
t.Fatalf("unexpected memory device: %+v", d)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if memoryCount != 1 {
|
||||||
|
t.Fatalf("expected 1 installed zero-size memory record, got %d", memoryCount)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBuildSpecification_ZeroSizeMemoryWithInventoryIsShown(t *testing.T) {
|
||||||
|
hw := &models.HardwareConfig{
|
||||||
|
Memory: []models.MemoryDIMM{
|
||||||
|
{
|
||||||
|
Slot: "PROC 1 DIMM 3",
|
||||||
|
Present: true,
|
||||||
|
SizeMB: 0,
|
||||||
|
Manufacturer: "Hynix",
|
||||||
|
PartNumber: "HMCG88AEBRA115N",
|
||||||
|
SerialNumber: "2B5F92C6",
|
||||||
|
Status: "ok",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
spec := buildSpecification(hw)
|
||||||
|
for _, line := range spec {
|
||||||
|
if line.Category == "Память" && line.Name == "Hynix HMCG88AEBRA115N (size unknown)" && line.Quantity == 1 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Fatalf("expected memory spec line for zero-size identified DIMM, got %+v", spec)
|
||||||
|
}
|
||||||
|
|
||||||
func TestBuildHardwareDevices_DuplicateSerials_AreAnnotated(t *testing.T) {
|
func TestBuildHardwareDevices_DuplicateSerials_AreAnnotated(t *testing.T) {
|
||||||
hw := &models.HardwareConfig{
|
hw := &models.HardwareConfig{
|
||||||
Memory: []models.MemoryDIMM{
|
Memory: []models.MemoryDIMM{
|
||||||
|
|||||||
@@ -530,11 +530,21 @@ func buildSpecification(hw *models.HardwareConfig) []SpecLine {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
present := mem.Present != nil && *mem.Present
|
present := mem.Present != nil && *mem.Present
|
||||||
// Skip empty slots (not present or 0 size)
|
if !present {
|
||||||
if !present || mem.SizeMB == 0 {
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
// Include frequency if available
|
|
||||||
|
if mem.SizeMB == 0 {
|
||||||
|
name := strings.TrimSpace(strings.Join(nonEmptyStrings(mem.Manufacturer, mem.PartNumber, mem.Type), " "))
|
||||||
|
if name == "" {
|
||||||
|
name = "Installed DIMM (size unknown)"
|
||||||
|
} else {
|
||||||
|
name += " (size unknown)"
|
||||||
|
}
|
||||||
|
memGroups[name]++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
key := ""
|
key := ""
|
||||||
currentSpeed := intFromDetails(mem.Details, "current_speed_mhz")
|
currentSpeed := intFromDetails(mem.Details, "current_speed_mhz")
|
||||||
if currentSpeed > 0 {
|
if currentSpeed > 0 {
|
||||||
@@ -626,6 +636,18 @@ func buildSpecification(hw *models.HardwareConfig) []SpecLine {
|
|||||||
return spec
|
return spec
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func nonEmptyStrings(values ...string) []string {
|
||||||
|
out := make([]string, 0, len(values))
|
||||||
|
for _, value := range values {
|
||||||
|
value = strings.TrimSpace(value)
|
||||||
|
if value == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out = append(out, value)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
func (s *Server) handleGetSerials(w http.ResponseWriter, r *http.Request) {
|
func (s *Server) handleGetSerials(w http.ResponseWriter, r *http.Request) {
|
||||||
result := s.GetResult()
|
result := s.GetResult()
|
||||||
if result == nil {
|
if result == nil {
|
||||||
|
|||||||
@@ -36,9 +36,9 @@
|
|||||||
<div id="archive-source-content">
|
<div id="archive-source-content">
|
||||||
<div class="upload-area" id="drop-zone">
|
<div class="upload-area" id="drop-zone">
|
||||||
<p>Перетащите архив, TXT/LOG или JSON snapshot сюда</p>
|
<p>Перетащите архив, TXT/LOG или JSON snapshot сюда</p>
|
||||||
<input type="file" id="file-input" accept="application/gzip,application/x-gzip,application/x-tar,application/zip,application/json,text/plain,.json,.tar,.tar.gz,.tgz,.sds,.zip,.txt,.log" hidden>
|
<input type="file" id="file-input" accept="application/gzip,application/x-gzip,application/x-tar,application/zip,application/json,text/plain,.ahs,.json,.tar,.tar.gz,.tgz,.sds,.zip,.txt,.log" hidden>
|
||||||
<button type="button" onclick="document.getElementById('file-input').click()">Выберите файл</button>
|
<button type="button" onclick="document.getElementById('file-input').click()">Выберите файл</button>
|
||||||
<p class="hint">Поддерживаемые форматы: tar.gz, tar, tgz, sds, zip, json, txt, log</p>
|
<p class="hint">Поддерживаемые форматы: ahs, tar.gz, tar, tgz, sds, zip, json, txt, log</p>
|
||||||
</div>
|
</div>
|
||||||
<div id="upload-status"></div>
|
<div id="upload-status"></div>
|
||||||
<div id="parsers-info" class="parsers-info"></div>
|
<div id="parsers-info" class="parsers-info"></div>
|
||||||
|
|||||||
Reference in New Issue
Block a user