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

collector/pkg/collector/base.go

@@ -4,14 +4,87 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"fmt"
+	"github.com/analogj/scrutiny/collector/pkg/models"
+	"github.com/jaypipes/ghw"
 	"io"
+	"net/http"
 	"os"
 	"os/exec"
 	"path"
+	"time"
 )
 
+var httpClient = &http.Client{Timeout: 10 * time.Second}
+
 type BaseCollector struct{}
 
+func (c *BaseCollector) detectStorageDevices() ([]models.Device, error) {
+
+	block, err := ghw.Block()
+	if err != nil {
+		fmt.Printf("Error getting block storage info: %v", err)
+		return nil, err
+	}
+
+	approvedDisks := []models.Device{}
+	for _, disk := range block.Disks {
+
+		// 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
+		}
+
+		diskModel := models.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
+}
+
 func (c *BaseCollector) getJson(url string, target interface{}) error {
 
 	r, err := httpClient.Get(url)
@@ -23,6 +96,21 @@ func (c *BaseCollector) getJson(url string, target interface{}) error {
 	return json.NewDecoder(r.Body).Decode(target)
 }
 
+func (c *BaseCollector) postJson(url string, body interface{}, target interface{}) error {
+	requestBody, err := json.Marshal(body)
+	if err != nil {
+		return err
+	}
+
+	r, err := httpClient.Post(url, "application/json", bytes.NewBuffer(requestBody))
+	if err != nil {
+		return err
+	}
+	defer r.Body.Close()
+
+	return json.NewDecoder(r.Body).Decode(target)
+}
+
 func (c *BaseCollector) execCmd(cmdName string, cmdArgs []string, workingDir string, environ []string) (string, error) {
 
 	cmd := exec.Command(cmdName, cmdArgs...)

collector/pkg/collector/metrics.go

@@ -6,16 +6,12 @@ import (
 	"github.com/analogj/scrutiny/collector/pkg/errors"
 	"github.com/analogj/scrutiny/collector/pkg/models"
 	"github.com/sirupsen/logrus"
-	"net/http"
 	"net/url"
 	"os/exec"
 	"strings"
 	"sync"
-	"time"
 )
 
-var httpClient = &http.Client{Timeout: 10 * time.Second}
-
 type MetricsCollector struct {
 	BaseCollector
 
@@ -44,12 +40,15 @@ func (mc *MetricsCollector) Run() error {
 	}
 
 	apiEndpoint, _ := url.Parse(mc.apiEndpoint.String())
-	apiEndpoint.Path = "/api/devices"
+	apiEndpoint.Path = "/api/devices/register"
 
-	deviceRespWrapper := new(models.DeviceRespWrapper)
+	deviceRespWrapper := new(models.DeviceWrapper)
+	detectedStorageDevices, err := mc.detectStorageDevices()
 
-	fmt.Println("Getting devices")
-	err = mc.getJson(apiEndpoint.String(), &deviceRespWrapper)
+	fmt.Println("Sending detected devices to API, for filtering & validation")
+	err = mc.postJson(apiEndpoint.String(), models.DeviceWrapper{
+		Data: detectedStorageDevices,
+	}, &deviceRespWrapper)
 	if err != nil {
 		return err
 	}