(v0.4.15) Automated packaging of release by Packagr

.github/workflows/ci.yaml

@@ -3,25 +3,11 @@ name: CI
 on: [pull_request]
 
 jobs:
-  test-frontend:
+  test:
-    name: Test Frontend
+    name: Test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Test Frontend
-        run: |
-          make binary-frontend-test-coverage
-      - name: Upload coverage
-        uses: actions/upload-artifact@v3
-        with:
-          name: coverage
-          path: ${{ github.workspace }}/webapp/frontend/coverage/lcov.info
-          retention-days: 1
-  test-backend:
-    name: Test Backend
     runs-on: ubuntu-latest
     container: ghcr.io/packagrio/packagr:latest-golang
+
     # Service containers to run with `build` (Required for end-to-end testing)
     services:
       influxdb:
@@ -36,6 +22,7 @@ jobs:
         ports:
           - 8086:8086
     env:
+      PROJECT_PATH: /go/src/github.com/analogj/scrutiny
       STATIC: true
     steps:
       - name: Git
@@ -45,36 +32,16 @@ jobs:
           git --version
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Test Backend
+      - name: Test
         run: |
           make binary-clean binary-test-coverage
-      - name: Upload coverage
+      - name: Generate coverage report
-        uses: actions/upload-artifact@v3
-        with:
-          name: coverage
-          path: ${{ github.workspace }}/coverage.txt
-          retention-days: 1
-  test-coverage:
-    name: Test Coverage Upload
-    needs:
-      - test-backend
-      - test-frontend
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Download coverage reports
-        uses: actions/download-artifact@v3
-        with:
-          name: coverage
-      - name: Upload coverage reports
         uses: codecov/codecov-action@v2
         with:
-          files: ${{ github.workspace }}/coverage.txt,${{ github.workspace }}/lcov.info
+          files: ${{ github.workspace }}/coverage.txt
           flags: unittests
           fail_ci_if_error: true
           verbose: true
-
   build:
     name: Build ${{ matrix.cfg.goos }}/${{ matrix.cfg.goarch }}
     runs-on: ${{ matrix.cfg.on }}
@@ -99,9 +66,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - uses: actions/setup-go@v3
-        with:
-          go-version: '^1.18.3'
       - name: Build Binaries
         run: |
           make binary-clean binary-all

.github/workflows/release-frontend.yaml

@@ -19,7 +19,6 @@ jobs:
         run: "cd webapp/frontend && ./git.version.sh"
       - name: Build Frontend
         run: |
-          apt-get update && apt-get install -y make
           make binary-frontend
           tar -czf scrutiny-web-frontend.tar.gz dist
       - name: Upload Frontend Asset

CONTRIBUTING.md

@@ -9,9 +9,8 @@ Depending on the functionality you are adding, you may need to setup a developme
 
 # Modifying the Scrutiny Backend Server (API)
 
-1. install the [Go runtime](https://go.dev/doc/install) (v1.18+)
+1. install the [Go runtime](https://go.dev/doc/install) (v1.17+)
-2. download the `scrutiny-web-frontend.tar.gz` for
+2. download the `scrutiny-web-frontend.tar.gz` for the [latest release](https://github.com/AnalogJ/scrutiny/releases/latest). Extract to a folder named `dist`
-   the [latest release](https://github.com/AnalogJ/scrutiny/releases/latest). Extract to a folder named `dist`
 3. create a `scrutiny.yaml` config file
     ```yaml
     # config file for local development. store as scrutiny.yaml
@@ -63,7 +62,7 @@ The frontend is written in Angular. If you're working on the frontend and can us
 If you're developing a feature that requires changes to the backend and the frontend, or a frontend feature that requires real data, 
 you'll need to follow the steps below:
 
-1. install the [Go runtime](https://go.dev/doc/install) (v1.18+)
+1. install the [Go runtime](https://go.dev/doc/install) (v1.17+)
 2. install [NodeJS](https://nodejs.org/en/download/)
 3. create a `scrutiny.yaml` config file
     ```yaml

Makefile

@@ -1,5 +1,4 @@
 .ONESHELL: # Applies to every targets in the file! .ONESHELL instructs make to invoke a single instance of the shell and provide it with the entire recipe, regardless of how many lines it contains.
-.SHELLFLAGS = -ec
 
 ########################################################################################################################
 # Global Env Settings
@@ -90,10 +89,6 @@ ifneq ($(OS),Windows_NT)
 	./$(WEB_BINARY_NAME) || true
 endif
 
-########################################################################################################################
-# Binary
-########################################################################################################################
-
 .PHONY: binary-frontend
 # reduce logging, disable angular-cli analytics for ci environment
 binary-frontend: export NPM_CONFIG_LOGLEVEL = warn
@@ -105,12 +100,6 @@ binary-frontend:
 	npm ci
 	npm run build:prod -- --output-path=$(CURDIR)/dist
 
-.PHONY: binary-frontend-test-coverage
-# reduce logging, disable angular-cli analytics for ci environment
-binary-frontend-test-coverage:
-	cd webapp/frontend
-	npm ci
-	npx ng test --watch=false --browsers=ChromeHeadless --code-coverage
 
 ########################################################################################################################
 # Docker

README.md

@@ -239,9 +239,9 @@ scrutiny-collector-metrics run --debug --log-file /tmp/collector.log
 | linux-arm-6 | :white_check_mark: |  |
 | linux-arm-7 | :white_check_mark: | web/collector only. see [#236](https://github.com/AnalogJ/scrutiny/issues/236)  |
 | linux-arm64 | :white_check_mark: | :white_check_mark: |
-| freebsd-amd64 | :white_check_mark: |  | 
+| freebsd-amd64 | collector only. see [#238](https://github.com/AnalogJ/scrutiny/issues/238) |  | 
-| macos-amd64 | :white_check_mark: | :white_check_mark: |
+| macos-amd64 |  | :white_check_mark: |
-| macos-arm64 | :white_check_mark: | :white_check_mark: |
+| macos-arm64 |  | :white_check_mark: |
 | windows-amd64 | :white_check_mark: | WIP, see [#15](https://github.com/AnalogJ/scrutiny/issues/15) |
 | windows-arm64 | :white_check_mark: |  |
 

collector/cmd/collector-metrics/collector-metrics.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"encoding/json"
 	"fmt"
 	"github.com/analogj/scrutiny/collector/pkg/collector"
 	"github.com/analogj/scrutiny/collector/pkg/config"
@@ -121,16 +120,26 @@ OPTIONS:
 						config.Set("api.endpoint", apiEndpoint)
 					}
 
-					collectorLogger, logFile, err := CreateLogger(config)
+					collectorLogger := logrus.WithFields(logrus.Fields{
-					if logFile != nil {
+						"type": "metrics",
-						defer logFile.Close()
+					})
-					}
+
-					if err != nil {
+					if level, err := logrus.ParseLevel(config.GetString("log.level")); err == nil {
-						return err
+						logrus.SetLevel(level)
+					} else {
+						logrus.SetLevel(logrus.InfoLevel)
+					}
+
+					if config.IsSet("log.file") && len(config.GetString("log.file")) > 0 {
+						logFile, err := os.OpenFile(config.GetString("log.file"), os.O_CREATE|os.O_WRONLY, 0644)
+						if err != nil {
+							logrus.Errorf("Failed to open log file %s for output: %s", config.GetString("log.file"), err)
+							return err
+						}
+						defer logFile.Close()
+						logrus.SetOutput(io.MultiWriter(os.Stderr, logFile))
 					}
 
-					settingsData, err := json.MarshalIndent(config.AllSettings(), "", "\t")
-					collectorLogger.Debug(string(settingsData), err)
 					metricCollector, err := collector.CreateMetricsCollector(
 						config,
 						collectorLogger,
@@ -183,28 +192,5 @@ OPTIONS:
 	if err != nil {
 		log.Fatal(color.HiRedString("ERROR: %v", err))
 	}
-}
 
-func CreateLogger(appConfig config.Interface) (*logrus.Entry, *os.File, error) {
-	logger := logrus.WithFields(logrus.Fields{
-		"type": "metrics",
-	})
-
-	if level, err := logrus.ParseLevel(appConfig.GetString("log.level")); err == nil {
-		logger.Logger.SetLevel(level)
-	} else {
-		logger.Logger.SetLevel(logrus.InfoLevel)
-	}
-
-	var logFile *os.File
-	var err error
-	if appConfig.IsSet("log.file") && len(appConfig.GetString("log.file")) > 0 {
-		logFile, err = os.OpenFile(appConfig.GetString("log.file"), os.O_CREATE|os.O_WRONLY, 0644)
-		if err != nil {
-			logger.Logger.Errorf("Failed to open log file %s for output: %s", appConfig.GetString("log.file"), err)
-			return nil, logFile, err
-		}
-		logger.Logger.SetOutput(io.MultiWriter(os.Stderr, logFile))
-	}
-	return logger, logFile, nil
 }

collector/pkg/collector/metrics.go

@@ -9,7 +9,6 @@ import (
 	"github.com/analogj/scrutiny/collector/pkg/detect"
 	"github.com/analogj/scrutiny/collector/pkg/errors"
 	"github.com/analogj/scrutiny/collector/pkg/models"
-	"github.com/samber/lo"
 	"github.com/sirupsen/logrus"
 	"net/url"
 	"os"
@@ -57,16 +56,11 @@ func (mc *MetricsCollector) Run() error {
 		Logger: mc.logger,
 		Config: mc.config,
 	}
-	rawDetectedStorageDevices, err := deviceDetector.Start()
+	detectedStorageDevices, err := deviceDetector.Start()
 	if err != nil {
 		return err
 	}
 
-	//filter any device with empty wwn (they are invalid)
-	detectedStorageDevices := lo.Filter[models.Device](rawDetectedStorageDevices, func(dev models.Device, _ int) bool {
-		return len(dev.WWN) > 0
-	})
-
 	mc.logger.Infoln("Sending detected devices to API, for filtering & validation")
 	jsonObj, _ := json.Marshal(detectedStorageDevices)
 	mc.logger.Debugf("Detected devices: %v", string(jsonObj))

docker/Dockerfile

@@ -5,7 +5,7 @@
 
 
 ########
-FROM golang:1.18-bullseye as backendbuild
+FROM golang:1.17-bullseye as backendbuild
 
 WORKDIR /go/src/github.com/analogj/scrutiny
 COPY . /go/src/github.com/analogj/scrutiny

docker/Dockerfile.collector

@@ -4,7 +4,7 @@
 
 
 ########
-FROM golang:1.18-bullseye as backendbuild
+FROM golang:1.17-bullseye as backendbuild
 
 WORKDIR /go/src/github.com/analogj/scrutiny
 
@@ -14,7 +14,7 @@ RUN make binary-clean binary-collector
 
 ########
 FROM debian:bullseye-slim as runtime
-WORKDIR /opt/scrutiny
+WORKDIR /scrutiny
 ENV PATH="/opt/scrutiny/bin:${PATH}"
 
 RUN apt-get update && apt-get install -y cron smartmontools ca-certificates tzdata && update-ca-certificates

docker/Dockerfile.web

@@ -5,7 +5,7 @@
 
 
 ########
-FROM golang:1.18-bullseye as backendbuild
+FROM golang:1.17-bullseye as backendbuild
 
 WORKDIR /go/src/github.com/analogj/scrutiny
 

docs/INSTALL_SYNOLOGY_COLLECTOR.md

@@ -91,13 +91,9 @@ wget https://raw.githubusercontent.com/smartmontools/smartmontools/master/smartm
 ```
 #!/bin/bash
 
-/volume1/\@Entware/scrutiny/bin/scrutiny-collector-metrics-linux-arm64 run --config /volume1/\@Entware/scrutiny/conf/collector.yaml
+/volume1/\@Entware/scrutiny/bin/scrutiny-collector-metrics-linux-arm64 run --config /volume1/\@Entware/scrutiny/config/collector.yaml
 ```
 
-**Make `run_collect.sh` executable**
-
-`chmod +x /volume1/\@Entware/scrutiny/bin/run_collect.sh`
-
 ## Set up Synology to run a scheduled task. 
 
 Log in to DSM and do the following:

docs/SUPPORTED_NAS_OS.md

@@ -1,18 +1,17 @@
-# Officially Supported NAS/OS's
+# Officially Supported NAS OS's
 
-These are the officially supported NAS OS's (with documentation and setup guides). Once a guide is created (
+These are the officially supported NAS OS's (with documentation and setup guides).
-in `docs/guides/` or elsewhere) it will be linked here.
+Once a guide is created (in `docs/guides/`) it will be linked here.
 
-- [x] [freenas/truenas](https://blog.stefandroid.com/2022/01/14/smart-scrutiny.html)
+- [ ] freenas/truenas
 - [x] [unraid](./INSTALL_UNRAID.md)
 - [ ] ESXI
 - [ ] Proxmox
-- [x] [Synology](./INSTALL_SYNOLOGY_COLLECTOR.md)
+- [x] Synology(./INSTALL_SYNOLOGY_COLLECTOR.md)
 - [ ] OMV
 - [ ] Amahi
 - [ ] Running in a LXC container
 - [x] [PFSense](./INSTALL_UNRAID.md)
-- [x] QNAP
+- [ ] QNAP
-- [x] [RockStor](https://rockstor.com/docs/interface/docker-based-rock-ons/scrutiny.html)
+- [ ] RockStor
-- [ ] Solaris/OmniOS CE Support
+
-- [ ] Kubernetes

docs/TROUBLESHOOTING_DEVICE_COLLECTOR.md

@@ -113,25 +113,11 @@ instead of the block device (`/dev/nvme0n1`). See [#209](https://github.com/Anal
 
 ### ATA
 
-### USB Devices
-
-The following information is extracted from [#266](https://github.com/AnalogJ/scrutiny/issues/266)
-
-External HDDs support two modes of operation usb-storage (old, slower, stable) and uas (new, faster, sometimes unstable)
-. On some external HDDs, uas mode does not properly pass through SMART information, or even causes hardware issues, so
-it has been disabled by the kernel. No amount of smartctl parameters will fix this, as it is being rejected by the
-kernel. This is especially true with Seagate HDDs. One solution is to force these devices into usb-storage mode, which
-will incur some performance penalty, but may work well enough for you. More info:
-
-- https://smartmontools.org/wiki/Supported_USB-Devices
-- https://smartmontools.org/wiki/SAT-with-UAS-Linux
-- https://forums.raspberrypi.com/viewtopic.php?t=245931
-
 ### Exit Codes
 
 If you see an error message similar to `smartctl returned an error code (2) while processing /dev/sda`, this means that
-`smartctl` (not Scrutiny) exited with an error code. Scrutiny will attempt to print a helpful error message to help you
+`smartctl` (not Scrutiny) exited with an error code. Scrutiny will attempt to print a helpful error message to help you debug,
-debug, but you can look at the table (and associated links) below to debug `smartctl`.
+but you can look at the table (and associated links) below to debug `smartctl`. 
 
 > smartctl Return Values
 > The return values of smartctl are defined by a bitmask. If all is well with the disk, the return value (exit status) of 

docs/TROUBLESHOOTING_INFLUXDB.md

@@ -1,18 +1,6 @@
 # InfluxDB Troubleshooting
 
-## Why??
-
-Scrutiny has many features, but the relevant one to this conversation is the "S.M.A.R.T metric tracking for historical
-trends". Basically Scrutiny not only shows you the current SMART values, but how they've changed over weeks, months (or
-even years).
-
-To efficiently handle that data at scale (and to make my life easier as a developer) I decided to add InfluxDB as a
-dependency. It's a dedicated timeseries database, as opposed to the general purpose sqlite DB I used before. I also did
-a bunch of testing and analysis before I made the change. With InfluxDB the memory footprint for Scrutiny (at idle) is ~
-100mb, which is still fairly reasonable.
-
 ## Installation 
-
 InfluxDB is a required dependency for Scrutiny v0.4.0+. 
 
 https://docs.influxdata.com/influxdb/v2.2/install/
@@ -78,319 +66,12 @@ panic: failed to check influxdb setup status - parse "://:": missing protocol sc
 As discussed in [#248](https://github.com/AnalogJ/scrutiny/issues/248) and [#234](https://github.com/AnalogJ/scrutiny/issues/234),
 this usually related to either:
 
-- Upgrading from the LSIO Scrutiny image to the Official Scrutiny image, without removing LSIO specific environmental
+- Upgrading from the LSIO Scrutiny image to the Official Scrutiny image, without removing LSIO specific environmental variables
-  variables
+  - remove the `SCRUTINY_WEB=true` and `SCRUTINY_COLLECTOR=true` environmental variables. They were used by the LSIO image, but are unnecessary and cause issues with the official Scrutiny image.
-  - remove the `SCRUTINY_WEB=true` and `SCRUTINY_COLLECTOR=true` environmental variables. They were used by the LSIO
+- Updated versions of the [LSIO Scrutiny images are broken](https://github.com/linuxserver/docker-scrutiny/issues/22), as they have not installed InfluxDB which is a required dependency of Scrutiny v0.4.x
-    image, but are unnecessary and cause issues with the official Scrutiny image.
+  - You can revert to an earlier version of the LSIO image (`lscr.io/linuxserver/scrutiny:060ac7b8-ls34`), or just change to the official Scrutiny image (`ghcr.io/analogj/scrutiny:master-omnibus`)
-- Updated versions of the [LSIO Scrutiny images are broken](https://github.com/linuxserver/docker-scrutiny/issues/22),
-  as they have not installed InfluxDB which is a required dependency of Scrutiny v0.4.x
-  - You can revert to an earlier version of the LSIO image (`lscr.io/linuxserver/scrutiny:060ac7b8-ls34`), or just
-    change to the official Scrutiny image (`ghcr.io/analogj/scrutiny:master-omnibus`)
 
 Here's a couple of confirmed working docker-compose files that you may want to look at:
 
 - https://github.com/AnalogJ/scrutiny/blob/master/docker/example.hubspoke.docker-compose.yml
 - https://github.com/AnalogJ/scrutiny/blob/master/docker/example.omnibus.docker-compose.yml
-
-## Bring your own InfluxDB
-
-> WARNING: Most users should not follow these steps. This is ONLY for users who have an EXISTING InfluxDB installation which contains data from multiple services.
-> The Scrutiny Docker omnibus image includes an empty InfluxDB instance which it can configure.
-> If you're deploying manually or via Hub/Spoke, you can just follow the installation instructions, Scrutiny knows how
-> to run the first-time setup automatically.
-
-The goal here is to create an InfluxDB API key with minimal permissions for use by Scrutiny.
-
-- Create Scrutiny buckets (`metrics`, `metrics_weekly`, `metrics_monthly`, `metrics_yearly`) with placeholder config
-- Create Downsampling tasks (`tsk-weekly-aggr`, `tsk-monthly-aggr`, `tsk-yearly-aggr`) with placeholder script.
-- Create API token with restricted scope
-- NOTE: Placeholder bucket & task configuration will be replaced automatically by Scrutiny during startup
-
-The placeholder buckets and tasks need to be created before the API token can be created, as the resource ID's need to
-exist for the scope restriction to work.
-
-Scopes:
-
-- `orgs`: read - required for scrutiny to find it's configured org_id
-- `tasks`: scrutiny specific read/write access - Scrutiny only needs access to the downsampling tasks you created above
-- `buckets`: scrutiny specific read/write access - Scrutiny only needs access to the buckets you created above
-
-### Setup Environmental Variables
-
-```bash
-# replace the following values with correct values for your InfluxDB installation
-export INFLUXDB_ADMIN_TOKEN=pCqRq7xxxxxx-FZgNLfstIs0w==
-export INFLUXDB_ORG_ID=b2495xxxxx
-export INFLUXDB_HOSTNAME=http://localhost:8086
-
-# if you want to change the bucket name prefix below, you'll also need to update the setting in the scrutiny.yaml config file.
-export INFLUXDB_SCRUTINY_BUCKET_BASENAME=metrics
-```
-
-### Create placeholder buckets
-
-<details>
-  <summary>Click to expand!</summary>
-
-```bash
-curl -sS -X POST ${INFLUXDB_HOSTNAME}/api/v2/buckets \
--H "Content-Type: application/json" \
--H "Authorization: Token ${INFLUXDB_ADMIN_TOKEN}" \
---data-binary @- << EOF
-{
-"name": "${INFLUXDB_SCRUTINY_BUCKET_BASENAME}",
-"orgID": "${INFLUXDB_ORG_ID}",
-"retentionRules": []
-}
-EOF
-
-curl -sS -X POST ${INFLUXDB_HOSTNAME}/api/v2/buckets \
--H "Content-Type: application/json" \
--H "Authorization: Token ${INFLUXDB_ADMIN_TOKEN}" \
---data-binary @- << EOF
-{
-"name": "${INFLUXDB_SCRUTINY_BUCKET_BASENAME}_weekly",
-"orgID": "${INFLUXDB_ORG_ID}",
-"retentionRules": []
-}
-EOF
-
-curl -sS -X POST ${INFLUXDB_HOSTNAME}/api/v2/buckets \
--H "Content-Type: application/json" \
--H "Authorization: Token ${INFLUXDB_ADMIN_TOKEN}" \
---data-binary @- << EOF
-{
-"name": "${INFLUXDB_SCRUTINY_BUCKET_BASENAME}_monthly",
-"orgID": "${INFLUXDB_ORG_ID}",
-"retentionRules": []
-}
-EOF
-
-curl -sS -X POST ${INFLUXDB_HOSTNAME}/api/v2/buckets \
--H "Content-Type: application/json" \
--H "Authorization: Token ${INFLUXDB_ADMIN_TOKEN}" \
---data-binary @- << EOF
-{
-"name": "${INFLUXDB_SCRUTINY_BUCKET_BASENAME}_yearly",
-"orgID": "${INFLUXDB_ORG_ID}",
-"retentionRules": []
-}
-EOF
-```
-
-</details>
-
-### Create placeholder tasks
-
-<details>
-  <summary>Click to expand!</summary>
-
-```bash
-curl -sS -X POST ${INFLUXDB_HOSTNAME}/api/v2/tasks \
-    -H "Content-Type: application/json" \
-    -H "Authorization: Token ${INFLUXDB_ADMIN_TOKEN}" \
-    --data-binary @- << EOF
-{
-  "orgID": "${INFLUXDB_ORG_ID}",
-  "flux": "option task = {name: \"tsk-weekly-aggr\", every: 1y} \nyield now()"
-}
-EOF
-
-curl -sS -X POST ${INFLUXDB_HOSTNAME}/api/v2/tasks \
-    -H "Content-Type: application/json" \
-    -H "Authorization: Token ${INFLUXDB_ADMIN_TOKEN}" \
-    --data-binary @- << EOF
-{
-  "orgID": "${INFLUXDB_ORG_ID}",
-  "flux": "option task = {name: \"tsk-monthly-aggr\", every: 1y} \nyield now()"
-}
-EOF
-
-curl -sS -X POST ${INFLUXDB_HOSTNAME}/api/v2/tasks \
-    -H "Content-Type: application/json" \
-    -H "Authorization: Token ${INFLUXDB_ADMIN_TOKEN}" \
-    --data-binary @- << EOF
-{
-  "orgID": "${INFLUXDB_ORG_ID}",
-  "flux": "option task = {name: \"tsk-yearly-aggr\", every: 1y} \nyield now()"
-}
-EOF
-
-```
-
-</details>
-
-### Create InfluxDB API Token
-
-<details>
-  <summary>Click to expand!</summary>
-
-```bash
-# replace these values with placeholder bucket and task ids from your InfluxDB installation. 
-export INFLUXDB_SCRUTINY_BASE_BUCKET_ID=1e0709xxxx
-export INFLUXDB_SCRUTINY_WEEKLY_BUCKET_ID=1af03dexxxxx
-export INFLUXDB_SCRUTINY_MONTHLY_BUCKET_ID=b3c59c7xxxxx
-export INFLUXDB_SCRUTINY_YEARLY_BUCKET_ID=f381d8cxxxxx
-
-export INFLUXDB_SCRUTINY_WEEKLY_TASK_ID=09a64ecxxxxx
-export INFLUXDB_SCRUTINY_MONTHLY_TASK_ID=09a64xxxxx
-export INFLUXDB_SCRUTINY_YEARLY_TASK_ID=09a64ecxxxxx
-
-
-curl -sS -X POST ${INFLUXDB_HOSTNAME}/api/v2/authorizations \
-    -H "Content-Type: application/json" \
-    -H "Authorization: Token ${INFLUXDB_ADMIN_TOKEN}" \
-    --data-binary @- << EOF
-{
-  "description": "scrutiny - restricted scope token",
-  "orgID": "${INFLUXDB_ORG_ID}",
-  "permissions": [
-        {
-            "action": "read",
-            "resource": {
-                "type": "orgs"
-            }
-        },
-        {
-            "action": "read",
-            "resource": {
-                "type": "tasks"
-            }
-        },
-        {
-            "action": "write",
-            "resource": {
-                "type": "tasks",
-                "id": "${INFLUXDB_SCRUTINY_WEEKLY_TASK_ID}",
-                "orgID": "${INFLUXDB_ORG_ID}"
-            }
-        },
-        {
-            "action": "write",
-            "resource": {
-                "type": "tasks",
-                "id": "${INFLUXDB_SCRUTINY_MONTHLY_TASK_ID}",
-                "orgID": "${INFLUXDB_ORG_ID}"
-            }
-        },
-        {
-            "action": "write",
-            "resource": {
-                "type": "tasks",
-                "id": "${INFLUXDB_SCRUTINY_YEARLY_TASK_ID}",
-                "orgID": "${INFLUXDB_ORG_ID}"
-            }
-        },
-        {
-            "action": "read",
-            "resource": {
-                "type": "buckets",
-                "id": "${INFLUXDB_SCRUTINY_BASE_BUCKET_ID}",
-                "orgID": "${INFLUXDB_ORG_ID}"
-            }
-       },
-        {
-            "action": "write",
-            "resource": {
-                "type": "buckets",
-                "id": "${INFLUXDB_SCRUTINY_BASE_BUCKET_ID}",
-                "orgID": "${INFLUXDB_ORG_ID}"
-            }
-       },
-        {
-            "action": "read",
-            "resource": {
-                "type": "buckets",
-                "id": "${INFLUXDB_SCRUTINY_WEEKLY_BUCKET_ID}",
-                "orgID": "${INFLUXDB_ORG_ID}"
-            }
-       },
-        {
-            "action": "write",
-            "resource": {
-                "type": "buckets",
-                "id": "${INFLUXDB_SCRUTINY_WEEKLY_BUCKET_ID}",
-                "orgID": "${INFLUXDB_ORG_ID}"
-            }
-       },
-        {
-            "action": "read",
-            "resource": {
-                "type": "buckets",
-                "id": "${INFLUXDB_SCRUTINY_MONTHLY_BUCKET_ID}",
-                "orgID": "${INFLUXDB_ORG_ID}"
-            }
-       },
-        {
-            "action": "write",
-            "resource": {
-                "type": "buckets",
-                "id": "${INFLUXDB_SCRUTINY_MONTHLY_BUCKET_ID}",
-                "orgID": "${INFLUXDB_ORG_ID}"
-            }
-       },
-        {
-            "action": "read",
-            "resource": {
-                "type": "buckets",
-                "id": "${INFLUXDB_SCRUTINY_YEARLY_BUCKET_ID}",
-                "orgID": "${INFLUXDB_ORG_ID}"
-            }
-       },
-        {
-            "action": "write",
-            "resource": {
-                "type": "buckets",
-                "id": "${INFLUXDB_SCRUTINY_YEARLY_BUCKET_ID}",
-                "orgID": "${INFLUXDB_ORG_ID}"
-            }
-       }
-  ]
-}
-EOF
-```
-
-</details>
-
-### Save InfluxDB API Token
-
-After running the Curl command above, you'll see a JSON response that looks like the following:
-
-```json
-{
-  "token": "ksVU2t5SkQwYkvIxxxxxxxYt2xUt0uRKSbSF1Po0UQ==",
-  "status": "active",
-  "description": "scrutiny - restricted scope token",
-  "orgID": "b2495586xxxx",
-  "org": "my-org",
-  "user": "admin",
-  "permissions": [
-    {
-      "action": "read",
-      "resource": {
-        "type": "orgs"
-      }
-    },
-    {
-      "action": "read",
-      "resource": {
-        "type": "tasks"
-      }
-    },
-    {
-      "action": "write",
-      "resource": {
-        "type": "tasks",
-        "id": "09a64exxxxx",
-        "orgID": "b24955860xxxxx",
-        "org": "my-org"
-      }
-    },
-    ...
-  ]
-}
-```
-
-You must copy the token field from the JSON response, and save it in your `scrutiny.yaml` config file. After that's
-done, you can start the Scrutiny server
-

docs/TROUBLESHOOTING_NOTIFICATIONS.md

@@ -21,6 +21,5 @@ SCRUTINY_DEVICE_NAME - eg. /dev/sda
 SCRUTINY_DEVICE_TYPE - ATA/SCSI/NVMe
 SCRUTINY_DEVICE_SERIAL - eg. WDDJ324KSO
 SCRUTINY_MESSAGE - eg. "Scrutiny SMART error notification for device: %s\nFailure Type: %s\nDevice Name: %s\nDevice Serial: %s\nDevice Type: %s\nDate: %s"
-SCRUTINY_HOST_ID - (optional) eg. "my-custom-host-id"
 ```
 

docs/TROUBLESHOOTING_UDEV.md

@@ -1,18 +0,0 @@
-# Operating systems without udev
-
-Some operating systems do not come with `udev` out of the box, for example Alpine Linux. In these instances you will not be able to bind `/run/udev` to the container for sharing device metadata. Some operating systems offer `udev` as a package that can be installed separately, or an alternative (such as `eudev` in the case of Alpine Linux) that provides the same functionality.
-
-To install `eudev` in Alpine Linux (run as root):
-
-```
-apk add eudev
-setup-udev
-```
-
-Once your `udev` implementation is installed, create `/run/udev` with the following command:
-
-```
-udevadm trigger
-```
-
-On Alpine Linux, this also has the benefit of creating symlinks to device serial numbers in `/dev/disk/by-id`.

docs/dbdiagram.io.txt

@@ -1,88 +1,62 @@
 
 // SQLite Table(s)
+Table device {
+  created_at timestamp
 
-Table Device  {
+  wwn varchar [pk]
-	//GORM attributes, see: http://gorm.io/docs/conventions.html
-	CreatedAt time
-	UpdatedAt time
-	DeletedAt time
 
-	WWN string
+  //user provided
+  label varchar
+  host_id varchar
 
-	DeviceName     string
+  // smartctl provided
-	DeviceUUID     string
+  device_name varchar
-	DeviceSerialID string
+  manufacturer varchar
-	DeviceLabel    string
+  model_name varchar
+  interface_type varchar
+  interface_speed varchar
+  serial_number varchar
+  firmware varchar
+  rotational_speed varchar
+  capacity varchar
+  form_factor varchar
+  smart_support varchar
+  device_protocol varchar
+  device_type varchar
 
-	Manufacturer   string
-	ModelName      string
-	InterfaceType  string
-	InterfaceSpeed string
-	SerialNumber   string
-	Firmware       string
-	RotationSpeed  int
-	Capacity       int64
-	FormFactor     string
-	SmartSupport   bool
-	DeviceProtocol string//protocol determines which smart attribute types are available (ATA, NVMe, SCSI)
-	DeviceType     string//device type is used for querying with -d/t flag, should only be used by collector.
-
-	// User provided metadata
-	Label  string
-	HostId string
-
-	// Data set by Scrutiny
-	DeviceStatus enum
-}
-
-Table Setting {
-	//GORM attributes, see: http://gorm.io/docs/conventions.html
-
-	SettingKeyName  string
-    SettingKeyDescription  string
-	SettingDataType string
-
-	SettingValueNumeric int64
-	SettingValueString  string
 }
 
 
 // InfluxDB Tables
-Table SmartTemperature {
+Table device_temperature {
-    Date time
+  //timestamp
-	DeviceWWN      string //(tag)
+  created_at timestamp
-	Temp int64
+
+  //tags (indexed & queryable)
+  device_wwn varchar [pk]
+
+  //fields
+  temp bigint
  }
 
 
-Table Smart {
+Table smart_ata_results {
-    Date           time
+  //timestamp
-	DeviceWWN      string //(tag)
+  created_at timestamp
-	DeviceProtocol string
 
-	//Metrics (fields)
+  //tags (indexed & queryable)
-	Temp            int64
+  device_wwn varchar [pk]
-	PowerOnHours    int64
+  smart_status varchar
-	PowerCycleCount int64
+  scrutiny_status varchar
 
-	//Smart Status
-	Status enum
 
-	//SMART Attributes (fields)
+
-	Attr_ID_AttributeId int
+  //fields
-	Attr_ID_Value       int64
+  temp bigint
-	Attr_ID_Threshold   int64
+  power_on_hours bigint
-	Attr_ID_Worst       int64
+  power_cycle_count bigint
-    Attr_ID_RawValue    int64
+
-	Attr_ID_RawString   string
-	Attr_ID_WhenFailed  string
-	//Generated data
-	Attr_ID_TransformedValue int64
-	Attr_ID_Status           enum
-	Attr_ID_StatusReason     string
-	Attr_ID_FailureRate      float64
 
  }
 
-Ref: Device.WWN < Smart.DeviceWWN
+Ref: device.wwn < smart_ata_results.device_wwn
-Ref: Device.WWN < SmartTemperature.DeviceWWN

example.scrutiny.yaml

@@ -73,6 +73,8 @@ log:
 #    - "join://shoutrrr:api-key@join/?devices=device1[,device2, ...][&icon=icon][&title=title]"
 #    - "script:///file/path/on/disk"
 #    - "https://www.example.com/path"
+#  filter_attributes: 'all' # options: 'all' or  'critical'
+#  level: 'fail' # options: 'fail', 'fail_scrutiny', 'fail_smart'
 
 ########################################################################################################################
 # FEATURES COMING SOON

go.mod

@@ -1,6 +1,6 @@
 module github.com/analogj/scrutiny
 
-go 1.18
+go 1.17
 
 require (
 	github.com/analogj/go-util v0.0.0-20190301173314-5295e364eb14
@@ -13,7 +13,6 @@ require (
 	github.com/influxdata/influxdb-client-go/v2 v2.9.0
 	github.com/jaypipes/ghw v0.6.1
 	github.com/mitchellh/mapstructure v1.2.2
-	github.com/samber/lo v1.25.0
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/viper v1.7.0
 	github.com/stretchr/testify v1.7.1
@@ -24,6 +23,7 @@ require (
 
 require (
 	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
+	github.com/citilinkru/libudev v1.0.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deepmap/oapi-codegen v1.8.2 // indirect
@@ -68,7 +68,6 @@ require (
 	github.com/subosito/gotenv v1.2.0 // indirect
 	github.com/ugorji/go/codec v1.1.7 // indirect
 	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
-	golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
 	golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
 	golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64 // indirect
 	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
@@ -78,7 +77,7 @@ require (
 	gopkg.in/ini.v1 v1.55.0 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.3.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 	gosrc.io/xmpp v0.5.1 // indirect
 	howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
 	modernc.org/libc v1.16.8 // indirect

go.sum

@@ -39,6 +39,8 @@ github.com/chromedp/cdproto v0.0.0-20190812224334-39ef923dcb8d/go.mod h1:0YChpVz
 github.com/chromedp/cdproto v0.0.0-20190926234355-1b4886c6fad6/go.mod h1:0YChpVzuLJC5CPr+x3xkHN6Z8KOSXjNbL7qV8Wc4GW0=
 github.com/chromedp/chromedp v0.3.1-0.20190619195644-fd957a4d2901/go.mod h1:mJdvfrVn594N9tfiPecUidF6W5jPRKHymqHfzbobPsM=
 github.com/chromedp/chromedp v0.4.0/go.mod h1:DC3QUn4mJ24dwjcaGQLoZrhm4X/uPHZ6spDbS2uFhm4=
+github.com/citilinkru/libudev v1.0.0 h1:upErSdhsJGdiKxwxPmvcz43fwJJD9R+y1j8BqU4wHog=
+github.com/citilinkru/libudev v1.0.0/go.mod h1:yaNdhdtfJMs5flqeXzUOMO0mT9QnyNh/U/jdY4WhA/I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/containrrr/shoutrrr v0.4.4 h1:vHZ4E/76pKVY+Jyn/qhBz3X540Bn8NI5ppPHK4PyILY=
@@ -280,11 +282,12 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
 github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kvz/logstreamer v0.0.0-20201023134116-02d20f4338f5 h1:dkCjlgGN81ahDFtM9R1x16gFGTa7ZvgZfdtAfM9lWOs=
 github.com/kvz/logstreamer v0.0.0-20201023134116-02d20f4338f5/go.mod h1:8/LTPeDLaklcUjgSQBHbhBF1ibKAFxzS5o+H7USfMSA=
 github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
@@ -342,7 +345,6 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.6 h1:11TGpSHY7Esh/i/qnq02Jo5oVrI1Gue8Slbq0ujPZFQ=
 github.com/nxadm/tail v1.4.6/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
@@ -386,8 +388,6 @@ github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThC
 github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/samber/lo v1.25.0 h1:H8F6cB0RotRdgcRCivTByAQePaYhGMdOTJIj2QFS2I0=
-github.com/samber/lo v1.25.0/go.mod h1:2I7tgIv8Q1SG2xEIkRq0F2i2zgxVpnyPOP0d3Gj2r+A=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
@@ -436,10 +436,10 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/thoas/go-funk v0.9.1 h1:O549iLZqPpTUQ10ykd26sZhzD+rmR5pWhuElrhbC20M=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/twitchyliquid64/golang-asm v0.0.0-20190126203739-365674df15fc/go.mod h1:NoCfSFWosfqMqmmD7hApkirIK9ozpHjxRnRxs1l413A=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
+github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
@@ -485,8 +485,6 @@ golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
 golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM=
-golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -658,8 +656,8 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
@@ -677,9 +675,8 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/mysql v1.0.1 h1:omJoilUzyrAp0xNoio88lGJCroGdIOen9hq2A/+3ifw=
 gorm.io/driver/mysql v1.0.1/go.mod h1:KtqSthtg55lFp3S5kUXqlGaelnWpKitn4k1xZTnoiPw=
 gorm.io/driver/postgres v1.0.0 h1:Yh4jyFQ0a7F+JPU0Gtiam/eKmpT/XFc1FKxotGqc6FM=

webapp/backend/cmd/scrutiny/scrutiny.go

@@ -1,15 +1,12 @@
 package main
 
 import (
-	"encoding/json"
 	"fmt"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/config"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/errors"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/version"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/web"
-	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
-	"io"
-	"log"
 	"os"
 	"time"
 
@@ -110,18 +107,7 @@ OPTIONS:
 						config.Set("log.file", c.String("log-file"))
 					}
 
-					webLogger, logFile, err := CreateLogger(config)
+					webServer := web.AppEngine{Config: config}
-					if logFile != nil {
-						defer logFile.Close()
-					}
-					if err != nil {
-						return err
-					}
-
-					settingsData, err := json.Marshal(config.AllSettings())
-					webLogger.Debug(string(settingsData), err)
-
-					webServer := web.AppEngine{Config: config, Logger: webLogger}
 
 					return webServer.Start()
 				},
@@ -154,27 +140,3 @@ OPTIONS:
 	}
 
 }
-
-func CreateLogger(appConfig config.Interface) (*logrus.Entry, *os.File, error) {
-	logger := logrus.WithFields(logrus.Fields{
-		"type": "web",
-	})
-	//set default log level
-	if level, err := logrus.ParseLevel(appConfig.GetString("log.level")); err == nil {
-		logger.Logger.SetLevel(level)
-	} else {
-		logger.Logger.SetLevel(logrus.InfoLevel)
-	}
-
-	var logFile *os.File
-	var err error
-	if appConfig.IsSet("log.file") && len(appConfig.GetString("log.file")) > 0 {
-		logFile, err = os.OpenFile(appConfig.GetString("log.file"), os.O_CREATE|os.O_WRONLY, 0644)
-		if err != nil {
-			logger.Logger.Errorf("Failed to open log file %s for output: %s", appConfig.GetString("log.file"), err)
-			return nil, logFile, err
-		}
-		logger.Logger.SetOutput(io.MultiWriter(os.Stderr, logFile))
-	}
-	return logger, logFile, nil
-}

webapp/backend/pkg/config/config.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"github.com/analogj/go-util/utils"
+	"github.com/analogj/scrutiny/webapp/backend/pkg"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/errors"
 	"github.com/spf13/viper"
 	"log"
@@ -9,8 +10,6 @@ import (
 	"strings"
 )
 
-const DB_USER_SETTINGS_SUBKEY = "user"
-
 // When initializing this class the following methods must be called:
 // Config.New
 // Config.Init
@@ -40,6 +39,8 @@ func (c *configuration) Init() error {
 	c.SetDefault("log.file", "")
 
 	c.SetDefault("notify.urls", []string{})
+	c.SetDefault("notify.filter_attributes", pkg.NotifyFilterAttributesAll)
+	c.SetDefault("notify.level", pkg.NotifyLevelFail)
 
 	c.SetDefault("web.influxdb.scheme", "http")
 	c.SetDefault("web.influxdb.host", "localhost")
@@ -54,6 +55,17 @@ func (c *configuration) Init() error {
 	//c.SetDefault("disks.include", []string{})
 	//c.SetDefault("disks.exclude", []string{})
 
+	//c.SetDefault("notify.metric.script", "/opt/scrutiny/config/notify-metrics.sh")
+	//c.SetDefault("notify.long.script", "/opt/scrutiny/config/notify-long-test.sh")
+	//c.SetDefault("notify.short.script", "/opt/scrutiny/config/notify-short-test.sh")
+
+	//c.SetDefault("collect.metric.enable", true)
+	//c.SetDefault("collect.metric.command", "-a -o on -S on")
+	//c.SetDefault("collect.long.enable", true)
+	//c.SetDefault("collect.long.command", "-a -o on -S on")
+	//c.SetDefault("collect.short.enable", true)
+	//c.SetDefault("collect.short.command", "-a -o on -S on")
+
 	//if you want to load a non-standard location system config file (~/drawbridge.yml), use ReadConfig
 	c.SetConfigType("yaml")
 	//c.SetConfigName("drawbridge")
@@ -65,18 +77,7 @@ func (c *configuration) Init() error {
 	c.AutomaticEnv()
 
 	//CLI options will be added via the `Set()` function
-	return c.ValidateConfig()
+	return nil
-}
-
-func (c *configuration) SubKeys(key string) []string {
-	return c.Sub(key).AllKeys()
-}
-
-func (c *configuration) Sub(key string) Interface {
-	config := configuration{
-		Viper: c.Viper.Sub(key),
-	}
-	return &config
 }
 
 func (c *configuration) ReadConfig(configFilePath string) error {
@@ -119,18 +120,24 @@ func (c *configuration) ReadConfig(configFilePath string) error {
 // This function ensures that the merged config works correctly.
 func (c *configuration) ValidateConfig() error {
 
-	//the following keys are deprecated, and no longer supported
+	////deserialize Questions
-	/*
+	//questionsMap := map[string]Question{}
-		- notify.filter_attributes (replaced by metrics.status.filter_attributes SETTING)
+	//err := c.UnmarshalKey("questions", &questionsMap)
-		- notify.level (replaced by metrics.notify.level and metrics.status.threshold SETTING)
+	//
-	*/
+	//if err != nil {
-	//TODO add docs and upgrade doc.
+	//	log.Printf("questions could not be deserialized correctly. %v", err)
-	if c.IsSet("notify.filter_attributes") {
+	//	return err
-		return errors.ConfigValidationError("`notify.filter_attributes` configuration option is deprecated. Replaced by option in Dashboard Settings page")
+	//}
-	}
+	//
-	if c.IsSet("notify.level") {
+	//for _, v := range questionsMap {
-		return errors.ConfigValidationError("`notify.level` configuration option is deprecated. Replaced by option in Dashboard Settings page")
+	//
-	}
+	//	typeContent, ok := v.Schema["type"].(string)
+	//	if !ok || len(typeContent) == 0 {
+	//		return errors.QuestionSyntaxError("`type` is required for questions")
+	//	}
+	//}
+	//
+	//
 
 	return nil
 }

webapp/backend/pkg/config/config_test.go

@@ -1,34 +0,0 @@
-package config
-
-import (
-	"github.com/spf13/viper"
-	"github.com/stretchr/testify/require"
-	"testing"
-)
-
-func Test_MergeConfigMap(t *testing.T) {
-	//setup
-	testConfig := configuration{
-		Viper: viper.New(),
-	}
-	testConfig.Set("user.dashboard_display", "hello")
-	testConfig.SetDefault("user.layout", "hello")
-
-	mergeSettings := map[string]interface{}{
-		"user": map[string]interface{}{
-			"dashboard_display": "dashboard_display",
-			"layout":            "layout",
-		},
-	}
-	//test
-	err := testConfig.MergeConfigMap(mergeSettings)
-
-	//verify
-	require.NoError(t, err)
-
-	// if using Set, the MergeConfigMap functionality will not override
-	// if using SetDefault, the MergeConfigMap will override correctly
-	require.Equal(t, "hello", testConfig.GetString("user.dashboard_display"))
-	require.Equal(t, "layout", testConfig.GetString("user.layout"))
-
-}

webapp/backend/pkg/config/interface.go

@@ -12,17 +12,12 @@ type Interface interface {
 	WriteConfig() error
 	Set(key string, value interface{})
 	SetDefault(key string, value interface{})
-	MergeConfigMap(cfg map[string]interface{}) error
 
-	Sub(key string) Interface
 	AllSettings() map[string]interface{}
-	AllKeys() []string
-	SubKeys(key string) []string
 	IsSet(key string) bool
 	Get(key string) interface{}
 	GetBool(key string) bool
 	GetInt(key string) int
-	GetInt64(key string) int64
 	GetString(key string) string
 	GetStringSlice(key string) []string
 	UnmarshalKey(key string, rawVal interface{}, decoderOpts ...viper.DecoderConfigOption) error

webapp/backend/pkg/config/mock/mock_config.go

@@ -7,7 +7,6 @@ package mock_config
 import (
 	reflect "reflect"
 
-	config "github.com/analogj/scrutiny/webapp/backend/pkg/config"
 	gomock "github.com/golang/mock/gomock"
 	viper "github.com/spf13/viper"
 )
@@ -35,20 +34,6 @@ func (m *MockInterface) EXPECT() *MockInterfaceMockRecorder {
 	return m.recorder
 }
 
-// AllKeys mocks base method.
-func (m *MockInterface) AllKeys() []string {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "AllKeys")
-	ret0, _ := ret[0].([]string)
-	return ret0
-}
-
-// AllKeys indicates an expected call of AllKeys.
-func (mr *MockInterfaceMockRecorder) AllKeys() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AllKeys", reflect.TypeOf((*MockInterface)(nil).AllKeys))
-}
-
 // AllSettings mocks base method.
 func (m *MockInterface) AllSettings() map[string]interface{} {
 	m.ctrl.T.Helper()
@@ -105,20 +90,6 @@ func (mr *MockInterfaceMockRecorder) GetInt(key interface{}) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInt", reflect.TypeOf((*MockInterface)(nil).GetInt), key)
 }
 
-// GetInt64 mocks base method.
-func (m *MockInterface) GetInt64(key string) int64 {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetInt64", key)
-	ret0, _ := ret[0].(int64)
-	return ret0
-}
-
-// GetInt64 indicates an expected call of GetInt64.
-func (mr *MockInterfaceMockRecorder) GetInt64(key interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInt64", reflect.TypeOf((*MockInterface)(nil).GetInt64), key)
-}
-
 // GetString mocks base method.
 func (m *MockInterface) GetString(key string) string {
 	m.ctrl.T.Helper()
@@ -175,20 +146,6 @@ func (mr *MockInterfaceMockRecorder) IsSet(key interface{}) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsSet", reflect.TypeOf((*MockInterface)(nil).IsSet), key)
 }
 
-// MergeConfigMap mocks base method.
-func (m *MockInterface) MergeConfigMap(cfg map[string]interface{}) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "MergeConfigMap", cfg)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// MergeConfigMap indicates an expected call of MergeConfigMap.
-func (mr *MockInterfaceMockRecorder) MergeConfigMap(cfg interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MergeConfigMap", reflect.TypeOf((*MockInterface)(nil).MergeConfigMap), cfg)
-}
-
 // ReadConfig mocks base method.
 func (m *MockInterface) ReadConfig(configFilePath string) error {
 	m.ctrl.T.Helper()
@@ -227,34 +184,6 @@ func (mr *MockInterfaceMockRecorder) SetDefault(key, value interface{}) *gomock.
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDefault", reflect.TypeOf((*MockInterface)(nil).SetDefault), key, value)
 }
 
-// Sub mocks base method.
-func (m *MockInterface) Sub(key string) config.Interface {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Sub", key)
-	ret0, _ := ret[0].(config.Interface)
-	return ret0
-}
-
-// Sub indicates an expected call of Sub.
-func (mr *MockInterfaceMockRecorder) Sub(key interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sub", reflect.TypeOf((*MockInterface)(nil).Sub), key)
-}
-
-// SubKeys mocks base method.
-func (m *MockInterface) SubKeys(key string) []string {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SubKeys", key)
-	ret0, _ := ret[0].([]string)
-	return ret0
-}
-
-// SubKeys indicates an expected call of SubKeys.
-func (mr *MockInterfaceMockRecorder) SubKeys(key interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubKeys", reflect.TypeOf((*MockInterface)(nil).SubKeys), key)
-}
-
 // UnmarshalKey mocks base method.
 func (m *MockInterface) UnmarshalKey(key string, rawVal interface{}, decoderOpts ...viper.DecoderConfigOption) error {
 	m.ctrl.T.Helper()

webapp/backend/pkg/constants.go

@@ -4,11 +4,17 @@ const DeviceProtocolAta = "ATA"
 const DeviceProtocolScsi = "SCSI"
 const DeviceProtocolNvme = "NVMe"
 
-//go:generate stringer -type=AttributeStatus
+const NotifyFilterAttributesAll = "all"
-// AttributeStatus bitwise flag, 1,2,4,8,16,32,etc
+const NotifyFilterAttributesCritical = "critical"
-type AttributeStatus uint8
 
+const NotifyLevelFail = "fail"
+const NotifyLevelFailScrutiny = "fail_scrutiny"
+const NotifyLevelFailSmart = "fail_smart"
+
+//go:generate stringer -type=AttributeStatus
+type AttributeStatus uint8
 const (
+	// AttributeStatusPassed binary, 1,2,4,8,16,32,etc
 	AttributeStatusPassed          AttributeStatus = 0
 	AttributeStatusFailedSmart     AttributeStatus = 1
 	AttributeStatusWarningScrutiny AttributeStatus = 2
@@ -24,10 +30,9 @@ func AttributeStatusToggle(b, flag AttributeStatus) AttributeStatus { return b ^
 func AttributeStatusHas(b, flag AttributeStatus) bool               { return b&flag != 0 }
 
 //go:generate stringer -type=DeviceStatus
-// DeviceStatus bitwise flag, 1,2,4,8,16,32,etc
 type DeviceStatus uint8
-
 const (
+	// DeviceStatusPassed binary, 1,2,4,8,16,32,etc
 	DeviceStatusPassed         DeviceStatus = 0
 	DeviceStatusFailedSmart    DeviceStatus = 1
 	DeviceStatusFailedScrutiny DeviceStatus = 2
@@ -37,29 +42,3 @@ func DeviceStatusSet(b, flag DeviceStatus) DeviceStatus    { return b | flag }
 func DeviceStatusClear(b, flag DeviceStatus) DeviceStatus  { return b &^ flag }
 func DeviceStatusToggle(b, flag DeviceStatus) DeviceStatus { return b ^ flag }
 func DeviceStatusHas(b, flag DeviceStatus) bool            { return b&flag != 0 }
-
-// Metrics Specific Filtering & Threshold Constants
-type MetricsNotifyLevel int64
-
-const (
-	MetricsNotifyLevelWarn MetricsNotifyLevel = 1
-	MetricsNotifyLevelFail MetricsNotifyLevel = 2
-)
-
-type MetricsStatusFilterAttributes int64
-
-const (
-	MetricsStatusFilterAttributesAll      MetricsStatusFilterAttributes = 0
-	MetricsStatusFilterAttributesCritical MetricsStatusFilterAttributes = 1
-)
-
-// MetricsStatusThreshold bitwise flag, 1,2,4,8,16,32,etc
-type MetricsStatusThreshold int64
-
-const (
-	MetricsStatusThresholdSmart    MetricsStatusThreshold = 1
-	MetricsStatusThresholdScrutiny MetricsStatusThreshold = 2
-
-	//shortcut
-	MetricsStatusThresholdBoth MetricsStatusThreshold = 3
-)

webapp/backend/pkg/database/interface.go

@@ -11,6 +11,9 @@ import (
 type DeviceRepo interface {
 	Close() error
 
+	//GetSettings()
+	//SaveSetting()
+
 	RegisterDevice(ctx context.Context, dev models.Device) error
 	GetDevices(ctx context.Context) ([]models.Device, error)
 	UpdateDevice(ctx context.Context, wwn string, collectorSmartData collector.SmartInfo) (models.Device, error)
@@ -25,7 +28,4 @@ type DeviceRepo interface {
 
 	GetSummary(ctx context.Context) (map[string]*models.DeviceSummary, error)
 	GetSmartTemperatureHistory(ctx context.Context, durationKey string) (map[string][]measurements.SmartTemperature, error)
-
-	LoadSettings(ctx context.Context) (*models.Settings, error)
-	SaveSettings(ctx context.Context, settings models.Settings) error
 }

webapp/backend/pkg/database/migrations/m20220716214900/setting.go

@@ -1,18 +0,0 @@
-package m20220716214900
-
-import (
-	"gorm.io/gorm"
-)
-
-type Setting struct {
-	//GORM attributes, see: http://gorm.io/docs/conventions.html
-	gorm.Model
-
-	SettingKeyName        string `json:"setting_key_name"`
-	SettingKeyDescription string `json:"setting_key_description"`
-	SettingDataType       string `json:"setting_data_type"`
-
-	SettingValueNumeric int    `json:"setting_value_numeric"`
-	SettingValueString  string `json:"setting_value_string"`
-	SettingValueBool    bool   `json:"setting_value_bool"`
-}

webapp/backend/pkg/database/scrutiny_repository.go

@@ -62,20 +62,7 @@ func NewScrutinyRepository(appConfig config.Interface, globalLogger logrus.Field
 	// Gorm/SQLite setup
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	globalLogger.Infof("Trying to connect to scrutiny sqlite db: %s\n", appConfig.GetString("web.database.location"))
-
+	database, err := gorm.Open(sqlite.Open(appConfig.GetString("web.database.location")), &gorm.Config{
-	// When a transaction cannot lock the database, because it is already locked by another one,
-	// SQLite by default throws an error: database is locked. This behavior is usually not appropriate when
-	// concurrent access is needed, typically when multiple processes write to the same database.
-	// PRAGMA busy_timeout lets you set a timeout or a handler for these events. When setting a timeout,
-	// SQLite will try the transaction multiple times within this timeout.
-	// fixes #341
-	// https://rsqlite.r-dbi.org/reference/sqlitesetbusyhandler
-	// retrying for 30000 milliseconds, 30seconds - this would be unreasonable for a distributed multi-tenant application,
-	// but should be fine for local usage.
-	pragmaStr := sqlitePragmaString(map[string]string{
-		"busy_timeout": "30000",
-	})
-	database, err := gorm.Open(sqlite.Open(appConfig.GetString("web.database.location")+pragmaStr), &gorm.Config{
 		//TODO: figure out how to log database queries again.
 		//Logger: logger
 		DisableForeignKeyConstraintWhenMigrating: true,
@@ -255,29 +242,21 @@ func (sr *scrutinyRepository) EnsureBuckets(ctx context.Context, org *domain.Org
 
 	//create buckets (used for downsampling)
 	weeklyBucket := fmt.Sprintf("%s_weekly", sr.appConfig.GetString("web.influxdb.bucket"))
-	if foundWeeklyBucket, foundErr := sr.influxClient.BucketsAPI().FindBucketByName(ctx, weeklyBucket); foundErr != nil {
+	if _, foundErr := sr.influxClient.BucketsAPI().FindBucketByName(ctx, weeklyBucket); foundErr != nil {
 		// metrics_weekly bucket will have a retention period of 8+1 weeks (since it will be down-sampled once a month)
 		_, err := sr.influxClient.BucketsAPI().CreateBucketWithName(ctx, org, weeklyBucket, weeklyBucketRetentionRule)
 		if err != nil {
 			return err
 		}
-	} else if sr.appConfig.GetBool("web.influxdb.retention_policy") {
-		//correctly set the retention period for the bucket (may not be able to do it during setup/creation)
-		foundWeeklyBucket.RetentionRules = domain.RetentionRules{weeklyBucketRetentionRule}
-		sr.influxClient.BucketsAPI().UpdateBucket(ctx, foundWeeklyBucket)
 	}
 
 	monthlyBucket := fmt.Sprintf("%s_monthly", sr.appConfig.GetString("web.influxdb.bucket"))
-	if foundMonthlyBucket, foundErr := sr.influxClient.BucketsAPI().FindBucketByName(ctx, monthlyBucket); foundErr != nil {
+	if _, foundErr := sr.influxClient.BucketsAPI().FindBucketByName(ctx, monthlyBucket); foundErr != nil {
 		// metrics_monthly bucket will have a retention period of 24+1 months (since it will be down-sampled once a year)
 		_, err := sr.influxClient.BucketsAPI().CreateBucketWithName(ctx, org, monthlyBucket, monthlyBucketRetentionRule)
 		if err != nil {
 			return err
 		}
-	} else if sr.appConfig.GetBool("web.influxdb.retention_policy") {
-		//correctly set the retention period for the bucket (may not be able to do it during setup/creation)
-		foundMonthlyBucket.RetentionRules = domain.RetentionRules{monthlyBucketRetentionRule}
-		sr.influxClient.BucketsAPI().UpdateBucket(ctx, foundMonthlyBucket)
 	}
 
 	yearlyBucket := fmt.Sprintf("%s_yearly", sr.appConfig.GetString("web.influxdb.bucket"))
@@ -463,16 +442,3 @@ func (sr *scrutinyRepository) lookupNestedDurationKeys(durationKey string) []str
 	}
 	return []string{DURATION_KEY_WEEK}
 }
-
-func sqlitePragmaString(pragmas map[string]string) string {
-	q := url.Values{}
-	for key, val := range pragmas {
-		q.Add("_pragma", key+"="+val)
-	}
-
-	queryStr := q.Encode()
-	if len(queryStr) > 0 {
-		return "?" + queryStr
-	}
-	return ""
-}

webapp/backend/pkg/database/scrutiny_repository_migrations.go

@@ -4,11 +4,9 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/analogj/scrutiny/webapp/backend/pkg"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/database/migrations/m20201107210306"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/database/migrations/m20220503120000"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/database/migrations/m20220509170100"
-	"github.com/analogj/scrutiny/webapp/backend/pkg/database/migrations/m20220716214900"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/models"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/models/collector"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/models/measurements"
@@ -269,85 +267,6 @@ func (sr *scrutinyRepository) Migrate(ctx context.Context) error {
 				return tx.AutoMigrate(m20220509170100.Device{})
 			},
 		},
-		{
-			ID: "m20220709181300",
-			Migrate: func(tx *gorm.DB) error {
-
-				// delete devices with empty `wwn` field (they are impossible to delete manually), and are invalid.
-				return tx.Where("wwn = ?", "").Delete(&models.Device{}).Error
-			},
-		},
-		{
-			ID: "m20220716214900", // add settings table.
-			Migrate: func(tx *gorm.DB) error {
-
-				// adding the settings table.
-				err := tx.AutoMigrate(m20220716214900.Setting{})
-				if err != nil {
-					return err
-				}
-				//add defaults.
-
-				var defaultSettings = []m20220716214900.Setting{
-					{
-						SettingKeyName:        "theme",
-						SettingKeyDescription: "Frontend theme ('light' | 'dark' | 'system')",
-						SettingDataType:       "string",
-						SettingValueString:    "system", // options: 'light' | 'dark' | 'system'
-					},
-					{
-						SettingKeyName:        "layout",
-						SettingKeyDescription: "Frontend layout ('material')",
-						SettingDataType:       "string",
-						SettingValueString:    "material",
-					},
-					{
-						SettingKeyName:        "dashboard_display",
-						SettingKeyDescription: "Frontend device display title ('name' | 'serial_id' | 'uuid' | 'label')",
-						SettingDataType:       "string",
-						SettingValueString:    "name",
-					},
-					{
-						SettingKeyName:        "dashboard_sort",
-						SettingKeyDescription: "Frontend device sort by ('status' | 'title' | 'age')",
-						SettingDataType:       "string",
-						SettingValueString:    "status",
-					},
-					{
-						SettingKeyName:        "temperature_unit",
-						SettingKeyDescription: "Frontend temperature unit ('celsius' | 'fahrenheit')",
-						SettingDataType:       "string",
-						SettingValueString:    "celsius",
-					},
-					{
-						SettingKeyName:        "file_size_si_units",
-						SettingKeyDescription: "File size in SI units (true | false)",
-						SettingDataType:       "bool",
-						SettingValueBool:      false,
-					},
-
-					{
-						SettingKeyName:        "metrics.notify_level",
-						SettingKeyDescription: "Determines which device status will cause a notification (fail or warn)",
-						SettingDataType:       "numeric",
-						SettingValueNumeric:   int(pkg.MetricsNotifyLevelFail), // options: 'fail' or 'warn'
-					},
-					{
-						SettingKeyName:        "metrics.status_filter_attributes",
-						SettingKeyDescription: "Determines which attributes should impact device status",
-						SettingDataType:       "numeric",
-						SettingValueNumeric:   int(pkg.MetricsStatusFilterAttributesAll), // options: 'all' or  'critical'
-					},
-					{
-						SettingKeyName:        "metrics.status_threshold",
-						SettingKeyDescription: "Determines which threshold should impact device status",
-						SettingDataType:       "numeric",
-						SettingValueNumeric:   int(pkg.MetricsStatusThresholdBoth), // options: 'scrutiny', 'smart', 'both'
-					},
-				}
-				return tx.Create(&defaultSettings).Error
-			},
-		},
 	})
 
 	if err := m.Migrate(); err != nil {
@@ -355,30 +274,6 @@ func (sr *scrutinyRepository) Migrate(ctx context.Context) error {
 		return err
 	}
 	sr.logger.Infoln("Database migration completed successfully")
-
-	//these migrations cannot be done within a transaction, so they are done as a separate group, with `UseTransaction = false`
-	sr.logger.Infoln("SQLite global configuration migrations starting. Please wait....")
-	globalMigrateOptions := gormigrate.DefaultOptions
-	globalMigrateOptions.UseTransaction = false
-	gm := gormigrate.New(sr.gormClient, globalMigrateOptions, []*gormigrate.Migration{
-		{
-			ID: "g20220802211500",
-			Migrate: func(tx *gorm.DB) error {
-				//shrink the Database (maybe necessary after 20220503113100)
-				if err := tx.Exec("VACUUM;").Error; err != nil {
-					return err
-				}
-				return nil
-			},
-		},
-	})
-
-	if err := gm.Migrate(); err != nil {
-		sr.logger.Errorf("SQLite global configuration migrations failed with error. \n Please open a github issue at https://github.com/AnalogJ/scrutiny and attach a copy of your scrutiny.db file. \n %v", err)
-		return err
-	}
-	sr.logger.Infoln("SQLite global configuration migrations completed successfully")
-
 	return nil
 }
 

webapp/backend/pkg/database/scrutiny_repository_settings.go

@@ -1,85 +0,0 @@
-package database
-
-import (
-	"context"
-	"fmt"
-	"github.com/analogj/scrutiny/webapp/backend/pkg/config"
-	"github.com/analogj/scrutiny/webapp/backend/pkg/models"
-	"github.com/mitchellh/mapstructure"
-	"strings"
-)
-
-// LoadSettings will retrieve settings from the database, store them in the AppConfig object, and return a Settings struct
-func (sr *scrutinyRepository) LoadSettings(ctx context.Context) (*models.Settings, error) {
-	settingsEntries := []models.SettingEntry{}
-	if err := sr.gormClient.WithContext(ctx).Find(&settingsEntries).Error; err != nil {
-		return nil, fmt.Errorf("Could not get settings from DB: %v", err)
-	}
-
-	// store retrieved settings in the AppConfig obj
-	for _, settingsEntry := range settingsEntries {
-		configKey := fmt.Sprintf("%s.%s", config.DB_USER_SETTINGS_SUBKEY, settingsEntry.SettingKeyName)
-
-		if settingsEntry.SettingDataType == "numeric" {
-			sr.appConfig.SetDefault(configKey, settingsEntry.SettingValueNumeric)
-		} else if settingsEntry.SettingDataType == "string" {
-			sr.appConfig.SetDefault(configKey, settingsEntry.SettingValueString)
-		} else if settingsEntry.SettingDataType == "bool" {
-			sr.appConfig.SetDefault(configKey, settingsEntry.SettingValueBool)
-		}
-	}
-
-	// unmarshal the dbsetting object data to a settings object.
-	var settings models.Settings
-	err := sr.appConfig.UnmarshalKey(config.DB_USER_SETTINGS_SUBKEY, &settings)
-	if err != nil {
-		return nil, err
-	}
-	return &settings, nil
-}
-
-// testing
-// curl -d '{"metrics": { "notify_level": 5, "status_filter_attributes": 5, "status_threshold": 5 }}' -H "Content-Type: application/json" -X POST http://localhost:9090/api/settings
-// SaveSettings will update settings in AppConfig object, then save the settings to the database.
-func (sr *scrutinyRepository) SaveSettings(ctx context.Context, settings models.Settings) error {
-	//save the entries to the appconfig
-	settingsMap := &map[string]interface{}{}
-	err := mapstructure.Decode(settings, &settingsMap)
-	if err != nil {
-		return err
-	}
-	settingsWrapperMap := map[string]interface{}{}
-	settingsWrapperMap[config.DB_USER_SETTINGS_SUBKEY] = *settingsMap
-	err = sr.appConfig.MergeConfigMap(settingsWrapperMap)
-	if err != nil {
-		return err
-	}
-	sr.logger.Debugf("after merge settings: %v", sr.appConfig.AllSettings())
-	//retrieve current settings from the database
-	settingsEntries := []models.SettingEntry{}
-	if err := sr.gormClient.WithContext(ctx).Find(&settingsEntries).Error; err != nil {
-		return fmt.Errorf("Could not get settings from DB: %v", err)
-	}
-
-	//update settingsEntries
-	for ndx, settingsEntry := range settingsEntries {
-		configKey := fmt.Sprintf("%s.%s", config.DB_USER_SETTINGS_SUBKEY, strings.ToLower(settingsEntry.SettingKeyName))
-
-		if settingsEntry.SettingDataType == "numeric" {
-			settingsEntries[ndx].SettingValueNumeric = sr.appConfig.GetInt(configKey)
-		} else if settingsEntry.SettingDataType == "string" {
-			settingsEntries[ndx].SettingValueString = sr.appConfig.GetString(configKey)
-		} else if settingsEntry.SettingDataType == "bool" {
-			settingsEntries[ndx].SettingValueBool = sr.appConfig.GetBool(configKey)
-		}
-
-		// store in database.
-		//TODO: this should be `sr.gormClient.Updates(&settingsEntries).Error`
-		err := sr.gormClient.Model(&models.SettingEntry{}).Where([]uint{settingsEntry.ID}).Select("setting_value_numeric", "setting_value_string", "setting_value_bool").Updates(settingsEntries[ndx]).Error
-		if err != nil {
-			return err
-		}
-
-	}
-	return nil
-}

webapp/backend/pkg/database/scrutiny_repository_tasks.go

@@ -11,71 +11,35 @@ import (
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 func (sr *scrutinyRepository) EnsureTasks(ctx context.Context, orgID string) error {
 	weeklyTaskName := "tsk-weekly-aggr"
-	weeklyTaskScript := sr.DownsampleScript("weekly", weeklyTaskName, "0 1 * * 0")
 	if found, findErr := sr.influxTaskApi.FindTasks(ctx, &api.TaskFilter{Name: weeklyTaskName}); findErr == nil && len(found) == 0 {
 		//weekly on Sunday at 1:00am
-		_, err := sr.influxTaskApi.CreateTaskByFlux(ctx, weeklyTaskScript, orgID)
+		_, err := sr.influxTaskApi.CreateTaskWithCron(ctx, weeklyTaskName, sr.DownsampleScript("weekly"), "0 1 * * 0", orgID)
 		if err != nil {
 			return err
 		}
-	} else if len(found) == 1 {
-		//check if we should update
-		task := &found[0]
-		if weeklyTaskScript != task.Flux {
-			sr.logger.Infoln("updating weekly task script")
-			task.Flux = weeklyTaskScript
-			_, err := sr.influxTaskApi.UpdateTask(ctx, task)
-			if err != nil {
-				return err
-			}
-		}
 	}
 
 	monthlyTaskName := "tsk-monthly-aggr"
-	monthlyTaskScript := sr.DownsampleScript("monthly", monthlyTaskName, "30 1 1 * *")
 	if found, findErr := sr.influxTaskApi.FindTasks(ctx, &api.TaskFilter{Name: monthlyTaskName}); findErr == nil && len(found) == 0 {
 		//monthly on first day of the month at 1:30am
-		_, err := sr.influxTaskApi.CreateTaskByFlux(ctx, monthlyTaskScript, orgID)
+		_, err := sr.influxTaskApi.CreateTaskWithCron(ctx, monthlyTaskName, sr.DownsampleScript("monthly"), "30 1 1 * *", orgID)
 		if err != nil {
 			return err
 		}
-	} else if len(found) == 1 {
-		//check if we should update
-		task := &found[0]
-		if monthlyTaskScript != task.Flux {
-			sr.logger.Infoln("updating monthly task script")
-			task.Flux = monthlyTaskScript
-			_, err := sr.influxTaskApi.UpdateTask(ctx, task)
-			if err != nil {
-				return err
-			}
-		}
 	}
 
 	yearlyTaskName := "tsk-yearly-aggr"
-	yearlyTaskScript := sr.DownsampleScript("yearly", yearlyTaskName, "0 2 1 1 *")
 	if found, findErr := sr.influxTaskApi.FindTasks(ctx, &api.TaskFilter{Name: yearlyTaskName}); findErr == nil && len(found) == 0 {
 		//yearly on the first day of the year at 2:00am
-		_, err := sr.influxTaskApi.CreateTaskByFlux(ctx, yearlyTaskScript, orgID)
+		_, err := sr.influxTaskApi.CreateTaskWithCron(ctx, yearlyTaskName, sr.DownsampleScript("yearly"), "0 2 1 1 *", orgID)
 		if err != nil {
 			return err
 		}
-	} else if len(found) == 1 {
-		//check if we should update
-		task := &found[0]
-		if yearlyTaskScript != task.Flux {
-			sr.logger.Infoln("updating yearly task script")
-			task.Flux = yearlyTaskScript
-			_, err := sr.influxTaskApi.UpdateTask(ctx, task)
-			if err != nil {
-				return err
-			}
-		}
 	}
 	return nil
 }
 
-func (sr *scrutinyRepository) DownsampleScript(aggregationType string, name string, cron string) string {
+func (sr *scrutinyRepository) DownsampleScript(aggregationType string) string {
 	var sourceBucket string // the source of the data
 	var destBucket string   // the destination for the aggregated data
 	var rangeStart string
@@ -124,11 +88,6 @@ func (sr *scrutinyRepository) DownsampleScript(aggregationType string, name stri
 	*/
 
 	return fmt.Sprintf(`
-option task = { 
-  name: "%s",
-  cron: "%s",
-}
-
   sourceBucket = "%s"
   rangeStart = %s
   rangeEnd = %s
@@ -143,18 +102,16 @@ from(bucket: sourceBucket)
   |> aggregateWindow(every: aggWindow, fn: last, createEmpty: false)
   |> to(bucket: destBucket, org: destOrg)
 
-from(bucket: sourceBucket)
+  temp_data = from(bucket: sourceBucket)
   |> range(start: rangeStart, stop: rangeEnd)
   |> filter(fn: (r) => r["_measurement"] == "temp")
   |> group(columns: ["device_wwn"])
   |> toInt()
+
+  temp_data
   |> aggregateWindow(fn: mean, every: aggWindow, createEmpty: false)
-|> set(key: "_measurement", value: "temp")
-|> set(key: "_field", value: "temp")
   |> to(bucket: destBucket, org: destOrg)
 		`,
-		name,
-		cron,
 		sourceBucket,
 		rangeStart,
 		rangeEnd,

webapp/backend/pkg/database/scrutiny_repository_tasks_test.go

@@ -1,164 +0,0 @@
-package database
-
-import (
-	mock_config "github.com/analogj/scrutiny/webapp/backend/pkg/config/mock"
-	"github.com/golang/mock/gomock"
-	"github.com/stretchr/testify/require"
-	"testing"
-)
-
-func Test_DownsampleScript_Weekly(t *testing.T) {
-	t.Parallel()
-
-	//setup
-	mockCtrl := gomock.NewController(t)
-	defer mockCtrl.Finish()
-	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().GetString("web.influxdb.bucket").Return("metrics").AnyTimes()
-	fakeConfig.EXPECT().GetString("web.influxdb.org").Return("scrutiny").AnyTimes()
-
-	deviceRepo := scrutinyRepository{
-		appConfig: fakeConfig,
-	}
-
-	aggregationType := "weekly"
-
-	//test
-	influxDbScript := deviceRepo.DownsampleScript(aggregationType, "tsk-weekly-aggr", "0 1 * * 0")
-
-	//assert
-	require.Equal(t, `
-option task = { 
-  name: "tsk-weekly-aggr",
-  cron: "0 1 * * 0",
-}
-
-sourceBucket = "metrics"
-rangeStart = -2w
-rangeEnd = -1w
-aggWindow = 1w
-destBucket = "metrics_weekly"
-destOrg = "scrutiny"
-
-from(bucket: sourceBucket)
-|> range(start: rangeStart, stop: rangeEnd)
-|> filter(fn: (r) => r["_measurement"] == "smart" )
-|> group(columns: ["device_wwn", "_field"])
-|> aggregateWindow(every: aggWindow, fn: last, createEmpty: false)
-|> to(bucket: destBucket, org: destOrg)
-
-from(bucket: sourceBucket)
-|> range(start: rangeStart, stop: rangeEnd)
-|> filter(fn: (r) => r["_measurement"] == "temp")
-|> group(columns: ["device_wwn"])
-|> toInt()
-|> aggregateWindow(fn: mean, every: aggWindow, createEmpty: false)
-|> set(key: "_measurement", value: "temp")
-|> set(key: "_field", value: "temp")
-|> to(bucket: destBucket, org: destOrg)
-		`, influxDbScript)
-}
-
-func Test_DownsampleScript_Monthly(t *testing.T) {
-	t.Parallel()
-
-	//setup
-	mockCtrl := gomock.NewController(t)
-	defer mockCtrl.Finish()
-	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().GetString("web.influxdb.bucket").Return("metrics").AnyTimes()
-	fakeConfig.EXPECT().GetString("web.influxdb.org").Return("scrutiny").AnyTimes()
-
-	deviceRepo := scrutinyRepository{
-		appConfig: fakeConfig,
-	}
-
-	aggregationType := "monthly"
-
-	//test
-	influxDbScript := deviceRepo.DownsampleScript(aggregationType, "tsk-monthly-aggr", "30 1 1 * *")
-
-	//assert
-	require.Equal(t, `
-option task = { 
-  name: "tsk-monthly-aggr",
-  cron: "30 1 1 * *",
-}
-
-sourceBucket = "metrics_weekly"
-rangeStart = -2mo
-rangeEnd = -1mo
-aggWindow = 1mo
-destBucket = "metrics_monthly"
-destOrg = "scrutiny"
-
-from(bucket: sourceBucket)
-|> range(start: rangeStart, stop: rangeEnd)
-|> filter(fn: (r) => r["_measurement"] == "smart" )
-|> group(columns: ["device_wwn", "_field"])
-|> aggregateWindow(every: aggWindow, fn: last, createEmpty: false)
-|> to(bucket: destBucket, org: destOrg)
-
-from(bucket: sourceBucket)
-|> range(start: rangeStart, stop: rangeEnd)
-|> filter(fn: (r) => r["_measurement"] == "temp")
-|> group(columns: ["device_wwn"])
-|> toInt()
-|> aggregateWindow(fn: mean, every: aggWindow, createEmpty: false)
-|> set(key: "_measurement", value: "temp")
-|> set(key: "_field", value: "temp")
-|> to(bucket: destBucket, org: destOrg)
-		`, influxDbScript)
-}
-
-func Test_DownsampleScript_Yearly(t *testing.T) {
-	t.Parallel()
-
-	//setup
-	mockCtrl := gomock.NewController(t)
-	defer mockCtrl.Finish()
-	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().GetString("web.influxdb.bucket").Return("metrics").AnyTimes()
-	fakeConfig.EXPECT().GetString("web.influxdb.org").Return("scrutiny").AnyTimes()
-
-	deviceRepo := scrutinyRepository{
-		appConfig: fakeConfig,
-	}
-
-	aggregationType := "yearly"
-
-	//test
-	influxDbScript := deviceRepo.DownsampleScript(aggregationType, "tsk-yearly-aggr", "0 2 1 1 *")
-
-	//assert
-	require.Equal(t, `
-option task = { 
-  name: "tsk-yearly-aggr",
-  cron: "0 2 1 1 *",
-}
-
-sourceBucket = "metrics_monthly"
-rangeStart = -2y
-rangeEnd = -1y
-aggWindow = 1y
-destBucket = "metrics_yearly"
-destOrg = "scrutiny"
-
-from(bucket: sourceBucket)
-|> range(start: rangeStart, stop: rangeEnd)
-|> filter(fn: (r) => r["_measurement"] == "smart" )
-|> group(columns: ["device_wwn", "_field"])
-|> aggregateWindow(every: aggWindow, fn: last, createEmpty: false)
-|> to(bucket: destBucket, org: destOrg)
-
-from(bucket: sourceBucket)
-|> range(start: rangeStart, stop: rangeEnd)
-|> filter(fn: (r) => r["_measurement"] == "temp")
-|> group(columns: ["device_wwn"])
-|> toInt()
-|> aggregateWindow(fn: mean, every: aggWindow, createEmpty: false)
-|> set(key: "_measurement", value: "temp")
-|> set(key: "_field", value: "temp")
-|> to(bucket: destBucket, org: destOrg)
-		`, influxDbScript)
-}

webapp/backend/pkg/database/scrutiny_repository_temperature_test.go

@@ -1,185 +0,0 @@
-package database
-
-import (
-	mock_config "github.com/analogj/scrutiny/webapp/backend/pkg/config/mock"
-	"github.com/golang/mock/gomock"
-	"github.com/stretchr/testify/require"
-	"testing"
-)
-
-func Test_aggregateTempQuery_Week(t *testing.T) {
-	t.Parallel()
-
-	//setup
-	mockCtrl := gomock.NewController(t)
-	defer mockCtrl.Finish()
-	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().GetString("web.influxdb.bucket").Return("metrics").AnyTimes()
-	fakeConfig.EXPECT().GetString("web.influxdb.org").Return("scrutiny").AnyTimes()
-
-	deviceRepo := scrutinyRepository{
-		appConfig: fakeConfig,
-	}
-
-	aggregationType := DURATION_KEY_WEEK
-
-	//test
-	influxDbScript := deviceRepo.aggregateTempQuery(aggregationType)
-
-	//assert
-	require.Equal(t, `import "influxdata/influxdb/schema"
-weekData = from(bucket: "metrics")
-|> range(start: -1w, stop: now())
-|> filter(fn: (r) => r["_measurement"] == "temp" )
-|> aggregateWindow(every: 1h, fn: mean, createEmpty: false)
-|> group(columns: ["device_wwn"])
-|> toInt()
-
-weekData
-|> schema.fieldsAsCols()
-|> yield()`, influxDbScript)
-}
-
-func Test_aggregateTempQuery_Month(t *testing.T) {
-	t.Parallel()
-
-	//setup
-	mockCtrl := gomock.NewController(t)
-	defer mockCtrl.Finish()
-	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().GetString("web.influxdb.bucket").Return("metrics").AnyTimes()
-	fakeConfig.EXPECT().GetString("web.influxdb.org").Return("scrutiny").AnyTimes()
-
-	deviceRepo := scrutinyRepository{
-		appConfig: fakeConfig,
-	}
-
-	aggregationType := DURATION_KEY_MONTH
-
-	//test
-	influxDbScript := deviceRepo.aggregateTempQuery(aggregationType)
-
-	//assert
-	require.Equal(t, `import "influxdata/influxdb/schema"
-weekData = from(bucket: "metrics")
-|> range(start: -1w, stop: now())
-|> filter(fn: (r) => r["_measurement"] == "temp" )
-|> aggregateWindow(every: 1h, fn: mean, createEmpty: false)
-|> group(columns: ["device_wwn"])
-|> toInt()
-
-monthData = from(bucket: "metrics_weekly")
-|> range(start: -1mo, stop: -1w)
-|> filter(fn: (r) => r["_measurement"] == "temp" )
-|> aggregateWindow(every: 1h, fn: mean, createEmpty: false)
-|> group(columns: ["device_wwn"])
-|> toInt()
-
-union(tables: [weekData, monthData])
-|> group(columns: ["device_wwn"])
-|> sort(columns: ["_time"], desc: false)
-|> schema.fieldsAsCols()`, influxDbScript)
-}
-
-func Test_aggregateTempQuery_Year(t *testing.T) {
-	t.Parallel()
-
-	//setup
-	mockCtrl := gomock.NewController(t)
-	defer mockCtrl.Finish()
-	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().GetString("web.influxdb.bucket").Return("metrics").AnyTimes()
-	fakeConfig.EXPECT().GetString("web.influxdb.org").Return("scrutiny").AnyTimes()
-
-	deviceRepo := scrutinyRepository{
-		appConfig: fakeConfig,
-	}
-
-	aggregationType := DURATION_KEY_YEAR
-
-	//test
-	influxDbScript := deviceRepo.aggregateTempQuery(aggregationType)
-
-	//assert
-	require.Equal(t, `import "influxdata/influxdb/schema"
-weekData = from(bucket: "metrics")
-|> range(start: -1w, stop: now())
-|> filter(fn: (r) => r["_measurement"] == "temp" )
-|> aggregateWindow(every: 1h, fn: mean, createEmpty: false)
-|> group(columns: ["device_wwn"])
-|> toInt()
-
-monthData = from(bucket: "metrics_weekly")
-|> range(start: -1mo, stop: -1w)
-|> filter(fn: (r) => r["_measurement"] == "temp" )
-|> aggregateWindow(every: 1h, fn: mean, createEmpty: false)
-|> group(columns: ["device_wwn"])
-|> toInt()
-
-yearData = from(bucket: "metrics_monthly")
-|> range(start: -1y, stop: -1mo)
-|> filter(fn: (r) => r["_measurement"] == "temp" )
-|> aggregateWindow(every: 1h, fn: mean, createEmpty: false)
-|> group(columns: ["device_wwn"])
-|> toInt()
-
-union(tables: [weekData, monthData, yearData])
-|> group(columns: ["device_wwn"])
-|> sort(columns: ["_time"], desc: false)
-|> schema.fieldsAsCols()`, influxDbScript)
-}
-
-func Test_aggregateTempQuery_Forever(t *testing.T) {
-	t.Parallel()
-
-	//setup
-	mockCtrl := gomock.NewController(t)
-	defer mockCtrl.Finish()
-	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().GetString("web.influxdb.bucket").Return("metrics").AnyTimes()
-	fakeConfig.EXPECT().GetString("web.influxdb.org").Return("scrutiny").AnyTimes()
-
-	deviceRepo := scrutinyRepository{
-		appConfig: fakeConfig,
-	}
-
-	aggregationType := DURATION_KEY_FOREVER
-
-	//test
-	influxDbScript := deviceRepo.aggregateTempQuery(aggregationType)
-
-	//assert
-	require.Equal(t, `import "influxdata/influxdb/schema"
-weekData = from(bucket: "metrics")
-|> range(start: -1w, stop: now())
-|> filter(fn: (r) => r["_measurement"] == "temp" )
-|> aggregateWindow(every: 1h, fn: mean, createEmpty: false)
-|> group(columns: ["device_wwn"])
-|> toInt()
-
-monthData = from(bucket: "metrics_weekly")
-|> range(start: -1mo, stop: -1w)
-|> filter(fn: (r) => r["_measurement"] == "temp" )
-|> aggregateWindow(every: 1h, fn: mean, createEmpty: false)
-|> group(columns: ["device_wwn"])
-|> toInt()
-
-yearData = from(bucket: "metrics_monthly")
-|> range(start: -1y, stop: -1mo)
-|> filter(fn: (r) => r["_measurement"] == "temp" )
-|> aggregateWindow(every: 1h, fn: mean, createEmpty: false)
-|> group(columns: ["device_wwn"])
-|> toInt()
-
-foreverData = from(bucket: "metrics_yearly")
-|> range(start: -10y, stop: -1y)
-|> filter(fn: (r) => r["_measurement"] == "temp" )
-|> aggregateWindow(every: 1h, fn: mean, createEmpty: false)
-|> group(columns: ["device_wwn"])
-|> toInt()
-
-union(tables: [weekData, monthData, yearData, foreverData])
-|> group(columns: ["device_wwn"])
-|> sort(columns: ["_time"], desc: false)
-|> schema.fieldsAsCols()`, influxDbScript)
-}

webapp/backend/pkg/models/setting.go

@@ -0,0 +1,5 @@
+package models
+
+// Temperature Format
+// Date Format
+// Device History window

webapp/backend/pkg/models/setting_entry.go

@@ -1,23 +0,0 @@
-package models
-
-import (
-	"gorm.io/gorm"
-)
-
-// SettingEntry matches a setting row in the database
-type SettingEntry struct {
-	//GORM attributes, see: http://gorm.io/docs/conventions.html
-	gorm.Model
-
-	SettingKeyName        string `json:"setting_key_name" gorm:"unique;not null"`
-	SettingKeyDescription string `json:"setting_key_description"`
-	SettingDataType       string `json:"setting_data_type"`
-
-	SettingValueNumeric int    `json:"setting_value_numeric"`
-	SettingValueString  string `json:"setting_value_string"`
-	SettingValueBool    bool   `json:"setting_value_bool"`
-}
-
-func (s SettingEntry) TableName() string {
-	return "settings"
-}

webapp/backend/pkg/models/settings.go

@@ -1,23 +0,0 @@
-package models
-
-// Settings is made up of parsed SettingEntry objects retrieved from the database
-//type Settings struct {
-//	MetricsNotifyLevel            pkg.MetricsNotifyLevel            `json:"metrics.notify.level" mapstructure:"metrics.notify.level"`
-//	MetricsStatusFilterAttributes pkg.MetricsStatusFilterAttributes `json:"metrics.status.filter_attributes" mapstructure:"metrics.status.filter_attributes"`
-//	MetricsStatusThreshold        pkg.MetricsStatusThreshold        `json:"metrics.status.threshold" mapstructure:"metrics.status.threshold"`
-//}
-
-type Settings struct {
-	Theme            string `json:"theme" mapstructure:"theme"`
-	Layout           string `json:"layout" mapstructure:"layout"`
-	DashboardDisplay string `json:"dashboard_display" mapstructure:"dashboard_display"`
-	DashboardSort    string `json:"dashboard_sort" mapstructure:"dashboard_sort"`
-	TemperatureUnit  string `json:"temperature_unit" mapstructure:"temperature_unit"`
-	FileSizeSIUnits  bool   `json:"file_size_si_units" mapstructure:"file_size_si_units"`
-
-	Metrics struct {
-		NotifyLevel            int `json:"notify_level" mapstructure:"notify_level"`
-		StatusFilterAttributes int `json:"status_filter_attributes" mapstructure:"status_filter_attributes"`
-		StatusThreshold        int `json:"status_threshold" mapstructure:"status_threshold"`
-	} `json:"metrics" mapstructure:"metrics"`
-}

webapp/backend/pkg/notify/notify.go

@@ -29,22 +29,20 @@ const NotifyFailureTypeSmartFailure = "SmartFailure"
 const NotifyFailureTypeScrutinyFailure = "ScrutinyFailure"
 
 // ShouldNotify check if the error Message should be filtered (level mismatch or filtered_attributes)
-func ShouldNotify(device models.Device, smartAttrs measurements.Smart, statusThreshold pkg.MetricsStatusThreshold, statusFilterAttributes pkg.MetricsStatusFilterAttributes) bool {
+func ShouldNotify(device models.Device, smartAttrs measurements.Smart, notifyLevel string, notifyFilterAttributes string) bool {
 	// 1. check if the device is healthy
 	if device.DeviceStatus == pkg.DeviceStatusPassed {
 		return false
 	}
 
-	//TODO: cannot check for warning notifyLevel yet.
-
 	// setup constants for comparison
 	var requiredDeviceStatus pkg.DeviceStatus
 	var requiredAttrStatus pkg.AttributeStatus
-	if statusThreshold == pkg.MetricsStatusThresholdBoth {
+	if notifyLevel == pkg.NotifyLevelFail {
 		// either scrutiny or smart failures should trigger an email
 		requiredDeviceStatus = pkg.DeviceStatusSet(pkg.DeviceStatusFailedSmart, pkg.DeviceStatusFailedScrutiny)
 		requiredAttrStatus = pkg.AttributeStatusSet(pkg.AttributeStatusFailedSmart, pkg.AttributeStatusFailedScrutiny)
-	} else if statusThreshold == pkg.MetricsStatusThresholdSmart {
+	} else if notifyLevel == pkg.NotifyLevelFailSmart {
 		//only smart failures
 		requiredDeviceStatus = pkg.DeviceStatusFailedSmart
 		requiredAttrStatus = pkg.AttributeStatusFailedSmart
@@ -55,9 +53,9 @@ func ShouldNotify(device models.Device, smartAttrs measurements.Smart, statusThr
 
 	// 2. check if the attributes that are failing should be filtered (non-critical)
 	// 3. for any unfiltered attribute, store the failure reason (Smart or Scrutiny)
-	if statusFilterAttributes == pkg.MetricsStatusFilterAttributesCritical {
+	if notifyFilterAttributes == pkg.NotifyFilterAttributesCritical {
 		hasFailingCriticalAttr := false
-		var statusFailingCriticalAttr pkg.AttributeStatus
+		var statusFailingCrtiticalAttr pkg.AttributeStatus
 
 		for attrId, attrData := range smartAttrs.Attributes {
 			//find failing attribute
@@ -66,7 +64,7 @@ func ShouldNotify(device models.Device, smartAttrs measurements.Smart, statusThr
 			}
 
 			// merge the status's of all critical attributes
-			statusFailingCriticalAttr = pkg.AttributeStatusSet(statusFailingCriticalAttr, attrData.GetStatus())
+			statusFailingCrtiticalAttr = pkg.AttributeStatusSet(statusFailingCrtiticalAttr, attrData.GetStatus())
 
 			//found a failing attribute, see if its critical
 			if device.IsScsi() && thresholds.ScsiMetadata[attrId].Critical {
@@ -91,7 +89,7 @@ func ShouldNotify(device models.Device, smartAttrs measurements.Smart, statusThr
 			return false
 		} else {
 			// check if any of the critical attributes have a status that we're looking for
-			return pkg.AttributeStatusHas(statusFailingCriticalAttr, requiredAttrStatus)
+			return pkg.AttributeStatusHas(statusFailingCrtiticalAttr, requiredAttrStatus)
 		}
 
 	} else {
@@ -101,9 +99,8 @@ func ShouldNotify(device models.Device, smartAttrs measurements.Smart, statusThr
 	}
 }
 
-// TODO: include user label for device.
+// TODO: include host and/or user label for device.
 type Payload struct {
-	HostId       string `json:"host_id,omitempty"` //host id (optional)
 	DeviceType   string `json:"device_type"`   //ATA/SCSI/NVMe
 	DeviceName   string `json:"device_name"`   //dev/sda
 	DeviceSerial string `json:"device_serial"` //WDDJ324KSO
@@ -116,9 +113,8 @@ type Payload struct {
 	Message     string `json:"message"`
 }
 
-func NewPayload(device models.Device, test bool, currentTime ...time.Time) Payload {
+func NewPayload(device models.Device, test bool) Payload {
 	payload := Payload{
-		HostId:       strings.TrimSpace(device.HostId),
 		DeviceType:   device.DeviceType,
 		DeviceName:   device.DeviceName,
 		DeviceSerial: device.SerialNumber,
@@ -126,13 +122,7 @@ func NewPayload(device models.Device, test bool, currentTime ...time.Time) Paylo
 	}
 
 	//validate that the Payload is populated
-	var sendDate time.Time
+	sendDate := time.Now()
-	if currentTime != nil && len(currentTime) > 0 {
-		sendDate = currentTime[0]
-	} else {
-		sendDate = time.Now()
-	}
-
 	payload.Date = sendDate.Format(time.RFC3339)
 	payload.FailureType = payload.GenerateFailureType(device.DeviceStatus)
 	payload.Subject = payload.GenerateSubject()
@@ -156,39 +146,25 @@ func (p *Payload) GenerateFailureType(deviceStatus pkg.DeviceStatus) string {
 
 func (p *Payload) GenerateSubject() string {
 	//generate a detailed failure message
-	var subject string
+	return fmt.Sprintf("Scrutiny SMART error (%s) detected on device: %s", p.FailureType, p.DeviceName)
-	if len(p.HostId) > 0 {
-		subject = fmt.Sprintf("Scrutiny SMART error (%s) detected on [host]device: [%s]%s", p.FailureType, p.HostId, p.DeviceName)
-	} else {
-		subject = fmt.Sprintf("Scrutiny SMART error (%s) detected on device: %s", p.FailureType, p.DeviceName)
-	}
-	return subject
 }
 
 func (p *Payload) GenerateMessage() string {
 	//generate a detailed failure message
+	message := fmt.Sprintf(
+		`Scrutiny SMART error notification for device: %s
+Failure Type: %s
+Device Name: %s
+Device Serial: %s
+Device Type: %s
 
-	messageParts := []string{}
+Date: %s`, p.DeviceName, p.FailureType, p.DeviceName, p.DeviceSerial, p.DeviceType, p.Date)
-
-	messageParts = append(messageParts, fmt.Sprintf("Scrutiny SMART error notification for device: %s", p.DeviceName))
-	if len(p.HostId) > 0 {
-		messageParts = append(messageParts, fmt.Sprintf("Host Id: %s", p.HostId))
-	}
-
-	messageParts = append(messageParts,
-		fmt.Sprintf("Failure Type: %s", p.FailureType),
-		fmt.Sprintf("Device Name: %s", p.DeviceName),
-		fmt.Sprintf("Device Serial: %s", p.DeviceSerial),
-		fmt.Sprintf("Device Type: %s", p.DeviceType),
-		"",
-		fmt.Sprintf("Date: %s", p.Date),
-	)
 
 	if p.Test {
-		messageParts = append([]string{"TEST NOTIFICATION:"}, messageParts...)
+		message = "TEST NOTIFICATION:\n" + message
 	}
 
-	return strings.Join(messageParts, "\n")
+	return message
 }
 
 func New(logger logrus.FieldLogger, appconfig config.Interface, device models.Device, test bool) Notify {
@@ -309,9 +285,6 @@ func (n *Notify) SendScriptNotification(scriptUrl string) error {
 	copyEnv = append(copyEnv, fmt.Sprintf("SCRUTINY_DEVICE_TYPE=%s", n.Payload.DeviceType))
 	copyEnv = append(copyEnv, fmt.Sprintf("SCRUTINY_DEVICE_SERIAL=%s", n.Payload.DeviceSerial))
 	copyEnv = append(copyEnv, fmt.Sprintf("SCRUTINY_MESSAGE=%s", n.Payload.Message))
-	if len(n.Payload.HostId) > 0 {
-		copyEnv = append(copyEnv, fmt.Sprintf("SCRUTINY_HOST_ID=%s", n.Payload.HostId))
-	}
 	err := utils.CmdExec(scriptPath, []string{}, "", copyEnv, "")
 	if err != nil {
 		n.Logger.Errorf("An error occurred while executing script %s: %v", scriptPath, err)

webapp/backend/pkg/notify/notify_test.go

@@ -1,13 +1,11 @@
 package notify
 
 import (
-	"fmt"
 	"github.com/analogj/scrutiny/webapp/backend/pkg"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/models"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/models/measurements"
 	"github.com/stretchr/testify/require"
 	"testing"
-	"time"
 )
 
 func TestShouldNotify_MustSkipPassingDevices(t *testing.T) {
@@ -17,56 +15,56 @@ func TestShouldNotify_MustSkipPassingDevices(t *testing.T) {
 		DeviceStatus: pkg.DeviceStatusPassed,
 	}
 	smartAttrs := measurements.Smart{}
-	statusThreshold := pkg.MetricsStatusThresholdBoth
+	notifyLevel := pkg.NotifyLevelFail
-	notifyFilterAttributes := pkg.MetricsStatusFilterAttributesAll
+	notifyFilterAttributes := pkg.NotifyFilterAttributesAll
 
 	//assert
-	require.False(t, ShouldNotify(device, smartAttrs, statusThreshold, notifyFilterAttributes))
+	require.False(t, ShouldNotify(device, smartAttrs, notifyLevel, notifyFilterAttributes))
 }
 
-func TestShouldNotify_MetricsStatusThresholdBoth_FailingSmartDevice(t *testing.T) {
+func TestShouldNotify_NotifyLevelFail_FailingSmartDevice(t *testing.T) {
 	t.Parallel()
 	//setup
 	device := models.Device{
 		DeviceStatus: pkg.DeviceStatusFailedSmart,
 	}
 	smartAttrs := measurements.Smart{}
-	statusThreshold := pkg.MetricsStatusThresholdBoth
+	notifyLevel := pkg.NotifyLevelFail
-	notifyFilterAttributes := pkg.MetricsStatusFilterAttributesAll
+	notifyFilterAttributes := pkg.NotifyFilterAttributesAll
 
 	//assert
-	require.True(t, ShouldNotify(device, smartAttrs, statusThreshold, notifyFilterAttributes))
+	require.True(t, ShouldNotify(device, smartAttrs, notifyLevel, notifyFilterAttributes))
 }
 
-func TestShouldNotify_MetricsStatusThresholdSmart_FailingSmartDevice(t *testing.T) {
+func TestShouldNotify_NotifyLevelFailSmart_FailingSmartDevice(t *testing.T) {
 	t.Parallel()
 	//setup
 	device := models.Device{
 		DeviceStatus: pkg.DeviceStatusFailedSmart,
 	}
 	smartAttrs := measurements.Smart{}
-	statusThreshold := pkg.MetricsStatusThresholdSmart
+	notifyLevel := pkg.NotifyLevelFailSmart
-	notifyFilterAttributes := pkg.MetricsStatusFilterAttributesAll
+	notifyFilterAttributes := pkg.NotifyFilterAttributesAll
 
 	//assert
-	require.True(t, ShouldNotify(device, smartAttrs, statusThreshold, notifyFilterAttributes))
+	require.True(t, ShouldNotify(device, smartAttrs, notifyLevel, notifyFilterAttributes))
 }
 
-func TestShouldNotify_MetricsStatusThresholdScrutiny_FailingSmartDevice(t *testing.T) {
+func TestShouldNotify_NotifyLevelFailScrutiny_FailingSmartDevice(t *testing.T) {
 	t.Parallel()
 	//setup
 	device := models.Device{
 		DeviceStatus: pkg.DeviceStatusFailedSmart,
 	}
 	smartAttrs := measurements.Smart{}
-	statusThreshold := pkg.MetricsStatusThresholdScrutiny
+	notifyLevel := pkg.NotifyLevelFailScrutiny
-	notifyFilterAttributes := pkg.MetricsStatusFilterAttributesAll
+	notifyFilterAttributes := pkg.NotifyFilterAttributesAll
 
 	//assert
-	require.False(t, ShouldNotify(device, smartAttrs, statusThreshold, notifyFilterAttributes))
+	require.False(t, ShouldNotify(device, smartAttrs, notifyLevel, notifyFilterAttributes))
 }
 
-func TestShouldNotify_MetricsStatusFilterAttributesCritical_WithCriticalAttrs(t *testing.T) {
+func TestShouldNotify_NotifyFilterAttributesCritical_WithCriticalAttrs(t *testing.T) {
 	t.Parallel()
 	//setup
 	device := models.Device{
@@ -77,14 +75,14 @@ func TestShouldNotify_MetricsStatusFilterAttributesCritical_WithCriticalAttrs(t
 			Status: pkg.AttributeStatusFailedSmart,
 		},
 	}}
-	statusThreshold := pkg.MetricsStatusThresholdBoth
+	notifyLevel := pkg.NotifyLevelFail
-	notifyFilterAttributes := pkg.MetricsStatusFilterAttributesCritical
+	notifyFilterAttributes := pkg.NotifyFilterAttributesCritical
 
 	//assert
-	require.True(t, ShouldNotify(device, smartAttrs, statusThreshold, notifyFilterAttributes))
+	require.True(t, ShouldNotify(device, smartAttrs, notifyLevel, notifyFilterAttributes))
 }
 
-func TestShouldNotify_MetricsStatusFilterAttributesCritical_WithMultipleCriticalAttrs(t *testing.T) {
+func TestShouldNotify_NotifyFilterAttributesCritical_WithMultipleCriticalAttrs(t *testing.T) {
 	t.Parallel()
 	//setup
 	device := models.Device{
@@ -98,14 +96,14 @@ func TestShouldNotify_MetricsStatusFilterAttributesCritical_WithMultipleCritical
 			Status: pkg.AttributeStatusFailedScrutiny,
 		},
 	}}
-	statusThreshold := pkg.MetricsStatusThresholdBoth
+	notifyLevel := pkg.NotifyLevelFail
-	notifyFilterAttributes := pkg.MetricsStatusFilterAttributesCritical
+	notifyFilterAttributes := pkg.NotifyFilterAttributesCritical
 
 	//assert
-	require.True(t, ShouldNotify(device, smartAttrs, statusThreshold, notifyFilterAttributes))
+	require.True(t, ShouldNotify(device, smartAttrs, notifyLevel, notifyFilterAttributes))
 }
 
-func TestShouldNotify_MetricsStatusFilterAttributesCritical_WithNoCriticalAttrs(t *testing.T) {
+func TestShouldNotify_NotifyFilterAttributesCritical_WithNoCriticalAttrs(t *testing.T) {
 	t.Parallel()
 	//setup
 	device := models.Device{
@@ -116,14 +114,14 @@ func TestShouldNotify_MetricsStatusFilterAttributesCritical_WithNoCriticalAttrs(
 			Status: pkg.AttributeStatusFailedSmart,
 		},
 	}}
-	statusThreshold := pkg.MetricsStatusThresholdBoth
+	notifyLevel := pkg.NotifyLevelFail
-	notifyFilterAttributes := pkg.MetricsStatusFilterAttributesCritical
+	notifyFilterAttributes := pkg.NotifyFilterAttributesCritical
 
 	//assert
-	require.False(t, ShouldNotify(device, smartAttrs, statusThreshold, notifyFilterAttributes))
+	require.False(t, ShouldNotify(device, smartAttrs, notifyLevel, notifyFilterAttributes))
 }
 
-func TestShouldNotify_MetricsStatusFilterAttributesCritical_WithNoFailingCriticalAttrs(t *testing.T) {
+func TestShouldNotify_NotifyFilterAttributesCritical_WithNoFailingCriticalAttrs(t *testing.T) {
 	t.Parallel()
 	//setup
 	device := models.Device{
@@ -134,14 +132,14 @@ func TestShouldNotify_MetricsStatusFilterAttributesCritical_WithNoFailingCritica
 			Status: pkg.AttributeStatusPassed,
 		},
 	}}
-	statusThreshold := pkg.MetricsStatusThresholdBoth
+	notifyLevel := pkg.NotifyLevelFail
-	notifyFilterAttributes := pkg.MetricsStatusFilterAttributesCritical
+	notifyFilterAttributes := pkg.NotifyFilterAttributesCritical
 
 	//assert
-	require.False(t, ShouldNotify(device, smartAttrs, statusThreshold, notifyFilterAttributes))
+	require.False(t, ShouldNotify(device, smartAttrs, notifyLevel, notifyFilterAttributes))
 }
 
-func TestShouldNotify_MetricsStatusFilterAttributesCritical_MetricsStatusThresholdSmart_WithCriticalAttrsFailingScrutiny(t *testing.T) {
+func TestShouldNotify_NotifyFilterAttributesCritical_NotifyLevelFailSmart_WithCriticalAttrsFailingScrutiny(t *testing.T) {
 	t.Parallel()
 	//setup
 	device := models.Device{
@@ -155,90 +153,9 @@ func TestShouldNotify_MetricsStatusFilterAttributesCritical_MetricsStatusThresho
 			Status: pkg.AttributeStatusFailedScrutiny,
 		},
 	}}
-	statusThreshold := pkg.MetricsStatusThresholdSmart
+	notifyLevel := pkg.NotifyLevelFailSmart
-	notifyFilterAttributes := pkg.MetricsStatusFilterAttributesCritical
+	notifyFilterAttributes := pkg.NotifyFilterAttributesCritical
 
 	//assert
-	require.False(t, ShouldNotify(device, smartAttrs, statusThreshold, notifyFilterAttributes))
+	require.False(t, ShouldNotify(device, smartAttrs, notifyLevel, notifyFilterAttributes))
-}
-
-func TestNewPayload(t *testing.T) {
-	t.Parallel()
-
-	//setup
-	device := models.Device{
-		SerialNumber: "FAKEWDDJ324KSO",
-		DeviceType:   pkg.DeviceProtocolAta,
-		DeviceName:   "/dev/sda",
-		DeviceStatus: pkg.DeviceStatusFailedScrutiny,
-	}
-	currentTime := time.Now()
-	//test
-
-	payload := NewPayload(device, false, currentTime)
-
-	//assert
-	require.Equal(t, "Scrutiny SMART error (ScrutinyFailure) detected on device: /dev/sda", payload.Subject)
-	require.Equal(t, fmt.Sprintf(`Scrutiny SMART error notification for device: /dev/sda
-Failure Type: ScrutinyFailure
-Device Name: /dev/sda
-Device Serial: FAKEWDDJ324KSO
-Device Type: ATA
-
-Date: %s`, currentTime.Format(time.RFC3339)), payload.Message)
-}
-
-func TestNewPayload_TestMode(t *testing.T) {
-	t.Parallel()
-
-	//setup
-	device := models.Device{
-		SerialNumber: "FAKEWDDJ324KSO",
-		DeviceType:   pkg.DeviceProtocolAta,
-		DeviceName:   "/dev/sda",
-		DeviceStatus: pkg.DeviceStatusFailedScrutiny,
-	}
-	currentTime := time.Now()
-	//test
-
-	payload := NewPayload(device, true, currentTime)
-
-	//assert
-	require.Equal(t, "Scrutiny SMART error (EmailTest) detected on device: /dev/sda", payload.Subject)
-	require.Equal(t, fmt.Sprintf(`TEST NOTIFICATION:
-Scrutiny SMART error notification for device: /dev/sda
-Failure Type: EmailTest
-Device Name: /dev/sda
-Device Serial: FAKEWDDJ324KSO
-Device Type: ATA
-
-Date: %s`, currentTime.Format(time.RFC3339)), payload.Message)
-}
-
-func TestNewPayload_WithHostId(t *testing.T) {
-	t.Parallel()
-
-	//setup
-	device := models.Device{
-		SerialNumber: "FAKEWDDJ324KSO",
-		DeviceType:   pkg.DeviceProtocolAta,
-		DeviceName:   "/dev/sda",
-		DeviceStatus: pkg.DeviceStatusFailedScrutiny,
-		HostId:       "custom-host",
-	}
-	currentTime := time.Now()
-	//test
-
-	payload := NewPayload(device, false, currentTime)
-
-	//assert
-	require.Equal(t, "Scrutiny SMART error (ScrutinyFailure) detected on [host]device: [custom-host]/dev/sda", payload.Subject)
-	require.Equal(t, fmt.Sprintf(`Scrutiny SMART error notification for device: /dev/sda
-Host Id: custom-host
-Failure Type: ScrutinyFailure
-Device Name: /dev/sda
-Device Serial: FAKEWDDJ324KSO
-Device Type: ATA
-
-Date: %s`, currentTime.Format(time.RFC3339)), payload.Message)
 }

webapp/backend/pkg/version/version.go

@@ -2,4 +2,4 @@ package version
 
 // VERSION is the app-global version string, which will be replaced with a
 // new value during packaging
-const VERSION = "0.5.0"
+const VERSION = "0.4.15"

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

@@ -8,7 +8,7 @@ import (
 )
 
 func DeleteDevice(c *gin.Context) {
-	logger := c.MustGet("LOGGER").(*logrus.Entry)
+	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
 	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)
 
 	err := deviceRepo.DeleteDevice(c, c.Param("wwn"))

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

@@ -9,7 +9,7 @@ import (
 )
 
 func GetDeviceDetails(c *gin.Context) {
-	logger := c.MustGet("LOGGER").(*logrus.Entry)
+	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
 	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)
 
 	device, err := deviceRepo.GetDeviceDetails(c, c.Param("wwn"))

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

@@ -8,7 +8,7 @@ import (
 )
 
 func GetDevicesSummary(c *gin.Context) {
-	logger := c.MustGet("LOGGER").(*logrus.Entry)
+	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
 	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)
 
 	summary, err := deviceRepo.GetSummary(c)
@@ -18,7 +18,6 @@ func GetDevicesSummary(c *gin.Context) {
 		return
 	}
 
-	//this must match DeviceSummaryWrapper (webapp/backend/pkg/models/device_summary.go)
 	c.JSON(http.StatusOK, gin.H{
 		"success": true,
 		"data": map[string]interface{}{

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

@@ -8,7 +8,7 @@ import (
 )
 
 func GetDevicesSummaryTempHistory(c *gin.Context) {
-	logger := c.MustGet("LOGGER").(*logrus.Entry)
+	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
 	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)
 
 	durationKey, exists := c.GetQuery("duration_key")

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

@@ -1,25 +0,0 @@
-package handler
-
-import (
-	"github.com/analogj/scrutiny/webapp/backend/pkg/database"
-	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
-	"net/http"
-)
-
-func GetSettings(c *gin.Context) {
-	logger := c.MustGet("LOGGER").(*logrus.Entry)
-	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)
-
-	settings, err := deviceRepo.LoadSettings(c)
-	if err != nil {
-		logger.Errorln("An error occurred while retrieving settings", err)
-		c.JSON(http.StatusInternalServerError, gin.H{"success": false})
-		return
-	}
-
-	c.JSON(http.StatusOK, gin.H{
-		"success":  true,
-		"settings": settings,
-	})
-}

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

@@ -4,7 +4,6 @@ import (
 	"github.com/analogj/scrutiny/webapp/backend/pkg/database"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/models"
 	"github.com/gin-gonic/gin"
-	"github.com/samber/lo"
 	"github.com/sirupsen/logrus"
 	"net/http"
 )
@@ -13,7 +12,7 @@ import (
 // This function is run everytime a collector is about to start a run. It can be used to update device metadata.
 func RegisterDevices(c *gin.Context) {
 	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)
-	logger := c.MustGet("LOGGER").(*logrus.Entry)
+	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
 
 	var collectorDeviceWrapper models.DeviceWrapper
 	err := c.BindJSON(&collectorDeviceWrapper)
@@ -23,13 +22,8 @@ func RegisterDevices(c *gin.Context) {
 		return
 	}
 
-	//filter any device with empty wwn (they are invalid)
-	detectedStorageDevices := lo.Filter[models.Device](collectorDeviceWrapper.Data, func(dev models.Device, _ int) bool {
-		return len(dev.WWN) > 0
-	})
-
 	errs := []error{}
-	for _, dev := range detectedStorageDevices {
+	for _, dev := range collectorDeviceWrapper.Data {
 		//insert devices into DB (and update specified columns if device is already registered)
 		// update device fields that may change: (DeviceType, HostID)
 		if err := deviceRepo.RegisterDevice(c, dev); err != nil {
@@ -46,7 +40,7 @@ func RegisterDevices(c *gin.Context) {
 	} else {
 		c.JSON(http.StatusOK, models.DeviceWrapper{
 			Success: true,
-			Data:    detectedStorageDevices,
+			Data:    collectorDeviceWrapper.Data,
 		})
 		return
 	}

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

@@ -1,34 +0,0 @@
-package handler
-
-import (
-	"github.com/analogj/scrutiny/webapp/backend/pkg/database"
-	"github.com/analogj/scrutiny/webapp/backend/pkg/models"
-	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
-	"net/http"
-)
-
-func SaveSettings(c *gin.Context) {
-	logger := c.MustGet("LOGGER").(*logrus.Entry)
-	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)
-
-	var settings models.Settings
-	err := c.BindJSON(&settings)
-	if err != nil {
-		logger.Errorln("Cannot parse updated settings", err)
-		c.JSON(http.StatusInternalServerError, gin.H{"success": false})
-		return
-	}
-
-	err = deviceRepo.SaveSettings(c, settings)
-	if err != nil {
-		logger.Errorln("An error occurred while saving settings", err)
-		c.JSON(http.StatusInternalServerError, gin.H{"success": false})
-		return
-	}
-
-	c.JSON(http.StatusOK, gin.H{
-		"success":  true,
-		"settings": settings,
-	})
-}

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

@@ -13,7 +13,7 @@ import (
 // Send test notification
 func SendTestNotification(c *gin.Context) {
 	appConfig := c.MustGet("CONFIG").(config.Interface)
-	logger := c.MustGet("LOGGER").(*logrus.Entry)
+	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
 
 	testNotify := notify.New(
 		logger,

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

@@ -1,7 +1,6 @@
 package handler
 
 import (
-	"fmt"
 	"github.com/analogj/scrutiny/webapp/backend/pkg"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/config"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/database"
@@ -14,17 +13,13 @@ import (
 
 func UploadDeviceMetrics(c *gin.Context) {
 	//db := c.MustGet("DB").(*gorm.DB)
-	logger := c.MustGet("LOGGER").(*logrus.Entry)
+	logger := c.MustGet("LOGGER").(logrus.FieldLogger)
 	appConfig := c.MustGet("CONFIG").(config.Interface)
 	//influxWriteDb := c.MustGet("INFLUXDB_WRITE").(*api.WriteAPIBlocking)
 	deviceRepo := c.MustGet("DEVICE_REPOSITORY").(database.DeviceRepo)
 
 	//appConfig := c.MustGet("CONFIG").(config.Interface)
 
-	if c.Param("wwn") == "" {
-		c.JSON(http.StatusBadRequest, gin.H{"success": false})
-	}
-
 	var collectorSmartData collector.SmartInfo
 	err := c.BindJSON(&collectorSmartData)
 	if err != nil {
@@ -68,12 +63,7 @@ func UploadDeviceMetrics(c *gin.Context) {
 	}
 
 	//check for error
-	if notify.ShouldNotify(
+	if notify.ShouldNotify(updatedDevice, smartData, appConfig.GetString("notify.level"), appConfig.GetString("notify.filter_attributes")) {
-		updatedDevice,
-		smartData,
-		pkg.MetricsStatusThreshold(appConfig.GetInt(fmt.Sprintf("%s.metrics.status_threshold", config.DB_USER_SETTINGS_SUBKEY))),
-		pkg.MetricsStatusFilterAttributes(appConfig.GetInt(fmt.Sprintf("%s.metrics.status_filter_attributes", config.DB_USER_SETTINGS_SUBKEY))),
-	) {
 		//send notifications
 
 		liveNotify := notify.New(

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

@@ -28,11 +28,11 @@ import (
 var timeFormat = "02/Jan/2006:15:04:05 -0700"
 
 // Logger is the logrus logger handler
-func LoggerMiddleware(logger *logrus.Entry) gin.HandlerFunc {
+func LoggerMiddleware(logger logrus.FieldLogger) gin.HandlerFunc {
 
 	hostname, err := os.Hostname()
 	if err != nil {
-		hostname = "unknown"
+		hostname = "unknow"
 	}
 
 	return func(c *gin.Context) {

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

@@ -1,7 +1,6 @@
 package middleware
 
 import (
-	"context"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/config"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/database"
 	"github.com/gin-gonic/gin"
@@ -15,14 +14,6 @@ func RepositoryMiddleware(appConfig config.Interface, globalLogger logrus.FieldL
 		panic(err)
 	}
 
-	// ensure the settings have been loaded into the app config during startup.
-	_, err = deviceRepo.LoadSettings(context.Background())
-	if err != nil {
-		panic(err)
-	}
-
-	//settings.UpdateSettingEntries()
-
 	//TODO: determine where we can call defer deviceRepo.Close()
 	return func(c *gin.Context) {
 		c.Set("DEVICE_REPOSITORY", deviceRepo)

webapp/backend/pkg/web/server.go

@@ -9,17 +9,18 @@ import (
 	"github.com/analogj/scrutiny/webapp/backend/pkg/web/middleware"
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
+	"io"
 	"net/http"
+	"os"
 	"path/filepath"
 	"strings"
 )
 
 type AppEngine struct {
 	Config config.Interface
-	Logger *logrus.Entry
 }
 
-func (ae *AppEngine) Setup(logger *logrus.Entry) *gin.Engine {
+func (ae *AppEngine) Setup(logger logrus.FieldLogger) *gin.Engine {
 	r := gin.New()
 
 	r.Use(middleware.LoggerMiddleware(logger))
@@ -35,10 +36,6 @@ func (ae *AppEngine) Setup(logger *logrus.Entry) *gin.Engine {
 		api := base.Group("/api")
 		{
 			api.GET("/health", func(c *gin.Context) {
-				//TODO:
-				// check if the /web folder is populated.
-				// check if access to influxdb
-				// check if access to sqlitedb.
 				c.JSON(http.StatusOK, gin.H{
 					"success": true,
 				})
@@ -53,8 +50,6 @@ func (ae *AppEngine) Setup(logger *logrus.Entry) *gin.Engine {
 			api.GET("/device/:wwn/details", handler.GetDeviceDetails) //used by Details
 			api.DELETE("/device/:wwn", handler.DeleteDevice)          //used by UI to delete device
 
-			api.GET("/settings", handler.GetSettings)   //used to get settings
-			api.POST("/settings", handler.SaveSettings) //used to save settings
 		}
 	}
 
@@ -80,6 +75,26 @@ func (ae *AppEngine) Start() error {
 		gin.SetMode(gin.DebugMode)
 	}
 
+	logger := logrus.New()
+	//set default log level
+	logLevel, err := logrus.ParseLevel(ae.Config.GetString("log.level"))
+	if err != nil {
+		return err
+	}
+	logger.SetLevel(logLevel)
+	//set the log file if present
+	if len(ae.Config.GetString("log.file")) != 0 {
+		logFile, err := os.OpenFile(ae.Config.GetString("log.file"), os.O_CREATE|os.O_WRONLY, 0644)
+		defer logFile.Close()
+		if err != nil {
+			logrus.Errorf("Failed to open log file %s for output: %s", ae.Config.GetString("log.file"), err)
+			return err
+		}
+
+		//configure the logrus default
+		logger.SetOutput(io.MultiWriter(os.Stderr, logFile))
+	}
+
 	//check if the database parent directory exists, fail here rather than in a handler.
 	if !utils.FileExists(filepath.Dir(ae.Config.GetString("web.database.location"))) {
 		return errors.ConfigValidationError(fmt.Sprintf(
@@ -87,7 +102,7 @@ func (ae *AppEngine) Start() error {
 			filepath.Dir(ae.Config.GetString("web.database.location"))))
 	}
 
-	r := ae.Setup(ae.Logger)
+	r := ae.Setup(logger)
 
 	return r.Run(fmt.Sprintf("%s:%s", ae.Config.GetString("web.listen.host"), ae.Config.GetString("web.listen.port")))
 }

webapp/backend/pkg/web/server_test.go

@@ -3,9 +3,7 @@ package web_test
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"github.com/analogj/scrutiny/webapp/backend/pkg"
-	"github.com/analogj/scrutiny/webapp/backend/pkg/config"
 	mock_config "github.com/analogj/scrutiny/webapp/backend/pkg/config/mock"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/models"
 	"github.com/analogj/scrutiny/webapp/backend/pkg/models/collector"
@@ -91,8 +89,6 @@ func (suite *ServerTestSuite) TestHealthRoute() {
 	mockCtrl := gomock.NewController(suite.T())
 	defer mockCtrl.Finish()
 	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().SetDefault(gomock.Any(), gomock.Any()).AnyTimes()
-	fakeConfig.EXPECT().UnmarshalKey(gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
 	fakeConfig.EXPECT().GetString("web.database.location").Return(path.Join(parentPath, "scrutiny_test.db")).AnyTimes()
 	fakeConfig.EXPECT().GetString("web.src.frontend.path").Return(parentPath).AnyTimes()
 	fakeConfig.EXPECT().GetString("web.listen.basepath").Return(suite.Basepath).AnyTimes()
@@ -115,7 +111,7 @@ func (suite *ServerTestSuite) TestHealthRoute() {
 		Config: fakeConfig,
 	}
 
-	router := ae.Setup(logrus.WithField("test", suite.T().Name()))
+	router := ae.Setup(logrus.New())
 
 	//test
 	w := httptest.NewRecorder()
@@ -134,8 +130,6 @@ func (suite *ServerTestSuite) TestRegisterDevicesRoute() {
 	mockCtrl := gomock.NewController(suite.T())
 	defer mockCtrl.Finish()
 	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().SetDefault(gomock.Any(), gomock.Any()).AnyTimes()
-	fakeConfig.EXPECT().UnmarshalKey(gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
 	fakeConfig.EXPECT().GetString("web.database.location").Return(path.Join(parentPath, "scrutiny_test.db")).AnyTimes()
 	fakeConfig.EXPECT().GetString("web.src.frontend.path").Return(parentPath).AnyTimes()
 	fakeConfig.EXPECT().GetString("web.listen.basepath").Return(suite.Basepath).AnyTimes()
@@ -156,7 +150,7 @@ func (suite *ServerTestSuite) TestRegisterDevicesRoute() {
 	ae := web.AppEngine{
 		Config: fakeConfig,
 	}
-	router := ae.Setup(logrus.WithField("test", suite.T().Name()))
+	router := ae.Setup(logrus.New())
 	file, err := os.Open("testdata/register-devices-req.json")
 	require.NoError(suite.T(), err)
 
@@ -176,8 +170,6 @@ func (suite *ServerTestSuite) TestUploadDeviceMetricsRoute() {
 	mockCtrl := gomock.NewController(suite.T())
 	defer mockCtrl.Finish()
 	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().SetDefault(gomock.Any(), gomock.Any()).AnyTimes()
-	fakeConfig.EXPECT().UnmarshalKey(gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
 	fakeConfig.EXPECT().GetString("web.database.location").AnyTimes().Return(path.Join(parentPath, "scrutiny_test.db"))
 	fakeConfig.EXPECT().GetString("web.src.frontend.path").AnyTimes().Return(parentPath)
 	fakeConfig.EXPECT().GetString("web.listen.basepath").Return(suite.Basepath).AnyTimes()
@@ -194,14 +186,13 @@ func (suite *ServerTestSuite) TestUploadDeviceMetricsRoute() {
 	} else {
 		fakeConfig.EXPECT().GetString("web.influxdb.host").Return("localhost").AnyTimes()
 	}
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.notify_level", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsNotifyLevelFail))
+	fakeConfig.EXPECT().GetString("notify.level").AnyTimes().Return(pkg.NotifyLevelFail)
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.status_filter_attributes", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsStatusFilterAttributesAll))
+	fakeConfig.EXPECT().GetString("notify.filter_attributes").AnyTimes().Return(pkg.NotifyFilterAttributesAll)
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.status_threshold", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsStatusThresholdBoth))
 
 	ae := web.AppEngine{
 		Config: fakeConfig,
 	}
-	router := ae.Setup(logrus.WithField("test", suite.T().Name()))
+	router := ae.Setup(logrus.New())
 	devicesfile, err := os.Open("testdata/register-devices-single-req.json")
 	require.NoError(suite.T(), err)
 
@@ -228,13 +219,10 @@ func (suite *ServerTestSuite) TestPopulateMultiple() {
 	mockCtrl := gomock.NewController(suite.T())
 	defer mockCtrl.Finish()
 	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().SetDefault(gomock.Any(), gomock.Any()).AnyTimes()
-	fakeConfig.EXPECT().UnmarshalKey(gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
 	//fakeConfig.EXPECT().GetString("web.database.location").AnyTimes().Return("testdata/scrutiny_test.db")
 	fakeConfig.EXPECT().GetStringSlice("notify.urls").Return([]string{}).AnyTimes()
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.notify_level", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsNotifyLevelFail))
+	fakeConfig.EXPECT().GetString("notify.level").AnyTimes().Return(pkg.NotifyLevelFail)
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.status_filter_attributes", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsStatusFilterAttributesAll))
+	fakeConfig.EXPECT().GetString("notify.filter_attributes").AnyTimes().Return(pkg.NotifyFilterAttributesAll)
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.status_threshold", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsStatusThresholdBoth))
 	fakeConfig.EXPECT().GetString("web.database.location").AnyTimes().Return(path.Join(parentPath, "scrutiny_test.db"))
 	fakeConfig.EXPECT().GetString("web.src.frontend.path").AnyTimes().Return(parentPath)
 	fakeConfig.EXPECT().GetString("web.listen.basepath").Return(suite.Basepath).AnyTimes()
@@ -255,7 +243,7 @@ func (suite *ServerTestSuite) TestPopulateMultiple() {
 	ae := web.AppEngine{
 		Config: fakeConfig,
 	}
-	router := ae.Setup(logrus.WithField("test", suite.T().Name()))
+	router := ae.Setup(logrus.New())
 	devicesfile, err := os.Open("testdata/register-devices-req.json")
 	require.NoError(suite.T(), err)
 
@@ -331,8 +319,6 @@ func (suite *ServerTestSuite) TestSendTestNotificationRoute_WebhookFailure() {
 	mockCtrl := gomock.NewController(suite.T())
 	defer mockCtrl.Finish()
 	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().SetDefault(gomock.Any(), gomock.Any()).AnyTimes()
-	fakeConfig.EXPECT().UnmarshalKey(gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
 	fakeConfig.EXPECT().GetString("web.database.location").AnyTimes().Return(path.Join(parentPath, "scrutiny_test.db"))
 	fakeConfig.EXPECT().GetString("web.src.frontend.path").AnyTimes().Return(parentPath)
 	fakeConfig.EXPECT().GetString("web.listen.basepath").Return(suite.Basepath).AnyTimes()
@@ -344,9 +330,8 @@ func (suite *ServerTestSuite) TestSendTestNotificationRoute_WebhookFailure() {
 	fakeConfig.EXPECT().GetString("web.influxdb.bucket").Return("metrics").AnyTimes()
 	fakeConfig.EXPECT().GetBool("web.influxdb.retention_policy").Return(false).AnyTimes()
 	fakeConfig.EXPECT().GetStringSlice("notify.urls").AnyTimes().Return([]string{"https://unroutable.domain.example.asdfghj"})
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.notify_level", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsNotifyLevelFail))
+	fakeConfig.EXPECT().GetString("notify.level").AnyTimes().Return(pkg.NotifyLevelFail)
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.status_filter_attributes", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsStatusFilterAttributesAll))
+	fakeConfig.EXPECT().GetString("notify.filter_attributes").AnyTimes().Return(pkg.NotifyFilterAttributesAll)
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.status_threshold", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsStatusThresholdBoth))
 
 	if _, isGithubActions := os.LookupEnv("GITHUB_ACTIONS"); isGithubActions {
 		// when running test suite in github actions, we run an influxdb service as a sidecar.
@@ -358,7 +343,7 @@ func (suite *ServerTestSuite) TestSendTestNotificationRoute_WebhookFailure() {
 	ae := web.AppEngine{
 		Config: fakeConfig,
 	}
-	router := ae.Setup(logrus.WithField("test", suite.T().Name()))
+	router := ae.Setup(logrus.New())
 
 	//test
 	wr := httptest.NewRecorder()
@@ -376,8 +361,6 @@ func (suite *ServerTestSuite) TestSendTestNotificationRoute_ScriptFailure() {
 	mockCtrl := gomock.NewController(suite.T())
 	defer mockCtrl.Finish()
 	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().SetDefault(gomock.Any(), gomock.Any()).AnyTimes()
-	fakeConfig.EXPECT().UnmarshalKey(gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
 	fakeConfig.EXPECT().GetString("web.database.location").AnyTimes().Return(path.Join(parentPath, "scrutiny_test.db"))
 	fakeConfig.EXPECT().GetString("web.src.frontend.path").AnyTimes().Return(parentPath)
 	fakeConfig.EXPECT().GetString("web.listen.basepath").Return(suite.Basepath).AnyTimes()
@@ -389,9 +372,8 @@ func (suite *ServerTestSuite) TestSendTestNotificationRoute_ScriptFailure() {
 	fakeConfig.EXPECT().GetString("web.influxdb.bucket").Return("metrics").AnyTimes()
 	fakeConfig.EXPECT().GetBool("web.influxdb.retention_policy").Return(false).AnyTimes()
 	fakeConfig.EXPECT().GetStringSlice("notify.urls").AnyTimes().Return([]string{"script:///missing/path/on/disk"})
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.notify_level", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsNotifyLevelFail))
+	fakeConfig.EXPECT().GetString("notify.level").AnyTimes().Return(pkg.NotifyLevelFail)
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.status_filter_attributes", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsStatusFilterAttributesAll))
+	fakeConfig.EXPECT().GetString("notify.filter_attributes").AnyTimes().Return(pkg.NotifyFilterAttributesAll)
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.status_threshold", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsStatusThresholdBoth))
 
 	if _, isGithubActions := os.LookupEnv("GITHUB_ACTIONS"); isGithubActions {
 		// when running test suite in github actions, we run an influxdb service as a sidecar.
@@ -403,7 +385,7 @@ func (suite *ServerTestSuite) TestSendTestNotificationRoute_ScriptFailure() {
 	ae := web.AppEngine{
 		Config: fakeConfig,
 	}
-	router := ae.Setup(logrus.WithField("test", suite.T().Name()))
+	router := ae.Setup(logrus.New())
 
 	//test
 	wr := httptest.NewRecorder()
@@ -421,8 +403,6 @@ func (suite *ServerTestSuite) TestSendTestNotificationRoute_ScriptSuccess() {
 	mockCtrl := gomock.NewController(suite.T())
 	defer mockCtrl.Finish()
 	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().SetDefault(gomock.Any(), gomock.Any()).AnyTimes()
-	fakeConfig.EXPECT().UnmarshalKey(gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
 	fakeConfig.EXPECT().GetString("web.database.location").AnyTimes().Return(path.Join(parentPath, "scrutiny_test.db"))
 	fakeConfig.EXPECT().GetString("web.src.frontend.path").AnyTimes().Return(parentPath)
 	fakeConfig.EXPECT().GetString("web.listen.basepath").Return(suite.Basepath).AnyTimes()
@@ -434,9 +414,8 @@ func (suite *ServerTestSuite) TestSendTestNotificationRoute_ScriptSuccess() {
 	fakeConfig.EXPECT().GetString("web.influxdb.bucket").Return("metrics").AnyTimes()
 	fakeConfig.EXPECT().GetBool("web.influxdb.retention_policy").Return(false).AnyTimes()
 	fakeConfig.EXPECT().GetStringSlice("notify.urls").AnyTimes().Return([]string{"script:///usr/bin/env"})
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.notify_level", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsNotifyLevelFail))
+	fakeConfig.EXPECT().GetString("notify.level").AnyTimes().Return(pkg.NotifyLevelFail)
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.status_filter_attributes", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsStatusFilterAttributesAll))
+	fakeConfig.EXPECT().GetString("notify.filter_attributes").AnyTimes().Return(pkg.NotifyFilterAttributesAll)
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.status_threshold", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsStatusThresholdBoth))
 
 	if _, isGithubActions := os.LookupEnv("GITHUB_ACTIONS"); isGithubActions {
 		// when running test suite in github actions, we run an influxdb service as a sidecar.
@@ -448,7 +427,7 @@ func (suite *ServerTestSuite) TestSendTestNotificationRoute_ScriptSuccess() {
 	ae := web.AppEngine{
 		Config: fakeConfig,
 	}
-	router := ae.Setup(logrus.WithField("test", suite.T().Name()))
+	router := ae.Setup(logrus.New())
 
 	//test
 	wr := httptest.NewRecorder()
@@ -466,8 +445,6 @@ func (suite *ServerTestSuite) TestSendTestNotificationRoute_ShoutrrrFailure() {
 	mockCtrl := gomock.NewController(suite.T())
 	defer mockCtrl.Finish()
 	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().SetDefault(gomock.Any(), gomock.Any()).AnyTimes()
-	fakeConfig.EXPECT().UnmarshalKey(gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
 	fakeConfig.EXPECT().GetString("web.database.location").AnyTimes().Return(path.Join(parentPath, "scrutiny_test.db"))
 	fakeConfig.EXPECT().GetString("web.src.frontend.path").AnyTimes().Return(parentPath)
 	fakeConfig.EXPECT().GetString("web.listen.basepath").Return(suite.Basepath).AnyTimes()
@@ -479,9 +456,8 @@ func (suite *ServerTestSuite) TestSendTestNotificationRoute_ShoutrrrFailure() {
 	fakeConfig.EXPECT().GetString("web.influxdb.bucket").Return("metrics").AnyTimes()
 	fakeConfig.EXPECT().GetBool("web.influxdb.retention_policy").Return(false).AnyTimes()
 	fakeConfig.EXPECT().GetStringSlice("notify.urls").AnyTimes().Return([]string{"discord://invalidtoken@channel"})
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.notify_level", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsNotifyLevelFail))
+	fakeConfig.EXPECT().GetString("notify.level").AnyTimes().Return(pkg.NotifyLevelFail)
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.status_filter_attributes", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsStatusFilterAttributesAll))
+	fakeConfig.EXPECT().GetString("notify.filter_attributes").AnyTimes().Return(pkg.NotifyFilterAttributesAll)
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.status_threshold", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsStatusThresholdBoth))
 
 	if _, isGithubActions := os.LookupEnv("GITHUB_ACTIONS"); isGithubActions {
 		// when running test suite in github actions, we run an influxdb service as a sidecar.
@@ -492,7 +468,7 @@ func (suite *ServerTestSuite) TestSendTestNotificationRoute_ShoutrrrFailure() {
 	ae := web.AppEngine{
 		Config: fakeConfig,
 	}
-	router := ae.Setup(logrus.WithField("test", suite.T().Name()))
+	router := ae.Setup(logrus.New())
 
 	//test
 	wr := httptest.NewRecorder()
@@ -510,8 +486,6 @@ func (suite *ServerTestSuite) TestGetDevicesSummaryRoute_Nvme() {
 	mockCtrl := gomock.NewController(suite.T())
 	defer mockCtrl.Finish()
 	fakeConfig := mock_config.NewMockInterface(mockCtrl)
-	fakeConfig.EXPECT().SetDefault(gomock.Any(), gomock.Any()).AnyTimes()
-	fakeConfig.EXPECT().UnmarshalKey(gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
 	fakeConfig.EXPECT().GetString("web.database.location").AnyTimes().Return(path.Join(parentPath, "scrutiny_test.db"))
 	fakeConfig.EXPECT().GetString("web.src.frontend.path").AnyTimes().Return(parentPath)
 	fakeConfig.EXPECT().GetString("web.listen.basepath").Return(suite.Basepath).AnyTimes()
@@ -523,10 +497,8 @@ func (suite *ServerTestSuite) TestGetDevicesSummaryRoute_Nvme() {
 	fakeConfig.EXPECT().GetString("web.influxdb.bucket").Return("metrics").AnyTimes()
 	fakeConfig.EXPECT().GetBool("web.influxdb.retention_policy").Return(false).AnyTimes()
 	fakeConfig.EXPECT().GetStringSlice("notify.urls").AnyTimes().Return([]string{})
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.notify_level", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsNotifyLevelFail))
+	fakeConfig.EXPECT().GetString("notify.level").AnyTimes().Return(pkg.NotifyLevelFail)
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.status_filter_attributes", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsStatusFilterAttributesAll))
+	fakeConfig.EXPECT().GetString("notify.filter_attributes").AnyTimes().Return(pkg.NotifyFilterAttributesAll)
-	fakeConfig.EXPECT().GetInt(fmt.Sprintf("%s.metrics.status_threshold", config.DB_USER_SETTINGS_SUBKEY)).AnyTimes().Return(int(pkg.MetricsStatusThresholdBoth))
-
 	if _, isGithubActions := os.LookupEnv("GITHUB_ACTIONS"); isGithubActions {
 		// when running test suite in github actions, we run an influxdb service as a sidecar.
 		fakeConfig.EXPECT().GetString("web.influxdb.host").Return("influxdb").AnyTimes()
@@ -537,7 +509,7 @@ func (suite *ServerTestSuite) TestGetDevicesSummaryRoute_Nvme() {
 	ae := web.AppEngine{
 		Config: fakeConfig,
 	}
-	router := ae.Setup(logrus.WithField("test", suite.T().Name()))
+	router := ae.Setup(logrus.New())
 	devicesfile, err := os.Open("testdata/register-devices-req-2.json")
 	require.NoError(suite.T(), err)
 

webapp/frontend/.gitignore

@@ -46,5 +46,3 @@ testem.log
 Thumbs.db
 
 /dist
-
-/coverage

webapp/frontend/angular.json

@@ -91,7 +91,6 @@
                 },
                 "test": {
                     "builder": "@angular-devkit/build-angular:karma",
-                    "defaultConfiguration": "production",
                     "options": {
                         "main": "src/test.ts",
                         "polyfills": "src/polyfills.ts",
@@ -102,22 +101,10 @@
                             "src/favicon-32x32.png",
                             "src/assets"
                         ],
-                        "stylePreprocessorOptions": {
-                            "includePaths": [
-                                "src/@treo/styles"
-                            ]
-                        },
                         "styles": [
-                            "src/styles/vendors.scss",
+                            "src/styles.scss"
-                            "src/@treo/styles/main.scss",
-                            "src/styles/styles.scss",
-                            "src/styles/tailwind.scss"
                         ],
-                        "scripts": [],
+                        "scripts": []
-                        "fileReplacements": [{
-                            "replace": "src/environments/environment.ts",
-                            "with": "src/environments/environment.prod.ts"
-                        }]
                     }
                 },
                 "lint": {

webapp/frontend/karma.conf.js

@@ -17,7 +17,7 @@ module.exports = function (config)
             clearContext: false // leave Jasmine Spec Runner output visible in browser
         },
         coverageIstanbulReporter: {
-            dir: require('path').join(__dirname, './coverage'),
+            dir                  : require('path').join(__dirname, './coverage/treo'),
             reports              : ['html', 'lcovonly', 'text-summary'],
             fixWebpackSourcePaths: true
         },

webapp/frontend/src/app/app.module.ts

@@ -1,11 +1,11 @@
-import {enableProdMode, NgModule} from '@angular/core';
+import { NgModule, enableProdMode } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ExtraOptions, PreloadAllModules, RouterModule } from '@angular/router';
 import { APP_BASE_HREF } from '@angular/common';
 import { MarkdownModule } from 'ngx-markdown';
 import { TreoModule } from '@treo';
-import {ScrutinyConfigModule} from 'app/core/config/scrutiny-config.module';
+import { TreoConfigModule } from '@treo/services/config';
 import { TreoMockApiModule } from '@treo/lib/mock-api';
 import { CoreModule } from 'app/core/core.module';
 import { appConfig } from 'app/core/config/app.config';
@@ -41,7 +41,7 @@ if (process.env.NODE_ENV === 'production') {
 
         // Treo & Treo Mock API
         TreoModule,
-        ScrutinyConfigModule.forRoot(appConfig),
+        TreoConfigModule.forRoot(appConfig),
         ...dev,
 
         // Core

webapp/frontend/src/app/core/config/app.config.ts

@@ -3,56 +3,20 @@ import {Layout} from 'app/layout/layout.types';
 // Theme type
 export type Theme = 'light' | 'dark' | 'system';
 
-// Device title to display on the dashboard
-export type DashboardDisplay = 'name' | 'serial_id' | 'uuid' | 'label'
-
-export type DashboardSort = 'status' | 'title' | 'age'
-
-export type TemperatureUnit = 'celsius' | 'fahrenheit'
-
-
-export enum MetricsNotifyLevel {
-    Warn = 1,
-    Fail = 2
-}
-
-export enum MetricsStatusFilterAttributes {
-    All = 0,
-    Critical = 1
-}
-
-export enum MetricsStatusThreshold {
-    Smart = 1,
-    Scrutiny = 2,
-
-    // shortcut
-    Both = 3
-}
-
 /**
  * AppConfig interface. Update this interface to strictly type your config
  * object.
  */
-export interface AppConfig {
+export interface AppConfig
-    theme?: Theme;
+{
-    layout?: Layout;
+    theme: Theme;
+    layout: Layout;
 
     // Dashboard options
-    dashboard_display?: DashboardDisplay;
+    dashboardDisplay: string;
-    dashboard_sort?: DashboardSort;
+    dashboardSort: string;
-
-    temperature_unit?: TemperatureUnit;
-
-    file_size_si_units?: boolean;
-
-    // Settings from Scrutiny API
-
-    metrics?: {
-        notify_level?: MetricsNotifyLevel
-        status_filter_attributes?: MetricsStatusFilterAttributes
-        status_threshold?: MetricsStatusThreshold
-    }
 
+    temperatureUnit: string;
 }
 
 /**
@@ -67,16 +31,9 @@ export const appConfig: AppConfig = {
     theme : 'light',
     layout: 'material',
 
-    dashboard_display: 'name',
+    dashboardDisplay: 'name',
-    dashboard_sort: 'status',
+    dashboardSort: 'status',
 
-    temperature_unit: 'celsius',
+    temperatureUnit: 'celsius',
-    file_size_si_units: false,
-
-    metrics: {
-        notify_level: MetricsNotifyLevel.Fail,
-        status_filter_attributes: MetricsStatusFilterAttributes.All,
-        status_threshold: MetricsStatusThreshold.Both
-    }
 };
 

webapp/frontend/src/app/core/config/scrutiny-config.module.ts

@@ -1,33 +0,0 @@
-import {ModuleWithProviders, NgModule} from '@angular/core';
-import {ScrutinyConfigService} from 'app/core/config/scrutiny-config.service';
-import {TREO_APP_CONFIG} from '@treo/services/config/config.constants';
-
-@NgModule()
-export class ScrutinyConfigModule {
-    /**
-     * Constructor
-     *
-     * @param {ScrutinyConfigService} _scrutinyConfigService
-     */
-    constructor(
-        private _scrutinyConfigService: ScrutinyConfigService
-    ) {
-    }
-
-    /**
-     * forRoot method for setting user configuration
-     *
-     * @param config
-     */
-    static forRoot(config: any): ModuleWithProviders {
-        return {
-            ngModule: ScrutinyConfigModule,
-            providers: [
-                {
-                    provide: TREO_APP_CONFIG,
-                    useValue: config
-                }
-            ]
-        };
-    }
-}

webapp/frontend/src/app/core/config/scrutiny-config.service.ts

@@ -1,84 +0,0 @@
-import {Inject, Injectable} from '@angular/core';
-import {HttpClient} from '@angular/common/http';
-import {TREO_APP_CONFIG} from '@treo/services/config/config.constants';
-import {BehaviorSubject, Observable} from 'rxjs';
-import {getBasePath} from '../../app.routing';
-import {map, tap} from 'rxjs/operators';
-import {AppConfig} from './app.config';
-import {merge} from 'lodash';
-
-@Injectable({
-    providedIn: 'root'
-})
-export class ScrutinyConfigService {
-    // Private
-    private _config: BehaviorSubject<AppConfig>;
-    private _defaultConfig: AppConfig;
-
-    constructor(
-        private _httpClient: HttpClient,
-        @Inject(TREO_APP_CONFIG) defaultConfig: AppConfig
-    ) {
-        // Set the private defaults
-        this._defaultConfig = defaultConfig
-        this._config = new BehaviorSubject(null);
-    }
-
-
-    // -----------------------------------------------------------------------------------------------------
-    // @ Accessors
-    // -----------------------------------------------------------------------------------------------------
-
-    /**
-     * Setter & getter for config
-     */
-    set config(value: AppConfig) {
-        // get the current config, merge the new values, and then submit. (setTheme only sets a single key, not the whole obj)
-        const mergedSettings = merge({}, this._config.getValue(), value);
-
-        console.log('saving settings...', mergedSettings)
-        this._httpClient.post(getBasePath() + '/api/settings', mergedSettings).pipe(
-            map((response: any) => {
-                console.log('settings resp')
-                return response.settings
-            }),
-            tap((settings: AppConfig) => {
-                this._config.next(settings);
-                return settings
-            })
-        ).subscribe(resp => {
-            console.log('updated settings', resp)
-        })
-    }
-
-    get config$(): Observable<AppConfig> {
-        if (this._config.getValue()) {
-            console.log('using cached settings:', this._config.getValue())
-            return this._config.asObservable()
-        } else {
-            console.log('retrieving settings')
-            return this._httpClient.get(getBasePath() + '/api/settings').pipe(
-                map((response: any) => {
-                    return response.settings
-                }),
-                tap((settings: AppConfig) => {
-                    this._config.next(settings);
-                    return this._config.asObservable()
-                })
-            );
-        }
-
-    }
-
-    // -----------------------------------------------------------------------------------------------------
-    // @ Public methods
-    // -----------------------------------------------------------------------------------------------------
-
-    /**
-     * Resets the config to the default
-     */
-    reset(): void {
-        // Set the config
-        this.config = this._defaultConfig
-    }
-}

webapp/frontend/src/app/core/models/device-details-response-wrapper.ts

@@ -1,14 +0,0 @@
-import {DeviceModel} from 'app/core/models/device-model';
-import {SmartModel} from 'app/core/models/measurements/smart-model';
-import {AttributeMetadataModel} from 'app/core/models/thresholds/attribute-metadata-model';
-
-// maps to webapp/backend/pkg/models/device_summary.go
-export interface DeviceDetailsResponseWrapper {
-    success: boolean;
-    errors?: any[];
-    data: {
-        device: DeviceModel;
-        smart_results: SmartModel[];
-    },
-    metadata: { [key: string]: AttributeMetadataModel } | { [key: number]: AttributeMetadataModel };
-}

webapp/frontend/src/app/core/models/device-model.ts

@@ -1,26 +0,0 @@
-// maps to webapp/backend/pkg/models/device.go
-export interface DeviceModel {
-    wwn: string;
-    device_name?: string;
-    device_uuid?: string;
-    device_serial_id?: string;
-    device_label?: string;
-
-    manufacturer: string;
-    model_name: string;
-    interface_type: string;
-    interface_speed: string;
-    serial_number: string;
-    firmware: string;
-    rotational_speed: number;
-    capacity: number;
-    form_factor: string;
-    smart_support: boolean;
-    device_protocol: string;
-    device_type: string;
-
-    label: string;
-    host_id: string;
-
-    device_status: number;
-}

webapp/frontend/src/app/core/models/device-summary-model.ts

@@ -1,16 +0,0 @@
-import {DeviceModel} from 'app/core/models/device-model';
-import {SmartTemperatureModel} from 'app/core/models/measurements/smart-temperature-model';
-
-// maps to webapp/backend/pkg/models/device_summary.go
-export interface DeviceSummaryModel {
-    device: DeviceModel;
-    smart?: SmartSummary;
-    temp_history?: SmartTemperatureModel[];
-}
-
-export interface SmartSummary {
-    collector_date?: string,
-    temp?: number
-    power_on_hours?: number
-}
-

webapp/frontend/src/app/core/models/device-summary-response-wrapper.ts

@@ -1,10 +0,0 @@
-import {DeviceSummaryModel} from 'app/core/models/device-summary-model';
-
-// maps to webapp/backend/pkg/models/device_summary.go
-export interface DeviceSummaryResponseWrapper {
-    success: boolean;
-    errors: any[];
-    data: {
-        summary: { [key: string]: DeviceSummaryModel }
-    }
-}

webapp/frontend/src/app/core/models/device-summary-temp-response-wrapper.ts

@@ -1,9 +0,0 @@
-import {SmartTemperatureModel} from './measurements/smart-temperature-model';
-
-export interface DeviceSummaryTempResponseWrapper {
-    success: boolean;
-    errors: any[];
-    data: {
-        temp_history: { [key: string]: SmartTemperatureModel[]; }
-    }
-}

webapp/frontend/src/app/core/models/measurements/smart-attribute-model.ts

@@ -1,19 +0,0 @@
-// maps to webapp/backend/pkg/models/measurements/smart_ata_attribute.go
-// maps to webapp/backend/pkg/models/measurements/smart_nvme_attribute.go
-// maps to webapp/backend/pkg/models/measurements/smart_scsi_attribute.go
-export interface SmartAttributeModel {
-    attribute_id: number | string
-    value: number
-    thresh: number
-    worst?: number
-    raw_value?: number
-    raw_string?: string
-    when_failed?: string
-
-    transformed_value: number
-    status: number
-    status_reason?: string
-    failure_rate?: number
-
-    chartData?: any[]
-}

webapp/frontend/src/app/core/models/measurements/smart-model.ts

@@ -1,13 +0,0 @@
-// maps to webapp/backend/pkg/models/measurements/smart.go
-import {SmartAttributeModel} from './smart-attribute-model';
-
-export interface SmartModel {
-    date: string;
-    device_wwn: string;
-    device_protocol: string;
-
-    temp: number;
-    power_on_hours: number;
-    power_cycle_count: number
-    attrs: { [key: string]: SmartAttributeModel }
-}

webapp/frontend/src/app/core/models/measurements/smart-temperature-model.ts

@@ -1,6 +0,0 @@
-// maps to webapp/backend/pkg/models/measurements/smart_temperature.go
-export interface SmartTemperatureModel {
-    date: string;
-    temp: number;
-}
-

webapp/frontend/src/app/core/models/thresholds/attribute-metadata-model.ts

@@ -1,13 +0,0 @@
-// map to webapp/backend/pkg/thresholds/ata_attribute_metadata.go
-// map to webapp/backend/pkg/thresholds/nvme_attribute_metadata.go
-// map to webapp/backend/pkg/thresholds/scsi_attribute_metadata.go
-export interface AttributeMetadataModel {
-    display_name: string
-    ideal: string
-    critical: boolean
-    description: string
-
-    transform_value_unit?: string
-    observed_thresholds?: any[]
-    display_type: string
-}

webapp/frontend/src/app/layout/common/dashboard-device-delete-dialog/dashboard-device-delete-dialog.component.spec.ts

@@ -1,39 +1,16 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { DashboardDeviceDeleteDialogComponent } from './dashboard-device-delete-dialog.component';
-import {HttpClientModule} from '@angular/common/http';
-import {MAT_DIALOG_DATA, MatDialogModule, MatDialogRef} from '@angular/material/dialog';
-import {MatButtonModule} from '@angular/material/button';
-import {MatIconModule} from '@angular/material/icon';
-import {SharedModule} from '../../../shared/shared.module';
-import {DashboardDeviceDeleteDialogService} from './dashboard-device-delete-dialog.service';
-import {of} from 'rxjs';
-
 
 describe('DashboardDeviceDeleteDialogComponent', () => {
   let component: DashboardDeviceDeleteDialogComponent;
   let fixture: ComponentFixture<DashboardDeviceDeleteDialogComponent>;
 
-    const matDialogRefSpy = jasmine.createSpyObj('MatDialogRef', ['closeDialog', 'close']);
-    const dashboardDeviceDeleteDialogServiceSpy = jasmine.createSpyObj('DashboardDeviceDeleteDialogService', ['deleteDevice']);
-
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-            imports: [
-                HttpClientModule,
-                MatDialogModule,
-                MatButtonModule,
-                MatIconModule,
-                SharedModule,
-            ],
-            providers: [
-                {provide: MatDialogRef, useValue: matDialogRefSpy},
-                {provide: MAT_DIALOG_DATA, useValue: {wwn: 'test-wwn', title: 'my-test-device-title'}},
-                {provide: DashboardDeviceDeleteDialogService, useValue: dashboardDeviceDeleteDialogServiceSpy}
-            ],
       declarations: [ DashboardDeviceDeleteDialogComponent ]
     })
-            .compileComponents()
+    .compileComponents();
   }));
 
   beforeEach(() => {
@@ -45,20 +22,4 @@ describe('DashboardDeviceDeleteDialogComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
-
-    it('should close the component if cancel is clicked', () => {
-        matDialogRefSpy.closeDialog.calls.reset();
-        matDialogRefSpy.closeDialog()
-        expect(matDialogRefSpy.closeDialog).toHaveBeenCalled();
-    });
-
-    it('should attempt to delete device if delete is clicked', () => {
-        dashboardDeviceDeleteDialogServiceSpy.deleteDevice.and.returnValue(of({'success': true}));
-
-        component.onDeleteClick()
-        expect(dashboardDeviceDeleteDialogServiceSpy.deleteDevice).toHaveBeenCalledWith('test-wwn');
-        expect(dashboardDeviceDeleteDialogServiceSpy.deleteDevice.calls.count())
-            .withContext('one call')
-            .toBe(1);
-    });
 });

webapp/frontend/src/app/layout/common/dashboard-device-delete-dialog/dashboard-device-delete-dialog.component.ts

@@ -1,6 +1,7 @@
-import {Component, Inject, OnInit} from '@angular/core';
+import { Component, OnInit, Inject } from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {DashboardDeviceDeleteDialogService} from 'app/layout/common/dashboard-device-delete-dialog/dashboard-device-delete-dialog.service';
+import {Subject} from 'rxjs';
 
 @Component({
   selector: 'app-dashboard-device-delete-dialog',

webapp/frontend/src/app/layout/common/dashboard-device-delete-dialog/dashboard-device-delete-dialog.module.ts

@@ -1,10 +1,26 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+import { Overlay } from '@angular/cdk/overlay';
+import { MAT_AUTOCOMPLETE_SCROLL_STRATEGY, MatAutocompleteModule } from '@angular/material/autocomplete';
 import { MatButtonModule } from '@angular/material/button';
+import { MatSelectModule } from '@angular/material/select';
+import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
 import { SharedModule } from 'app/shared/shared.module';
 import {DashboardDeviceDeleteDialogComponent} from 'app/layout/common/dashboard-device-delete-dialog/dashboard-device-delete-dialog.component'
+import { MatButtonToggleModule} from '@angular/material/button-toggle';
+import {MatTabsModule} from '@angular/material/tabs';
+import {MatSliderModule} from '@angular/material/slider';
+import {MatSlideToggleModule} from '@angular/material/slide-toggle';
+import {MatTooltipModule} from '@angular/material/tooltip';
 import {dashboardRoutes} from 'app/modules/dashboard/dashboard.routing';
+import {MatDividerModule} from '@angular/material/divider';
+import {MatMenuModule} from '@angular/material/menu';
+import {MatProgressBarModule} from '@angular/material/progress-bar';
+import {MatSortModule} from '@angular/material/sort';
+import {MatTableModule} from '@angular/material/table';
+import {NgApexchartsModule} from 'ng-apexcharts';
 import { MatDialogModule } from '@angular/material/dialog';
 
 @NgModule({
@@ -15,7 +31,14 @@ import {MatDialogModule} from '@angular/material/dialog';
         RouterModule.forChild([]),
         RouterModule.forChild(dashboardRoutes),
         MatButtonModule,
+        MatDividerModule,
+        MatTooltipModule,
         MatIconModule,
+        MatMenuModule,
+        MatProgressBarModule,
+        MatSortModule,
+        MatTableModule,
+        NgApexchartsModule,
         SharedModule,
         MatDialogModule
     ],

webapp/frontend/src/app/layout/common/dashboard-device/dashboard-device.component.html

@@ -1,21 +1,21 @@
-<div [ngClass]="{ 'border-green': deviceStatusForModelWithThreshold(deviceSummary.device, !!deviceSummary.smart, config.metrics.status_threshold) == 'passed',
+<div [ngClass]="{ 'border-green': deviceSummary.device.device_status == 0 && deviceSummary.smart,
-                                'border-red': deviceStatusForModelWithThreshold(deviceSummary.device, !!deviceSummary.smart, config.metrics.status_threshold) == 'failed' }"
+                                'border-red': deviceSummary.device.device_status != 0 }"
      class="relative flex flex-col flex-auto p-6 pr-3 pb-3 bg-card rounded border-l-4 shadow-md overflow-hidden">
     <div class="absolute bottom-0 right-0 w-24 h-24 -m-6">
         <mat-icon class="icon-size-96 opacity-12 text-green"
-                  *ngIf="deviceStatusForModelWithThreshold(deviceSummary.device, !!deviceSummary.smart, config.metrics.status_threshold) == 'passed'"
+                  *ngIf="deviceSummary.device.device_status == 0 && deviceSummary.smart"
                   [svgIcon]="'heroicons_outline:check-circle'"></mat-icon>
         <mat-icon class="icon-size-96 opacity-12 text-red"
-                  *ngIf="deviceStatusForModelWithThreshold(deviceSummary.device, !!deviceSummary.smart, config.metrics.status_threshold) == 'failed'"
+                  *ngIf="deviceSummary.device.device_status != 0"
                   [svgIcon]="'heroicons_outline:exclamation-circle'"></mat-icon>
         <mat-icon class="icon-size-96 opacity-12 text-yellow"
-                  *ngIf="deviceStatusForModelWithThreshold(deviceSummary.device, !!deviceSummary.smart, config.metrics.status_threshold) == 'unknown'"
+                  *ngIf="!deviceSummary.smart"
                   [svgIcon]="'heroicons_outline:question-mark-circle'"></mat-icon>
     </div>
     <div class="flex items-center">
         <div class="flex flex-col">
             <a [routerLink]="'/device/'+ deviceSummary.device.wwn"
-               class="font-bold text-md text-secondary uppercase tracking-wider">{{deviceSummary.device | deviceTitle:config.dashboard_display}}</a>
+               class="font-bold text-md text-secondary uppercase tracking-wider">{{deviceSummary.device | deviceTitle:config.dashboardDisplay}}</a>
             <div [ngClass]="classDeviceLastUpdatedOn(deviceSummary)" class="font-medium text-sm" *ngIf="deviceSummary.smart">
                 Last Updated on {{deviceSummary.smart.collector_date | date:'MMMM dd, yyyy - HH:mm' }}
             </div>
@@ -46,20 +46,17 @@
     <div class="flex flex-row flex-wrap mt-4 -mx-6">
         <div class="flex flex-col mx-6 my-3 xs:w-full">
             <div class="font-semibold text-xs text-hint uppercase tracking-wider leading-none">Status</div>
-            <div class="mt-2 font-medium text-3xl leading-none"
+            <div class="mt-2 font-medium text-3xl leading-none" *ngIf="deviceSummary.smart?.collector_date; else unknownStatus">{{ deviceStatusString(deviceSummary.device.device_status) | titlecase}}</div>
-                 *ngIf="deviceSummary.smart?.collector_date; else unknownStatus">{{ deviceStatusForModelWithThreshold(deviceSummary.device, !!deviceSummary.smart, config.metrics.status_threshold) | titlecase}}</div>
             <ng-template #unknownStatus><div class="mt-2 font-medium text-3xl leading-none">No Data</div></ng-template>
         </div>
         <div class="flex flex-col mx-6 my-3 xs:w-full">
             <div class="font-semibold text-xs text-hint uppercase tracking-wider leading-none">Temperature</div>
-            <div class="mt-2 font-medium text-3xl leading-none"
+            <div class="mt-2 font-medium text-3xl leading-none" *ngIf="deviceSummary.smart?.collector_date; else unknownTemp">{{ deviceSummary.smart?.temp | temperature:config.temperatureUnit:true }}</div>
-                 *ngIf="deviceSummary.smart?.collector_date; else unknownTemp">{{ deviceSummary.smart?.temp | temperature:config.temperature_unit:true }}</div>
             <ng-template #unknownTemp><div class="mt-2 font-medium text-3xl leading-none">--</div></ng-template>
         </div>
         <div class="flex flex-col mx-6 my-3 xs:w-full">
             <div class="font-semibold text-xs text-hint uppercase tracking-wider leading-none">Capacity</div>
-            <div
+            <div class="mt-2 font-medium text-3xl leading-none">{{ deviceSummary.device.capacity | fileSize}}</div>
-                class="mt-2 font-medium text-3xl leading-none">{{ deviceSummary.device.capacity | fileSize:config.file_size_si_units}}</div>
         </div>
         <div class="flex flex-col mx-6 my-3 xs:w-full">
             <div class="font-semibold text-xs text-hint uppercase tracking-wider leading-none">Powered On</div>

webapp/frontend/src/app/layout/common/dashboard-device/dashboard-device.component.spec.ts

@@ -1,158 +1,25 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { DashboardDeviceComponent } from './dashboard-device.component';
-import {MatDialog} from '@angular/material/dialog';
-import {MatButtonModule} from '@angular/material/button';
-import {MatIconModule} from '@angular/material/icon';
-import {SharedModule} from 'app/shared/shared.module';
-import {MatMenuModule} from '@angular/material/menu';
-import {TREO_APP_CONFIG} from '@treo/services/config/config.constants';
-import {DeviceSummaryModel} from 'app/core/models/device-summary-model';
-import * as moment from 'moment';
-import {HttpClientTestingModule} from '@angular/common/http/testing';
-import {HttpClient} from '@angular/common/http';
-import {ScrutinyConfigService} from 'app/core/config/scrutiny-config.service';
-import {of} from 'rxjs';
-import {MetricsStatusThreshold} from 'app/core/config/app.config';
 
 describe('DashboardDeviceComponent', () => {
   let component: DashboardDeviceComponent;
   let fixture: ComponentFixture<DashboardDeviceComponent>;
 
-    const matDialogSpy = jasmine.createSpyObj('MatDialog', ['open']);
-    // const configServiceSpy = jasmine.createSpyObj('ScrutinyConfigService', ['config$']);
-    let configService: ScrutinyConfigService;
-    let httpClientSpy: jasmine.SpyObj<HttpClient>;
-
   beforeEach(async(() => {
-
-        httpClientSpy = jasmine.createSpyObj('HttpClient', ['get']);
-        configService = new ScrutinyConfigService(httpClientSpy, {});
-
     TestBed.configureTestingModule({
-            imports: [
-                MatButtonModule,
-                MatIconModule,
-                MatMenuModule,
-                SharedModule,
-                HttpClientTestingModule,
-            ],
-            providers: [
-                {provide: MatDialog, useValue: matDialogSpy},
-                {provide: TREO_APP_CONFIG, useValue: {dashboard_display: 'name', metrics: {status_threshold: 3}}},
-                {provide: ScrutinyConfigService, useValue: configService}
-            ],
       declarations: [ DashboardDeviceComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-        // configServiceSpy.config$.and.returnValue(of({'success': true}));
     fixture = TestBed.createComponent(DashboardDeviceComponent);
     component = fixture.componentInstance;
+    fixture.detectChanges();
   });
 
   it('should create', () => {
     expect(component).toBeTruthy();
   });
-
-    describe('#classDeviceLastUpdatedOn()', () => {
-
-        it('if non-zero device status, should be red', () => {
-            httpClientSpy.get.and.returnValue(of({
-                settings: {
-                    metrics: {
-                        status_threshold: MetricsStatusThreshold.Both,
-                    }
-                }
-            }));
-            component.ngOnInit()
-            // component.deviceSummary = summary.data.summary['0x5000c500673e6b5f'] as DeviceSummaryModel
-            expect(component.classDeviceLastUpdatedOn({
-                device: {
-                    device_status: 2,
-                },
-                smart: {
-                    collector_date: moment().subtract(13, 'days').toISOString()
-                },
-            } as DeviceSummaryModel)).toBe('text-red')
-        });
-
-        it('if non-zero device status, should be red', () => {
-            httpClientSpy.get.and.returnValue(of({
-                settings: {
-                    metrics: {
-                        status_threshold: MetricsStatusThreshold.Both,
-                    }
-                }
-            }));
-            component.ngOnInit()
-            expect(component.classDeviceLastUpdatedOn({
-                device: {
-                    device_status: 2
-                },
-                smart: {
-                    collector_date: moment().subtract(13, 'days').toISOString()
-                },
-            } as DeviceSummaryModel)).toBe('text-red')
-        });
-
-        it('if healthy device status and updated in the last two weeks, should be green', () => {
-            httpClientSpy.get.and.returnValue(of({
-                settings: {
-                    metrics: {
-                        status_threshold: MetricsStatusThreshold.Both,
-                    }
-                }
-            }));
-            component.ngOnInit()
-            expect(component.classDeviceLastUpdatedOn({
-                device: {
-                    device_status: 0
-                },
-                smart: {
-                    collector_date: moment().subtract(13, 'days').toISOString()
-                }
-            } as DeviceSummaryModel)).toBe('text-green')
-        });
-
-        it('if healthy device status and updated more than two weeks ago, but less than 1 month, should be yellow', () => {
-            httpClientSpy.get.and.returnValue(of({
-                settings: {
-                    metrics: {
-                        status_threshold: MetricsStatusThreshold.Both,
-                    }
-                }
-            }));
-            component.ngOnInit()
-            expect(component.classDeviceLastUpdatedOn({
-                device: {
-                    device_status: 0
-                },
-                smart: {
-                    collector_date: moment().subtract(3, 'weeks').toISOString()
-                }
-            } as DeviceSummaryModel)).toBe('text-yellow')
-        });
-
-        it('if healthy device status and updated more 1 month ago, should be red', () => {
-            httpClientSpy.get.and.returnValue(of({
-                settings: {
-                    metrics: {
-                        status_threshold: MetricsStatusThreshold.Both,
-                    }
-                }
-            }));
-            component.ngOnInit()
-            expect(component.classDeviceLastUpdatedOn({
-                device: {
-                    device_status: 0
-                },
-                smart: {
-                    collector_date: moment().subtract(5, 'weeks').toISOString()
-                }
-            } as DeviceSummaryModel)).toBe('text-red')
-        });
-    })
 });

webapp/frontend/src/app/layout/common/dashboard-device/dashboard-device.component.ts

@@ -1,15 +1,13 @@
-import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
+import { Component, Input, Output, OnInit, EventEmitter} from '@angular/core';
 import * as moment from 'moment';
 import {takeUntil} from 'rxjs/operators';
 import {AppConfig} from 'app/core/config/app.config';
-import {ScrutinyConfigService} from 'app/core/config/scrutiny-config.service';
+import {TreoConfigService} from '@treo/services/config';
 import {Subject} from 'rxjs';
 import  humanizeDuration from 'humanize-duration'
 import {MatDialog} from '@angular/material/dialog';
 import {DashboardDeviceDeleteDialogComponent} from 'app/layout/common/dashboard-device-delete-dialog/dashboard-device-delete-dialog.component';
 import {DeviceTitlePipe} from 'app/shared/device-title.pipe';
-import {DeviceSummaryModel} from 'app/core/models/device-summary-model';
-import {DeviceStatusPipe} from 'app/shared/device-status.pipe';
 
 @Component({
   selector: 'app-dashboard-device',
@@ -19,14 +17,13 @@ import {DeviceStatusPipe} from 'app/shared/device-status.pipe';
 export class DashboardDeviceComponent implements OnInit {
 
     constructor(
-        private _configService: ScrutinyConfigService,
+        private _configService: TreoConfigService,
         public dialog: MatDialog,
     ) {
         // Set the private defaults
         this._unsubscribeAll = new Subject();
     }
-
+    @Input() deviceSummary: any;
-    @Input() deviceSummary: DeviceSummaryModel;
     @Input() deviceWWN: string;
     @Output() deviceDeleted = new EventEmitter<string>();
 
@@ -36,8 +33,6 @@ export class DashboardDeviceComponent implements OnInit {
 
     readonly humanizeDuration = humanizeDuration;
 
-    deviceStatusForModelWithThreshold = DeviceStatusPipe.deviceStatusForModelWithThreshold
-
     ngOnInit(): void {
         // Subscribe to config changes
         this._configService.config$
@@ -52,33 +47,40 @@ export class DashboardDeviceComponent implements OnInit {
     // @ Public methods
     // -----------------------------------------------------------------------------------------------------
 
-    classDeviceLastUpdatedOn(deviceSummary: DeviceSummaryModel): string {
+    classDeviceLastUpdatedOn(deviceSummary): string {
-        const deviceStatus = DeviceStatusPipe.deviceStatusForModelWithThreshold(deviceSummary.device, !!deviceSummary.smart, this.config.metrics.status_threshold)
+        if (deviceSummary.device.device_status !== 0) {
-        if (deviceStatus === 'failed') {
             return 'text-red' // if the device has failed, always highlight in red
-        } else if (deviceStatus === 'passed') {
+        } else if(deviceSummary.device.device_status === 0 && deviceSummary.smart){
-            if (moment().subtract(14, 'days').isBefore(deviceSummary.smart.collector_date)) {
+            if(moment().subtract(14, 'd').isBefore(deviceSummary.smart.collector_date)){
                 // this device was updated in the last 2 weeks.
                 return 'text-green'
-            } else if (moment().subtract(1, 'months').isBefore(deviceSummary.smart.collector_date)) {
+            } else if(moment().subtract(1, 'm').isBefore(deviceSummary.smart.collector_date)){
                 // this device was updated in the last month
                 return 'text-yellow'
             } else{
                 // last updated more than a month ago.
                 return 'text-red'
             }
+
         } else {
             return ''
         }
     }
 
+    deviceStatusString(deviceStatus): string {
+        if(deviceStatus === 0){
+            return 'passed'
+        } else {
+            return 'failed'
+        }
+    }
+
+
+
     openDeleteDialog(): void {
         const dialogRef = this.dialog.open(DashboardDeviceDeleteDialogComponent, {
             // width: '250px',
-            data: {
+            data: {wwn: this.deviceWWN, title: DeviceTitlePipe.deviceTitleWithFallback(this.deviceSummary.device, this.config.dashboardDisplay)}
-                wwn: this.deviceWWN,
-                title: DeviceTitlePipe.deviceTitleWithFallback(this.deviceSummary.device, this.config.dashboard_display)
-            }
         });
 
         dialogRef.afterClosed().subscribe(result => {

webapp/frontend/src/app/layout/common/dashboard-device/dashboard-device.module.ts

@@ -1,11 +1,27 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+import { Overlay } from '@angular/cdk/overlay';
+import { MAT_AUTOCOMPLETE_SCROLL_STRATEGY, MatAutocompleteModule } from '@angular/material/autocomplete';
 import { MatButtonModule } from '@angular/material/button';
+import { MatSelectModule } from '@angular/material/select';
+import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
 import { SharedModule } from 'app/shared/shared.module';
 import {DashboardDeviceComponent} from 'app/layout/common/dashboard-device/dashboard-device.component'
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatButtonToggleModule} from '@angular/material/button-toggle';
+import {MatTabsModule} from '@angular/material/tabs';
+import {MatSliderModule} from '@angular/material/slider';
+import {MatSlideToggleModule} from '@angular/material/slide-toggle';
+import {MatTooltipModule} from '@angular/material/tooltip';
 import {dashboardRoutes} from '../../../modules/dashboard/dashboard.routing';
+import {MatDividerModule} from '@angular/material/divider';
 import {MatMenuModule} from '@angular/material/menu';
+import {MatProgressBarModule} from '@angular/material/progress-bar';
+import {MatSortModule} from '@angular/material/sort';
+import {MatTableModule} from '@angular/material/table';
+import {NgApexchartsModule} from 'ng-apexcharts';
 import {DashboardDeviceDeleteDialogModule} from 'app/layout/common/dashboard-device-delete-dialog/dashboard-device-delete-dialog.module';
 
 @NgModule({
@@ -16,8 +32,14 @@ import {DashboardDeviceDeleteDialogModule} from 'app/layout/common/dashboard-dev
         RouterModule.forChild([]),
         RouterModule.forChild(dashboardRoutes),
         MatButtonModule,
+        MatDividerModule,
+        MatTooltipModule,
         MatIconModule,
         MatMenuModule,
+        MatProgressBarModule,
+        MatSortModule,
+        MatTableModule,
+        NgApexchartsModule,
         SharedModule,
         DashboardDeviceDeleteDialogModule
     ],
@@ -26,5 +48,6 @@ import {DashboardDeviceDeleteDialogModule} from 'app/layout/common/dashboard-dev
     ],
     providers   : []
 })
-export class DashboardDeviceModule {
+export class DashboardDeviceModule
+{
 }

webapp/frontend/src/app/layout/common/dashboard-settings/dashboard-settings.component.html

@@ -37,41 +37,69 @@
 
         <div class="flex flex-col mt-5 gt-md:flex-row">
             <mat-form-field class="flex-auto gt-xs:pr-3 gt-md:pr-3">
-                <mat-label>Temperature</mat-label>
+                <mat-label>Temperature Display Unit</mat-label>
                 <mat-select [(ngModel)]="temperatureUnit">
                     <mat-option value="celsius">Celsius</mat-option>
                     <mat-option value="fahrenheit">Fahrenheit</mat-option>
                 </mat-select>
             </mat-form-field>
 
-            <mat-form-field class="flex-auto gt-xs:pr-3 gt-md:pr-3">
+        </div>
-                <mat-label>File Size</mat-label>
+
-                <mat-select [(ngModel)]="fileSizeSIUnits">
+        <div class="flex">
-                    <mat-option [value]=true>SI Units (GB)</mat-option>
+            <mat-tab-group mat-align-tabs="start">
-                    <mat-option [value]=false>Binary Units (GiB)</mat-option>
+                <mat-tab label="Ata">
-                </mat-select>
+
+                    <div matTooltip="not yet implemented" class="flex flex-col mt-5 gt-md:flex-row">
+                        <mat-form-field class="flex-auto gt-md:pr-3">
+                            <mat-label class="text-hint">Critical Error Threshold</mat-label>
+                            <input disabled matInput [value]="'10%'">
+                        </mat-form-field>
+                        <mat-form-field class="flex-auto gt-md:pl-3">
+                            <mat-label class="text-hint">Critical Warning Threshold</mat-label>
+                            <input disabled matInput>
                         </mat-form-field>
                     </div>
 
-        <div class="flex flex-col mt-5 gt-md:flex-row">
+                    <div matTooltip="not yet implemented" class="flex flex-col gt-md:flex-row">
-            <mat-form-field class="flex-auto gt-xs:pr-3 gt-md:pr-3">
+                        <mat-form-field class="flex-auto gt-md:pr-3">
-                <mat-label>Device Status - Thresholds</mat-label>
+                            <mat-label class="text-hint">Error Threshold</mat-label>
-                <mat-select [(ngModel)]=statusThreshold>
+                            <input disabled matInput [value]="'20%'">
-                    <mat-option [value]=1>Smart</mat-option>
+                        </mat-form-field>
-                    <mat-option [value]=2>Scrutiny</mat-option>
+                        <mat-form-field class="flex-auto gt-md:pl-3">
-                    <mat-option [value]=3>Both</mat-option>
+                            <mat-label class="text-hint">Warning Threshold</mat-label>
-                </mat-select>
+                            <input disabled matInput [value]="'10%'">
                         </mat-form-field>
                     </div>
 
-        <div class="flex flex-col mt-5 gt-md:flex-row">
+                </mat-tab>
-            <mat-form-field class="flex-auto gt-xs:pr-3 gt-md:pr-3">
+                <mat-tab label="NVMe">
-                <mat-label>Notify - Filter Attributes</mat-label>
+
-                <mat-select [(ngModel)]=statusFilterAttributes>
+                    <div matTooltip="not yet implemented" class="flex flex-col mt-5 gt-md:flex-row">
-                    <mat-option [value]=0>All</mat-option>
+                        <mat-form-field class="flex-auto gt-md:pr-3">
-                    <mat-option [value]=1>Critical</mat-option>
+                            <mat-label class="text-hint">Critical Error Threshold</mat-label>
-                </mat-select>
+                            <input disabled matInput [value]="'enabled'">
                         </mat-form-field>
+                        <mat-form-field class="flex-auto gt-md:pl-3">
+                            <mat-label class="text-hint">Critical Warning Threshold</mat-label>
+                            <input disabled matInput>
+                        </mat-form-field>
+                    </div>
+
+                </mat-tab>
+                <mat-tab label="SCSI">
+                    <div matTooltip="not yet implemented" class="flex flex-col mt-5 gt-md:flex-row">
+                        <mat-form-field class="flex-auto gt-md:pr-3">
+                            <mat-label class="text-hint">Critical Error Threshold</mat-label>
+                            <input disabled matInput [value]="'enabled'">
+                        </mat-form-field>
+                        <mat-form-field class="flex-auto gt-md:pl-3">
+                            <mat-label class="text-hint">Critical Warning Threshold</mat-label>
+                            <input disabled matInput>
+                        </mat-form-field>
+                    </div>
+                </mat-tab>
+            </mat-tab-group>
         </div>
     </div>
 

webapp/frontend/src/app/layout/common/dashboard-settings/dashboard-settings.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DashboardSettingsComponent } from './dashboard-settings.component';
+
+describe('DashboardSettingsComponent', () => {
+  let component: DashboardSettingsComponent;
+  let fixture: ComponentFixture<DashboardSettingsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DashboardSettingsComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DashboardSettingsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

webapp/frontend/src/app/layout/common/dashboard-settings/dashboard-settings.component.ts

@@ -1,14 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import {
+import {AppConfig} from 'app/core/config/app.config';
-    AppConfig,
+import { TreoConfigService } from '@treo/services/config';
-    DashboardDisplay,
-    DashboardSort,
-    MetricsStatusFilterAttributes,
-    MetricsStatusThreshold,
-    TemperatureUnit,
-    Theme
-} from 'app/core/config/app.config';
-import {ScrutinyConfigService} from 'app/core/config/scrutiny-config.service';
 import {Subject} from 'rxjs';
 import {takeUntil} from 'rxjs/operators';
 
@@ -22,16 +14,13 @@ export class DashboardSettingsComponent implements OnInit {
     dashboardDisplay: string;
     dashboardSort: string;
     temperatureUnit: string;
-    fileSizeSIUnits: boolean;
     theme: string;
-    statusThreshold: number;
-    statusFilterAttributes: number;
 
     // Private
     private _unsubscribeAll: Subject<any>;
 
     constructor(
-        private _configService: ScrutinyConfigService,
+        private _configService: TreoConfigService,
     ) {
         // Set the private defaults
         this._unsubscribeAll = new Subject();
@@ -44,30 +33,23 @@ export class DashboardSettingsComponent implements OnInit {
           .subscribe((config: AppConfig) => {
 
               // Store the config
-                this.dashboardDisplay = config.dashboard_display;
+              this.dashboardDisplay = config.dashboardDisplay;
-                this.dashboardSort = config.dashboard_sort;
+              this.dashboardSort = config.dashboardSort;
-                this.temperatureUnit = config.temperature_unit;
+              this.temperatureUnit = config.temperatureUnit;
-                this.fileSizeSIUnits = config.file_size_si_units;
               this.theme = config.theme;
 
-                this.statusFilterAttributes = config.metrics.status_filter_attributes;
-                this.statusThreshold = config.metrics.status_threshold;
-
           });
 
   }
 
   saveSettings(): void {
-        const newSettings: AppConfig = {
+
-            dashboard_display: this.dashboardDisplay as DashboardDisplay,
+
-            dashboard_sort: this.dashboardSort as DashboardSort,
+        const newSettings = {
-            temperature_unit: this.temperatureUnit as TemperatureUnit,
+            dashboardDisplay: this.dashboardDisplay,
-            file_size_si_units: this.fileSizeSIUnits,
+            dashboardSort: this.dashboardSort,
-            theme: this.theme as Theme,
+            temperatureUnit: this.temperatureUnit,
-            metrics: {
+            theme: this.theme
-                status_filter_attributes: this.statusFilterAttributes as MetricsStatusFilterAttributes,
-                status_threshold: this.statusThreshold as MetricsStatusThreshold
-            }
         }
         this._configService.config = newSettings
         console.log(`Saved Settings: ${JSON.stringify(newSettings)}`)

webapp/frontend/src/app/layout/common/detail-settings/detail-settings.module.ts

@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import {MatAutocompleteModule} from '@angular/material/autocomplete';
+import { Overlay } from '@angular/cdk/overlay';
+import { MAT_AUTOCOMPLETE_SCROLL_STRATEGY, MatAutocompleteModule } from '@angular/material/autocomplete';
 import { MatButtonModule } from '@angular/material/button';
 import { MatSelectModule } from '@angular/material/select';
 import { MatFormFieldModule } from '@angular/material/form-field';
@@ -40,5 +41,6 @@ import {MatTooltipModule} from '@angular/material/tooltip';
     ],
     providers   : []
 })
-export class DetailSettingsModule {
+export class DetailSettingsModule
+{
 }

webapp/frontend/src/app/layout/layout.component.ts

@@ -4,7 +4,7 @@ import {ActivatedRoute, NavigationEnd, Router} from '@angular/router';
 import { MatSlideToggleChange } from '@angular/material/slide-toggle';
 import { Subject } from 'rxjs';
 import { filter, takeUntil } from 'rxjs/operators';
-import {ScrutinyConfigService} from 'app/core/config/scrutiny-config.service';
+import { TreoConfigService } from '@treo/services/config';
 import { TreoDrawerService } from '@treo/components/drawer';
 import { Layout } from 'app/layout/layout.types';
 import { AppConfig, Theme } from 'app/core/config/app.config';
@@ -15,7 +15,8 @@ import {AppConfig, Theme} from 'app/core/config/app.config';
     styleUrls    : ['./layout.component.scss'],
     encapsulation: ViewEncapsulation.None
 })
-export class LayoutComponent implements OnInit, OnDestroy {
+export class LayoutComponent implements OnInit, OnDestroy
+{
     config: AppConfig;
     layout: Layout;
     theme: Theme;
@@ -28,14 +29,14 @@ export class LayoutComponent implements OnInit, OnDestroy {
      * Constructor
      *
      * @param {ActivatedRoute} _activatedRoute
-     * @param {ScrutinyConfigService} _scrutinyConfigService
+     * @param {TreoConfigService} _treoConfigService
      * @param {TreoDrawerService} _treoDrawerService
      * @param {DOCUMENT} _document
      * @param {Router} _router
      */
     constructor(
         private _activatedRoute: ActivatedRoute,
-        private _scrutinyConfigService: ScrutinyConfigService,
+        private _treoConfigService: TreoConfigService,
         private _treoDrawerService: TreoDrawerService,
         @Inject(DOCUMENT) private _document: any,
         private _router: Router
@@ -58,7 +59,7 @@ export class LayoutComponent implements OnInit, OnDestroy {
     ngOnInit(): void
     {
         // Subscribe to config changes
-        this._scrutinyConfigService.config$
+        this._treoConfigService.config$
             .pipe(takeUntil(this._unsubscribeAll))
             .subscribe((config: AppConfig) => {
 
@@ -179,7 +180,8 @@ export class LayoutComponent implements OnInit, OnDestroy {
      *
      * @param layout
      */
-    setLayout(layout: Layout): void {
+    setLayout(layout: string): void
+    {
         // Clear the 'layout' query param to allow layout changes
         this._router.navigate([], {
             queryParams        : {
@@ -189,7 +191,7 @@ export class LayoutComponent implements OnInit, OnDestroy {
         }).then(() => {
 
             // Set the config
-            this._scrutinyConfigService.config = {layout};
+            this._treoConfigService.config = {layout};
         });
     }
 
@@ -200,6 +202,6 @@ export class LayoutComponent implements OnInit, OnDestroy {
      */
     setTheme(change: MatSlideToggleChange): void
     {
-        this._scrutinyConfigService.config = {theme: change.checked ? 'dark' : 'light'};
+        this._treoConfigService.config = {theme: change.checked ? 'dark' : 'light'};
     }
 }

webapp/frontend/src/app/modules/dashboard/dashboard.component.html

@@ -1,5 +1,5 @@
 
-<div *ngIf="summaryData; else emptyDashboard">
+<div *ngIf="data && data.data && data.data.summary; else emptyDashboard">
     <div class="flex flex-col flex-auto w-full p-8 xs:p-2">
 
         <div class="flex flex-wrap w-full">
@@ -51,11 +51,7 @@
             <div class="flex flex-wrap w-full" *ngFor="let hostId of hostGroups | keyvalue">
                 <h3 class="ml-4" *ngIf="hostId.key">{{hostId.key}}</h3>
                 <div class="flex flex-wrap w-full">
-                    <app-dashboard-device (deviceDeleted)="onDeviceDeleted($event)"
+                    <app-dashboard-device (deviceDeleted)="onDeviceDeleted($event)" class="flex gt-sm:w-1/2 min-w-80 p-4" *ngFor="let deviceSummary of (deviceSummariesForHostGroup(hostId.value) | deviceSort:config.dashboardSort:config.dashboardDisplay )" [deviceWWN]="deviceSummary.device.wwn" [deviceSummary]="deviceSummary"></app-dashboard-device>
-                                          class="flex gt-sm:w-1/2 min-w-80 p-4"
-                                          *ngFor="let deviceSummary of (deviceSummariesForHostGroup(hostId.value) | deviceSort:config.dashboard_sort:config.dashboard_display )"
-                                          [deviceWWN]="deviceSummary.device.wwn"
-                                          [deviceSummary]="deviceSummary"></app-dashboard-device>
                 </div>
             </div>
 

webapp/frontend/src/app/modules/dashboard/dashboard.component.ts

@@ -1,12 +1,6 @@
-import {
+import { AfterViewInit, ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
-    AfterViewInit,
+import { MatSort } from '@angular/material/sort';
-    ChangeDetectionStrategy,
+import { MatTableDataSource } from '@angular/material/table';
-    Component,
-    OnDestroy,
-    OnInit,
-    ViewChild,
-    ViewEncapsulation
-} from '@angular/core';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import {ApexOptions, ChartComponent} from 'ng-apexcharts';
@@ -14,11 +8,10 @@ import {DashboardService} from 'app/modules/dashboard/dashboard.service';
 import {MatDialog} from '@angular/material/dialog';
 import { DashboardSettingsComponent } from 'app/layout/common/dashboard-settings/dashboard-settings.component';
 import {AppConfig} from 'app/core/config/app.config';
-import {ScrutinyConfigService} from 'app/core/config/scrutiny-config.service';
+import {TreoConfigService} from '@treo/services/config';
 import {Router} from '@angular/router';
 import {TemperaturePipe} from 'app/shared/temperature.pipe';
 import {DeviceTitlePipe} from 'app/shared/device-title.pipe';
-import {DeviceSummaryModel} from 'app/core/models/device-summary-model';
 
 @Component({
     selector       : 'example',
@@ -29,7 +22,7 @@ import {DeviceSummaryModel} from 'app/core/models/device-summary-model';
 })
 export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy
 {
-    summaryData: { [key: string]: DeviceSummaryModel };
+    data: any;
     hostGroups: { [hostId: string]: string[] } = {}
     temperatureOptions: ApexOptions;
     tempDurationKey = 'forever'
@@ -42,14 +35,11 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy
     /**
      * Constructor
      *
-     * @param {DashboardService} _dashboardService
+     * @param {SmartService} _smartService
-     * @param {ScrutinyConfigService} _configService
-     * @param {MatDialog} dialog
-     * @param {Router} router
      */
     constructor(
-        private _dashboardService: DashboardService,
+        private _smartService: DashboardService,
-        private _configService: ScrutinyConfigService,
+        private _configService: TreoConfigService,
         public dialog: MatDialog,
         private router: Router,
     )
@@ -91,16 +81,16 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy
             });
 
         // Get the data
-        this._dashboardService.data$
+        this._smartService.data$
             .pipe(takeUntil(this._unsubscribeAll))
             .subscribe((data) => {
 
                 // Store the data
-                this.summaryData = data;
+                this.data = data;
 
                 // generate group data.
-                for (const wwn in this.summaryData) {
+                for(const wwn in this.data.data.summary){
-                    const hostid = this.summaryData[wwn].device.host_id
+                    const hostid = this.data.data.summary[wwn].device.host_id
                     const hostDeviceList = this.hostGroups[hostid] || []
                     hostDeviceList.push(wwn)
                     this.hostGroups[hostid] = hostDeviceList
@@ -142,15 +132,15 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy
     private _deviceDataTemperatureSeries(): any[] {
         const deviceTemperatureSeries = []
 
-        console.log('DEVICE DATA SUMMARY', this.summaryData)
+        console.log('DEVICE DATA SUMMARY', this.data)
 
-        for (const wwn in this.summaryData) {
+        for(const wwn in this.data.data.summary){
-            const deviceSummary = this.summaryData[wwn]
+            const deviceSummary = this.data.data.summary[wwn]
             if (!deviceSummary.temp_history){
                 continue
             }
 
-            const deviceName = DeviceTitlePipe.deviceTitleWithFallback(deviceSummary.device, this.config.dashboard_display)
+            const deviceName = DeviceTitlePipe.deviceTitleWithFallback(deviceSummary.device, this.config.dashboardDisplay)
 
             const deviceSeriesMetadata = {
                 name: deviceName,
@@ -161,7 +151,7 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy
                 const newDate = new Date(tempHistory.date);
                 deviceSeriesMetadata.data.push({
                     x: newDate,
-                    y: TemperaturePipe.formatTemperature(tempHistory.temp, this.config.temperature_unit, false)
+                    y: TemperaturePipe.formatTemperature(tempHistory.temp, this.config.temperatureUnit, false)
                 })
             }
             deviceTemperatureSeries.push(deviceSeriesMetadata)
@@ -212,7 +202,7 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy
                 y    : {
 
                     formatter: (value) => {
-                        return TemperaturePipe.formatTemperature(value, this.config.temperature_unit, true) as string;
+                        return TemperaturePipe.formatTemperature(value, this.config.temperatureUnit, true) as string;
                     }
                 }
             },
@@ -226,18 +216,18 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy
     // @ Public methods
     // -----------------------------------------------------------------------------------------------------
 
-    deviceSummariesForHostGroup(hostGroupWWNs: string[]): DeviceSummaryModel[] {
+    deviceSummariesForHostGroup(hostGroupWWNs: string[]): any[] {
-        const deviceSummaries: DeviceSummaryModel[] = []
+        const deviceSummaries = []
         for(const wwn of hostGroupWWNs){
-            if (this.summaryData[wwn]) {
+            if(this.data.data.summary[wwn]){
-                deviceSummaries.push(this.summaryData[wwn])
+                deviceSummaries.push(this.data.data.summary[wwn])
             }
         }
         return deviceSummaries
     }
 
     openDialog(): void {
-        const dialogRef = this.dialog.open(DashboardSettingsComponent, {width: '600px',});
+        const dialogRef = this.dialog.open(DashboardSettingsComponent);
 
         dialogRef.afterClosed().subscribe(result => {
             console.log(`Dialog result: ${result}`);
@@ -245,7 +235,7 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy
     }
 
     onDeviceDeleted(wwn: string): void {
-        delete this.summaryData[wwn] // remove the device from the summary list.
+        delete this.data.data.summary[wwn] // remove the device from the summary list.
     }
 
     /*
@@ -256,16 +246,16 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy
 	DURATION_KEY_FOREVER = "forever"
      */
 
-    changeSummaryTempDuration(durationKey: string): void {
+    changeSummaryTempDuration(durationKey: string){
         this.tempDurationKey = durationKey
 
-        this._dashboardService.getSummaryTempData(durationKey)
+        this._smartService.getSummaryTempData(durationKey)
-            .subscribe((tempHistoryData) => {
+            .subscribe((data) => {
 
                 // given a list of device temp history, override the data in the "summary" object.
-                for (const wwn in this.summaryData) {
+                for(const wwn in this.data.data.summary) {
                     // console.log(`Updating ${wwn}, length: ${this.data.data.summary[wwn].temp_history.length}`)
-                    this.summaryData[wwn].temp_history = tempHistoryData[wwn] || []
+                    this.data.data.summary[wwn].temp_history = data.data.temp_history[wwn] || []
                 }
 
                 // Prepare the chart series data

webapp/frontend/src/app/modules/dashboard/dashboard.resolvers.ts

@@ -2,12 +2,12 @@ import {Injectable} from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 import { DashboardService } from 'app/modules/dashboard/dashboard.service';
-import {DeviceSummaryModel} from 'app/core/models/device-summary-model';
 
 @Injectable({
     providedIn: 'root'
 })
-export class DashboardResolver implements Resolve<any> {
+export class DashboardResolver implements Resolve<any>
+{
     /**
      * Constructor
      *
@@ -29,7 +29,8 @@ export class DashboardResolver implements Resolve<any> {
      * @param route
      * @param state
      */
-    resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<{ [p: string]: DeviceSummaryModel }> {
+    resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<any>
+    {
         return this._dashboardService.getSummaryData();
     }
 }

webapp/frontend/src/app/modules/dashboard/dashboard.service.spec.ts

@@ -1,44 +0,0 @@
-import {HttpClient} from '@angular/common/http';
-import {DashboardService} from './dashboard.service';
-import {of} from 'rxjs';
-import {summary} from 'app/data/mock/summary/data'
-import {temp_history} from 'app/data/mock/summary/temp_history'
-import {DeviceSummaryModel} from 'app/core/models/device-summary-model';
-import {SmartTemperatureModel} from 'app/core/models/measurements/smart-temperature-model';
-
-describe('DashboardService', () => {
-    let service: DashboardService;
-    let httpClientSpy: jasmine.SpyObj<HttpClient>;
-
-    beforeEach(() => {
-        httpClientSpy = jasmine.createSpyObj('HttpClient', ['get']);
-        service = new DashboardService(httpClientSpy);
-    });
-
-    it('should unwrap and return getSummaryData() (HttpClient called once)', (done: DoneFn) => {
-        httpClientSpy.get.and.returnValue(of(summary));
-
-        service.getSummaryData().subscribe(value => {
-            expect(value).toBe(summary.data.summary as { [key: string]: DeviceSummaryModel });
-            done();
-        });
-        expect(httpClientSpy.get.calls.count())
-            .withContext('one call')
-            .toBe(1);
-    });
-
-    it('should unwrap and return getSummaryTempData() (HttpClient called once)', (done: DoneFn) => {
-        // const expectedHeroes: any[] =
-        //     [{ id: 1, name: 'A' }, { id: 2, name: 'B' }];
-
-        httpClientSpy.get.and.returnValue(of(temp_history));
-
-        service.getSummaryTempData('weekly').subscribe(value => {
-            expect(value).toBe(temp_history.data.temp_history as { [key: string]: SmartTemperatureModel[] });
-            done();
-        });
-        expect(httpClientSpy.get.calls.count())
-            .withContext('one call')
-            .toBe(1);
-    });
-});

webapp/frontend/src/app/modules/dashboard/dashboard.service.ts

@@ -1,19 +1,16 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { BehaviorSubject, Observable } from 'rxjs';
-import {map, tap} from 'rxjs/operators';
+import { tap } from 'rxjs/operators';
 import { getBasePath } from 'app/app.routing';
-import {DeviceSummaryResponseWrapper} from 'app/core/models/device-summary-response-wrapper';
-import {DeviceSummaryModel} from 'app/core/models/device-summary-model';
-import {SmartTemperatureModel} from 'app/core/models/measurements/smart-temperature-model';
-import {DeviceSummaryTempResponseWrapper} from 'app/core/models/device-summary-temp-response-wrapper';
 
 @Injectable({
     providedIn: 'root'
 })
-export class DashboardService {
+export class DashboardService
+{
     // Observables
-    private _data: BehaviorSubject<{ [p: string]: DeviceSummaryModel }>;
+    private _data: BehaviorSubject<any>;
 
     /**
      * Constructor
@@ -35,7 +32,8 @@ export class DashboardService {
     /**
      * Getter for data
      */
-    get data$(): Observable<{ [p: string]: DeviceSummaryModel }> {
+    get data$(): Observable<any>
+    {
         return this._data.asObservable();
     }
 
@@ -46,28 +44,22 @@ export class DashboardService {
     /**
      * Get data
      */
-    getSummaryData(): Observable<{ [key: string]: DeviceSummaryModel }> {
+    getSummaryData(): Observable<any>
+    {
         return this._httpClient.get(getBasePath() + '/api/summary').pipe(
-            map((response: DeviceSummaryResponseWrapper) => {
+            tap((response: any) => {
-                // console.log("FILTERING=----", response.data.summary)
-                return response.data.summary
-            }),
-            tap((response: { [key: string]: DeviceSummaryModel }) => {
                 this._data.next(response);
             })
         );
     }
 
-    getSummaryTempData(durationKey: string): Observable<{ [key: string]: SmartTemperatureModel[] }> {
+    getSummaryTempData(durationKey: string): Observable<any>
+    {
         const params = {}
         if(durationKey){
             params['duration_key'] = durationKey
         }
 
-        return this._httpClient.get(getBasePath() + '/api/summary/temp', {params: params}).pipe(
+        return this._httpClient.get(getBasePath() + '/api/summary/temp', {params: params});
-            map((response: DeviceSummaryTempResponseWrapper) => {
-                return response.data.temp_history
-            })
-        );
     }
 }

webapp/frontend/src/app/modules/detail/detail.component.html

@@ -4,7 +4,7 @@
 
         <div class="flex items-center justify-between w-full my-4 px-4 xs:pr-0">
             <div class="mr-6">
-                <h2 class="m-0">Drive Details - {{device | deviceTitle:config.dashboard_display}} </h2>
+                <h2 class="m-0">Drive Details - {{device | deviceTitle:config.dashboardDisplay}} </h2>
                 <div class="text-secondary tracking-tight">Dive into S.M.A.R.T data</div>
             </div>
             <!-- Action buttons -->
@@ -17,7 +17,7 @@
                     <span class="ml-2">Export</span>
                 </button>
                 <button class="ml-2 xs:hidden"
-                        matTooltip="not yet implemented"
+                        (click)="openDialog()"
                         mat-stroked-button>
                     <mat-icon class="icon-size-20 rotate-90 mirror"
                               [svgIcon]="'tune'"></mat-icon>
@@ -56,13 +56,12 @@
                     <div *ngIf="device" class="my-2 col-span-2 lt-md:col-span-1">
                         <div>
                             <span class="inline-flex items-center font-bold text-xs px-2 py-2px rounded-full tracking-wide uppercase"
-                                  [ngClass]="{'red-200': deviceStatusForModelWithThreshold(device, !!smart_results, config.metrics.status_threshold) == 'failed',
+                                   [ngClass]="{'red-200': device?.device_status != 0,
                                   'green-200': device?.device_status == 0}">
                                 <span class="w-2 h-2 rounded-full mr-2"
                                       [ngClass]="{'bg-red': device?.device_status != 0,
                                   'bg-green': device?.device_status == 0}"></span>
-                                <span
+                                <span class="pr-2px leading-relaxed whitespace-no-wrap">{{device?.device_status | deviceStatus}}</span>
-                                    class="pr-2px leading-relaxed whitespace-no-wrap">{{device | deviceStatus:!!smart_results:config.metrics.status_threshold:true}}</span>
                             </span>
                         </div>
                         <div class="text-secondary text-md">Status</div>
@@ -107,7 +106,7 @@
                         <div class="text-secondary text-md">Firmware Version</div>
                     </div>
                     <div class="my-2 col-span-2 lt-md:col-span-1">
-                        <div>{{device?.capacity | fileSize:config.file_size_si_units}}</div>
+                        <div>{{device?.capacity | fileSize}}</div>
                         <div class="text-secondary text-md">Capacity</div>
                     </div>
                     <div *ngIf="device?.rotational_speed" class="my-2 col-span-2 lt-md:col-span-1">
@@ -127,7 +126,7 @@
                         <div class="text-secondary text-md">Powered On</div>
                     </div>
                     <div class="my-2 col-span-2 lt-md:col-span-1">
-                        <div>{{smart_results[0]?.temp | temperature:config.temperature_unit:true}}</div>
+                        <div>{{smart_results[0]?.temp | temperature:config.temperatureUnit:true}}</div>
                         <div class="text-secondary text-md">Temperature</div>
                     </div>
                 </div>

webapp/frontend/src/app/modules/detail/detail.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DetailComponent } from './detail.component';
+
+describe('DetailComponent', () => {
+  let component: DetailComponent;
+  let fixture: ComponentFixture<DetailComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DetailComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

webapp/frontend/src/app/modules/detail/detail.component.ts

@@ -1,22 +1,18 @@
-import humanizeDuration from 'humanize-duration';
+import {AfterViewInit, Component, OnDestroy, OnInit, ViewChild} from '@angular/core';
-import {AfterViewInit, Component, Inject, LOCALE_ID, OnDestroy, OnInit, ViewChild} from '@angular/core';
 import {ApexOptions} from 'ng-apexcharts';
-import {AppConfig} from 'app/core/config/app.config';
+import {MatTableDataSource} from '@angular/material/table';
+import {MatSort} from '@angular/material/sort';
+import {Subject} from 'rxjs';
 import {DetailService} from './detail.service';
+import {takeUntil} from 'rxjs/operators';
 import {DetailSettingsComponent} from 'app/layout/common/detail-settings/detail-settings.component';
 import {MatDialog} from '@angular/material/dialog';
-import {MatSort} from '@angular/material/sort';
+import humanizeDuration from 'humanize-duration';
-import {MatTableDataSource} from '@angular/material/table';
+import {TreoConfigService} from '@treo/services/config';
-import {Subject} from 'rxjs';
+import {AppConfig} from 'app/core/config/app.config';
-import {ScrutinyConfigService} from 'app/core/config/scrutiny-config.service';
 import {animate, state, style, transition, trigger} from '@angular/animations';
 import {formatDate} from '@angular/common';
-import {takeUntil} from 'rxjs/operators';
+import { LOCALE_ID, Inject } from '@angular/core';
-import {DeviceModel} from 'app/core/models/device-model';
-import {SmartModel} from 'app/core/models/measurements/smart-model';
-import {SmartAttributeModel} from 'app/core/models/measurements/smart-attribute-model';
-import {AttributeMetadataModel} from 'app/core/models/thresholds/attribute-metadata-model';
-import {DeviceStatusPipe} from 'app/shared/device-status.pipe';
 
 // from Constants.go - these must match
 const AttributeStatusPassed = 0
@@ -44,16 +40,15 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
      * Constructor
      *
      * @param {DetailService} _detailService
-     * @param {MatDialog} dialog
-     * @param {ScrutinyConfigService} _configService
-     * @param {string} locale
      */
     constructor(
         private _detailService: DetailService,
         public dialog: MatDialog,
-        private _configService: ScrutinyConfigService,
+        private _configService: TreoConfigService,
         @Inject(LOCALE_ID) public locale: string
-    ) {
+
+    )
+    {
         // Set the private defaults
         this._unsubscribeAll = new Subject();
 
@@ -70,15 +65,14 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
 
     onlyCritical = true;
     // data: any;
-    expandedAttribute: SmartAttributeModel | null;
+    expandedAttribute: any | null;
 
-    metadata: { [p: string]: AttributeMetadataModel } | { [p: number]: AttributeMetadataModel };
+    metadata: any;
-    device: DeviceModel;
+    device: any;
-    // tslint:disable-next-line:variable-name
+    smart_results: any[];
-    smart_results: SmartModel[];
 
     commonSparklineOptions: Partial<ApexOptions>;
-    smartAttributeDataSource: MatTableDataSource<SmartAttributeModel>;
+    smartAttributeDataSource: MatTableDataSource<any>;
     smartAttributeTableColumns: string[];
 
     @ViewChild('smartAttributeTable', {read: MatSort})
@@ -90,7 +84,6 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
 
     readonly humanizeDuration = humanizeDuration;
 
-    deviceStatusForModelWithThreshold = DeviceStatusPipe.deviceStatusForModelWithThreshold
     // -----------------------------------------------------------------------------------------------------
     // @ Lifecycle hooks
     // -----------------------------------------------------------------------------------------------------
@@ -98,7 +91,8 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
     /**
      * On init
      */
-    ngOnInit(): void {
+    ngOnInit(): void
+    {
         // Subscribe to config changes
         this._configService.config$
             .pipe(takeUntil(this._unsubscribeAll))
@@ -110,13 +104,13 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
         // Get the data
         this._detailService.data$
             .pipe(takeUntil(this._unsubscribeAll))
-            .subscribe((respWrapper) => {
+            .subscribe((data) => {
 
                 // Store the data
                 // this.data = data;
-                this.device = respWrapper.data.device;
+                this.device = data.data.device;
-                this.smart_results = respWrapper.data.smart_results
+                this.smart_results = data.data.smart_results
-                this.metadata = respWrapper.metadata;
+                this.metadata = data.metadata;
 
 
                 // Store the table data
@@ -130,7 +124,8 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
     /**
      * After view init
      */
-    ngAfterViewInit(): void {
+    ngAfterViewInit(): void
+    {
         // Make the data source sortable
         this.smartAttributeDataSource.sort = this.smartAttributeTableMatSort;
     }
@@ -138,7 +133,8 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
     /**
      * On destroy
      */
-    ngOnDestroy(): void {
+    ngOnDestroy(): void
+    {
         // Unsubscribe from all subscriptions
         this._unsubscribeAll.next();
         this._unsubscribeAll.complete();
@@ -162,7 +158,6 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
         return ''
         // tslint:enable:no-bitwise
     }
-
     getAttributeScrutinyStatusName(attributeStatus: number): string {
         // tslint:disable:no-bitwise
         if ((attributeStatus & AttributeStatusFailedScrutiny) !== 0){
@@ -186,136 +181,134 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
     }
 
 
-    getAttributeName(attributeData: SmartAttributeModel): string {
+    getAttributeName(attribute_data): string {
-        const attributeMetadata = this.metadata[attributeData.attribute_id]
+        const attribute_metadata = this.metadata[attribute_data.attribute_id]
-        if (!attributeMetadata) {
+        if(!attribute_metadata){
             return 'Unknown Attribute Name'
         } else {
-            return attributeMetadata.display_name
+            return attribute_metadata.display_name
         }
     }
-
+    getAttributeDescription(attribute_data){
-    getAttributeDescription(attributeData: SmartAttributeModel): string {
+        const attribute_metadata = this.metadata[attribute_data.attribute_id]
-        const attributeMetadata = this.metadata[attributeData.attribute_id]
+        if(!attribute_metadata){
-        if (!attributeMetadata) {
             return 'Unknown'
         } else {
-            return attributeMetadata.description
+            return attribute_metadata.description
+        }
+        return
+    }
+
+    getAttributeValue(attribute_data){
+        if(this.isAta()) {
+            const attribute_metadata = this.metadata[attribute_data.attribute_id]
+            if(!attribute_metadata){
+                return attribute_data.value
+            } else if (attribute_metadata.display_type == 'raw') {
+                return attribute_data.raw_value
+            } else if (attribute_metadata.display_type == 'transformed' && attribute_data.transformed_value) {
+                return attribute_data.transformed_value
+            } else {
+                return attribute_data.value
+            }
+        }
+        else{
+            return attribute_data.value
         }
     }
 
-    getAttributeValue(attributeData: SmartAttributeModel): number {
+    getAttributeValueType(attribute_data){
         if(this.isAta()) {
-            const attributeMetadata = this.metadata[attributeData.attribute_id]
+            const attribute_metadata = this.metadata[attribute_data.attribute_id]
-            if (!attributeMetadata) {
+            if(!attribute_metadata){
-                return attributeData.value
-            } else if (attributeMetadata.display_type === 'raw') {
-                return attributeData.raw_value
-            } else if (attributeMetadata.display_type === 'transformed' && attributeData.transformed_value) {
-                return attributeData.transformed_value
-            } else {
-                return attributeData.value
-            }
-        } else {
-            return attributeData.value
-        }
-    }
-
-    getAttributeValueType(attributeData: SmartAttributeModel): string {
-        if (this.isAta()) {
-            const attributeMetadata = this.metadata[attributeData.attribute_id]
-            if (!attributeMetadata) {
                 return ''
             } else {
-                return attributeMetadata.display_type
+                return attribute_metadata.display_type
             }
         } else {
             return ''
         }
     }
 
-    getAttributeIdeal(attributeData: SmartAttributeModel): string {
+    getAttributeIdeal(attribute_data){
         if(this.isAta()){
-            return this.metadata[attributeData.attribute_id]?.display_type === 'raw' ? this.metadata[attributeData.attribute_id]?.ideal : ''
+            return this.metadata[attribute_data.attribute_id]?.display_type == 'raw' ? this.metadata[attribute_data.attribute_id]?.ideal : ''
         } else {
-            return this.metadata[attributeData.attribute_id]?.ideal
+            return this.metadata[attribute_data.attribute_id]?.ideal
         }
     }
 
-    getAttributeWorst(attributeData: SmartAttributeModel): number | string {
+    getAttributeWorst(attribute_data){
-        const attributeMetadata = this.metadata[attributeData.attribute_id]
+        const attribute_metadata = this.metadata[attribute_data.attribute_id]
-        if (!attributeMetadata) {
+        if(!attribute_metadata){
-            return attributeData.worst
+            return attribute_data.worst
         } else {
-            return attributeMetadata?.display_type === 'normalized' ? attributeData.worst : ''
+            return attribute_metadata?.display_type == 'normalized' ? attribute_data.worst : ''
         }
     }
 
-    getAttributeThreshold(attributeData: SmartAttributeModel): number | string {
+    getAttributeThreshold(attribute_data){
         if(this.isAta()){
-            const attributeMetadata = this.metadata[attributeData.attribute_id]
+            const attribute_metadata = this.metadata[attribute_data.attribute_id]
-            if (!attributeMetadata || attributeMetadata.display_type === 'normalized') {
+            if(!attribute_metadata || attribute_metadata.display_type == 'normalized'){
-                return attributeData.thresh
+                return attribute_data.thresh
             } else {
                 // if(this.data.metadata[attribute_data.attribute_id].observed_thresholds){
                 //
                 // } else {
                 // }
                 // return ''
-                return attributeData.thresh
+                return attribute_data.thresh
             }
         } else {
-            return (attributeData.thresh === -1 ? '' : attributeData.thresh)
+            return (attribute_data.thresh == -1 ? '' : attribute_data.thresh )
         }
     }
 
-    getAttributeCritical(attributeData: SmartAttributeModel): boolean {
+    getAttributeCritical(attribute_data){
-        return this.metadata[attributeData.attribute_id]?.critical
+        return this.metadata[attribute_data.attribute_id]?.critical
     }
-
+    getHiddenAttributes(){
-    getHiddenAttributes(): number {
+        if (!this.smart_results || this.smart_results.length == 0) {
-        if (!this.smart_results || this.smart_results.length === 0) {
             return 0
         }
 
-        let attributesLength = 0
+        let attributes_length = 0
         const attributes = this.smart_results[0]?.attrs
         if (attributes) {
-            attributesLength = Object.keys(attributes).length
+            attributes_length = Object.keys(attributes).length
         }
 
-        return attributesLength - this.smartAttributeDataSource.data.length
+        return attributes_length - this.smartAttributeDataSource.data.length
     }
 
     isAta(): boolean {
-        return this.device.device_protocol === 'ATA'
+        return this.device.device_protocol == 'ATA'
     }
-
     isScsi(): boolean {
-        return this.device.device_protocol === 'SCSI'
+        return this.device.device_protocol == 'SCSI'
     }
-
     isNvme(): boolean {
-        return this.device.device_protocol === 'NVMe'
+        return this.device.device_protocol == 'NVMe'
     }
 
-    private _generateSmartAttributeTableDataSource(smartResults: SmartModel[]): SmartAttributeModel[] {
+    private _generateSmartAttributeTableDataSource(smart_results){
-        const smartAttributeDataSource: SmartAttributeModel[] = [];
+        const smartAttributeDataSource = [];
 
-        if (smartResults.length === 0) {
+        if(smart_results.length == 0){
             return smartAttributeDataSource
         }
-        const latestSmartResult = smartResults[0];
+        const latest_smart_result = smart_results[0];
-        let attributes: { [p: string]: SmartAttributeModel } = {}
+        let attributes = {}
         if(this.isScsi()) {
             this.smartAttributeTableColumns = ['status', 'name', 'value', 'thresh', 'history'];
-            attributes = latestSmartResult.attrs
+            attributes = latest_smart_result.attrs
         } else if(this.isNvme()){
             this.smartAttributeTableColumns = ['status', 'name', 'value', 'thresh', 'ideal', 'history'];
-            attributes = latestSmartResult.attrs
+            attributes = latest_smart_result.attrs
         } else {
             // ATA
-            attributes = latestSmartResult.attrs
+            attributes = latest_smart_result.attrs
             this.smartAttributeTableColumns = ['status', 'id', 'name', 'value', 'thresh','ideal', 'failure', 'history'];
         }
 
@@ -327,14 +320,14 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
 
 
                 const attrHistory = []
-                for (const smartResult of smartResults) {
+                for (const smart_result of smart_results){
                     // attrHistory.push(this.getAttributeValue(smart_result.attrs[attrId]))
 
                     const chartDatapoint = {
-                        x: formatDate(smartResult.date, 'MMMM dd, yyyy - HH:mm', this.locale),
+                        x: formatDate(smart_result.date, 'MMMM dd, yyyy - HH:mm', this.locale),
-                        y: this.getAttributeValue(smartResult.attrs[attrId])
+                        y: this.getAttributeValue(smart_result.attrs[attrId])
                     }
-                    const attributeStatusName = this.getAttributeStatusName(smartResult.attrs[attrId].status)
+                    const attributeStatusName = this.getAttributeStatusName(smart_result.attrs[attrId].status)
                     if(attributeStatusName === 'failed') {
                         chartDatapoint['strokeColor'] = '#F05252'
                         chartDatapoint['fillColor'] = '#F05252'
@@ -351,9 +344,7 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
                 attributes[attrId].chartData = [
                     {
                         name: 'chart-line-sparkline',
-                        // attrHistory needs to be reversed, so the newest data is on the right
+                        data: attrHistory
-                        // fixes #339
-                        data: attrHistory.reverse()
                     }
                 ]
             }
@@ -371,7 +362,8 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
      *
      * @private
      */
-    private _prepareChartData(): void {
+    private _prepareChartData(): void
+    {
 
         // Account balance
         this.commonSparklineOptions = {
@@ -400,7 +392,7 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
                 },
                 y: {
                     title: {
-                        formatter: (seriesName) => {
+                        formatter: function(seriesName) {
                             return '';
                         }
                     }
@@ -425,21 +417,20 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
             return config.theme
         }
     }
-
     // -----------------------------------------------------------------------------------------------------
     // @ Public methods
     // -----------------------------------------------------------------------------------------------------
 
-    toHex(decimalNumb: number | string): string {
+    toHex(decimalNumb){
         return '0x' + Number(decimalNumb).toString(16).padStart(2, '0').toUpperCase()
     }
-
+    toggleOnlyCritical(){
-    toggleOnlyCritical(): void {
         this.onlyCritical = !this.onlyCritical
         this.smartAttributeDataSource.data = this._generateSmartAttributeTableDataSource(this.smart_results);
+
     }
 
-    openDialog(): void {
+    openDialog() {
         const dialogRef = this.dialog.open(DetailSettingsComponent);
 
         dialogRef.afterClosed().subscribe(result => {
@@ -453,7 +444,8 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
      * @param index
      * @param item
      */
-    trackByFn(index: number, item: any): any {
+    trackByFn(index: number, item: any): any
+    {
         return index;
         // return item.id || index;
     }

webapp/frontend/src/app/modules/detail/detail.resolvers.ts

@@ -2,12 +2,12 @@ import {Injectable} from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 import { DetailService } from 'app/modules/detail/detail.service';
-import {DeviceDetailsResponseWrapper} from 'app/core/models/device-details-response-wrapper';
 
 @Injectable({
     providedIn: 'root'
 })
-export class DetailResolver implements Resolve<any> {
+export class DetailResolver implements Resolve<any>
+{
     /**
      * Constructor
      *
@@ -29,7 +29,8 @@ export class DetailResolver implements Resolve<any> {
      * @param route
      * @param state
      */
-    resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<DeviceDetailsResponseWrapper> {
+    resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<any>
+    {
         return this._detailService.getData(route.params.wwn);
     }
 }

webapp/frontend/src/app/modules/detail/detail.service.spec.ts

@@ -1,28 +0,0 @@
-import {HttpClient} from '@angular/common/http';
-import {DetailService} from './detail.service';
-import {of} from 'rxjs';
-import {sda} from 'app/data/mock/device/details/sda'
-import {DeviceDetailsResponseWrapper} from 'app/core/models/device-details-response-wrapper';
-
-describe('DetailService', () => {
-    describe('#getData', () => {
-        let service: DetailService;
-        let httpClientSpy: jasmine.SpyObj<HttpClient>;
-
-        beforeEach(() => {
-            httpClientSpy = jasmine.createSpyObj('HttpClient', ['get']);
-            service = new DetailService(httpClientSpy);
-        });
-        it('should return getData() (HttpClient called once)', (done: DoneFn) => {
-            httpClientSpy.get.and.returnValue(of(sda));
-
-            service.getData('test').subscribe(value => {
-                expect(value).toBe(sda as DeviceDetailsResponseWrapper);
-                done();
-            });
-            expect(httpClientSpy.get.calls.count())
-                .withContext('one call')
-                .toBe(1);
-        });
-    })
-});

webapp/frontend/src/app/modules/detail/detail.service.ts

@@ -3,14 +3,14 @@ import {HttpClient} from '@angular/common/http';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { getBasePath } from 'app/app.routing';
-import {DeviceDetailsResponseWrapper} from 'app/core/models/device-details-response-wrapper';
 
 @Injectable({
     providedIn: 'root'
 })
-export class DetailService {
+export class DetailService
+{
     // Observables
-    private _data: BehaviorSubject<DeviceDetailsResponseWrapper>;
+    private _data: BehaviorSubject<any>;
 
     /**
      * Constructor
@@ -19,7 +19,8 @@ export class DetailService {
      */
     constructor(
         private _httpClient: HttpClient
-    ) {
+    )
+    {
         // Set the private defaults
         this._data = new BehaviorSubject(null);
     }
@@ -31,7 +32,8 @@ export class DetailService {
     /**
      * Getter for data
      */
-    get data$(): Observable<DeviceDetailsResponseWrapper> {
+    get data$(): Observable<any>
+    {
         return this._data.asObservable();
     }
 
@@ -42,9 +44,10 @@ export class DetailService {
     /**
      * Get data
      */
-    getData(wwn): Observable<DeviceDetailsResponseWrapper> {
+    getData(wwn): Observable<any>
+    {
         return this._httpClient.get(getBasePath() + `/api/device/${wwn}/details`).pipe(
-            tap((response: DeviceDetailsResponseWrapper) => {
+            tap((response: any) => {
                 this._data.next(response);
             })
         );

webapp/frontend/src/app/shared/device-status.pipe.spec.ts

@@ -1,146 +1,8 @@
 import { DeviceStatusPipe } from './device-status.pipe';
-import {MetricsStatusThreshold} from '../core/config/app.config';
-import {DeviceModel} from '../core/models/device-model';
 
 describe('DeviceStatusPipe', () => {
   it('create an instance', () => {
     const pipe = new DeviceStatusPipe();
     expect(pipe).toBeTruthy();
   });
-
-    describe('#deviceStatusForModelWithThreshold', () => {
-        it('if healthy device, should be passing', () => {
-            expect(DeviceStatusPipe.deviceStatusForModelWithThreshold(
-                {device_status: 0} as DeviceModel,
-                true,
-                MetricsStatusThreshold.Both
-            )).toBe('passed')
-        });
-
-        it('if device with no smart data, should be unknown', () => {
-            expect(DeviceStatusPipe.deviceStatusForModelWithThreshold(
-                {device_status: 0} as DeviceModel,
-                false,
-                MetricsStatusThreshold.Both
-            )).toBe('unknown')
-        });
-
-        const testCases = [
-            {
-                'deviceStatus': 10000, // invalid status
-                'hasSmartResults': false,
-                'threshold': MetricsStatusThreshold.Smart,
-                'includeReason': false,
-                'result': 'unknown'
-            },
-
-            {
-                'deviceStatus': 1,
-                'hasSmartResults': true,
-                'threshold': MetricsStatusThreshold.Smart,
-                'includeReason': false,
-                'result': 'failed'
-            },
-            {
-                'deviceStatus': 1,
-                'hasSmartResults': true,
-                'threshold': MetricsStatusThreshold.Scrutiny,
-                'includeReason': false,
-                'result': 'passed'
-            },
-            {
-                'deviceStatus': 1,
-                'hasSmartResults': true,
-                'threshold': MetricsStatusThreshold.Both,
-                'includeReason': false,
-                'result': 'failed'
-            },
-
-            {
-                'deviceStatus': 2,
-                'hasSmartResults': true,
-                'threshold': MetricsStatusThreshold.Smart,
-                'includeReason': false,
-                'result': 'passed'
-            },
-            {
-                'deviceStatus': 2,
-                'hasSmartResults': true,
-                'threshold': MetricsStatusThreshold.Scrutiny,
-                'includeReason': false,
-                'result': 'failed'
-            },
-            {
-                'deviceStatus': 2,
-                'hasSmartResults': true,
-                'threshold': MetricsStatusThreshold.Both,
-                'includeReason': false,
-                'result': 'failed'
-            },
-
-            {
-                'deviceStatus': 3,
-                'hasSmartResults': true,
-                'threshold': MetricsStatusThreshold.Smart,
-                'includeReason': false,
-                'result': 'failed'
-            },
-            {
-                'deviceStatus': 3,
-                'hasSmartResults': true,
-                'threshold': MetricsStatusThreshold.Scrutiny,
-                'includeReason': false,
-                'result': 'failed'
-            },
-            {
-                'deviceStatus': 3,
-                'hasSmartResults': true,
-                'threshold': MetricsStatusThreshold.Both,
-                'includeReason': false,
-                'result': 'failed'
-            },
-
-            {
-                'deviceStatus': 3,
-                'hasSmartResults': false,
-                'threshold': MetricsStatusThreshold.Smart,
-                'includeReason': true,
-                'result': 'unknown'
-            },
-            {
-                'deviceStatus': 3,
-                'hasSmartResults': true,
-                'threshold': MetricsStatusThreshold.Smart,
-                'includeReason': true,
-                'result': 'failed: smart'
-            },
-            {
-                'deviceStatus': 3,
-                'hasSmartResults': true,
-                'threshold': MetricsStatusThreshold.Scrutiny,
-                'includeReason': true,
-                'result': 'failed: scrutiny'
-            },
-            {
-                'deviceStatus': 3,
-                'hasSmartResults': true,
-                'threshold': MetricsStatusThreshold.Both,
-                'includeReason': true,
-                'result': 'failed: both'
-            }
-
-
-        ]
-
-        testCases.forEach((test, index) => {
-            it(`if device with status (${test.deviceStatus}), hasSmartResults(${test.hasSmartResults}) and threshold (${test.threshold}), should be ${test.result}`, () => {
-                expect(DeviceStatusPipe.deviceStatusForModelWithThreshold(
-                    {device_status: test.deviceStatus} as DeviceModel,
-                    test.hasSmartResults,
-                    test.threshold,
-                    test.includeReason
-                )).toBe(test.result)
-            });
-        });
-    });
 });

webapp/frontend/src/app/shared/device-status.pipe.ts

@@ -1,71 +1,21 @@
 import { Pipe, PipeTransform } from '@angular/core';
-import {MetricsStatusThreshold} from '../core/config/app.config';
-import {DeviceModel} from '../core/models/device-model';
-
-const DEVICE_STATUS_NAMES: { [key: number]: string } = {
-    0: 'passed',
-    1: 'failed',
-    2: 'failed',
-    3: 'failed'
-};
-
-const DEVICE_STATUS_NAMES_WITH_REASON: { [key: number]: string } = {
-    0: 'passed',
-    1: 'failed: smart',
-    2: 'failed: scrutiny',
-    3: 'failed: both'
-};
-
 
 @Pipe({
   name: 'deviceStatus'
 })
 export class DeviceStatusPipe implements PipeTransform {
 
-
+  transform(deviceStatusFlag: number): string {
-    static deviceStatusForModelWithThreshold(
+      if(deviceStatusFlag === 0){
-        deviceModel: DeviceModel,
+          return 'passed'
-        hasSmartResults: boolean = true,
+      } else if(deviceStatusFlag === 3){
-        threshold: MetricsStatusThreshold = MetricsStatusThreshold.Both,
+          return 'failed: both'
-        includeReason: boolean = false
+      } else if(deviceStatusFlag === 2) {
-    ): string {
+          return 'failed: scrutiny'
-        // no smart data, so treat the device status as unknown
+      } else if(deviceStatusFlag === 1) {
-        if (!hasSmartResults) {
+          return 'failed: smart'
+      }
     return 'unknown'
   }
 
-        let statusNameLookup = DEVICE_STATUS_NAMES
-        if (includeReason) {
-            statusNameLookup = DEVICE_STATUS_NAMES_WITH_REASON
-        }
-        // determine the device status, by comparing it against the allowed threshold
-        // tslint:disable-next-line:no-bitwise
-        const deviceStatus = deviceModel.device_status & threshold
-        return statusNameLookup[deviceStatus]
-    }
-
-    // static deviceStatusForModelWithThreshold(deviceModel: DeviceModel | any, threshold: MetricsStatusThreshold): string {
-    //     // tslint:disable-next-line:no-bitwise
-    //     const deviceStatus = deviceModel?.device_status & threshold
-    //     if(deviceStatus === 0){
-    //         return 'passed'
-    //     } else if(deviceStatus === 3){
-    //         return 'failed: both'
-    //     } else if(deviceStatus === 2) {
-    //         return 'failed: scrutiny'
-    //     } else if(deviceStatus === 1) {
-    //         return 'failed: smart'
-    //     }
-    //     return 'unknown'
-    // }
-
-    transform(
-        deviceModel: DeviceModel,
-        hasSmartResults: boolean = true,
-        threshold: MetricsStatusThreshold = MetricsStatusThreshold.Both,
-        includeReason: boolean = false
-    ): string {
-        return DeviceStatusPipe.deviceStatusForModelWithThreshold(deviceModel, hasSmartResults, threshold, includeReason)
-    }
-
 }

webapp/frontend/src/app/shared/device-title.pipe.spec.ts

@@ -1,151 +1,8 @@
 import { DeviceTitlePipe } from './device-title.pipe';
-import {DeviceModel} from 'app/core/models/device-model';
 
 describe('DeviceTitlePipe', () => {
   it('create an instance', () => {
     const pipe = new DeviceTitlePipe();
     expect(pipe).toBeTruthy();
   });
-
-    describe('#deviceTitleForType', () => {
-        const testCases = [
-            {
-                'device': {
-                    'device_name': 'sda',
-                    'device_type': 'ata',
-                    'model_name': 'Samsung',
-                },
-                'titleType': 'name',
-                'result': '/dev/sda - Samsung'
-            },{
-                'device': {
-                    'device_name': 'nvme0',
-                    'device_type': 'nvme',
-                    'model_name': 'Samsung',
-                },
-                'titleType': 'name',
-                'result': '/dev/nvme0 - nvme - Samsung'
-            },{
-                'device': {},
-                'titleType': 'serial_id',
-                'result': ''
-            },{
-                'device': {
-                    'device_serial_id': 'ata-WDC_WD140EDFZ-11AXXXXX_9RXXXXXX',
-                },
-                'titleType': 'serial_id',
-                'result': '/by-id/ata-WDC_WD140EDFZ-11AXXXXX_9RXXXXXX'
-            },{
-                'device': {},
-                'titleType': 'uuid',
-                'result': ''
-            },{
-                'device': {
-                    'device_uuid': 'abcdef-1234-4567-8901'
-                },
-                'titleType': 'uuid',
-                'result': '/by-uuid/abcdef-1234-4567-8901'
-            },{
-                'device': {},
-                'titleType': 'label',
-                'result': ''
-            },{
-                'device': {
-                    'label': 'custom-device-label'
-                },
-                'titleType': 'label',
-                'result': 'custom-device-label'
-            },{
-                'device': {
-                    'device_label': 'drive-volume-label'
-                },
-                'titleType': 'label',
-                'result': '/by-label/drive-volume-label'
-            },
-        ]
-        testCases.forEach((test, index) => {
-            it(`should correctly format device title ${JSON.stringify(test.device)}. (testcase: ${index + 1})`, () => {
-                // test
-                const formatted = DeviceTitlePipe.deviceTitleForType(test.device as DeviceModel, test.titleType)
-                expect(formatted).toEqual(test.result);
-            });
-        })
-    })
-
-    describe('#deviceTitleWithFallback',() => {
-        const testCases = [
-            {
-                'device': {
-                    'device_name': 'sda',
-                    'device_type': 'ata',
-                    'model_name': 'Samsung',
-                },
-                'titleType': 'name',
-                'result': '/dev/sda - Samsung'
-            },{
-                'device': {
-                    'device_name': 'nvme0',
-                    'device_type': 'nvme',
-                    'model_name': 'Samsung',
-                },
-                'titleType': 'name',
-                'result': '/dev/nvme0 - nvme - Samsung'
-            },{
-                'device': {
-                    'device_name': 'fallback',
-                    'device_type': 'ata',
-                    'model_name': 'fallback',
-                },
-                'titleType': 'serial_id',
-                'result': '/dev/fallback - fallback'
-            },{
-                'device': {
-                    'device_serial_id': 'ata-WDC_WD140EDFZ-11AXXXXX_9RXXXXXX',
-                },
-                'titleType': 'serial_id',
-                'result': '/by-id/ata-WDC_WD140EDFZ-11AXXXXX_9RXXXXXX'
-            },{
-                'device': {
-                    'device_name': 'fallback',
-                    'device_type': 'ata',
-                    'model_name': 'fallback',
-                },
-                'titleType': 'uuid',
-                'result': '/dev/fallback - fallback'
-            },{
-                'device': {
-                    'device_uuid': 'abcdef-1234-4567-8901'
-                },
-                'titleType': 'uuid',
-                'result': '/by-uuid/abcdef-1234-4567-8901'
-            },{
-                'device': {
-                    'device_name': 'fallback',
-                    'device_type': 'ata',
-                    'model_name': 'fallback',
-                },
-                'titleType': 'label',
-                'result': '/dev/fallback - fallback'
-            },{
-                'device': {
-                    'label': 'custom-device-label'
-                },
-                'titleType': 'label',
-                'result': 'custom-device-label'
-            },{
-                'device': {
-                    'device_label': 'drive-volume-label'
-                },
-                'titleType': 'label',
-                'result': '/by-label/drive-volume-label'
-            },
-        ]
-        testCases.forEach((test, index) => {
-            it(`should correctly format device title ${JSON.stringify(test.device)}. (testcase: ${index + 1})`, () => {
-                // test
-                const formatted = DeviceTitlePipe.deviceTitleWithFallback(test.device as DeviceModel, test.titleType)
-                expect(formatted).toEqual(test.result);
-            });
-        })
-    })
 });

webapp/frontend/src/app/shared/device-title.pipe.ts

@@ -1,12 +1,11 @@
 import { Pipe, PipeTransform } from '@angular/core';
-import {DeviceModel} from 'app/core/models/device-model';
 
 @Pipe({
   name: 'deviceTitle'
 })
 export class DeviceTitlePipe implements PipeTransform {
 
-    static deviceTitleForType(device: DeviceModel, titleType: string): string {
+    static deviceTitleForType(device: any, titleType: string): string {
         const titleParts = []
         switch(titleType){
             case 'name':
@@ -36,7 +35,7 @@ export class DeviceTitlePipe implements PipeTransform {
         return titleParts.join(' - ')
     }
 
-    static deviceTitleWithFallback(device: DeviceModel, titleType: string): string {
+    static deviceTitleWithFallback(device, titleType: string): string {
         console.log(`Displaying Device ${device.wwn} with: ${titleType}`)
         const titleParts = []
         if (device.host_id) titleParts.push(device.host_id)
@@ -48,7 +47,7 @@ export class DeviceTitlePipe implements PipeTransform {
     }
 
 
-    transform(device: DeviceModel, titleType: string = 'name'): string {
+    transform(device: any, titleType: string = 'name'): string {
         return DeviceTitlePipe.deviceTitleWithFallback(device, titleType)
     }
 

webapp/frontend/src/app/shared/file-size.pipe.spec.ts

@@ -1,73 +0,0 @@
-import {FileSizePipe} from './file-size.pipe';
-
-describe('FileSizePipe', () => {
-    it('create an instance', () => {
-        const pipe = new FileSizePipe();
-        expect(pipe).toBeTruthy();
-    });
-
-    describe('#transform',() => {
-        const testCases = [
-            {
-                'bytes': 1500,
-                'si': false,
-                'result': '1.5 KiB'
-            },
-            {
-                'bytes': 1500,
-                'si': true,
-                'result': '1.5 kB'
-            },
-            {
-                'bytes': 5000,
-                'si': false,
-                'result': '4.9 KiB',
-            },
-            {
-                'bytes': 5000,
-                'si': true,
-                'result': '5.0 kB',
-            },
-            {
-                'bytes': 999_949,
-                'si': false,
-                'result': '976.5 KiB',
-            },
-            {
-                'bytes': 999_949,
-                'si': true,
-                'result': '999.9 kB',
-            },
-            {
-                'bytes': 999_950,
-                'si': true,
-                'result': '1.0 MB',
-            },
-            {
-                'bytes': 1_551_859_712,
-                'si': false,
-                'result': '1.4 GiB',
-            },
-            {
-                'bytes': 2_100_000_000,
-                'si': false,
-                'result': '2.0 GiB',
-            },
-            {
-                'bytes': 2_100_000_000,
-                'si': true,
-                'result': '2.1 GB',
-            }
-        ]
-
-        testCases.forEach((test, index) => {
-            it(`should correctly format bytes ${test.bytes}. (testcase: ${index + 1})`, () => {
-                // test
-                const pipe = new FileSizePipe();
-                const formatted = pipe.transform(test.bytes, test.si)
-                expect(formatted).toEqual(test.result);
-            });
-        })
-    })
-
-});

webapp/frontend/src/app/shared/file-size.pipe.ts

@@ -1,27 +1,75 @@
+/**
+ * @license
+ * Copyright (c) 2019 Jonathan Catmull.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 import { Pipe, PipeTransform } from '@angular/core';
 
+type unit = 'bytes' | 'KB' | 'MB' | 'GB' | 'TB' | 'PB';
+type unitPrecisionMap = {
+    [u in unit]: number;
+};
+
+const defaultPrecisionMap: unitPrecisionMap = {
+    bytes: 0,
+    KB: 0,
+    MB: 1,
+    GB: 1,
+    TB: 2,
+    PB: 2
+};
+
+/*
+ * Convert bytes into largest possible unit.
+ * Takes an precision argument that can be a number or a map for each unit.
+ * Usage:
+ *   bytes | fileSize:precision
+ * @example
+ * // returns 1 KB
+ * {{ 1500 | fileSize }}
+ * @example
+ * // returns 2.1 GB
+ * {{ 2100000000 | fileSize }}
+ * @example
+ * // returns 1.46 KB
+ * {{ 1500 | fileSize:2 }}
+ */
 @Pipe({ name: 'fileSize' })
 export class FileSizePipe implements PipeTransform {
+    private readonly units: unit[] = ['bytes', 'KB', 'MB', 'GB', 'TB', 'PB'];
 
-    transform(bytes: number = 0, si = false, dp = 1): string {
+    transform(bytes: number = 0, precision: number | unitPrecisionMap = defaultPrecisionMap): string {
-        const thresh = si ? 1000 : 1024;
+        if (isNaN(parseFloat(String(bytes))) || !isFinite(bytes)) return '?';
 
-        if (Math.abs(bytes) < thresh) {
+        let unitIndex = 0;
-            return bytes + ' B';
+
+        while (bytes >= 1024) {
+            bytes /= 1024;
+            unitIndex++;
         }
 
-        const units = si
+        const unit = this.units[unitIndex];
-            ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
-            : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
-        let u = -1;
-        const r = 10 ** dp;
 
-        do {
+        if (typeof precision === 'number') {
-            bytes /= thresh;
+            return `${bytes.toFixed(+precision)} ${unit}`;
-            ++u;
+        }
-        } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
+        return `${bytes.toFixed(precision[unit])} ${unit}`;
-
-
-        return bytes.toFixed(dp) + ' ' + units[u];
     }
 }