Skip to content

Commit a7818e6

Browse files
mikhail-vlmikhail-vl
authored
Installing Redis App and updating dashboard with data (#9)
1 parent d65af11 commit a7818e6

File tree

9 files changed

+279
-90
lines changed

9 files changed

+279
-90
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Change Log
22

3+
## 1.3.0 (2021-04-03)
4+
5+
### Features / Enhancements
6+
7+
- Based on Grafana 7.5.1
8+
- Installing Redis Application plug-in with Auto provisioning
9+
- Dashboard exported as Global to support Auto provisioning
10+
- Plugin statistics updated to Apr, 3 2021
11+
312
## 1.2.0 (2021-03-24)
413

514
### Features / Enhancements

‎dashboards/grafana-plugins.json‎

Lines changed: 62 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
11
{
2-
"__inputs": [
3-
{
4-
"name": "DS_REDIS",
5-
"label": "Redis",
6-
"description": "",
7-
"type": "datasource",
8-
"pluginId": "redis-datasource",
9-
"pluginName": "Redis"
10-
}
11-
],
2+
"__inputs": [],
123
"__requires": [
134
{
145
"type": "grafana",
156
"id": "grafana",
167
"name": "Grafana",
17-
"version": "7.4.3"
8+
"version": "7.5.1"
189
},
1910
{
2011
"type": "panel",
@@ -42,10 +33,11 @@
4233
}
4334
]
4435
},
45-
"editable": false,
36+
"editable": true,
4637
"gnetId": null,
4738
"graphTooltip": 0,
4839
"id": null,
40+
"iteration": 1617495894134,
4941
"links": [],
5042
"panels": [
5143
{
@@ -67,11 +59,9 @@
6759
"bars": false,
6860
"dashLength": 10,
6961
"dashes": false,
70-
"datasource": "${DS_REDIS}",
62+
"datasource": "$redis",
7163
"fieldConfig": {
72-
"defaults": {
73-
"custom": {}
74-
},
64+
"defaults": {},
7565
"overrides": []
7666
},
7767
"fill": 1,
@@ -107,7 +97,7 @@
10797
"alertThreshold": true
10898
},
10999
"percentage": false,
110-
"pluginVersion": "7.4.3",
100+
"pluginVersion": "7.5.1",
111101
"pointradius": 2,
112102
"points": false,
113103
"renderer": "flot",
@@ -173,11 +163,9 @@
173163
"bars": false,
174164
"dashLength": 10,
175165
"dashes": false,
176-
"datasource": "${DS_REDIS}",
166+
"datasource": "$redis",
177167
"fieldConfig": {
178-
"defaults": {
179-
"custom": {}
180-
},
168+
"defaults": {},
181169
"overrides": []
182170
},
183171
"fill": 1,
@@ -210,7 +198,7 @@
210198
"alertThreshold": true
211199
},
212200
"percentage": false,
213-
"pluginVersion": "7.4.3",
201+
"pluginVersion": "7.5.1",
214202
"pointradius": 2,
215203
"points": false,
216204
"renderer": "flot",
@@ -275,12 +263,10 @@
275263
"bars": false,
276264
"dashLength": 10,
277265
"dashes": false,
278-
"datasource": "${DS_REDIS}",
266+
"datasource": "$redis",
279267
"description": "",
280268
"fieldConfig": {
281-
"defaults": {
282-
"custom": {}
283-
},
269+
"defaults": {},
284270
"overrides": []
285271
},
286272
"fill": 1,
@@ -316,7 +302,7 @@
316302
"alertThreshold": true
317303
},
318304
"percentage": false,
319-
"pluginVersion": "7.4.3",
305+
"pluginVersion": "7.5.1",
320306
"pointradius": 2,
321307
"points": false,
322308
"renderer": "flot",
@@ -382,11 +368,9 @@
382368
"bars": false,
383369
"dashLength": 10,
384370
"dashes": false,
385-
"datasource": "${DS_REDIS}",
371+
"datasource": "$redis",
386372
"fieldConfig": {
387-
"defaults": {
388-
"custom": {}
389-
},
373+
"defaults": {},
390374
"overrides": []
391375
},
392376
"fill": 1,
@@ -419,7 +403,7 @@
419403
"alertThreshold": true
420404
},
421405
"percentage": false,
422-
"pluginVersion": "7.4.3",
406+
"pluginVersion": "7.5.1",
423407
"pointradius": 2,
424408
"points": false,
425409
"renderer": "flot",
@@ -481,7 +465,7 @@
481465
},
482466
{
483467
"collapsed": false,
484-
"datasource": null,
468+
"datasource": "$redis",
485469
"gridPos": {
486470
"h": 1,
487471
"w": 24,
@@ -498,11 +482,9 @@
498482
"bars": false,
499483
"dashLength": 10,
500484
"dashes": false,
501-
"datasource": "${DS_REDIS}",
485+
"datasource": "$redis",
502486
"fieldConfig": {
503-
"defaults": {
504-
"custom": {}
505-
},
487+
"defaults": {},
506488
"overrides": []
507489
},
508490
"fill": 1,
@@ -538,7 +520,7 @@
538520
"alertThreshold": true
539521
},
540522
"percentage": false,
541-
"pluginVersion": "7.4.3",
523+
"pluginVersion": "7.5.1",
542524
"pointradius": 2,
543525
"points": false,
544526
"renderer": "flot",
@@ -604,11 +586,9 @@
604586
"bars": false,
605587
"dashLength": 10,
606588
"dashes": false,
607-
"datasource": "${DS_REDIS}",
589+
"datasource": "$redis",
608590
"fieldConfig": {
609-
"defaults": {
610-
"custom": {}
611-
},
591+
"defaults": {},
612592
"overrides": []
613593
},
614594
"fill": 1,
@@ -641,7 +621,7 @@
641621
"alertThreshold": true
642622
},
643623
"percentage": false,
644-
"pluginVersion": "7.4.3",
624+
"pluginVersion": "7.5.1",
645625
"pointradius": 2,
646626
"points": false,
647627
"renderer": "flot",
@@ -703,7 +683,7 @@
703683
},
704684
{
705685
"collapsed": false,
706-
"datasource": null,
686+
"datasource": "$redis",
707687
"gridPos": {
708688
"h": 1,
709689
"w": 24,
@@ -720,11 +700,9 @@
720700
"bars": false,
721701
"dashLength": 10,
722702
"dashes": false,
723-
"datasource": "${DS_REDIS}",
703+
"datasource": "$redis",
724704
"fieldConfig": {
725-
"defaults": {
726-
"custom": {}
727-
},
705+
"defaults": {},
728706
"overrides": []
729707
},
730708
"fill": 1,
@@ -759,7 +737,7 @@
759737
"alertThreshold": true
760738
},
761739
"percentage": false,
762-
"pluginVersion": "7.4.3",
740+
"pluginVersion": "7.5.1",
763741
"pointradius": 2,
764742
"points": false,
765743
"renderer": "flot",
@@ -824,11 +802,9 @@
824802
"bars": false,
825803
"dashLength": 10,
826804
"dashes": false,
827-
"datasource": "${DS_REDIS}",
805+
"datasource": "$redis",
828806
"fieldConfig": {
829-
"defaults": {
830-
"custom": {}
831-
},
807+
"defaults": {},
832808
"overrides": []
833809
},
834810
"fill": 1,
@@ -861,7 +837,7 @@
861837
"alertThreshold": true
862838
},
863839
"percentage": false,
864-
"pluginVersion": "7.4.3",
840+
"pluginVersion": "7.5.1",
865841
"pointradius": 2,
866842
"points": false,
867843
"renderer": "flot",
@@ -923,7 +899,7 @@
923899
},
924900
{
925901
"collapsed": false,
926-
"datasource": null,
902+
"datasource": "$redis",
927903
"gridPos": {
928904
"h": 1,
929905
"w": 24,
@@ -940,11 +916,9 @@
940916
"bars": false,
941917
"dashLength": 10,
942918
"dashes": false,
943-
"datasource": "${DS_REDIS}",
919+
"datasource": "$redis",
944920
"fieldConfig": {
945-
"defaults": {
946-
"custom": {}
947-
},
921+
"defaults": {},
948922
"overrides": []
949923
},
950924
"fill": 1,
@@ -979,7 +953,7 @@
979953
"alertThreshold": true
980954
},
981955
"percentage": false,
982-
"pluginVersion": "7.4.3",
956+
"pluginVersion": "7.5.1",
983957
"pointradius": 2,
984958
"points": false,
985959
"renderer": "flot",
@@ -1044,11 +1018,9 @@
10441018
"bars": false,
10451019
"dashLength": 10,
10461020
"dashes": false,
1047-
"datasource": "${DS_REDIS}",
1021+
"datasource": "$redis",
10481022
"fieldConfig": {
1049-
"defaults": {
1050-
"custom": {}
1051-
},
1023+
"defaults": {},
10521024
"overrides": []
10531025
},
10541026
"fill": 1,
@@ -1081,7 +1053,7 @@
10811053
"alertThreshold": true
10821054
},
10831055
"percentage": false,
1084-
"pluginVersion": "7.4.3",
1056+
"pluginVersion": "7.5.1",
10851057
"pointradius": 2,
10861058
"points": false,
10871059
"renderer": "flot",
@@ -1147,10 +1119,32 @@
11471119
"style": "dark",
11481120
"tags": [],
11491121
"templating": {
1150-
"list": []
1122+
"list": [
1123+
{
1124+
"current": {
1125+
"selected": false,
1126+
"text": "Redis",
1127+
"value": "Redis"
1128+
},
1129+
"description": null,
1130+
"error": null,
1131+
"hide": 0,
1132+
"includeAll": false,
1133+
"label": "Redis",
1134+
"multi": false,
1135+
"name": "redis",
1136+
"options": [],
1137+
"query": "redis-datasource",
1138+
"queryValue": "",
1139+
"refresh": 1,
1140+
"regex": "",
1141+
"skipUrlSync": false,
1142+
"type": "datasource"
1143+
}
1144+
]
11511145
},
11521146
"time": {
1153-
"from": "now-7d",
1147+
"from": "now-30d",
11541148
"to": "now"
11551149
},
11561150
"timepicker": {
@@ -1159,5 +1153,5 @@
11591153
"timezone": "",
11601154
"title": "Grafana Plugins",
11611155
"uid": "1iKRLJIGz",
1162-
"version": 1
1156+
"version": 4
11631157
}

‎data/dump.rdb‎

364 KB
Binary file not shown.

‎docker-compose.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,8 @@ services:
1919
- GF_AUTH_ANONYMOUS_ENABLED=true
2020
- GF_AUTH_BASIC_ENABLED=false
2121
- GF_ENABLE_GZIP=true
22-
- GF_INSTALL_PLUGINS=redis-datasource
22+
- GF_USERS_DEFAULT_THEME=light
23+
- GF_INSTALL_PLUGINS=redis-app
24+
volumes:
25+
- ./provisioning:/etc/grafana/provisioning
26+
- ./dashboards:/var/lib/grafana/dashboards

0 commit comments

Comments
 (0)