add monthly overview dashboard

terjesannum · Dec 3, 2023 · 8ac7b3b · 8ac7b3b
1 parent d4e75f0
commit 8ac7b3b
Show file tree

Hide file tree

Showing 7 changed files with 462 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -17,6 +17,10 @@ If you don't have a device for live measurements, only the power price metrics w
 
 ![Grafana dashboard without pulse](grafana/dashboard-without-pulse.png)
 
+These metrics can also be used for a [monthly overview dashboard](grafana/dashboard-monthly.json):
+
+![Grafana monthly overview dashboard](grafana/dashboard-monthly.png)
+
 #### Next day prices
 
 The Tibber API provides power prices for the current and the next day, but storing future data can't be done easily in Prometheus. To be able to show future power prices, this exporter also has a JSON service which can be queried to get this data. In Grafana this can be used with the [JSON API datasource plugin](https://grafana.com/grafana/plugins/marcusolsson-json-datasource/).
@@ -55,7 +59,7 @@ cd docker-compose
 TIBBER_TOKEN=... docker compose up
 ```
 
-Then go to http://localhost:3000/ and find the dashboards in the General folder.
+Then go to http://localhost:3000/ and find the dashboards from the menu.
 
 ### Kubernetes
 

diff --git a/charts/tibber-exporter/Chart.yaml b/charts/tibber-exporter/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: tibber-exporter
-version: 3.3.1
+version: 3.4.0
 description: Tibber exporter
 type: application
 keywords:
@@ -28,3 +28,5 @@ annotations:
       url: https://raw.githubusercontent.com/terjesannum/tibber-exporter/master/grafana/dashboard-without-pulse.png
     - title: Prices dashboard
       url: https://raw.githubusercontent.com/terjesannum/tibber-exporter/master/grafana/dashboard-prices.png
+    - title: Monthly overview
+      url: https://raw.githubusercontent.com/terjesannum/tibber-exporter/master/grafana/dashboard-monthly.png
diff --git a/charts/tibber-exporter/README.md b/charts/tibber-exporter/README.md
@@ -8,6 +8,8 @@ If you don't have Tibber Pulse, you still get price and daily consumption/cost m
 
 ![Grafana dashboard](https://raw.githubusercontent.com/terjesannum/tibber-exporter/master/grafana/dashboard-without-pulse.png)
 
-![Grafana dashboard](https://raw.githubusercontent.com/terjesannum/tibber-exporter/master/grafana/dashboard-prices.png)
+![Grafana prices dashboard](https://raw.githubusercontent.com/terjesannum/tibber-exporter/master/grafana/dashboard-prices.png)
+
+![Grafana monthly overview dashboard](https://raw.githubusercontent.com/terjesannum/tibber-exporter/master/grafana/dashboard-monthly.png)
 
 See [https://github.com/terjesannum/tibber-exporter](https://github.com/terjesannum/tibber-exporter) for more information.
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
@@ -31,6 +31,7 @@ services:
       - ../grafana/dashboard.json:/dashboard.json
       - ../grafana/dashboard-without-pulse.json:/dashboard-without-pulse.json
       - ../grafana/dashboard-prices.json:/dashboard-prices.json
+      - ../grafana/dashboard-monthly.json:/dashboard-monthly.json
       - ./grafana.sh:/grafana.sh
       - grafana_data:/var/lib/grafana
     ports:

diff --git a/docker-compose/grafana.sh b/docker-compose/grafana.sh
@@ -6,4 +6,5 @@ mkdir -p /var/lib/grafana/dashboards
 cat /dashboard.json | sed -e 's/${DS_PROMETHEUS}/1/;s/now-7d/now-6h/;s/\"refresh\": \"1m\"/\"refresh\": \"5s\"/' > /var/lib/grafana/dashboards/dashboard.json
 cat /dashboard-without-pulse.json | sed -e 's/${DS_PROMETHEUS}/1/' > /var/lib/grafana/dashboards/dashboard-without-pulse.json
 cat /dashboard-prices.json | sed -e 's/${DS_TIBBER-EXPORTER}/2/' > /var/lib/grafana/dashboards/dashboard-prices.json
+cat /dashboard-monthly.json | sed -e 's/${DS_PROMETHEUS}/1/' > /var/lib/grafana/dashboards/dashboard-monthly.json
 /run.sh