Skip to content

Commit

Permalink
Grafana update, deusche Anleitung
Browse files Browse the repository at this point in the history
  • Loading branch information
@ToWipf
ToWipf committed Nov 24, 2024
1 parent c3d1437 commit b35289e
Show file tree
Hide file tree
Showing 4 changed files with 125 additions and 23 deletions.
3 changes: 1 addition & 2 deletions setup/docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
version: "3"
services:
grafana:
container_name: grafana
image: grafana/grafana:9.3.6
image: grafana/grafana:11.3.1
ports:
- "3000:3000"
volumes:
Expand Down
77 changes: 56 additions & 21 deletions setup/grafana.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@
}
]
},
"description": "",
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
"id": 1,
"id": 2,
"links": [
{
"asDropdown": false,
Expand All @@ -42,7 +41,6 @@
"url": ""
}
],
"liveNow": false,
"panels": [
{
"datasource": {
Expand Down Expand Up @@ -82,6 +80,8 @@
},
"id": 6,
"options": {
"minVizHeight": 75,
"minVizWidth": 75,
"orientation": "auto",
"reduceOptions": {
"calcs": [
Expand All @@ -91,9 +91,10 @@
"values": false
},
"showThresholdLabels": false,
"showThresholdMarkers": true
"showThresholdMarkers": true,
"sizing": "auto"
},
"pluginVersion": "9.3.6",
"pluginVersion": "11.3.1",
"targets": [
{
"datasource": {
Expand All @@ -120,11 +121,13 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 98,
"gradientMode": "opacity",
Expand All @@ -133,6 +136,7 @@
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 2,
"pointSize": 5,
Expand Down Expand Up @@ -201,7 +205,7 @@
{
"matcher": {
"id": "byName",
"options": "Watt (Modbus)"
"options": "Watt (API)"
},
"properties": [
{
Expand Down Expand Up @@ -238,6 +242,7 @@
"sort": "none"
}
},
"pluginVersion": "11.3.1",
"targets": [
{
"datasource": {
Expand All @@ -256,12 +261,12 @@
"editorMode": "code",
"expr": "sum ((current{} * voltage{}) > 0) < 900",
"hide": false,
"legendFormat": "Watt (Modbus)",
"legendFormat": "Watt (API)",
"range": true,
"refId": "B"
}
],
"title": "Watt",
"title": "Leistung",
"type": "timeseries"
},
{
Expand All @@ -274,13 +279,15 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"axisSoftMax": 1,
"axisSoftMin": 0,
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 28,
"gradientMode": "none",
Expand All @@ -289,6 +296,7 @@
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "stepAfter",
"lineWidth": 1,
"pointSize": 1,
Expand Down Expand Up @@ -342,6 +350,7 @@
"sort": "none"
}
},
"pluginVersion": "11.3.1",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -396,16 +405,19 @@
"graphMode": "area",
"justifyMode": "auto",
"orientation": "auto",
"percentChangeColorMode": "standard",
"reduceOptions": {
"calcs": [
"lastNotNull"
],
"fields": "",
"values": false
},
"textMode": "auto"
"showPercentChange": false,
"textMode": "auto",
"wideLayout": true
},
"pluginVersion": "9.3.6",
"pluginVersion": "11.3.1",
"targets": [
{
"datasource": {
Expand All @@ -418,7 +430,7 @@
"refId": "A"
}
],
"title": "Tagesleistung",
"title": "Monatsleistung",
"type": "stat"
},
{
Expand All @@ -431,7 +443,7 @@
"color": {
"mode": "thresholds"
},
"decimals": 2,
"decimals": 3,
"mappings": [],
"min": 0,
"thresholds": {
Expand Down Expand Up @@ -479,16 +491,19 @@
"graphMode": "none",
"justifyMode": "auto",
"orientation": "auto",
"percentChangeColorMode": "standard",
"reduceOptions": {
"calcs": [
"lastNotNull"
],
"fields": "",
"values": false
},
"textMode": "auto"
"showPercentChange": false,
"textMode": "auto",
"wideLayout": true
},
"pluginVersion": "9.3.6",
"pluginVersion": "11.3.1",
"targets": [
{
"datasource": {
Expand All @@ -515,11 +530,13 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 4,
"gradientMode": "opacity",
Expand All @@ -528,6 +545,7 @@
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -603,6 +621,7 @@
"sort": "none"
}
},
"pluginVersion": "11.3.1",
"targets": [
{
"datasource": {
Expand All @@ -629,11 +648,13 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 5,
"gradientMode": "opacity",
Expand All @@ -642,6 +663,7 @@
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -717,6 +739,7 @@
"sort": "none"
}
},
"pluginVersion": "11.3.1",
"targets": [
{
"datasource": {
Expand All @@ -743,11 +766,13 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 100,
"gradientMode": "opacity",
Expand All @@ -756,6 +781,7 @@
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -831,6 +857,7 @@
"sort": "none"
}
},
"pluginVersion": "11.3.1",
"targets": [
{
"datasource": {
Expand All @@ -843,7 +870,7 @@
"refId": "A"
}
],
"title": "Watt",
"title": "Leistung",
"type": "timeseries"
},
{
Expand All @@ -857,11 +884,13 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 100,
"gradientMode": "opacity",
Expand All @@ -870,6 +899,7 @@
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "stepAfter",
"lineWidth": 1,
"pointSize": 5,
Expand Down Expand Up @@ -945,6 +975,7 @@
"sort": "none"
}
},
"pluginVersion": "11.3.1",
"targets": [
{
"datasource": {
Expand All @@ -971,11 +1002,13 @@
"mode": "palette-classic"
},
"custom": {
"axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 7,
"gradientMode": "opacity",
Expand All @@ -984,6 +1017,7 @@
"tooltip": false,
"viz": false
},
"insertNulls": false,
"lineInterpolation": "stepAfter",
"lineWidth": 3,
"pointSize": 5,
Expand Down Expand Up @@ -1073,6 +1107,7 @@
"sort": "none"
}
},
"pluginVersion": "11.3.1",
"targets": [
{
"datasource": {
Expand All @@ -1089,9 +1124,9 @@
"type": "timeseries"
}
],
"preload": false,
"refresh": "",
"schemaVersion": 37,
"style": "dark",
"schemaVersion": 40,
"tags": [
"ok"
],
Expand All @@ -1104,8 +1139,8 @@
},
"timepicker": {},
"timezone": "",
"title": "Übersicht Solar",
"uid": "8wFrHwb4k",
"version": 44,
"title": "Übersicht Solar 2",
"uid": "8wFrHwb4kx",
"version": 1,
"weekStart": ""
}
}
Binary file modified setup/grafana.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b35289e

Please sign in to comment.