fix: complete hardware collection diagnostics

2026-08-25 17:04:33 +03:00
parent 33ace33de5
commit ccc781856e
19 changed files with 311 additions and 81 deletions
@@ -178,53 +178,77 @@ type HardwareStorage struct {

 type HardwarePCIeDevice struct {
 	HardwareComponentStatus
-	Slot                      *string        `json:"slot,omitempty"`
-	VendorID                  *int           `json:"vendor_id,omitempty"`
-	DeviceID                  *int           `json:"device_id,omitempty"`
-	NUMANode                  *int           `json:"numa_node,omitempty"`
-	TemperatureC              *float64       `json:"temperature_c,omitempty"`
-	PowerW                    *float64       `json:"power_w,omitempty"`
-	LifeRemainingPct          *float64       `json:"life_remaining_pct,omitempty"`
-	LifeUsedPct               *float64       `json:"life_used_pct,omitempty"`
-	ECCCorrectedTotal         *int64         `json:"ecc_corrected_total,omitempty"`
-	ECCUncorrectedTotal       *int64         `json:"ecc_uncorrected_total,omitempty"`
-	HWSlowdown                *bool          `json:"hw_slowdown,omitempty"`
-	ResetRequired             *bool          `json:"reset_required,omitempty"`
-	RemappedRowsCorrectable   *int64         `json:"remapped_rows_correctable,omitempty"`
-	RemappedRowsUncorrectable *int64         `json:"remapped_rows_uncorrectable,omitempty"`
-	RemappedRowsPending       *bool          `json:"remapped_rows_pending,omitempty"`
-	RemappedRowsFailure       *bool          `json:"remapped_rows_failure,omitempty"`
-	BatteryChargePct          *float64       `json:"battery_charge_pct,omitempty"`
-	BatteryHealthPct          *float64       `json:"battery_health_pct,omitempty"`
-	BatteryTemperatureC       *float64       `json:"battery_temperature_c,omitempty"`
-	BatteryVoltageV           *float64       `json:"battery_voltage_v,omitempty"`
-	BatteryReplaceRequired    *bool          `json:"battery_replace_required,omitempty"`
-	SFPPresent                *bool          `json:"sfp_present,omitempty"`
-	SFPIdentifier             *string        `json:"sfp_identifier,omitempty"`
-	SFPConnector              *string        `json:"sfp_connector,omitempty"`
-	SFPVendor                 *string        `json:"sfp_vendor,omitempty"`
-	SFPPartNumber             *string        `json:"sfp_part_number,omitempty"`
-	SFPSerialNumber           *string        `json:"sfp_serial_number,omitempty"`
-	SFPWavelengthNM           *float64       `json:"sfp_wavelength_nm,omitempty"`
-	SFPTemperatureC           *float64       `json:"sfp_temperature_c,omitempty"`
-	SFPTXPowerDBM             *float64       `json:"sfp_tx_power_dbm,omitempty"`
-	SFPRXPowerDBM             *float64       `json:"sfp_rx_power_dbm,omitempty"`
-	SFPVoltageV               *float64       `json:"sfp_voltage_v,omitempty"`
-	SFPBiasMA                 *float64       `json:"sfp_bias_ma,omitempty"`
-	BDF                       *string        `json:"-"`
-	DeviceClass               *string        `json:"device_class,omitempty"`
-	Manufacturer              *string        `json:"manufacturer,omitempty"`
-	Model                     *string        `json:"model,omitempty"`
-	LinkWidth                 *int           `json:"link_width,omitempty"`
-	LinkSpeed                 *string        `json:"link_speed,omitempty"`
-	MaxLinkWidth              *int           `json:"max_link_width,omitempty"`
-	MaxLinkSpeed              *string        `json:"max_link_speed,omitempty"`
-	SerialNumber              *string        `json:"serial_number,omitempty"`
-	Firmware                  *string        `json:"firmware,omitempty"`
-	MacAddresses              []string       `json:"mac_addresses,omitempty"`
-	Present                   *bool          `json:"present,omitempty"`
-	IOMMUGroup                *int           `json:"iommu_group,omitempty"`
-	Telemetry                 map[string]any `json:"-"`
+	Slot                      *string  `json:"slot,omitempty"`
+	VendorID                  *int     `json:"vendor_id,omitempty"`
+	DeviceID                  *int     `json:"device_id,omitempty"`
+	NUMANode                  *int     `json:"numa_node,omitempty"`
+	TemperatureC              *float64 `json:"temperature_c,omitempty"`
+	PowerW                    *float64 `json:"power_w,omitempty"`
+	LifeRemainingPct          *float64 `json:"life_remaining_pct,omitempty"`
+	LifeUsedPct               *float64 `json:"life_used_pct,omitempty"`
+	ECCCorrectedTotal         *int64   `json:"ecc_corrected_total,omitempty"`
+	ECCUncorrectedTotal       *int64   `json:"ecc_uncorrected_total,omitempty"`
+	HWSlowdown                *bool    `json:"hw_slowdown,omitempty"`
+	ResetRequired             *bool    `json:"reset_required,omitempty"`
+	RemappedRowsCorrectable   *int64   `json:"remapped_rows_correctable,omitempty"`
+	RemappedRowsUncorrectable *int64   `json:"remapped_rows_uncorrectable,omitempty"`
+	RemappedRowsPending       *bool    `json:"remapped_rows_pending,omitempty"`
+	RemappedRowsFailure       *bool    `json:"remapped_rows_failure,omitempty"`
+	BatteryChargePct          *float64 `json:"battery_charge_pct,omitempty"`
+	BatteryHealthPct          *float64 `json:"battery_health_pct,omitempty"`
+	BatteryTemperatureC       *float64 `json:"battery_temperature_c,omitempty"`
+	BatteryVoltageV           *float64 `json:"battery_voltage_v,omitempty"`
+	BatteryReplaceRequired    *bool    `json:"battery_replace_required,omitempty"`
+	SFPPresent                *bool    `json:"sfp_present,omitempty"`
+	SFPIdentifier             *string  `json:"sfp_identifier,omitempty"`
+	SFPConnector              *string  `json:"sfp_connector,omitempty"`
+	SFPVendor                 *string  `json:"sfp_vendor,omitempty"`
+	SFPPartNumber             *string  `json:"sfp_part_number,omitempty"`
+	SFPSerialNumber           *string  `json:"sfp_serial_number,omitempty"`
+	SFPRevision               *string  `json:"sfp_revision,omitempty"`
+	SFPTransceiverType        *string  `json:"sfp_transceiver_type,omitempty"`
+	SFPWavelengthNM           *float64 `json:"sfp_wavelength_nm,omitempty"`
+	SFPTemperatureC           *float64 `json:"sfp_temperature_c,omitempty"`
+	SFPTXPowerDBM             *float64 `json:"sfp_tx_power_dbm,omitempty"`
+	SFPRXPowerDBM             *float64 `json:"sfp_rx_power_dbm,omitempty"`
+	SFPVoltageV               *float64 `json:"sfp_voltage_v,omitempty"`
+	SFPBiasMA                 *float64 `json:"sfp_bias_ma,omitempty"`
+	// SFPModules is the per-port transceiver inventory.  The scalar SFP*
+	// fields above are retained for compatibility and mirror port 0 only.
+	SFPModules   []HardwareSFPModule `json:"sfp_modules,omitempty"`
+	BDF          *string             `json:"-"`
+	DeviceClass  *string             `json:"device_class,omitempty"`
+	Manufacturer *string             `json:"manufacturer,omitempty"`
+	Model        *string             `json:"model,omitempty"`
+	LinkWidth    *int                `json:"link_width,omitempty"`
+	LinkSpeed    *string             `json:"link_speed,omitempty"`
+	MaxLinkWidth *int                `json:"max_link_width,omitempty"`
+	MaxLinkSpeed *string             `json:"max_link_speed,omitempty"`
+	SerialNumber *string             `json:"serial_number,omitempty"`
+	Firmware     *string             `json:"firmware,omitempty"`
+	MacAddresses []string            `json:"mac_addresses,omitempty"`
+	Present      *bool               `json:"present,omitempty"`
+	IOMMUGroup   *int                `json:"iommu_group,omitempty"`
+	Telemetry    map[string]any      `json:"-"`
+}
+
+// HardwareSFPModule is one optical/electrical transceiver attached to a NIC
+// port.  Port is the zero-based port number within its PCIe device.
+type HardwareSFPModule struct {
+	Port            int      `json:"port"`
+	Identifier      *string  `json:"identifier,omitempty"`
+	Connector       *string  `json:"connector,omitempty"`
+	Vendor          *string  `json:"vendor,omitempty"`
+	PartNumber      *string  `json:"part_number,omitempty"`
+	SerialNumber    *string  `json:"serial_number,omitempty"`
+	Revision        *string  `json:"revision,omitempty"`
+	TransceiverType *string  `json:"transceiver_type,omitempty"`
+	WavelengthNM    *int     `json:"wavelength_nm,omitempty"`
+	TemperatureC    *float64 `json:"temperature_c,omitempty"`
+	TXPowerDBM      *float64 `json:"tx_power_dbm,omitempty"`
+	RXPowerDBM      *float64 `json:"rx_power_dbm,omitempty"`
+	VoltageV        *float64 `json:"voltage_v,omitempty"`
+	BiasMA          *float64 `json:"bias_ma,omitempty"`
 }

 type HardwarePowerSupply struct {