jnd/beszel-ipv6
1
0
Fork 0
mirror of https://github.com/henrygd/beszel.git synced 2025-12-17 10:46:16 +01:00
Code Issues Packages Projects Releases 2 Wiki Activity

Skip virtual disks (#1332)

Browse Source
This commit is contained in:
Sven van Ginkel
2025-10-27 16:44:21 +01:00
committed by GitHub
parent 9df4d29236
commit f11564a7ac
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
agent/smart.go
View File

@@ -5,6 +5,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"os/exec" "os/exec"
"strings"
"sync" "sync"
"time" "time"
@@ -250,6 +251,29 @@ func (sm *SmartManager) parseScan(output []byte) bool {
return true return true
} }
// isVirtualDevice checks if a device is a virtual disk that should be filtered out
func (sm *SmartManager) isVirtualDevice(data *smart.SmartInfoForSata) bool {
vendorUpper := strings.ToUpper(data.ScsiVendor)
productUpper := strings.ToUpper(data.ScsiProduct)
modelUpper := strings.ToUpper(data.ModelName)
switch {
case strings.Contains(vendorUpper, "IET"), // iSCSI Enterprise Target
strings.Contains(productUpper, "VIRTUAL"),
strings.Contains(productUpper, "QEMU"),
strings.Contains(productUpper, "VBOX"),
strings.Contains(productUpper, "VMWARE"),
strings.Contains(vendorUpper, "MSFT"), // Microsoft Hyper-V
strings.Contains(modelUpper, "VIRTUAL"),
strings.Contains(modelUpper, "QEMU"),
strings.Contains(modelUpper, "VBOX"),
strings.Contains(modelUpper, "VMWARE"):
return true
default:
return false
}
}
// parseSmartForSata parses the output of smartctl --all -j for SATA/ATA devices and updates the SmartDataMap // parseSmartForSata parses the output of smartctl --all -j for SATA/ATA devices and updates the SmartDataMap
// Returns hasValidData and exitStatus // Returns hasValidData and exitStatus
func (sm *SmartManager) parseSmartForSata(output []byte) (bool, int) { func (sm *SmartManager) parseSmartForSata(output []byte) (bool, int) {
@@ -264,6 +288,12 @@ func (sm *SmartManager) parseSmartForSata(output []byte) (bool, int) {
return false, data.Smartctl.ExitStatus return false, data.Smartctl.ExitStatus
} }
// Skip virtual devices (e.g., Kubernetes PVCs, QEMU, VirtualBox, etc.)
if sm.isVirtualDevice(&data) {
slog.Debug("skipping virtual device", "device", data.Device.Name, "model", data.ModelName)
return false, data.Smartctl.ExitStatus
}
sm.Lock() sm.Lock()
defer sm.Unlock() defer sm.Unlock()

2
internal/entities/smart/smart.go
View File

@@ -211,6 +211,8 @@ type SmartInfoForSata struct {
// Wwn WwnInfo `json:"wwn"` // Wwn WwnInfo `json:"wwn"`
FirmwareVersion string `json:"firmware_version"` FirmwareVersion string `json:"firmware_version"`
UserCapacity UserCapacity `json:"user_capacity"` UserCapacity UserCapacity `json:"user_capacity"`
ScsiVendor string `json:"scsi_vendor"`
ScsiProduct string `json:"scsi_product"`
// LogicalBlockSize int `json:"logical_block_size"` // LogicalBlockSize int `json:"logical_block_size"`
// PhysicalBlockSize int `json:"physical_block_size"` // PhysicalBlockSize int `json:"physical_block_size"`
// RotationRate int `json:"rotation_rate"` // RotationRate int `json:"rotation_rate"`