Skip to content
Snippets Groups Projects
Commit 51b3c0ae authored by MyIgel's avatar MyIgel :fire:
Browse files

Map & Grafana: Fixed time ranges for dashboards as InfluxDB is a little bit... 

Map & Grafana: Fixed time ranges for dashboards as InfluxDB is a little bit quirky if no newer date is available
parent dec2e7c0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
grafana/files/dashboards/Nodes/Firmware.json
+ 1
− 1
View file @ 51b3c0ae
......@@ -511,7 +511,7 @@
},
"time": {
"from": "now-24h",
"to": "now"
"to": "now-1m"
},
"timepicker": {
"refresh_intervals": [
......
grafana/files/dashboards/Nodes/Node Details for Map.json
+ 3
− 3
View file @ 51b3c0ae
......@@ -22,7 +22,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 1,
"iteration": 1644007409389,
"iteration": 1644010728242,
"links": [],
"liveNow": false,
"panels": [
......@@ -1071,7 +1071,7 @@
},
"time": {
"from": "now-7d",
"to": "now"
"to": "now-1m"
},
"timepicker": {
"refresh_intervals": [
......@@ -1100,6 +1100,6 @@
"timezone": "browser",
"title": "Node Details for Map",
"uid": "000000003",
"version": 2,
"version": 3,
"weekStart": ""
}
grafana/files/dashboards/Nodes/Nodes Details.json
+ 5
− 5
View file @ 51b3c0ae
......@@ -21,7 +21,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 1,
"iteration": 1644005891532,
"iteration": 1644010596871,
"links": [],
"liveNow": false,
"panels": [
......@@ -227,7 +227,7 @@
[
{
"params": [
"traffic.tx.bytes"
"traffic.rx.bytes"
],
"type": "field"
},
......@@ -258,7 +258,7 @@
]
}
],
"title": "Aktuell: Clientnetz-TX",
"title": "Aktuell: Clientnetz-RX",
"transparent": true,
"type": "stat"
},
......@@ -2207,7 +2207,7 @@
},
"time": {
"from": "now-7d",
"to": "now"
"to": "now-1m"
},
"timepicker": {
"refresh_intervals": [
......@@ -2237,6 +2237,6 @@
"timezone": "browser",
"title": "Nodes Details",
"uid": "000000002",
"version": 1,
"version": 2,
"weekStart": ""
}
meshviewer/files/config.json.j2
+ 12
− 12
View file @ 51b3c0ae
......@@ -34,40 +34,40 @@
"nodeInfos": [
{
"name": "Clientstatistik",
"href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_NAME}&from=now-7d&to=now",
"image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/node-details-for-map?panelId=7&var-id={NODE_ID}&from=now-7d&to=now&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
"href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_NAME}&from=now-7d&to=now-1m",
"image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/node-details-for-map?panelId=7&var-id={NODE_ID}&from=now-7d&to=now-1m&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
"title": "Knoten {NODE_ID} ({NODE_NAME})"
},
{
"name": "Traffic",
"href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_NAME}&from=now-7d&to=now",
"image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/node-details-for-map?panelId=1&var-id={NODE_ID}&from=now-7d&to=now&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
"href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_NAME}&from=now-7d&to=now-1m",
"image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/node-details-for-map?panelId=1&var-id={NODE_ID}&from=now-7d&to=now-1m&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
"title": "Knoten {NODE_ID} ({NODE_NAME})"
},
{
"name": "Uptime",
"href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_NAME}&from=now-7d&to=now",
"image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/node-details-for-map?panelId=5&var-id={NODE_ID}&from=now-7d&to=now&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
"href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_NAME}&from=now-7d&to=now-1m",
"image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/node-details-for-map?panelId=5&var-id={NODE_ID}&from=now-7d&to=now-1m&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
"title": "Knoten {NODE_ID} ({NODE_NAME})"
},
{
"name": "CPU Auslastung",
"href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_NAME}&from=now-7d&to=now",
"image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/node-details-for-map?panelId=2&var-id={NODE_ID}&from=now-7d&to=now&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
"href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_NAME}&from=now-7d&to=now-1m",
"image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/node-details-for-map?panelId=2&var-id={NODE_ID}&from=now-7d&to=now-1m&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
"title": "Knoten {NODE_ID} ({NODE_NAME})"
},
{
"name": "Neighbours",
"href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_NAME}&from=now-7d&to=now",
"image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/node-details-for-map?panelId=4&var-id={NODE_ID}&from=now-7d&to=now&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
"href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/nodes-details?var-name={NODE_NAME}&from=now-7d&to=now-1m",
"image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/node-details-for-map?panelId=4&var-id={NODE_ID}&from=now-7d&to=now-1m&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
"title": "Knoten {NODE_ID} ({NODE_NAME})"
}
],
"globalInfos": [
{
"name": "Wochenstatistik",
"href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/deck?from=now-7d&to=now",
"image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/deck?&panelId=11&from=now-7d&to=now&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
"href": "{{ salt['pillar.get']('grafana:grafana_url') }}/d/000000002/deck?from=now-7d&to=now-1m",
"image": "{{ salt['pillar.get']('grafana:grafana_url') }}/render/d-solo/000000003/deck?&panelId=11&from=now-7d&to=now-1m&width=600&height=300&theme=light&tz=Europe%2FBerlin&_t={TIME}",
"title": "Bild der Wochenstatistik"
}
],
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment