diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c36eda1..e288033 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -31,7 +31,7 @@ jobs: # Service containers to run with `build` (Required for end-to-end testing) services: influxdb: - image: influxdb:2.2 + image: influxdb:2.8 env: DOCKER_INFLUXDB_INIT_MODE: setup DOCKER_INFLUXDB_INIT_USERNAME: admin diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index afd027d..ba9ba4c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -20,7 +20,7 @@ jobs: # Service containers to run with `build` (Required for end-to-end testing) services: influxdb: - image: influxdb:2.2 + image: influxdb:2.8 env: DOCKER_INFLUXDB_INIT_MODE: setup DOCKER_INFLUXDB_INIT_USERNAME: admin diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0845332..02992dd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -177,7 +177,7 @@ Depending on the functionality you are adding, you may need to setup a developme ``` 4. start a InfluxDB docker container. ```bash - docker run -p 8086:8086 --rm influxdb:2.2 + docker run -p 8086:8086 --rm influxdb:2.8 ``` 5. start the scrutiny web server ```bash @@ -230,7 +230,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 --rm influxdb:2.8 ``` 5. build the Angular Frontend Application ```bash @@ -254,7 +254,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 --rm influxdb:2.8 # curl -X POST -H "Content-Type: application/json" -d @webapp/backend/pkg/web/testdata/register-devices-req.json localhost:8080/api/devices/register @@ -322,7 +322,7 @@ 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 +influxdb:2.8 go test ./... ``` diff --git a/README.md b/README.md index ed59dce..48e902a 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ other Docker images: - `ghcr.io/analogj/scrutiny:latest-collector` - Contains the Scrutiny data collector, `smartctl` binary and cron-like scheduler. You can run one collector on each server. - `ghcr.io/analogj/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.8` - InfluxDB image, used by the Web container to persist SMART data. Only one container necessary See [docs/TROUBLESHOOTING_INFLUXDB.md](./docs/TROUBLESHOOTING_INFLUXDB.md) > See [docker/example.hubspoke.docker-compose.yml](https://github.com/AnalogJ/scrutiny/blob/master/docker/example.hubspoke.docker-compose.yml) for a docker-compose file. @@ -111,7 +111,7 @@ other Docker images: docker run -p 8086:8086 --restart unless-stopped \ -v `pwd`/influxdb2:/var/lib/influxdb2 \ --name scrutiny-influxdb \ - influxdb:2.2 + influxdb:2.8 docker run -p 8080:8080 --restart unless-stopped \ -v `pwd`/scrutiny:/opt/scrutiny/config \ diff --git a/docker/example.hubspoke.docker-compose.yml b/docker/example.hubspoke.docker-compose.yml index ba3917c..454cde0 100644 --- a/docker/example.hubspoke.docker-compose.yml +++ b/docker/example.hubspoke.docker-compose.yml @@ -3,7 +3,7 @@ version: '2.4' services: influxdb: restart: unless-stopped - image: influxdb:2.2 + image: influxdb:2.8 ports: - '8086:8086' volumes: diff --git a/docs/INSTALL_MANUAL.md b/docs/INSTALL_MANUAL.md index b9f101e..24b9f26 100644 --- a/docs/INSTALL_MANUAL.md +++ b/docs/INSTALL_MANUAL.md @@ -10,9 +10,9 @@ Scrutiny is made up of three components: an influxdb Database, a collector and a ## InfluxDB -Please follow the official InfluxDB installation guide. Note, you'll need to install v2.2.0+. +Please follow the official InfluxDB installation guide. Note, you'll need to install v2.8.0+. -https://docs.influxdata.com/influxdb/v2.2/install/ +https://docs.influxdata.com/influxdb/v2/install/ ## Webapp/API diff --git a/docs/INSTALL_ROOTLESS_PODMAN.md b/docs/INSTALL_ROOTLESS_PODMAN.md index 4b6e30d..3572d59 100644 --- a/docs/INSTALL_ROOTLESS_PODMAN.md +++ b/docs/INSTALL_ROOTLESS_PODMAN.md @@ -88,7 +88,7 @@ Description=influxdb [Container] ContainerName=influxdb -Image=docker.io/library/influxdb:2.2 +Image=docker.io/library/influxdb:2.8 AutoUpdate=registry Timezone=local ## not strictly necessary, but keeps file permission sane for influxdb diff --git a/docs/TROUBLESHOOTING_INFLUXDB.md b/docs/TROUBLESHOOTING_INFLUXDB.md index 291814d..579ea91 100644 --- a/docs/TROUBLESHOOTING_INFLUXDB.md +++ b/docs/TROUBLESHOOTING_INFLUXDB.md @@ -41,14 +41,14 @@ The growth rate is pretty unintuitive -- see https://github.com/AnalogJ/scrutiny InfluxDB is a required dependency for Scrutiny v0.4.0+. -https://docs.influxdata.com/influxdb/v2.2/install/ +https://docs.influxdata.com/influxdb/v2/install/ ## Persistence To ensure that all data is correctly stored, you must also persist the InfluxDB database directory - If you're using the Official Scrutiny Omnibus image (`ghcr.io/analogj/scrutiny:master-omnibus`), the path is `/opt/scrutiny/influxdb` -- If you're deploying in Hub/Spoke mode with the InfluxDB maintained image (`influxdb:2.2`), the path is `/var/lib/influxdb2` +- If you're deploying in Hub/Spoke mode with the InfluxDB maintained image (`influxdb:2.8`), the path is `/var/lib/influxdb2` If you attempt to restart Scrutiny but you forgot to persist the InfluxDB directory, you will get an error message like follows: