Skip to content

Commit

Permalink
chore: fix grafana and prom provisioning (#144)
Browse files Browse the repository at this point in the history 
Follow advice from @sukunrt for generating dashboard json by exporting dashboards for sharing

Took some manual editing of the dashboards to make sure things worked properly.
  • Loading branch information
@SgtPooki
SgtPooki authored Apr 11, 2024
1 parent a9bb04f commit c60ccd8
Show file tree
Hide file tree
Showing 4 changed files with 200 additions and 193 deletions.
170 changes: 109 additions & 61 deletions config/grafana/dashboards/main-dashboard.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,55 @@
{
"__inputs": [
{
"name": "DS_PROMETHEUS",
"label": "prometheus",
"description": "",
"type": "datasource",
"pluginId": "prometheus",
"pluginName": "Prometheus"
},
{
"name": "VAR_HEATMAP_BUCKETS",
"type": "constant",
"label": "heatmap_buckets",
"value": "10",
"description": ""
},
{
"name": "VAR_AXISWIDTH",
"type": "constant",
"label": "axisWidth",
"value": "200",
"description": ""
}
],
"__elements": {},
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "10.4.1"
},
{
"type": "datasource",
"id": "prometheus",
"name": "Prometheus",
"version": "1.0.0"
},
{
"type": "panel",
"id": "stat",
"name": "Stat",
"version": ""
},
{
"type": "panel",
"id": "timeseries",
"name": "Time series",
"version": ""
}
],
"annotations": {
"list": [
{
Expand All @@ -18,7 +69,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
"id": 1,
"id": null,
"links": [],
"panels": [
{
Expand Down Expand Up @@ -115,8 +166,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "code",
Expand Down Expand Up @@ -201,8 +251,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "code",
Expand Down Expand Up @@ -300,8 +349,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "code",
Expand Down Expand Up @@ -386,8 +434,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "code",
Expand Down Expand Up @@ -484,8 +531,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -567,8 +613,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -666,8 +711,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -749,8 +793,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -813,8 +856,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand Down Expand Up @@ -848,8 +890,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -931,8 +972,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -996,8 +1036,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand Down Expand Up @@ -1032,8 +1071,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand All @@ -1050,8 +1088,7 @@
},
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -1139,8 +1176,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -1214,8 +1250,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand Down Expand Up @@ -1248,8 +1283,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -1334,8 +1368,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -1413,8 +1446,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand Down Expand Up @@ -1447,8 +1479,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -1530,8 +1561,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -1594,8 +1624,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand Down Expand Up @@ -1628,8 +1657,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -1713,8 +1741,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -1779,8 +1806,7 @@
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
"color": "green"
},
{
"color": "red",
Expand Down Expand Up @@ -1814,8 +1840,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand Down Expand Up @@ -1901,8 +1926,7 @@
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "fdh27hlcicjk0e"
"type": "prometheus"
},
"disableTextWrap": false,
"editorMode": "builder",
Expand All @@ -1924,24 +1948,48 @@
"type": "row"
}
],
"refresh": "auto",
"refresh": "5s",
"schemaVersion": 39,
"tags": [],
"templating": {
"list": [
{
"hide": 2,
"name": "heatmap_buckets",
"query": "10",
"query": "${VAR_HEATMAP_BUCKETS}",
"skipUrlSync": false,
"type": "constant"
"type": "constant",
"current": {
"value": "${VAR_HEATMAP_BUCKETS}",
"text": "${VAR_HEATMAP_BUCKETS}",
"selected": false
},
"options": [
{
"value": "${VAR_HEATMAP_BUCKETS}",
"text": "${VAR_HEATMAP_BUCKETS}",
"selected": false
}
]
},
{
"hide": 2,
"name": "axisWidth",
"query": "200",
"query": "${VAR_AXISWIDTH}",
"skipUrlSync": false,
"type": "constant"
"type": "constant",
"current": {
"value": "${VAR_AXISWIDTH}",
"text": "${VAR_AXISWIDTH}",
"selected": false
},
"options": [
{
"value": "${VAR_AXISWIDTH}",
"text": "${VAR_AXISWIDTH}",
"selected": false
}
]
}
]
},
Expand All @@ -1953,6 +2001,6 @@
"timezone": "browser",
"title": "helia-http-gateway default dashboard",
"uid": "helia-http-gateway-default",
"version": 3,
"version": 1,
"weekStart": ""
}
Loading

0 comments on commit c60ccd8

Please sign in to comment.