Merge pull request #4 from manjarisri/feature

Modified Dockerfile and reduced image size

.dockerignore

@@ -0,0 +1,8 @@
+/**
+
+!main.go
+!/lib
+!/templates
+!/static
+!/go.mod
+!/go.sum

.env.example

@@ -22,4 +22,7 @@ LISTEN=":8080"
 
 # Basic Security, these are required to view the data
 IDENTITY_USERNAME=admin
-IDENTITY_PASSWORD=admin
+IDENTITY_PASSWORD=admin
+
+# Enable/Disable debug features
+DEBUG_MODE=false

.gitignore

@@ -2,4 +2,5 @@ snapshots.dat
 .env
 dist
 data.db
-data.sqlite
+data.sqlite
+dev_data

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch Package",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}"
+        }
+    ]
+}

Dockerfile

@@ -0,0 +1,65 @@
+# === Build Stage ===
+FROM debian:bullseye-slim AS builder
+ENV IS_DOCKER TRUE
+
+LABEL org.opencontainers.image.source https://github.com/JustKato/drive-health
+
+# Install build dependencies and runtime dependencies
+RUN apt-get update && apt-get install -y \
+    gcc \
+    musl-dev \
+    libsqlite3-dev \
+    libsqlite3-0 \
+    wget \
+    && rm -rf /var/lib/apt/lists/*
+
+# Manually install Go 1.21
+ENV GOLANG_VERSION 1.21.0
+RUN wget https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz -O go.tgz \
+    && tar -C /usr/local -xzf go.tgz \
+    && rm go.tgz
+ENV PATH /usr/local/go/bin:$PATH
+
+# Set the environment variable for Go
+ENV GOPATH=/go
+ENV PATH=$GOPATH/bin:$PATH
+ENV GO111MODULE=on
+
+# Create the directory and set it as the working directory
+WORKDIR /app
+
+# Copy the Go files and download dependencies
+COPY go.mod go.sum ./
+RUN go mod download
+
+# Copy the source from the current directory to the Working Directory inside the container
+COPY . .
+
+# Build the Go app
+RUN go build -o drive-health
+
+# Cleanup build dependencies to reduce image size
+RUN apt-get purge -y gcc musl-dev libsqlite3-dev wget \
+    && apt-get autoremove -y \
+    && apt-get clean
+
+# === Final Stage ===
+FROM debian:bullseye-slim AS final
+
+# Set the environment variable
+ENV IS_DOCKER TRUE
+
+# Create the directory and set it as the working directory
+WORKDIR /app
+
+# Copy only the necessary files from the builder stage
+COPY --from=builder /app/drive-health .
+
+# Expose the necessary port
+EXPOSE 8080
+
+# Volume for external data
+VOLUME [ "/data" ]
+
+# Command to run the executable
+CMD ["./drive-health"]

LICENSE

@@ -0,0 +1,13 @@
+Copyright [2024] [Daniel Legt]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

README.md

@@ -1,11 +1,98 @@
-## About
+## 📖 About
+Drive Health is a program written in golang to help with tracking and monitoring of your hardware's temperature.
 
-## Disclaimer
+This tool had been conceived with the purpose of installing it on different servers I own with different configurations to help keep track of the temperature of hard-disks, ssds, nvme drives, etc...
 
-This software is only meant to run on linux, it's something I threw together all at once in one sitting without really thinking about structure or even caring about anything but making it work.
+### Features
+- Disk Listing
+- Temperature Graphing
+- Disk activity logging
+- [API](./lib/web/api.go)
 
-It's actually meant to run on my own server just so I can track the temperature of my harddrives in a live environment, I just want this service to run, record the status of the harddrives, and be able via my VPN to access it in a private manner, it's not meant to be dockerized, it's not meant to be ran in a VM, it's meant to be ran either as a `service` or in a [screen](https://git.savannah.gnu.org/cgit/screen.git) in the background.
+![UI Example](./media/design_v1.webp)
 
-It's not really meant to run all the time or anything like that, I just wanted to write this disclaimer, feel free to use the code any way you want to :)
+## ❗ Disclaimer
+I'm not exactly a linux hardware wizard, so I honestly have no clue about a lot of things and I myself can tell there's a lot to improve upon and that there's a lot of other things missing that are a little bit more obscure, I personally don't currently own any m.2 sata drives to test the code on, or many of the other drive types, I have only tested on HDD, SSD and NVMe drives, any issues opened would help me so much!
 
-## How to use
+## ❗ Requirements
+1. A linux machine, this will NOT work on macOS or on Windows, it's meant to be ran on servers as a service with which administrators can privately connect to for temperature logging.
+
+2. Please make sure you have the [**drivetemp kernel drive**](https://docs.kernel.org/hwmon/drivetemp.html) you can check this by running `sudo modprobe drivetemp`.
+The program depends on this to be able to log the temperature of your devices.
+
+
+## 📖 How to use
+1. Follow the `Deployment` section instrcutions to launch the program
+
+2. Once the program has launched, access it in your browser
+
+3. Enter the administrative username and password for the simple HTTP Auth
+
+4. You now have access to the application, you can monitor your disk's temperature over a period of time.
+
+## 🐦 Deployment
+To deploy the application you have multiple choices, the preffered method should be one which runs the binary directly and not containerization, the `docker` image is taking up a wopping `1Gb+` because I have to include sqlite3-dev and musl-dev dependencies, which sucks, so I whole heartedly recommend just installing this on your system as a binary either with `SystemD` or whichever service manager you are using.
+
+Download binaries from [the releases page](https://github.com/JustKato/drive-health/releases)
+
+### 🐋 Docker
+In the project there's a `docker-compose.prod.yml` which you can deploy on your server, you will notice that there's also a "dev" version, this version simply has a `build` instead of `image` property, so feel free to use either.
+
+Please do take notice that I have just fed the `environment file` directly to the service via docker-compose, and I recommend you do the same but please feel free to pass in `environment` variables straight to the process as well.
+
+[Docker Compose File](./docker-compose.prod.yml)
+```yaml
+version: "3.8"
+
+services:
+  drive-health:
+    # Latest image pull, mention the specific version here please.
+    image: ghcr.io/justkato/drive-health:latest
+    # Restart in case of crashing
+    restart: unless-stopped
+    # Load environment variables from .env file
+    env_file:
+      - .env
+    # Mount the volume to the local drive
+    volumes:
+      - ./data:/data
+    # Setup application ports
+    ports:
+      - 5003:8080
+```
+
+### 💾 SystemD
+When running with SystemD or any other service manager, please make sure you have a `.env` inside the `WorkingDirectory` of your runner, in the below example I will simply put my env in `/home/daniel/services/drive-health/.env`
+
+```ini
+[Unit]
+Description=Drive Health Service
+After=network.target
+
+[Service]
+Type=simple
+User=daniel # Your user here
+WorkingDirectory=/home/daniel/services/drive-health # The path to the service's directory
+ExecStart=/home/daniel/services/drive-health/drive-health # The path to the binary
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+```
+
+## ❔ FAQ
+
+### How does it work?
+Currently the program does not depend on any go library for hardware detection as I couldn't find anything that would not require root access while giving me the possibility to interrogate the temperature of the drives.
+
+I chose not to depend on `lsblk` either, so how does the program work?
+The program currently looks in `/sys/block` and then tries to make sense of the devices, I have had limited testing with my hardware specs, any issues being open in regards to different kinds of hardware would be highly appreciated
+
+### Why not just run as root?
+I really, REALLY, **REALLY** want to avoid asking people to run **ANY** program I write as root and even try and prevent that from happening since that's how things can go bad, especially because I am running actions over hardware devices.
+
+## Support & Contribution
+For support, bug reports, or feature requests, please open an issue on the [GitHub repository](https://github.com/JustKato/drive-health/issues). Contributions are welcome! Fork the repository, make your changes, and submit a pull request.
+
+## License
+This project is licensed under the [Apache License 2.0](./LICENSE).

build.sh

@@ -1,17 +1,50 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+set -o pipefail
+set -u
+
+# Function to display messages in color
+echo_color() {
+    color=$1
+    text=$2
+    case $color in
+        "green") echo -e "\033[0;32m$text\033[0m" ;;
+        "yellow") echo -e "\033[0;33m$text\033[0m" ;;
+        "red") echo -e "\033[0;31m$text\033[0m" ;;
+        *) echo "$text" ;;
+    esac
+}
+
+# Getting GIT_VERSION from the most recent tag or commit hash
+GIT_VERSION=$(git describe --tags --always)
+if [ -z "$GIT_VERSION" ]; then
+    echo_color red "Error: Unable to determine GIT_VERSION."
+    exit 1
+fi
 
 APP_NAME="drive-health"
-DIST_DIR="dist"
+DIST_DIR="${DIST_DIR:-dist}"
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+# make sure we are in the source dir
+cd $SCRIPT_DIR;
 
 # Create the dist directory if it doesn't exist
 mkdir -p $DIST_DIR
 
 # Build the application
-echo "Building the application..."
+echo_color yellow "[🦝] Building the application..."
-GOOS=linux GOARCH=amd64 go build -o $DIST_DIR/$APP_NAME
+GOOS=linux CGO_ENABLED=1 GOARCH=amd64 go build -o $DIST_DIR/$APP_NAME
 
-# Copy additional resources (like .env, static files, templates) to the dist directory
+# Copying additional resources...
-echo "Copying additional resources..."
+cp -r static templates $DIST_DIR/
-cp -r .env static templates $DIST_DIR/
 
-echo "Compilation and packaging completed."
+echo_color yellow "[🦝] Compilation and packaging completed, archiving..."
+
+cd $DIST_DIR/
+
+zip "drive-health_$GIT_VERSION.zip" -r .
+
+# TODO: Add reliable method of cleaning up the compiled files optionally
+
+cd $SCRIPT_DIR;

deploy.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# Function to display messages in color
+echo_color() {
+    color=$1
+    text=$2
+    case $color in
+        "green") echo -e "\033[0;32m$text\033[0m" ;;
+        "yellow") echo -e "\033[0;33m$text\033[0m" ;;
+        "red") echo -e "\033[0;31m$text\033[0m" ;;
+        *) echo "$text" ;;
+    esac
+}
+
+# Getting GIT_VERSION from the most recent tag or commit hash
+GIT_VERSION=$(git describe --tags --always)
+if [ -z "$GIT_VERSION" ]; then
+    echo_color red "Error: Unable to determine GIT_VERSION."
+    exit 1
+fi
+
+# Run tests before proceeding
+echo_color yellow "Running tests..."
+if ! go test; then
+    echo_color red "Tests failed. Cancelling build process."
+    exit 1
+fi
+echo_color green "All tests passed successfully."
+
+echo_color green "Starting the Docker build process with version $GIT_VERSION..."
+
+LATEST_IMAGE_NAME="ghcr.io/justkato/drive-health:latest"
+IMAGE_NAME="ghcr.io/justkato/drive-health:$GIT_VERSION"
+echo_color yellow "Image to be built: $IMAGE_NAME"
+
+# Confirmation to build
+read -p "Are you sure you want to build an image? (y/N) " response
+if [[ "$response" =~ ^([yY][eE][sS]|[yY])$ ]]; then
+    # Building the Docker image
+    echo "Building Docker image: $IMAGE_NAME"
+    docker build --no-cache -t $IMAGE_NAME .
+
+    # Also tag this build as 'latest'
+    echo "Tagging image as latest: $LATEST_IMAGE_NAME"
+    docker tag $IMAGE_NAME $LATEST_IMAGE_NAME
+else
+    echo_color red "Build cancelled."
+    exit 1
+fi
+
+# Prompt to push the image
+read -p "Push image to repository? (y/N) " push_response
+if [[ "$push_response" =~ ^([yY][eE][sS]|[yY])$ ]]; then
+    # Pushing the image
+    echo "Pushing image: $IMAGE_NAME"
+    docker push $IMAGE_NAME
+
+    # Pushing the 'latest' image
+    echo "Pushing latest image: $LATEST_IMAGE_NAME"
+    docker push $LATEST_IMAGE_NAME
+else
+    echo_color red "Push cancelled."
+fi
+
+echo_color green "Ending the Docker build process..."

docker-compose.dev.yml

@@ -0,0 +1,14 @@
+version: "3.8"
+
+services:
+  drive-health:
+    # Build the current image
+    build: .
+    # Read straight from the .env file, or use the environment path
+    env_file:
+      - .env
+    volumes:
+      - ./dev_data:/data
+    # Setup application ports
+    ports:
+      - 8080:8080

docker-compose.prod.yml

@@ -0,0 +1,17 @@
+version: "3.8"
+
+services:
+  drive-health:
+    # Latest image pull, mention the specific version here please.
+    image: ghcr.io/justkato/drive-health:latest
+    # Restart in case of crashing
+    restart: unless-stopped
+    # Load environment variables from .env file
+    env_file:
+      - .env
+    # Mount the volume to the local drive
+    volumes:
+      - ./data:/data
+    # Setup application ports
+    ports:
+      - 5003:8080

go.mod

@@ -1,15 +1,22 @@
-module tea.chunkbyte.com/kato/drive-health
+module github.com/JustKato/drive-health
 
 go 1.21.6
 
 require (
-	github.com/anatol/smart.go v0.0.0-20230705044831-c3b27137baa3 // indirect
+	github.com/gin-gonic/gin v1.9.1
+	github.com/joho/godotenv v1.5.1
+	github.com/wcharczuk/go-chart/v2 v2.1.1
+	gorm.io/driver/sqlite v1.5.4
+	gorm.io/gorm v1.25.5
+)
+
+require (
+	github.com/blend/go-sdk v1.20220411.3 // indirect
 	github.com/bytedance/sonic v1.10.2 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/chenzhuoyu/iasm v0.9.1 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/gin-gonic/gin v1.9.1 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.17.0 // indirect
@@ -17,7 +24,6 @@ require (
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/joho/godotenv v1.5.1 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
@@ -28,7 +34,6 @@ require (
 	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
-	github.com/wcharczuk/go-chart/v2 v2.1.1 // indirect
 	golang.org/x/arch v0.7.0 // indirect
 	golang.org/x/crypto v0.18.0 // indirect
 	golang.org/x/image v0.11.0 // indirect
@@ -37,6 +42,4 @@ require (
 	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gorm.io/driver/sqlite v1.5.4 // indirect
-	gorm.io/gorm v1.25.5 // indirect
 )

go.sum

@@ -1,5 +1,5 @@
-github.com/anatol/smart.go v0.0.0-20230705044831-c3b27137baa3 h1:kAF2MWFD8tyDqD74OQizymjj2cnZAURwSzBrEslCDnI=
+github.com/blend/go-sdk v1.20220411.3 h1:GFV4/FQX5UzXLPwWV03gP811pj7B8J2sbuq+GJQofXc=
-github.com/anatol/smart.go v0.0.0-20230705044831-c3b27137baa3/go.mod h1:llkexGSe52bW0OjNva0kvIqGZxfSnVfpKHrnKBI2+pU=
+github.com/blend/go-sdk v1.20220411.3/go.mod h1:7lnH8fTi6U4i1fArEXRyOIY2E1X4MALg09qsQqY1+ak=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
 github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE=
@@ -12,6 +12,7 @@ github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLI
 github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0=
 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
 github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
@@ -19,6 +20,8 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
+github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
@@ -29,7 +32,7 @@ github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
@@ -57,6 +60,7 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
 github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
@@ -67,6 +71,7 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
@@ -102,8 +107,6 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
-golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -121,9 +124,11 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
 google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

lib/config/config.go

@@ -16,10 +16,21 @@ type DHConfig struct {
 
 	IdentityUsername string `json:"identityUsername"`
 	IdentityPassword string `json:"identityPassword"`
+
+	IsDocker bool `json:isDocker`
+
+	DebugMode bool `json:"debugMode"`
 }
 
-func GetConfiguration() DHConfig {
+var config *DHConfig = nil
-	config := DHConfig{
+
+func GetConfiguration() *DHConfig {
+
+	if config != nil {
+		return config
+	}
+
+	config = &DHConfig{
 		DiskFetchFrequency:      5,
 		CleanupServiceFrequency: 3600,
 		MaxHistoryAge:           2592000,
@@ -27,6 +38,8 @@ func GetConfiguration() DHConfig {
 		IdentityUsername:        "admin",
 		IdentityPassword:        "admin",
 
+		IsDocker: false,
+
 		Listen: ":8080",
 	}
 
@@ -64,5 +77,19 @@ func GetConfiguration() DHConfig {
 		config.IdentityPassword = val
 	}
 
+	if val, exists := os.LookupEnv("DEBUG_MODE"); exists {
+		if isDebug, err := strconv.ParseBool(val); err == nil {
+			config.DebugMode = isDebug
+		}
+	}
+
+	if val, exists := os.LookupEnv("IS_DOCKER"); exists {
+		if isDocker, err := strconv.ParseBool(val); err == nil {
+			config.IsDocker = isDocker
+
+			config.DatabaseFilePath = "/data/data.sqlite"
+		}
+	}
+
 	return config
 }

lib/hardware/logic.go

@@ -1,70 +1,78 @@
 package hardware
 
 import (
-	"bufio"
-	"bytes"
 	"fmt"
-	"os/exec"
+	"os"
+	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
 
+	"github.com/JustKato/drive-health/lib/config"
 	"gorm.io/gorm"
 )
 
 func GetSystemHardDrives(db *gorm.DB, olderThan *time.Time, newerThan *time.Time) ([]*HardDrive, error) {
-
-	// Execute the lsblk command to get detailed block device information
-	cmd := exec.Command("lsblk", "-d", "-o", "NAME,TRAN,SIZE,MODEL,SERIAL,TYPE")
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	err := cmd.Run()
-	if err != nil {
-		fmt.Println("Failed to execute command:", err)
-		return nil, err
-	}
-
 	var systemHardDrives []*HardDrive
 
-	// Scan the output line by line
+	// List all block devices
-	scanner := bufio.NewScanner(&out)
+	devices, err := os.ReadDir("/sys/block/")
-	for scanner.Scan() {
+	if err != nil {
-		line := scanner.Text()
+		return nil, fmt.Errorf("failed to list block devices: %w", err)
-
-		// Skip the header line
-		if strings.Contains(line, "NAME") {
-			continue
-		}
-
-		// Split the line into columns
-		cols := strings.Fields(line)
-		if len(cols) < 6 {
-			continue
-		}
-
-		// Filter out nvme drives (M.2)
-		if cols[1] != "usb" {
-			hd := &HardDrive{
-				Name:      cols[0],
-				Transport: cols[1],
-				Size:      cols[2],
-				Model:     cols[3],
-				Serial:    cols[4],
-				Type:      cols[5],
-			}
-			systemHardDrives = append(systemHardDrives, hd)
-		}
 	}
 
-	// Handle error
+	for _, device := range devices {
-	if err := scanner.Err(); err != nil {
+		deviceName := device.Name()
-		return nil, err
+
+		// Skip non-physical devices (like loop and ram devices)
+		// TODO: Read more about this, there might be some other devices we should or should not skip
+		if strings.HasPrefix(deviceName, "loop") || strings.HasPrefix(deviceName, "ram") {
+			continue
+		}
+
+		// Read device details
+		model, _ := os.ReadFile(fmt.Sprintf("/sys/block/%s/device/model", deviceName))
+		serial, _ := os.ReadFile(fmt.Sprintf("/sys/block/%s/device/serial", deviceName))
+		sizeBytes, _ := os.ReadFile(fmt.Sprintf("/sys/block/%s/size", deviceName))
+
+		size := convertSizeToString(sizeBytes)
+		transport := getTransportType(deviceName)
+
+		// TODO: Maybe find a better way?
+		if size == "0 Bytes" {
+			// This looks like an invalid device, skip it.
+			if config.GetConfiguration().DebugMode {
+				fmt.Printf("[🟨] Igoring device:[/dev/%s], reported size of 0\n", deviceName)
+			}
+			continue
+		}
+
+		hwid, err := getHardwareID(deviceName)
+		if err != nil {
+			if config.GetConfiguration().DebugMode {
+				fmt.Printf("[🟨] No unique identifier found for device:[/dev/%s] unique identifier\n", deviceName)
+			}
+			continue
+		}
+
+		hd := &HardDrive{
+			Name:      deviceName,
+			Transport: transport,
+			Model:     strings.TrimSpace(string(model)),
+			Serial:    strings.TrimSpace(string(serial)),
+			Size:      size,
+			Type:      getDriveType(deviceName),
+			HWID:      hwid,
+		}
+
+		systemHardDrives = append(systemHardDrives, hd)
 	}
 
 	var updatedHardDrives []*HardDrive
 
 	for _, sysHDD := range systemHardDrives {
 		var existingHD HardDrive
-		q := db.Where("serial = ? AND model = ? AND type = ?", sysHDD.Serial, sysHDD.Model, sysHDD.Type)
+		q := db.Where("hw_id = ?", sysHDD.HWID)
 
 		if newerThan != nil && olderThan != nil {
 			q = q.Preload("Temperatures", "time_stamp < ? AND time_stamp > ?", newerThan, olderThan)
@@ -90,3 +98,101 @@ func GetSystemHardDrives(db *gorm.DB, olderThan *time.Time, newerThan *time.Time
 
 	return updatedHardDrives, nil
 }
+
+func getTransportType(deviceName string) string {
+	transportLink, err := filepath.EvalSymlinks(fmt.Sprintf("/sys/block/%s/device", deviceName))
+	if err != nil {
+		return "Unknown"
+	}
+
+	if strings.Contains(transportLink, "/usb/") {
+		return "USB"
+	} else if strings.Contains(transportLink, "/ata") {
+		return "SATA"
+	} else if strings.Contains(transportLink, "/nvme/") {
+		return "NVMe"
+	}
+
+	return "Other"
+}
+
+func convertSizeToString(sizeBytes []byte) string {
+	// Convert the size from a byte slice to a string, then to an integer
+	sizeStr := strings.TrimSpace(string(sizeBytes))
+	sizeSectors, err := strconv.ParseInt(sizeStr, 10, 64)
+	if err != nil {
+		return "Unknown"
+	}
+
+	// Convert from 512-byte sectors to bytes
+	sizeInBytes := sizeSectors * 512
+
+	// Define size units
+	const (
+		_          = iota // ignore first value by assigning to blank identifier
+		KB float64 = 1 << (10 * iota)
+		MB
+		GB
+		TB
+	)
+
+	var size float64 = float64(sizeInBytes)
+	var unit string
+
+	// Determine the unit to use
+	switch {
+	case size >= TB:
+		size /= TB
+		unit = "TB"
+	case size >= GB:
+		size /= GB
+		unit = "GB"
+	case size >= MB:
+		size /= MB
+		unit = "MB"
+	case size >= KB:
+		size /= KB
+		unit = "KB"
+	default:
+		unit = "Bytes"
+	}
+
+	// Return the formatted size
+	return fmt.Sprintf("%.2f %s", size, unit)
+}
+
+// Look throug /sys/block/device/ and try and find the unique identifier of the device.
+func getHardwareID(deviceName string) (string, error) {
+	// Define potential ID file paths
+	idFilePaths := []string{
+		"/sys/block/" + deviceName + "/device/wwid",
+		"/sys/block/" + deviceName + "/device/wwn",
+		"/sys/block/" + deviceName + "/device/serial",
+	}
+
+	// Try to read each file and return the first successful read
+	for _, path := range idFilePaths {
+		if idBytes, err := os.ReadFile(path); err == nil {
+			return strings.TrimSpace(string(idBytes)), nil
+		}
+	}
+
+	// Return an empty string if no ID is found
+	return "", fmt.Errorf("could not find unique identifier for %s", deviceName)
+}
+
+// Figure out what kind of device this is by reading if it's rotational or not
+func getDriveType(deviceName string) string {
+	// Check if the drive is rotational (HDD)
+	if isRotational, _ := os.ReadFile(fmt.Sprintf("/sys/block/%s/queue/rotational", deviceName)); string(isRotational) == "1\n" {
+		return "HDD"
+	}
+
+	// Check if the drive is NVMe
+	if strings.HasPrefix(deviceName, "nvme") {
+		return "NVMe"
+	}
+
+	// Default to SSD for non-rotational and non-NVMe drives
+	return "SSD"
+}

lib/hardware/models.go

@@ -2,9 +2,12 @@ package hardware
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
 	"time"
 
-	"github.com/anatol/smart.go"
 	"gorm.io/gorm"
 )
 
@@ -19,6 +22,7 @@ type HardDrive struct {
 	Model        string
 	Serial       string
 	Type         string
+	HWID         string
 	Temperatures []HardDriveTemperature `gorm:"foreignKey:HardDriveID"`
 }
 
@@ -39,26 +43,52 @@ type Snapshots struct {
 	List []*HardwareSnapshot
 }
 
-// Fetch the temperature of the device, optinally update the reference object
 func (h *HardDrive) GetTemperature() int {
-	// Fetch the device by name
-	disk, err := smart.Open("/dev/" + h.Name)
-	if err != nil {
-		fmt.Printf("Failed to open device %s: %s\n", h.Name, err)
-		return -1
-	}
-	defer disk.Close()
 
-	// Fetch SMART data
+	possiblePaths := []string{
-	smartInfo, err := disk.ReadGenericAttributes()
+		"/sys/block/" + h.Name + "/device/hwmon/",
-	if err != nil {
+		"/sys/block/" + h.Name + "/device/",
-		fmt.Printf("Failed to get SMART data for %s: %s\n", h.Name, err)
+		"/sys/block/" + h.Name + "/device/generic/device/",
-		return -1
 	}
 
-	// Parse the temperature
+	for _, path := range possiblePaths {
-	temperature := int(smartInfo.Temperature)
+		// Try HDD/SSD path
+		temp, found := h.getTemperatureFromPath(path)
+		if found {
+			return temp
+		}
+	}
 
-	// Return the found value
+	fmt.Printf("[🛑] Failed to get temperature for %s\n", h.Name)
-	return temperature
+	return -1
+}
+
+func (h *HardDrive) getTemperatureFromPath(basePath string) (int, bool) {
+	hwmonDirs, err := os.ReadDir(basePath)
+	if err != nil {
+		return 0, false
+	}
+
+	for _, dir := range hwmonDirs {
+		if strings.HasPrefix(dir.Name(), "hwmon") {
+			tempPath := filepath.Join(basePath, dir.Name(), "temp1_input")
+			if _, err := os.Stat(tempPath); err == nil {
+				tempBytes, err := os.ReadFile(tempPath)
+				if err != nil {
+					continue
+				}
+
+				tempStr := strings.TrimSpace(string(tempBytes))
+				temperature, err := strconv.Atoi(tempStr)
+				if err != nil {
+					continue
+				}
+
+				// Convert millidegree Celsius to degree Celsius
+				return temperature / 1000, true
+			}
+		}
+	}
+
+	return 0, false
 }

lib/svc/service.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/JustKato/drive-health/lib/config"
+	"github.com/JustKato/drive-health/lib/hardware"
 	"github.com/wcharczuk/go-chart/v2"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
-	"tea.chunkbyte.com/kato/drive-health/lib/config"
-	"tea.chunkbyte.com/kato/drive-health/lib/hardware"
 )
 
 var db *gorm.DB
@@ -79,7 +79,7 @@ func GetDiskGraphImage(hddID int, newerThan *time.Time, olderThan *time.Time) (*
 	// Fetch by a combination of fields
 	q := db.Where("id = ?", hddID)
 
-	if newerThan == nil && olderThan == nil {
+	if newerThan == nil || olderThan == nil {
 		q = q.Preload("Temperatures")
 	} else {
 		q = q.Preload("Temperatures", "time_stamp < ? AND time_stamp > ?", newerThan, olderThan)

lib/svc/service_cleanup.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"tea.chunkbyte.com/kato/drive-health/lib/config"
+	"github.com/JustKato/drive-health/lib/config"
-	"tea.chunkbyte.com/kato/drive-health/lib/hardware"
+	"github.com/JustKato/drive-health/lib/hardware"
 )
 
 // Delete all thermal entries that are older than X amount of seconds

lib/web/api.go

@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/JustKato/drive-health/lib/hardware"
+	"github.com/JustKato/drive-health/lib/svc"
 	"github.com/gin-gonic/gin"
-	"tea.chunkbyte.com/kato/drive-health/lib/hardware"
-	"tea.chunkbyte.com/kato/drive-health/lib/svc"
 )
 
 func setupApi(r *gin.Engine) {
@@ -26,7 +26,23 @@ func setupApi(r *gin.Engine) {
 			return
 		}
 
-		graphData, err := svc.GetDiskGraphImage(diskId, nil, nil)
+		var olderThan, newerThan *time.Time
+
+		if ot := ctx.Query("older"); ot != "" {
+			if otInt, err := strconv.ParseInt(ot, 10, 64); err == nil {
+				otTime := time.UnixMilli(otInt)
+				olderThan = &otTime
+			}
+		}
+
+		if nt := ctx.Query("newer"); nt != "" {
+			if ntInt, err := strconv.ParseInt(nt, 10, 64); err == nil {
+				ntTime := time.UnixMilli(ntInt)
+				newerThan = &ntTime
+			}
+		}
+
+		graphData, err := svc.GetDiskGraphImage(diskId, newerThan, olderThan)
 		if err != nil {
 			ctx.AbortWithStatusJSON(500, gin.H{
 				"error":   err.Error(),

lib/web/frontend.go

@@ -1,12 +1,14 @@
 package web
 
 import (
+	"fmt"
 	"net/http"
+	"strconv"
 	"time"
 
+	"github.com/JustKato/drive-health/lib/hardware"
+	"github.com/JustKato/drive-health/lib/svc"
 	"github.com/gin-gonic/gin"
-	"tea.chunkbyte.com/kato/drive-health/lib/hardware"
-	"tea.chunkbyte.com/kato/drive-health/lib/svc"
 )
 
 func setupFrontend(r *gin.Engine) {
@@ -14,22 +16,51 @@ func setupFrontend(r *gin.Engine) {
 	r.Static("/static", "./static")
 
 	// Set up a route for the root URL
-	r.GET("/", func(c *gin.Context) {
+	r.GET("/", func(ctx *gin.Context) {
-		olderThan := time.Now().Add(time.Minute * time.Duration(10) * -1)
+		hardDrives, err := hardware.GetSystemHardDrives(svc.GetDatabaseRef(), nil, nil)
-		newerThan := time.Now()
-
-		hardDrives, err := hardware.GetSystemHardDrives(svc.GetDatabaseRef(), &olderThan, &newerThan)
 		if err != nil {
-			c.AbortWithStatus(500)
+			ctx.AbortWithStatus(500)
 		}
 
 		for _, hdd := range hardDrives {
 			hdd.GetTemperature()
 		}
 
+		var olderThan, newerThan *time.Time
+
+		if ot := ctx.Query("older"); ot != "" {
+			fmt.Printf("ot = %s\n", ot)
+			if otInt, err := strconv.ParseInt(ot, 10, 64); err == nil {
+				otTime := time.UnixMilli(otInt)
+				olderThan = &otTime
+			}
+		}
+
+		if nt := ctx.Query("newer"); nt != "" {
+			fmt.Printf("nt = %s\n", nt)
+			if ntInt, err := strconv.ParseInt(nt, 10, 64); err == nil {
+				ntTime := time.UnixMilli(ntInt)
+				newerThan = &ntTime
+			}
+		}
+
+		if olderThan == nil {
+			genTime := time.Now().Add(time.Hour * -1)
+
+			olderThan = &genTime
+		}
+
+		if newerThan == nil {
+			genTime := time.Now()
+
+			newerThan = &genTime
+		}
+
 		// Render the HTML template
-		c.HTML(http.StatusOK, "index.html", gin.H{
+		ctx.HTML(http.StatusOK, "index.html", gin.H{
 			"drives": hardDrives,
+			"older":  olderThan.UnixMilli(),
+			"newer":  newerThan.UnixMilli(),
 		})
 	})
 }

lib/web/net.go

@@ -1,13 +1,19 @@
 package web
 
 import (
+	"github.com/JustKato/drive-health/lib/config"
 	"github.com/gin-gonic/gin"
-	"tea.chunkbyte.com/kato/drive-health/lib/config"
 )
 
 func SetupRouter() *gin.Engine {
-	// Initialize the Gin engine
 	cfg := config.GetConfiguration()
+
+	if !cfg.DebugMode {
+		// Set gin to release
+		gin.SetMode(gin.ReleaseMode)
+	}
+
+	// Initialize the Gin engine
 	r := gin.Default()
 
 	r.Use(BasicAuthMiddleware(cfg.IdentityUsername, cfg.IdentityPassword))

main.go

@@ -9,10 +9,10 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/JustKato/drive-health/lib/config"
+	"github.com/JustKato/drive-health/lib/svc"
+	"github.com/JustKato/drive-health/lib/web"
 	"github.com/joho/godotenv"
-	"tea.chunkbyte.com/kato/drive-health/lib/config"
-	"tea.chunkbyte.com/kato/drive-health/lib/svc"
-	"tea.chunkbyte.com/kato/drive-health/lib/web"
 )
 
 func main() {

static/main.js

@@ -0,0 +1,55 @@
+/**
+ * @typedef {number}
+ */
+var initialInputOlder = 0; // miliseconds Unix TimeStamp
+/**
+ * @typedef {number}
+ */
+var initialInputNewer = 0; // miliseconds Unix TimeStamp
+
+
+/**
+ * @typedef {HTMLInputElement}
+ */
+var olderThanInputElement;
+/**
+ * @typedef {HTMLInputElement}
+ */
+var newerThanInputElement;
+
+document.addEventListener(`DOMContentLoaded`, initializePage)
+
+function initializePage() {
+
+    // Update the page's time filter
+    initialInputOlder = Number(document.getElementById(`inp-older`).textContent.trim())
+    initialInputNewer = Number(document.getElementById(`inp-newer`).textContent.trim())
+
+    // Bind the date elements
+    olderThanInputElement = document.getElementById(`olderThan`);
+    newerThanInputElement = document.getElementById(`newerThan`);
+
+    olderThanInputElement.value = convertTimestampToDateTimeLocal(initialInputOlder);
+    newerThanInputElement.value = convertTimestampToDateTimeLocal(initialInputNewer);
+
+}
+
+// Handle one of the date elements having their value changed.
+function applyDateInterval() {
+    const olderTimeStamp = new Date(olderThanInputElement.value).getTime()
+    const newerTimeStamp = new Date(newerThanInputElement.value).getTime()
+
+    window.location.href = `/?older=${olderTimeStamp}&newer=${newerTimeStamp}`;
+}
+
+/**
+ * Converts a Unix timestamp to a standard datetime string
+ * @param {number} timestamp - The Unix timestamp in milliseconds.
+ * @returns {string} - A normal string with Y-m-d H:i:s format
+ */
+function convertTimestampToDateTimeLocal(timestamp) {
+    const date = new Date(timestamp);
+    const offset = date.getTimezoneOffset() * 60000; // offset in milliseconds
+    const localDate = new Date(date.getTime() - offset);
+    return localDate.toISOString().slice(0, 19);
+}

