Skip to content

armgit / Pulse

Public Imported from GitHub
0

Real-time monitoring dashboard for Proxmox VE, PBS, Docker, Kubernetes, TrueNAS and vSphere. Self-hosted, with alerts for failed backups, full disks, unhealthy containers and offline nodes.

Incorporate batch-start disk identity repair and selector cleanup

pulse-triage[bot]28bd7a3eaeac
diff --cc internal/truenas/provider.go
index 0c1717477b,5fcd606d57..cc12fd63b2
--- a/internal/truenas/provider.go
+++ b/internal/truenas/provider.go
@@@ -395,22 -395,35 +396,24 @@@ func (p *Provider) PhysicalDiskTemperat
return nil, fmt.Errorf("truenas provider has no cached snapshot")
}
- identifiers, metricIDsByIdentifier := trueNASDiskHistoryIdentities(snapshot.Disks)
+ diskScope := systemSourceID(p.connectionID, snapshot.System.Hostname)
- identifiers := make([]string, 0, len(snapshot.Disks))
- metricIDsByIdentifier := make(map[string]string, len(snapshot.Disks)*3)
- for _, disk := range snapshot.Disks {
- metricID := trueNASDiskMetricResourceID(diskScope, disk)
- if metricID == "" {
- continue
- }
- if name := strings.TrimSpace(disk.Name); name != "" {
- identifiers = append(identifiers, name)
- }
- for _, key := range trueNASDiskHistoryLookupKeys(disk) {
- if _, exists := metricIDsByIdentifier[key]; !exists {
- metricIDsByIdentifier[key] = metricID
- }
- }
- }
- identifiers = dedupeStrings(identifiers)
++ identifiers, metricIDsByIdentifier := trueNASDiskHistoryIdentities(diskScope, snapshot.Disks)
if len(identifiers) == 0 {
return nil, nil
}
nativeHistory, err := historyFetcher.DiskTemperatureHistory(ctx, identifiers, duration)
- if err != nil {
+ if len(nativeHistory) == 0 {
return nil, err
}
- if len(nativeHistory) == 0 {
- return nil, nil
+ // Inventory may change while the RPC is in flight. Never attach an old
+ // disk's series to a replacement occupying the same native device name.
+ currentSnapshot := p.Snapshot()
+ if currentSnapshot == nil {
+ return nil, err
}
- _, currentMetricIDs := trueNASDiskHistoryIdentities(currentSnapshot.Disks)
++ currentDiskScope := systemSourceID(p.connectionID, currentSnapshot.System.Hostname)
++ _, currentMetricIDs := trueNASDiskHistoryIdentities(currentDiskScope, currentSnapshot.Disks)
historyByMetricID := make(map[string][]TimeSeriesPoint, len(nativeHistory))
for identifier, points := range nativeHistory {
@@@ -423,35 -436,9 +426,35 @@@
historyByMetricID[metricID] = copied
}
if len(historyByMetricID) == 0 {
- return nil, nil
+ return nil, err
+ }
+ return historyByMetricID, err
+}
+
- func trueNASDiskHistoryIdentities(disks []Disk) ([]string, map[string]string) {
++func trueNASDiskHistoryIdentities(diskScope string, disks []Disk) ([]string, map[string]string) {
+ identifiers := make([]string, 0, len(disks))
+ metricIDs := make(map[string]string, len(disks)*3)
+ counts := make(map[string]int, len(disks))
+ for _, disk := range disks {
- counts[trueNASDiskMetricResourceID(disk)]++
++ counts[trueNASDiskMetricResourceID(diskScope, disk)]++
+ }
+ for _, disk := range disks {
- metricID := trueNASDiskMetricResourceID(disk)
++ metricID := trueNASDiskMetricResourceID(diskScope, disk)
+ if metricID == "" || counts[metricID] != 1 {
+ continue
+ }
+ if name := strings.TrimSpace(disk.Name); name != "" {
+ identifiers = append(identifiers, name)
+ }
+ for _, key := range trueNASDiskHistoryLookupKeys(disk) {
+ if existing, exists := metricIDs[key]; exists && existing != metricID {
+ metricIDs[key] = "" // ambiguous aliases stay unusable
+ } else if !exists {
+ metricIDs[key] = metricID
+ }
+ }
}
- return historyByMetricID, nil
+ return dedupeStrings(identifiers), metricIDs
}
// Close releases resources held by the active fetcher, if supported.