Skip to content

Commit

Permalink
Grafana 11.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
swiffer committed Oct 31, 2024
1 parent 226a65b commit 6f4ce5d
Show file tree
Hide file tree
Showing 22 changed files with 962 additions and 1,561 deletions.
6 changes: 5 additions & 1 deletion grafana/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Ensure selecting a tag that is available for arm/v7, arm64, and amd64
# https://hub.docker.com/r/grafana/grafana/tags
FROM grafana/grafana:11.0.6-security-01
FROM grafana/grafana:11.3.0

ENV GF_ANALYTICS_REPORTING_ENABLED=false \
GF_AUTH_ANONYMOUS_ENABLED=false \
Expand All @@ -15,6 +15,10 @@ ENV GF_ANALYTICS_REPORTING_ENABLED=false \
DATABASE_PORT=5432 \
DATABASE_SSL_MODE=disable

# Scenes-powered Grafana dashboards disabled via feature toggle
# until grafana/grafana #95209 is resolved
ENV GF_FEATURE_TOGGLES_DASHBOARD_SCENE=false

USER grafana

COPY logo.svg /usr/share/grafana/public/img/grafana_icon.svg
Expand Down
151 changes: 105 additions & 46 deletions grafana/dashboards/battery-health.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "11.1.0"
"version": "11.3.0"
},
{
"type": "datasource",
Expand Down Expand Up @@ -90,7 +90,6 @@
"type": "dashboards"
}
],
"liveNow": false,
"panels": [
{
"datasource": {
Expand Down Expand Up @@ -150,7 +149,7 @@
"textMode": "value_and_name",
"wideLayout": true
},
"pluginVersion": "11.1.0",
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -298,7 +297,7 @@
"textMode": "value_and_name",
"wideLayout": true
},
"pluginVersion": "11.1.0",
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -402,7 +401,7 @@
"textMode": "value_and_name",
"wideLayout": true
},
"pluginVersion": "11.1.0",
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -658,7 +657,7 @@
"sort": "none"
}
},
"pluginVersion": "8.5.6",
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -774,7 +773,7 @@
"showThresholdMarkers": true,
"sizing": "auto"
},
"pluginVersion": "11.1.0",
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -857,6 +856,12 @@
"id": 12,
"options": {
"displayMode": "gradient",
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": false
},
"maxVizHeight": 300,
"minVizHeight": 10,
"minVizWidth": 0,
Expand All @@ -873,7 +878,7 @@
"sizing": "auto",
"valueMode": "color"
},
"pluginVersion": "11.1.0",
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -999,7 +1004,7 @@
"textMode": "value_and_name",
"wideLayout": true
},
"pluginVersion": "11.1.0",
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -1229,6 +1234,12 @@
"id": 25,
"options": {
"displayMode": "lcd",
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": false
},
"maxVizHeight": 300,
"minVizHeight": 10,
"minVizWidth": 0,
Expand All @@ -1246,7 +1257,7 @@
"text": {},
"valueMode": "color"
},
"pluginVersion": "11.1.0",
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -1441,7 +1452,7 @@
"textMode": "value",
"wideLayout": true
},
"pluginVersion": "11.1.0",
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -1524,6 +1535,12 @@
"id": 27,
"options": {
"displayMode": "gradient",
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": false
},
"maxVizHeight": 300,
"minVizHeight": 10,
"minVizWidth": 0,
Expand All @@ -1541,7 +1558,7 @@
"text": {},
"valueMode": "color"
},
"pluginVersion": "11.1.0",
"pluginVersion": "11.3.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -1631,14 +1648,17 @@
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"fillOpacity": 50,
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"pointShape": "circle",
"pointSize": {
"fixed": 6
},
"pointStrokeWidth": 1,
"scaleDistribution": {
"type": "linear"
},
Expand Down Expand Up @@ -1675,6 +1695,33 @@
"value": "lines"
}
]
},
{
"matcher": {
"id": "byName",
"options": "kWh"
},
"properties": [
{
"id": "custom.pointSize.fixed",
"value": 5
}
]
},
{
"matcher": {
"id": "byName",
"options": "M-kWh"
},
"properties": [
{
"id": "color",
"value": {
"fixedColor": "dark-red",
"mode": "fixed"
}
}
]
}
]
},
Expand All @@ -1692,37 +1739,62 @@
"placement": "bottom",
"showLegend": false
},
"mapping": "manual",
"series": [
{
"name": "Odometer",
"pointColor": {
"field": "kWh"
"color": {
"matcher": {
"id": "byName",
"options": "kWh"
}
},
"pointSize": {
"fixed": 5,
"max": 100,
"min": 1
"frame": {
"matcher": {
"id": "byIndex",
"options": 0
}
},
"x": {
"matcher": {
"id": "byName",
"options": "Odometer"
}
},
"x": "Odometer",
"y": "kWh"
"y": {
"matcher": {
"id": "byName",
"options": "kWh"
}
}
},
{
"name": "Median Odometer",
"pointColor": {
"fixed": "dark-red"
"frame": {
"matcher": {
"id": "byIndex",
"options": 1
}
},
"x": "M-Odometer",
"y": "M-kWh"
"x": {
"matcher": {
"id": "byName",
"options": "M-Odometer"
}
},
"y": {
"matcher": {
"id": "byName",
"options": "M-kWh"
}
}
}
],
"seriesMapping": "manual",
"tooltip": {
"maxHeight": 600,
"mode": "single",
"sort": "none"
}
},
"pluginVersion": "8.5.6",
"pluginVersion": "11.3.0",
"targets": [
{
"alias": "",
Expand Down Expand Up @@ -1832,7 +1904,7 @@
}
],
"refresh": "",
"schemaVersion": 39,
"schemaVersion": 40,
"tags": [
"tesla"
],
Expand All @@ -1856,10 +1928,7 @@
"regex": "",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",
"tagsQuery": "",
"type": "query",
"useTags": false
"type": "query"
},
{
"current": {},
Expand All @@ -1870,7 +1939,6 @@
"definition": "SELECT unit_of_length FROM settings LIMIT 1",
"hide": 2,
"includeAll": false,
"label": "",
"multi": false,
"name": "length_unit",
"options": [],
Expand All @@ -1879,10 +1947,7 @@
"regex": "",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",
"tagsQuery": "",
"type": "query",
"useTags": false
"type": "query"
},
{
"current": {},
Expand Down Expand Up @@ -1912,7 +1977,6 @@
"definition": "SELECT base_url FROM settings LIMIT 1",
"hide": 2,
"includeAll": false,
"label": "",
"multi": false,
"name": "base_url",
"options": [],
Expand All @@ -1921,10 +1985,7 @@
"regex": "",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",
"tagsQuery": "",
"type": "query",
"useTags": false
"type": "query"
},
{
"current": {},
Expand All @@ -1947,7 +2008,6 @@
},
{
"current": {
"selected": false,
"text": "0",
"value": "0"
},
Expand All @@ -1968,7 +2028,6 @@
},
{
"current": {
"selected": false,
"text": "0",
"value": "0"
},
Expand Down Expand Up @@ -1999,6 +2058,6 @@
"timezone": "browser",
"title": "Battery Health",
"uid": "jchmRiqUfXgTM",
"version": 11,
"version": 17,
"weekStart": ""
}
Loading

0 comments on commit 6f4ce5d

Please sign in to comment.