Skip to content

Commit fa95d7c

Browse files
sebastiangaisersebastiangaiser
authored
fix(examples,grafana): correct dashboards for Grafana 10.X (#163)
Signed-off-by: Sebastian Gaiser <sebastiangaiser@users.noreply.github.com>
1 parent 3aaed58 commit fa95d7c

File tree

4 files changed

+57
-121
lines changed

4 files changed

+57
-121
lines changed

‎charts/pyrra/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type: application
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
1818

19-
version: 0.13.0
19+
version: 0.13.1
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to

‎charts/pyrra/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# pyrra
22

3-
![Version: 0.13.0](https://img.shields.io/badge/Version-0.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.7.5](https://img.shields.io/badge/AppVersion-v0.7.5-informational?style=flat-square)
3+
![Version: 0.13.1](https://img.shields.io/badge/Version-0.13.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.7.5](https://img.shields.io/badge/AppVersion-v0.7.5-informational?style=flat-square)
44

55
SLO manager and alert generator
66

‎charts/pyrra/files/grafana-dashboards/pyrra-detail.json‎

Lines changed: 45 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,4 @@
11
{
2-
"__inputs": [
3-
{
4-
"name": "DS_PROMETHEUS",
5-
"label": "prometheus",
6-
"description": "",
7-
"type": "datasource",
8-
"pluginId": "prometheus",
9-
"pluginName": "Prometheus"
10-
}
11-
],
12-
"__elements": {},
13-
"__requires": [
14-
{
15-
"type": "grafana",
16-
"id": "grafana",
17-
"name": "Grafana",
18-
"version": "9.1.5"
19-
},
20-
{
21-
"type": "datasource",
22-
"id": "prometheus",
23-
"name": "Prometheus",
24-
"version": "1.0.0"
25-
},
26-
{
27-
"type": "panel",
28-
"id": "stat",
29-
"name": "Stat",
30-
"version": ""
31-
},
32-
{
33-
"type": "panel",
34-
"id": "timeseries",
35-
"name": "Time series",
36-
"version": ""
37-
}
38-
],
392
"annotations": {
403
"list": [
414
{
@@ -62,14 +25,13 @@
6225
"editable": true,
6326
"fiscalYearStartMonth": 0,
6427
"graphTooltip": 1,
65-
"id": null,
6628
"links": [],
6729
"liveNow": false,
6830
"panels": [
6931
{
7032
"datasource": {
7133
"type": "prometheus",
72-
"uid": "${DS_PROMETHEUS}"
34+
"uid": "${datasource}"
7335
},
7436
"description": "",
7537
"fieldConfig": {
@@ -112,15 +74,17 @@
11274
"fields": "",
11375
"values": false
11476
},
77+
"showPercentChange": false,
11578
"text": {},
116-
"textMode": "auto"
79+
"textMode": "auto",
80+
"wideLayout": true
11781
},
118-
"pluginVersion": "9.1.5",
82+
"pluginVersion": "10.4.1",
11983
"targets": [
12084
{
12185
"datasource": {
12286
"type": "prometheus",
123-
"uid": "${DS_PROMETHEUS}"
87+
"uid": "${datasource}"
12488
},
12589
"editorMode": "code",
12690
"exemplar": false,
@@ -137,7 +101,7 @@
137101
{
138102
"datasource": {
139103
"type": "prometheus",
140-
"uid": "${DS_PROMETHEUS}"
104+
"uid": "${datasource}"
141105
},
142106
"description": "",
143107
"fieldConfig": {
@@ -179,15 +143,17 @@
179143
"fields": "",
180144
"values": false
181145
},
146+
"showPercentChange": false,
182147
"text": {},
183-
"textMode": "auto"
148+
"textMode": "auto",
149+
"wideLayout": true
184150
},
185-
"pluginVersion": "9.1.5",
151+
"pluginVersion": "10.4.1",
186152
"targets": [
187153
{
188154
"datasource": {
189155
"type": "prometheus",
190-
"uid": "${DS_PROMETHEUS}"
156+
"uid": "${datasource}"
191157
},
192158
"editorMode": "code",
193159
"exemplar": false,
@@ -204,7 +170,7 @@
204170
{
205171
"datasource": {
206172
"type": "prometheus",
207-
"uid": "${DS_PROMETHEUS}"
173+
"uid": "${datasource}"
208174
},
209175
"description": "",
210176
"fieldConfig": {
@@ -251,15 +217,17 @@
251217
"fields": "",
252218
"values": false
253219
},
220+
"showPercentChange": false,
254221
"text": {},
255-
"textMode": "auto"
222+
"textMode": "auto",
223+
"wideLayout": true
256224
},
257-
"pluginVersion": "9.1.5",
225+
"pluginVersion": "10.4.1",
258226
"targets": [
259227
{
260228
"datasource": {
261229
"type": "prometheus",
262-
"uid": "${DS_PROMETHEUS}"
230+
"uid": "${datasource}"
263231
},
264232
"editorMode": "code",
265233
"exemplar": false,
@@ -276,7 +244,7 @@
276244
{
277245
"datasource": {
278246
"type": "prometheus",
279-
"uid": "${DS_PROMETHEUS}"
247+
"uid": "${datasource}"
280248
},
281249
"description": "",
282250
"fieldConfig": {
@@ -323,15 +291,17 @@
323291
"fields": "",
324292
"values": false
325293
},
294+
"showPercentChange": false,
326295
"text": {},
327-
"textMode": "auto"
296+
"textMode": "auto",
297+
"wideLayout": true
328298
},
329-
"pluginVersion": "9.1.5",
299+
"pluginVersion": "10.4.1",
330300
"targets": [
331301
{
332302
"datasource": {
333303
"type": "prometheus",
334-
"uid": "${DS_PROMETHEUS}"
304+
"uid": "${datasource}"
335305
},
336306
"editorMode": "code",
337307
"exemplar": false,
@@ -348,7 +318,7 @@
348318
{
349319
"datasource": {
350320
"type": "prometheus",
351-
"uid": "${DS_PROMETHEUS}"
321+
"uid": "${datasource}"
352322
},
353323
"description": "",
354324
"fieldConfig": {
@@ -358,6 +328,7 @@
358328
"seriesBy": "last"
359329
},
360330
"custom": {
331+
"axisBorderShow": false,
361332
"axisCenteredZero": false,
362333
"axisColorMode": "text",
363334
"axisLabel": "",
@@ -372,6 +343,7 @@
372343
"tooltip": false,
373344
"viz": false
374345
},
346+
"insertNulls": false,
375347
"lineInterpolation": "linear",
376348
"lineWidth": 0,
377349
"pointSize": 5,
@@ -430,7 +402,7 @@
430402
{
431403
"datasource": {
432404
"type": "prometheus",
433-
"uid": "${DS_PROMETHEUS}"
405+
"uid": "${datasource}"
434406
},
435407
"editorMode": "code",
436408
"expr": "((pyrra_availability{slo=\"$slo\"} - pyrra_objective{slo=\"$slo\"})) / (1 - pyrra_objective{slo=\"$slo\"})",
@@ -445,7 +417,7 @@
445417
{
446418
"datasource": {
447419
"type": "prometheus",
448-
"uid": "${DS_PROMETHEUS}"
420+
"uid": "${datasource}"
449421
},
450422
"description": "",
451423
"fieldConfig": {
@@ -454,6 +426,7 @@
454426
"mode": "palette-classic"
455427
},
456428
"custom": {
429+
"axisBorderShow": false,
457430
"axisCenteredZero": false,
458431
"axisColorMode": "text",
459432
"axisLabel": "",
@@ -468,6 +441,7 @@
468441
"tooltip": false,
469442
"viz": false
470443
},
444+
"insertNulls": false,
471445
"lineInterpolation": "linear",
472446
"lineWidth": 2,
473447
"pointSize": 5,
@@ -526,7 +500,7 @@
526500
{
527501
"datasource": {
528502
"type": "prometheus",
529-
"uid": "${DS_PROMETHEUS}"
503+
"uid": "${datasource}"
530504
},
531505
"editorMode": "code",
532506
"expr": "sum(rate(pyrra_requests_total{slo=\"$slo\"}[$__rate_interval]))",
@@ -542,7 +516,7 @@
542516
{
543517
"datasource": {
544518
"type": "prometheus",
545-
"uid": "${DS_PROMETHEUS}"
519+
"uid": "${datasource}"
546520
},
547521
"description": "",
548522
"fieldConfig": {
@@ -551,6 +525,7 @@
551525
"mode": "palette-classic"
552526
},
553527
"custom": {
528+
"axisBorderShow": false,
554529
"axisCenteredZero": false,
555530
"axisColorMode": "text",
556531
"axisLabel": "",
@@ -566,6 +541,7 @@
566541
"tooltip": false,
567542
"viz": false
568543
},
544+
"insertNulls": false,
569545
"lineInterpolation": "linear",
570546
"lineWidth": 2,
571547
"pointSize": 5,
@@ -641,7 +617,7 @@
641617
{
642618
"datasource": {
643619
"type": "prometheus",
644-
"uid": "${DS_PROMETHEUS}"
620+
"uid": "${datasource}"
645621
},
646622
"editorMode": "builder",
647623
"expr": "sum(rate(pyrra_errors_total{slo=\"$slo\"}[$__rate_interval]))",
@@ -656,22 +632,17 @@
656632
}
657633
],
658634
"refresh": "10s",
659-
"schemaVersion": 37,
660-
"style": "dark",
635+
"schemaVersion": 39,
661636
"tags": [],
662637
"templating": {
663638
"list": [
664639
{
665-
"current": {
666-
"selected": false,
667-
"text": "prometheus",
668-
"value": "prometheus"
669-
},
640+
"current": {},
670641
"hide": 0,
671642
"includeAll": false,
672-
"label": "Prometheus",
643+
"label": "Data source",
673644
"multi": false,
674-
"name": "prometheus",
645+
"name": "datasource",
675646
"options": [],
676647
"query": "prometheus",
677648
"queryValue": "",
@@ -684,18 +655,19 @@
684655
"current": {},
685656
"datasource": {
686657
"type": "prometheus",
687-
"uid": "${DS_PROMETHEUS}"
658+
"uid": "${datasource}"
688659
},
689-
"definition": "label_values(pyrra_objective, slo)",
660+
"definition": "label_values(pyrra_objective,slo)",
690661
"hide": 0,
691662
"includeAll": false,
692663
"label": "SLO",
693664
"multi": false,
694665
"name": "slo",
695666
"options": [],
696667
"query": {
697-
"query": "label_values(pyrra_objective, slo)",
698-
"refId": "StandardVariableQuery"
668+
"qryType": 1,
669+
"query": "label_values(pyrra_objective,slo)",
670+
"refId": "PrometheusVariableQueryEditor-VariableQuery"
699671
},
700672
"refresh": 1,
701673
"regex": "",

0 commit comments

Comments
 (0)