feat(release): promote develop to master

.github/workflows/ci.yaml

@@ -22,14 +22,15 @@ jobs:
     # Service containers to run with `build` (Required for end-to-end testing)
     services:
       influxdb:
-        image: influxdb:2.2
+        image: influxdb:2.9
         env:
           DOCKER_INFLUXDB_INIT_MODE: setup
           DOCKER_INFLUXDB_INIT_USERNAME: admin
           DOCKER_INFLUXDB_INIT_PASSWORD: password12345
           DOCKER_INFLUXDB_INIT_ORG: scrutiny
           DOCKER_INFLUXDB_INIT_BUCKET: metrics
           DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: my-super-secret-auth-token
+          INFLUXD_USE_HASHED_TOKENS: "false"
         ports:
           - 8086:8086
     env:

.github/workflows/docker-build.yaml

@@ -92,6 +92,66 @@ jobs:
           cache-from: type=gha,scope=docker-collector
           cache-to: type=gha,mode=max,scope=docker-collector
 
+  collector-omnibus:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v7
+        with:
+          fetch-depth: 0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v4
+        with:
+          platforms: 'arm64,arm'
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v4
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v6
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: |
+            latest=false
+          tags: |
+            # Manual trigger
+            type=raw,value=${{ inputs.tag_suffix }}-collector-omnibus,enable=${{ github.event_name == 'workflow_dispatch' }}
+            # Branch builds
+            type=raw,value=latest-collector-omnibus,enable=${{ (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')) && github.event_name != 'workflow_dispatch' }}
+            type=raw,value=beta-collector-omnibus,enable=${{ github.ref == 'refs/heads/beta' && github.event_name != 'workflow_dispatch' }}
+            type=raw,value=develop-collector-omnibus,enable=${{ github.ref == 'refs/heads/develop' && github.event_name != 'workflow_dispatch' }}
+            # Version tags
+            type=semver,pattern={{version}}-collector-omnibus
+            type=semver,pattern={{major}}.{{minor}}-collector-omnibus
+            type=semver,pattern={{major}}-collector-omnibus,enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v7
+        with:
+          platforms: linux/amd64,linux/arm64
+          context: .
+          file: docker/Dockerfile.collector-omnibus
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha,scope=docker-collector-omnibus
+          cache-to: type=gha,mode=max,scope=docker-collector-omnibus
+
   collector-zfs:
     runs-on: ubuntu-latest
     timeout-minutes: 30

.github/workflows/sonarqube.yaml

@@ -16,14 +16,15 @@ jobs:
     runs-on: ubuntu-latest
     services:
       influxdb:
-        image: influxdb:2.2
+        image: influxdb:2.9
         env:
           DOCKER_INFLUXDB_INIT_MODE: setup
           DOCKER_INFLUXDB_INIT_USERNAME: admin
           DOCKER_INFLUXDB_INIT_PASSWORD: password12345
           DOCKER_INFLUXDB_INIT_ORG: scrutiny
           DOCKER_INFLUXDB_INIT_BUCKET: metrics
           DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: my-super-secret-auth-token
+          INFLUXD_USE_HASHED_TOKENS: "false"
         ports:
           - 8086:8086
     env:

CONTRIBUTING.md

@@ -87,7 +87,7 @@ unless the task specifically requires host-level device access from Zeus.
     ```
 4. if you need a Dockerized InfluxDB dependency, start it on Zeus rather than on this Mac.
     ```bash
-    docker run -p 8086:8086 --rm influxdb:2.2
+    docker run -p 8086:8086 -e INFLUXD_USE_HASHED_TOKENS=false --rm influxdb:2.9
     ```
 5. start the scrutiny web server
     ```bash
@@ -151,7 +151,7 @@ you'll need to follow the steps below:
     ```
 4. start a InfluxDB docker container.
     ```bash
-    docker run -p 8086:8086 --rm influxdb:2.2
+    docker run -p 8086:8086 -e INFLUXD_USE_HASHED_TOKENS=false --rm influxdb:2.9
     ```
 5. build the Angular Frontend Application
     ```bash
@@ -175,7 +175,7 @@ If you'd like to populate the database with some test data,  you can run the fol
 > This is done automatically by the `webapp/backend/pkg/models/testdata/helper.go` script
 
 ```
-docker run -p 8086:8086 --rm influxdb:2.2
+docker run -p 8086:8086 -e INFLUXD_USE_HASHED_TOKENS=false --rm influxdb:2.9
 
 
 # curl -X POST -H "Content-Type: application/json" -d @webapp/backend/pkg/web/testdata/register-devices-req.json localhost:8080/api/devices/register
@@ -249,7 +249,8 @@ docker run -p 8086:8086 -d --rm \
 -e DOCKER_INFLUXDB_INIT_ORG=scrutiny \
 -e DOCKER_INFLUXDB_INIT_BUCKET=metrics \
 -e DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=my-super-secret-auth-token \
-influxdb:2.2
+-e INFLUXD_USE_HASHED_TOKENS=false \
+influxdb:2.9
 
 go test ./...                                    # Run all tests
 go test -v ./webapp/backend/pkg/web/...          # Run tests in specific package

Makefile

@@ -212,6 +212,11 @@ docker-collector:
 	@echo "building collector docker image"
 	docker build $(DOCKER_TARGETARCH_BUILD_ARG) -f docker/Dockerfile.collector -t ghcr.io/starosdev/scrutiny-dev:collector .
 
+.PHONY: docker-collector-omnibus
+docker-collector-omnibus:
+	@echo "building collector omnibus docker image"
+	docker build $(DOCKER_TARGETARCH_BUILD_ARG) -f docker/Dockerfile.collector-omnibus -t ghcr.io/starosdev/scrutiny-dev:collector-omnibus .
+
 .PHONY: docker-collector-zfs
 docker-collector-zfs:
 	@echo "building ZFS collector docker image"

README.md

@@ -77,12 +77,13 @@ This repository also owns the testing and production deployment definitions for
 - Beta images publish from the `beta` branch through [`Publish Beta Image`](./.github/workflows/deploy-beta.yml)
 - Production deploys from the `master` branch through [`Automated Release and Deploy`](./.github/workflows/release-and-deploy.yml)
 - `beta` is an optional pre-release channel for features that need validation before going to `master`
-- Zeus production and testing are separate host appdata trees:
+- Zeus currently runs separate develop, beta, and production host appdata trees:
+  - develop: `/mnt/user/appdata/scrutiny-develop`
+  - beta: `/mnt/user/appdata/scrutiny-beta`
   - production: `/mnt/user/appdata/scrutiny`
-  - testing: `/mnt/user/appdata/scrutiny-dev`
 - Zeus host-side deploy helpers target the live appdata-root compose files, not the repo `deploy/*` example compose files:
+  - develop helper: `/mnt/user/appdata/scrutiny-develop/docker-compose.yml`
   - production helper: `/mnt/user/appdata/scrutiny/docker-compose.yml`
-  - testing helper: `/mnt/user/appdata/scrutiny-dev/docker-compose.yml`
 - Host smoke checks require `/api/health` to return `200`, while the root path may legitimately redirect depending on auth or proxy behavior.
 - Deployment compose files, env templates, and host expectations live in [docs/DEPLOYMENTS.md](./docs/DEPLOYMENTS.md)
 
@@ -247,6 +248,9 @@ the following Docker images:
 
 - `ghcr.io/starosdev/scrutiny:latest-collector` - Contains the Scrutiny data collector, `smartctl` binary and cron-like
   scheduler. You can run one collector on each server.
+- `ghcr.io/starosdev/scrutiny:latest-collector-omnibus` - Recommended single-spoke image for hub/spoke deployments.
+  Bundles the SMART, ZFS, MDADM, Btrfs, filesystem, and performance collectors in one container while keeping each
+  optional collector disabled until you enable its existing schedule or run-on-startup env vars.
 - `ghcr.io/starosdev/scrutiny:latest-collector-zfs` - ZFS pool collector for monitoring ZFS health.
   Run alongside or instead of the standard collector if you use ZFS. See [docs/ZFS_POOL_MONITORING.md](./docs/ZFS_POOL_MONITORING.md) for setup instructions.
 - `ghcr.io/starosdev/scrutiny:latest-collector-mdadm` - MDADM collector for Linux software RAID monitoring.
@@ -256,7 +260,7 @@ the following Docker images:
 - `ghcr.io/starosdev/scrutiny:latest-collector-performance` - Performance benchmark collector using fio.
   Runs periodic benchmarks and tracks throughput, IOPS, and latency over time. See [Performance Benchmarking](#performance-benchmarking) for details.
 - `ghcr.io/starosdev/scrutiny:latest-web` - Contains the Web UI and API. Only one container necessary
-- `influxdb:2.2` - InfluxDB image, used by the Web container to persist SMART data. Only one container necessary.
+- `influxdb:2.9` - InfluxDB image, used by the Web container to persist SMART data. Only one container necessary.
   See [docs/TROUBLESHOOTING_INFLUXDB.md](./docs/TROUBLESHOOTING_INFLUXDB.md)
 
 Branch channel tags follow the same pattern across images:
@@ -268,15 +272,16 @@ Branch channel tags follow the same pattern across images:
 Default CI image publishing currently builds:
 
 - `collector` for `linux/amd64`, `linux/arm64`, and `linux/arm/v7`
-- `web`, `collector-zfs`, `collector-mdadm`, `collector-btrfs`, and `collector-performance` for `linux/amd64` and `linux/arm64`
+- `collector-omnibus`, `web`, `collector-zfs`, `collector-mdadm`, `collector-btrfs`, and `collector-performance` for `linux/amd64` and `linux/arm64`
 
 > See [docker/example.hubspoke.docker-compose.yml](docker/example.hubspoke.docker-compose.yml) for a docker-compose file.
 
 ```bash
 docker run -p 8086:8086 --restart unless-stopped \
   -v `pwd`/influxdb2:/var/lib/influxdb2 \
+  -e INFLUXD_USE_HASHED_TOKENS=false \
   --name scrutiny-influxdb \
-  influxdb:2.2
+  influxdb:2.9
 
 docker run -p 8080:8080 --restart unless-stopped \
   -v `pwd`/scrutiny:/opt/scrutiny/config \
@@ -286,13 +291,17 @@ docker run -p 8080:8080 --restart unless-stopped \
 docker run --restart unless-stopped \
   -v /run/udev:/run/udev:ro \
   --cap-add SYS_RAWIO \
+  --cap-add SYS_ADMIN \
   --device=/dev/sda \
   --device=/dev/sdb \
   -e COLLECTOR_API_ENDPOINT=http://SCRUTINY_WEB_IPADDRESS:8080 \
   --name scrutiny-collector \
-  ghcr.io/starosdev/scrutiny:latest-collector
+  ghcr.io/starosdev/scrutiny:latest-collector-omnibus
 ```
 
+Use `ghcr.io/starosdev/scrutiny:latest-collector` instead if you only want the SMART collector in that spoke and do not
+need the extra host tooling for ZFS, MDADM, Btrfs, filesystem, or fio workloads.
+
 ## Manual Installation (without-Docker)
 
 While the easiest way to get started with Scrutiny is using Docker (see above),
@@ -335,7 +344,8 @@ None of these files are required, however if provided, they allow you to configu
 
 ## Cron Schedule
 Unfortunately the Cron schedule cannot be configured via the `collector.yaml` (as the collector binary needs to be triggered by a scheduler/cron).
-However, if you are using the official `ghcr.io/starosdev/scrutiny:latest-collector` or `ghcr.io/starosdev/scrutiny:latest-omnibus` docker images,
+However, if you are using the official `ghcr.io/starosdev/scrutiny:latest-collector`, `ghcr.io/starosdev/scrutiny:latest-collector-omnibus`,
+or `ghcr.io/starosdev/scrutiny:latest-omnibus` docker images,
 you can use the `COLLECTOR_CRON_SCHEDULE` environmental variable to override the default cron schedule (daily @ midnight - `0 0 * * *`).
 
 `docker run -e COLLECTOR_CRON_SCHEDULE="0 0 * * *" ...`
@@ -695,6 +705,12 @@ The test route sends through the same configured targets as normal notifications
 Scrutiny provides various methods to change the log level and generate log files.
 The web server and collector have **independent** log configurations and can be set separately.
 
+## Shared Startup Banner Suppression
+
+Set `SCRUTINY_NO_LOGO=true` to suppress the ASCII startup banner in the web binary and all container-facing collector binaries.
+
+By default, the banner is still printed during startup. This env var is evaluated at process startup, so it works alongside `SCRUTINY_LOG_LEVEL` and `COLLECTOR_LOG_LEVEL` when you want quiet `WARN` or `ERROR` startup behavior without changing the default banner behavior for other runs.
+
 ## Valid Log Levels
 
 The following log levels are supported (case-insensitive), listed from highest to lowest severity:
@@ -718,6 +734,7 @@ You can use environmental variables to enable debug logging and/or log files for
 
 ```bash
 DEBUG=true
+SCRUTINY_NO_LOGO=true
 SCRUTINY_LOG_FILE=/tmp/web.log
 ```
 
@@ -799,6 +816,7 @@ Example:
 ```bash
 docker run -e SCRUTINY_WEB_LISTEN_PORT=9090 \
   -e SCRUTINY_WEB_INFLUXDB_HOST=influxdb.local \
+  -e SCRUTINY_NO_LOGO=true \
   -e SCRUTINY_LOG_LEVEL=DEBUG \
   ghcr.io/starosdev/scrutiny:latest-web
 ```
@@ -809,6 +827,7 @@ You can use environmental variables to enable debug logging and/or log files for
 
 ```bash
 DEBUG=true
+SCRUTINY_NO_LOGO=true
 COLLECTOR_LOG_FILE=/tmp/collector.log
 ```
 
@@ -846,6 +865,7 @@ Example:
 ```bash
 docker run -e COLLECTOR_COMMANDS_METRICS_SMART_ARGS="--xall --json -T permissive" \
   -e COLLECTOR_API_ENDPOINT=http://scrutiny-web:8080 \
+  -e SCRUTINY_NO_LOGO=true \
   ghcr.io/starosdev/scrutiny:latest-collector
 ```
 
@@ -865,6 +885,7 @@ The performance collector is a separate binary (`scrutiny-collector-performance`
 
 ```bash
 DEBUG=true
+SCRUTINY_NO_LOGO=true
 COLLECTOR_PERF_LOG_FILE=/tmp/performance.log
 ```
 
@@ -937,6 +958,8 @@ The MDADM collector prefers its own config file, `collector-mdadm.yaml`, and fal
 
 For mounts, capabilities, compose examples, and troubleshooting, see [docs/MDADM_MONITORING.md](docs/MDADM_MONITORING.md).
 
+If you upgrade from a build that registered MDADM arrays before `host_id` was persisted on re-registration, run one fresh MDADM collection on each affected host so grouped host headings can backfill correctly in the UI.
+
 # Supported Architectures
 
 | Architecture Name | Binaries | Docker |

TESTING.md

@@ -55,7 +55,7 @@ main repository.
 
 ```bash
 # Run all backend tests
-docker run -p 8086:8086 -d --rm influxdb:2.2   # InfluxDB required
+docker run -p 8086:8086 -d -e INFLUXD_USE_HASHED_TOKENS=false --rm influxdb:2.9   # InfluxDB required
 go test ./...
 
 # Run all frontend tests
@@ -96,7 +96,8 @@ docker run -p 8086:8086 -d --rm \
   -e DOCKER_INFLUXDB_INIT_ORG=scrutiny \
   -e DOCKER_INFLUXDB_INIT_BUCKET=metrics \
   -e DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=my-super-secret-auth-token \
-  influxdb:2.2
+  -e INFLUXD_USE_HASHED_TOKENS=false \
+  influxdb:2.9
 ```
 
 Then run tests:
@@ -189,7 +190,7 @@ npm run lint:fix      # Auto-fix what it can
 
 ## 3. Building Docker Images Locally
 
-The project produces five Docker images. Build whichever you need to test:
+Build whichever image matches the path you changed:
 
 ```bash
 # Omnibus (web + all collectors + InfluxDB, all-in-one)
@@ -204,10 +205,22 @@ make docker-web
 make docker-collector
 # -> ghcr.io/starosdev/scrutiny-dev:collector
 
+# Single-container hub/spoke collector bundle
+make docker-collector-omnibus
+# -> ghcr.io/starosdev/scrutiny-dev:collector-omnibus
+
 # ZFS collector only
 make docker-collector-zfs
 # -> ghcr.io/starosdev/scrutiny-dev:collector-zfs
 
+# MDADM collector only
+make docker-collector-mdadm
+# -> ghcr.io/starosdev/scrutiny-dev:collector-mdadm
+
+# Btrfs collector only
+make docker-collector-btrfs
+# -> ghcr.io/starosdev/scrutiny-dev:collector-btrfs
+
 # Performance collector only
 make docker-collector-performance
 # -> ghcr.io/starosdev/scrutiny-dev:collector-performance
@@ -272,7 +285,8 @@ For testing changes to individual components in isolation:
 # 1. Start InfluxDB
 docker run -d --name influxdb \
   -p 8086:8086 \
-  influxdb:2.2
+  -e INFLUXD_USE_HASHED_TOKENS=false \
+  influxdb:2.9
 
 # 2. Build and start the web server
 docker build -f docker/Dockerfile.web -t scrutiny-web:local .
@@ -307,9 +321,11 @@ For a more production-like test, use the provided compose files:
 cat > docker-compose.test.yaml << 'EOF'
 services:
   influxdb:
-    image: influxdb:2.2
+    image: influxdb:2.9
     ports:
       - '8086:8086'
+    environment:
+      INFLUXD_USE_HASHED_TOKENS: "false"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8086/health"]
       interval: 5s
@@ -759,7 +775,8 @@ docker run -p 8086:8086 -d --rm \
   -e DOCKER_INFLUXDB_INIT_ORG=scrutiny \
   -e DOCKER_INFLUXDB_INIT_BUCKET=metrics \
   -e DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=my-super-secret-auth-token \
-  influxdb:2.2
+  -e INFLUXD_USE_HASHED_TOKENS=false \
+  influxdb:2.9
 
 go mod vendor
 go test ./...