From 58eaa29e4d2fff740305dacc5fd0869de540d5c5 Mon Sep 17 00:00:00 2001 From: Jason Kulatunga Date: Tue, 27 Oct 2020 08:25:44 -0700 Subject: [PATCH] check for "unknown" wwn value. fix #113 --- collector/pkg/detect/devices_darwin.go | 2 +- collector/pkg/detect/devices_freebsd.go | 2 +- collector/pkg/detect/devices_linux.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/collector/pkg/detect/devices_darwin.go b/collector/pkg/detect/devices_darwin.go index 73c0657..6a70f67 100644 --- a/collector/pkg/detect/devices_darwin.go +++ b/collector/pkg/detect/devices_darwin.go @@ -92,7 +92,7 @@ func (d *Detect) wwnFallback(detectedDevice *models.Device) { block, err := ghw.Block() if err == nil { for _, disk := range block.Disks { - if disk.Name == detectedDevice.DeviceName { + if disk.Name == detectedDevice.DeviceName && strings.ToLower(disk.WWN) != "unknown" { d.Logger.Debugf("Found matching block device. WWN: %s", disk.WWN) detectedDevice.WWN = disk.WWN break diff --git a/collector/pkg/detect/devices_freebsd.go b/collector/pkg/detect/devices_freebsd.go index 619e731..93e9a00 100644 --- a/collector/pkg/detect/devices_freebsd.go +++ b/collector/pkg/detect/devices_freebsd.go @@ -30,7 +30,7 @@ func (d *Detect) wwnFallback(detectedDevice *models.Device) { block, err := ghw.Block() if err == nil { for _, disk := range block.Disks { - if disk.Name == detectedDevice.DeviceName { + if disk.Name == detectedDevice.DeviceName && strings.ToLower(disk.WWN) != "unknown" { d.Logger.Debugf("Found matching block device. WWN: %s", disk.WWN) detectedDevice.WWN = disk.WWN break diff --git a/collector/pkg/detect/devices_linux.go b/collector/pkg/detect/devices_linux.go index 619e731..93e9a00 100644 --- a/collector/pkg/detect/devices_linux.go +++ b/collector/pkg/detect/devices_linux.go @@ -30,7 +30,7 @@ func (d *Detect) wwnFallback(detectedDevice *models.Device) { block, err := ghw.Block() if err == nil { for _, disk := range block.Disks { - if disk.Name == detectedDevice.DeviceName { + if disk.Name == detectedDevice.DeviceName && strings.ToLower(disk.WWN) != "unknown" { d.Logger.Debugf("Found matching block device. WWN: %s", disk.WWN) detectedDevice.WWN = disk.WWN break