adding support for a collecto config file.

/scrutiny/config/collector.yaml

Adding ability to specify host identifier (label), that is updated on every collector run.
Can be specified by `host-id` CLI or `COLLECTOR_HOST_ID` env var.

Created a config class, interface and associated tests.

Created a "TransformDetectedDrives" function, that will allow users to insert drives not detected by Smarctl --scan, ignore drives that they dont want, and override smartctl device type.

Added Upsert functionality when registering devices.

Replaced "github.com/jinzhu/gorm" with "gorm.io/gorm" (ORM location moved, was using incorrect lib url)
Removed machineid library.

webapp/backend/cmd/scrutiny/scrutiny.go

@@ -60,7 +60,7 @@ OPTIONS:
 		},
 		Before: func(c *cli.Context) error {
 
-			drawbridge := "github.com/AnalogJ/scrutiny"
+			scrutiny := "github.com/AnalogJ/scrutiny"
 
 			var versionInfo string
 			if len(goos) > 0 && len(goarch) > 0 {
@@ -69,7 +69,7 @@ OPTIONS:
 				versionInfo = fmt.Sprintf("dev-%s", version.VERSION)
 			}
 
-			subtitle := drawbridge + utils.LeftPad2Len(versionInfo, " ", 65-len(drawbridge))
+			subtitle := scrutiny + utils.LeftPad2Len(versionInfo, " ", 65-len(scrutiny))
 
 			color.New(color.FgGreen).Fprintf(c.App.Writer, fmt.Sprintf(utils.StripIndent(
 				`

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

@@ -21,7 +21,8 @@ type Device struct {
 	UpdatedAt time.Time
 	DeletedAt *time.Time
 
-	WWN string `json:"wwn" gorm:"primary_key"`
+	WWN    string `json:"wwn" gorm:"primary_key"`
+	HostId string `json:"host_id"`
 
 	DeviceName     string  `json:"device_name"`
 	Manufacturer   string  `json:"manufacturer"`
@@ -151,6 +152,8 @@ func (dv *Device) ApplyMetadataRules() error {
 	return nil
 }
 
+// This function is called every time the collector sends SMART data to the API.
+// It can be used to update device data that can change over time.
 func (dv *Device) UpdateFromCollectorSmartInfo(info collector.SmartInfo) error {
 	dv.Firmware = info.FirmwareVersion
 	return nil

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

@@ -3,7 +3,7 @@ package db
 import (
 	"github.com/analogj/scrutiny/webapp/backend/pkg/metadata"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/models/collector"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"time"
 )
 

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

@@ -2,7 +2,7 @@ package db
 
 import (
 	"github.com/analogj/scrutiny/webapp/backend/pkg/metadata"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 	"strings"
 )
 

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

@@ -2,7 +2,7 @@ package db
 
 import (
 	"github.com/analogj/scrutiny/webapp/backend/pkg/metadata"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 )
 
 type SmartScsiAttribute struct {

webapp/backend/pkg/web/handler/get_device_details.go

@@ -4,8 +4,8 @@ import (
 	"github.com/analogj/scrutiny/webapp/backend/pkg/metadata"
 	dbModels "github.com/analogj/scrutiny/webapp/backend/pkg/models/db"
 	"github.com/gin-gonic/gin"
-	"github.com/jinzhu/gorm"
 	"github.com/sirupsen/logrus"
+	"gorm.io/gorm"
 	"net/http"
 )
 

webapp/backend/pkg/web/handler/get_devices_summary.go

@@ -3,8 +3,8 @@ package handler
 import (
 	dbModels "github.com/analogj/scrutiny/webapp/backend/pkg/models/db"
 	"github.com/gin-gonic/gin"
-	"github.com/jinzhu/gorm"
 	"github.com/sirupsen/logrus"
+	"gorm.io/gorm"
 	"net/http"
 )
 

webapp/backend/pkg/web/handler/register_devices.go

@@ -3,12 +3,15 @@ package handler
 import (
 	dbModels "github.com/analogj/scrutiny/webapp/backend/pkg/models/db"
 	"github.com/gin-gonic/gin"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
+
 	"github.com/sirupsen/logrus"
 	"net/http"
 )
 
-// filter devices that are detected by various collectors.
+// register devices that are detected by various collectors.
+// This function is run everytime a collector is about to start a run. It can be used to update device data.
 func RegisterDevices(c *gin.Context) {
 	db := c.MustGet("DB").(*gorm.DB)
 	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
@@ -21,11 +24,15 @@ func RegisterDevices(c *gin.Context) {
 		return
 	}
 
-	//TODO: filter devices here (remove excludes, force includes)
 	errs := []error{}
 	for _, dev := range collectorDeviceWrapper.Data {
-		//insert devices into DB if not already there.
-		if err := db.Where(dbModels.Device{WWN: dev.WWN}).FirstOrCreate(&dev).Error; err != nil {
+		//insert devices into DB (and update specified columns if device is already registered)
+		// update device fields that may change: (DeviceType, HostID)
+		if err := db.Clauses(clause.OnConflict{
+			Columns:   []clause.Column{{Name: "wwn"}},
+			DoUpdates: clause.AssignmentColumns([]string{"host_id", "device_name"}),
+		}).Create(&dev).Error; err != nil {
+
 			errs = append(errs, err)
 		}
 	}

webapp/backend/pkg/web/middleware/sqlite3.go

@@ -5,20 +5,24 @@ import (
 	"github.com/analogj/scrutiny/webapp/backend/pkg/config"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/models/db"
 	"github.com/gin-gonic/gin"
-	"github.com/jinzhu/gorm"
-	_ "github.com/jinzhu/gorm/dialects/sqlite"
 	"github.com/sirupsen/logrus"
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
 )
 
-func DatabaseMiddleware(appConfig config.Interface, logger logrus.FieldLogger) gin.HandlerFunc {
+func DatabaseMiddleware(appConfig config.Interface, globalLogger logrus.FieldLogger) gin.HandlerFunc {
+
 	//var database *gorm.DB
 	fmt.Printf("Trying to connect to database stored: %s\n", appConfig.GetString("web.database.location"))
-	database, err := gorm.Open("sqlite3", appConfig.GetString("web.database.location"))
+	database, err := gorm.Open(sqlite.Open(appConfig.GetString("web.database.location")), &gorm.Config{
+		//TODO: figure out how to log database queries again.
+		//Logger: logger
+	})
 	if err != nil {
 		panic("Failed to connect to database!")
 	}
 
-	database.SetLogger(&GormLogger{Logger: logger})
+	//database.SetLogger()
 	database.AutoMigrate(&db.Device{})
 	database.AutoMigrate(&db.SelfTest{})
 	database.AutoMigrate(&db.Smart{})