moved hard drive device detection to collector (So we can run multiple in parallel).

webapp/backend/pkg/models/db/device.go

@@ -7,7 +7,7 @@ import (
 	"time"
 )
 
-type DeviceRespWrapper struct {
+type DeviceWrapper struct {
 	Success bool     `json:"success"`
 	Errors  []error  `json:"errors"`
 	Data    []Device `json:"data"`

webapp/backend/pkg/web/disk.go

@@ -1,77 +0,0 @@
-package web
-
-import (
-	"fmt"
-	"github.com/analogj/scrutiny/webapp/backend/pkg/models/db"
-	"github.com/jaypipes/ghw"
-)
-
-func RetrieveStorageDevices() ([]db.Device, error) {
-
-	block, err := ghw.Block()
-	if err != nil {
-		fmt.Printf("Error getting block storage info: %v", err)
-		return nil, err
-	}
-
-	approvedDisks := []db.Device{}
-	for _, disk := range block.Disks {
-		//TODO: always allow if in approved list
-		fmt.Printf(" %v\n", disk)
-
-		// ignore optical drives and floppy disks
-		if disk.DriveType == ghw.DRIVE_TYPE_FDD || disk.DriveType == ghw.DRIVE_TYPE_ODD {
-			fmt.Printf(" => Ignore: Optical or floppy disk - (found %s)\n", disk.DriveType.String())
-			continue
-		}
-
-		// ignore removable disks
-		if disk.IsRemovable {
-			fmt.Printf(" => Ignore: Removable disk (%v)\n", disk.IsRemovable)
-			continue
-		}
-
-		// ignore virtual disks & mobile phone storage devices
-		if disk.StorageController == ghw.STORAGE_CONTROLLER_VIRTIO || disk.StorageController == ghw.STORAGE_CONTROLLER_MMC {
-			fmt.Printf(" => Ignore: Virtual/multi-media storage controller - (found %s)\n", disk.StorageController.String())
-			continue
-		}
-
-		// ignore NVMe devices (not currently supported) TBA
-		if disk.StorageController == ghw.STORAGE_CONTROLLER_NVME {
-			fmt.Printf(" => Ignore: NVMe storage controller - (found %s)\n", disk.StorageController.String())
-			continue
-		}
-
-		// Skip unknown storage controllers, not usually S.M.A.R.T compatible.
-		if disk.StorageController == ghw.STORAGE_CONTROLLER_UNKNOWN {
-			fmt.Printf(" => Ignore: Unknown storage controller - (found %s)\n", disk.StorageController.String())
-			continue
-		}
-
-		//TODO: remove if in excluded list
-
-		diskModel := db.Device{
-			WWN:           disk.WWN,
-			Manufacturer:  disk.Vendor,
-			ModelName:     disk.Model,
-			InterfaceType: disk.StorageController.String(),
-			//InterfaceSpeed: string
-			SerialNumber: disk.SerialNumber,
-			Capacity:     int64(disk.SizeBytes),
-			//Firmware       string
-			//RotationSpeed  int
-
-			DeviceName: disk.Name,
-		}
-		if len(diskModel.WWN) == 0 {
-			//(macOS and some other os's) do not provide a WWN, so we're going to fallback to
-			//diskname as identifier if WWN is not present
-			diskModel.WWN = disk.Name
-		}
-
-		approvedDisks = append(approvedDisks, diskModel)
-	}
-
-	return approvedDisks, nil
-}

webapp/backend/pkg/web/server.go

@@ -31,7 +31,7 @@ func (ae *AppEngine) Start() error {
 		})
 
 		//TODO: notifications
-		api.GET("/devices", GetDevicesHandler)
+		api.POST("/devices/register", RegisterDevices)
 		api.GET("/summary", GetDevicesSummary)
 		api.POST("/device/:wwn/smart", UploadDeviceSmartData)
 		api.POST("/device/:wwn/selftest", UploadDeviceSelfTestData)
@@ -55,12 +55,20 @@ func (ae *AppEngine) Start() error {
 	return r.Run(fmt.Sprintf("%s:%s", ae.Config.GetString("web.listen.host"), ae.Config.GetString("web.listen.port"))) // listen and serve on 0.0.0.0:8080 (for windows "localhost:8080")
 }
 
-// Get all active disks for processing by collectors
-func GetDevicesHandler(c *gin.Context) {
-	storageDevices, err := RetrieveStorageDevices()
-
+// filter devices that are detected by various collectors.
+func RegisterDevices(c *gin.Context) {
 	db := c.MustGet("DB").(*gorm.DB)
-	for _, dev := range storageDevices {
+
+	var collectorDeviceWrapper dbModels.DeviceWrapper
+	err := c.BindJSON(&collectorDeviceWrapper)
+	if err != nil {
+		log.Error("Cannot parse detected devices")
+		c.JSON(http.StatusOK, gin.H{"success": false})
+	}
+
+	//TODO: filter devices here (remove excludes, force includes)
+
+	for _, dev := range collectorDeviceWrapper.Data {
 		//insert devices into DB if not already there.
 		db.Where(dbModels.Device{WWN: dev.WWN}).FirstOrCreate(&dev)
 	}
@@ -70,9 +78,9 @@ func GetDevicesHandler(c *gin.Context) {
 			"success": false,
 		})
 	} else {
-		c.JSON(http.StatusOK, gin.H{
-			"success": true,
-			"data":    storageDevices,
+		c.JSON(http.StatusOK, dbModels.DeviceWrapper{
+			Success: true,
+			Data:    collectorDeviceWrapper.Data,
 		})
 	}
 }