Initial support for InfluxDB 2

Author: guessi

README.md

@@ -8,44 +8,29 @@ This is demonstration scripts for running Grafana with InfluxDB as datasource.
 
 ### Prerequisites
 
-- Docker-CE 18.06+
-- Docker Compose v1.23.1+
+- Docker-CE 19.03+
+- Docker Compose v1.25.1+
 
 ### Quick Start Guide
 
 ```bash
-$ ./provision.sh
+./provision.sh
 ```
 
 That's all, now you should be able to check your dashboard by visiting http://localhost:3000 :-)
 
 ### FAQ
 
-#### Where can I find my data?
-
-please find your data via `$ docker volume ls`
-
-```bash
-$ docker volume ls
-
-DRIVER          VOLUME NAME
-local           demo_grafana-lib
-local           demo_grafana-log
-local           demo_influxdb-lib
-```
-
 #### I just messed up, how do I start over again?
 
-I know you will ask, here's the cleanup script for you :-)
-
 ```bash
-$ ./cleanup.sh
+./cleanup.sh
 ```
 
 ### Docker Images
 
 - [Grafana v8.0.6][docker-image-grafana]
-- [InfluxDB 1.8.5][docker-image-influxdb]
+- [InfluxDB 2.0.7][docker-image-influxdb]
 
 [docker-image-influxdb]: https://hub.docker.com/_/influxdb/
 [docker-image-grafana]: https://hub.docker.com/r/grafana/grafana/

cleanup.sh

@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
 
 docker-compose down
-
-docker volume rm demo_grafana-lib
-docker volume rm demo_grafana-log
-docker volume rm demo_influxdb-lib
+docker system prune --volumes --force

demo.env

@@ -1,35 +1,37 @@
-version: "3"
+version: "3.7"
 
 services:
-    influxdb:
-        container_name: influxdb
-        image: influxdb:1.8.5-alpine
-        volumes:
-            - ./influxdb/etc:/etc/influxdb
-            - influxdb-lib:/var/lib/influxdb
-        env_file:
-            - ./demo.env
-        ports:
-            - 8083:8083
-            - 8086:8086
-        privileged: true
+  influxdb:
+    container_name: influxdb
+    image: influxdb:2.0.7-alpine
+    volumes:
+      - influxdb-lib:/var/lib/influxdb2
+    env_file:
+      # BE SURE TO CHANGE THIS LINE BEFORE GOING TO PRODUCTION
+      - ./influx2.env
+    ports:
+      - 8086:8086
+    restart: always
+    privileged: true
 
-    grafana:
-        container_name: grafana
-        image: grafana/grafana:8.0.6
-        volumes:
-            - ./grafana/etc:/etc/grafana:ro
-            - grafana-lib:/var/lib/grafana
-            - grafana-log:/var/log/grafana
-        links:
-            - influxdb:influxdb
-        env_file:
-            - ./demo.env # BE SURE TO CHANGE THIS LINE BEFORE GOING TO PRODUCTION
-        ports:
-            - 3000:3000
-        depends_on:
-            - influxdb
-        privileged: true
+  grafana:
+    container_name: grafana
+    image: grafana/grafana:8.0.6
+    volumes:
+      - ./grafana/etc:/etc/grafana:ro
+      - grafana-lib:/var/lib/grafana
+      - grafana-log:/var/log/grafana
+    links:
+      - influxdb:influxdb
+    env_file:
+      # BE SURE TO CHANGE THIS LINE BEFORE GOING TO PRODUCTION
+      - ./grafana.env
+    ports:
+      - 3000:3000
+    depends_on:
+      - influxdb
+    restart: always
+    privileged: true
 
 volumes:
   influxdb-lib:

docker-compose.yaml

@@ -0,0 +1 @@
+GF_INSTALL_PLUGINS=grafana-clock-panel

grafana.env

@@ -1,10 +1,14 @@
 apiVersion: 1
 
 datasources:
-  - name: InfluxDB
+  - name: InfluxDB_v2_Flux
     type: influxdb
     access: proxy
-    database: %%INFLUXDB_DEMO_DATABASE%%
-    user: %%INFLUXDB_ADMIN_USER%%
-    password: %%INFLUXDB_ADMIN_PASSWORD%%
     url: http://influxdb:8086
+    secureJsonData:
+      token: %%INFLUXDB_INIT_ADMIN_TOKEN%%
+    jsonData:
+      version: Flux
+      organization: %%INFLUXDB_INIT_ORG%%
+      defaultBucket: %%INFLUXDB_INIT_BUCKET%%
+      tlsSkipVerify: true

grafana/etc/provisioning/datasources/datasource.yaml.template

@@ -0,0 +1,7 @@
+DOCKER_INFLUXDB_INIT_MODE=setup
+DOCKER_INFLUXDB_INIT_USERNAME=root
+DOCKER_INFLUXDB_INIT_PASSWORD=5up3rS3cr3t
+DOCKER_INFLUXDB_INIT_ORG=influxdata-org
+DOCKER_INFLUXDB_INIT_BUCKET=default
+DOCKER_INFLUXDB_INIT_RETENTION=1w
+DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=5up3r-S3cr3t-auth-t0k3n