static/style.css

@@ -5,11 +5,22 @@
     --bg1: #282d33;
     --bg2: #31373f;
     --bg3: #3e4248;
+    --bg4: #1a1c1f;
 
     --fg0: #bbc0ca;
     --fg1: #434c56;
 
-    --acc: #bbc0ca;
+    --acc1: #2aa3f4;
+    --acc1BG0: #2aa3f450;
+    --acc1BG1: #2aa3f430;
+
+    --acc2: #2af488;
+    --acc2BG0: #2af48850;
+    --acc2BG1: #2af48830;
+
+    --acc3: #f4e02a;
+    --acc3BG0: #f4e02a50;
+    --acc3BG1: #f4e02a30;
 }
 
 :root {
@@ -54,6 +65,41 @@ html, body {
     margin: 0;
 }
 
+.badge {
+    font-size: 12px;
+    font-weight: bold;
+    padding: .1rem .4rem;
+
+    display: inline-block;
+    border-radius: 3px;
+
+    color: var(--acc1);
+    background-color: var(--acc1BG0);
+    border: 1px solid var(--acc1BG1);
+}
+
+.badge[type="HDD"] {
+    color: var(--acc2);
+    background-color: var(--acc2BG0);
+    border: 1px solid var(--acc2BG1);
+}
+
+.badge[type="NVMe"] {
+    color: var(--acc3);
+    background-color: var(--acc3BG0);
+    border: 1px solid var(--acc3BG1);
+}
+
+.grooved {
+    background-color: var(--bg0);
+    border: 1px solid var(--bg1);
+
+    font-size: 12px;
+    padding: .1rem .3rem;
+
+    border-radius: 4px;
+}
+
 
 /* Table */
 
@@ -76,4 +122,67 @@ table thead tr {
     border-radius: 8px;
 
     padding: .3rem .5rem;
+}
+
+
+/* Controls */
+
+input {
+    padding: .25rem .5rem;
+    font-size: 16px;
+    background-color: var(--bg3);
+    color: var(--fg0);
+
+    border: 1px solid var(--fg1);
+    border-radius: 4px;
+}
+
+.btn {
+    font-size: 16px;
+
+    padding: .5rem 1rem;
+
+    border: 1px solid var(--fg1);
+    border-radius: 6px;
+
+    background-color: var(--bg4);
+    color: var(--fg0);
+
+    cursor: pointer;
+}
+
+.btn:hover {
+    background-color: var(--bg3);
+}
+
+.input-grp {
+    display: flex;
+    flex-flow: column;
+}
+
+.input-grp label {
+    margin-bottom: .25rem;
+    font-weight: bold;
+}
+
+.graph-controls {
+    display: flex;
+    flex-flow: wrap;
+
+    width: 100%;
+}
+
+.graph-controls input:nth-child(0) {
+    margin-right: 1rem;
+}
+
+.controls-panel {
+    display: flex;
+    flex-flow: column;
+
+    padding: 1rem 0;
+
+    border-bottom: 1px solid var(--fg1);
+    margin-bottom: 1rem;
+
 }

templates/index.html

@@ -6,6 +6,10 @@
     <link rel="stylesheet" href="/static/style.css">
     <title>Drive Health Dashboard</title>
 </head>
+
+{{ $older := .older }}
+{{ $newer := .newer }}
+
 <body>
     <div class="container bordered">
 
@@ -66,12 +70,40 @@
         </div>
         <div class="container-body">
             <div class="pad">
+
+                <!-- Controls -->
+                <div class="controls-panel">
+                    <div class="graph-controls">
+                        <span id="inp-older" style="display: none !important" hidden="true">{{ .older }}</span>
+                        <span id="inp-newer" style="display: none !important" hidden="true">{{ .newer }}</span>
+    
+                        <div class="input-grp" style="margin-right: 1rem;">
+                            <label for="olderThan">From Date</label>
+                            <input id="olderThan" type="datetime-local" class="date-change-inp">
+                        </div>
+    
+                        <div class="input-grp">
+                            <label for="newerThan">To Date</label>
+                            <input id="newerThan" type="datetime-local" class="date-change-inp">
+                        </div>
+    
+                    </div>
+
+                    <div class="btn-group">
+                        <button type="button" class="btn" onclick="applyDateInterval()" style="margin-top: 1rem;">
+                            Filter
+                        </button>
+                    </div>
+                </div>
+
+                <!-- Drives -->
                 {{ if len .drives }}
                     {{ range .drives }}
-                        <div class="disk-graph-entry bordered" id="disk-temp-{{ .ID }}">
+                        <div class="disk-graph-entry bordered" id="disk-temp-{{ .ID }}" style="position: relative;">
-                            <h4>{{.Name}}:{{.Serial}} [{{.Size}}]</h4>
+                            <div class="badge" type="{{.Type}}" style="position: absolute; top: 1rem; right: 1rem;">/dev/{{.Name}}</div>
+                            <h4>{{.Model}}:{{.HWID}} <span class="grooved">{{.Size}}</span></h4>
                             <a href="/api/v1/disks/{{.ID}}/chart" target="_blank">
-                                <img class="graph-image" src="/api/v1/disks/{{.ID}}/chart" alt="{{ .Model }} Image">
+                                <img class="graph-image" src="/api/v1/disks/{{.ID}}/chart?older={{ $older }}&newer={{ $newer }}" alt="{{ .Model }} Image">
                             </a>
                         </div>
                         <br>