Skip to content

Commit b85f04a

Browse files
Bo0merBo0mer
committed
Minor dashboards enhancements
- Fix InfluxDB datasource name - Use default policy when querying for metrics
1 parent b5ef9cb commit b85f04a

File tree

6 files changed

+38
-67
lines changed

6 files changed

+38
-67
lines changed

‎demo/mib/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.vagrant

‎demo/mib/Vagrantfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Vagrant.configure(2) do |config|
3232
config.vm.provision "shell", keep_color: true, path: "scripts/riemann.sh"
3333

3434
# Provision Grafana dashboards
35-
config.vm.provision "file", source: "dashboards/summary.json", destination: "~/summary.json"
35+
config.vm.provision "file", source: "dashboards/", destination: "~/dashboards/"
3636
config.vm.provision "shell", keep_color: true, path: "scripts/configure_dashboards.sh"
3737

3838
end

‎demo/mib/dashboards/events.json‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
{
2-
"__inputs": [
3-
{
4-
"name": "DS_INFLUXDB",
5-
"label": "InfluxDB",
6-
"description": "",
7-
"type": "datasource",
8-
"pluginId": "influxdb",
9-
"pluginName": "InfluxDB"
10-
}
11-
],
122
"__requires": [
133
{
144
"type": "panel",
@@ -77,7 +67,7 @@
7767
{
7868
"allValue": null,
7969
"current": {},
80-
"datasource": "${DS_INFLUXDB}",
70+
"datasource": "InfluxDB",
8171
"hide": 0,
8272
"includeAll": false,
8373
"label": "Organization",
@@ -96,7 +86,7 @@
9686
{
9787
"allValue": null,
9888
"current": {},
99-
"datasource": "${DS_INFLUXDB}",
89+
"datasource": "InfluxDB",
10090
"hide": 0,
10191
"includeAll": false,
10292
"label": "Space",
@@ -115,7 +105,7 @@
115105
{
116106
"allValue": null,
117107
"current": {},
118-
"datasource": "${DS_INFLUXDB}",
108+
"datasource": "InfluxDB",
119109
"hide": 0,
120110
"includeAll": false,
121111
"label": "Application",
@@ -154,7 +144,7 @@
154144
{
155145
"aliasColors": {},
156146
"bars": false,
157-
"datasource": "${DS_INFLUXDB}",
147+
"datasource": "InfluxDB",
158148
"editable": true,
159149
"error": false,
160150
"fill": 1,
@@ -392,4 +382,4 @@
392382
"collapse": false
393383
}
394384
]
395-
}
385+
}

‎demo/mib/dashboards/http_statistics.json‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
{
2-
"__inputs": [
3-
{
4-
"name": "DS_INFLUXDB",
5-
"label": "InfluxDB",
6-
"description": "",
7-
"type": "datasource",
8-
"pluginId": "influxdb",
9-
"pluginName": "InfluxDB"
10-
}
11-
],
122
"__requires": [
133
{
144
"type": "panel",
@@ -83,7 +73,7 @@
8373
{
8474
"allValue": null,
8575
"current": {},
86-
"datasource": "${DS_INFLUXDB}",
76+
"datasource": "InfluxDB",
8777
"hide": 0,
8878
"includeAll": false,
8979
"label": "Organization",
@@ -102,7 +92,7 @@
10292
{
10393
"allValue": null,
10494
"current": {},
105-
"datasource": "${DS_INFLUXDB}",
95+
"datasource": "InfluxDB",
10696
"hide": 0,
10797
"includeAll": false,
10898
"label": "Space",
@@ -121,7 +111,7 @@
121111
{
122112
"allValue": null,
123113
"current": {},
124-
"datasource": "${DS_INFLUXDB}",
114+
"datasource": "InfluxDB",
125115
"hide": 0,
126116
"includeAll": false,
127117
"label": "Application",
@@ -256,7 +246,7 @@
256246
"panels": [
257247
{
258248
"columns": [],
259-
"datasource": "${DS_INFLUXDB}",
249+
"datasource": "InfluxDB",
260250
"editable": true,
261251
"error": false,
262252
"fontSize": "100%",
@@ -354,7 +344,7 @@
354344
{
355345
"aliasColors": {},
356346
"bars": true,
357-
"datasource": "${DS_INFLUXDB}",
347+
"datasource": "InfluxDB",
358348
"decimals": 1,
359349
"editable": true,
360350
"error": false,
@@ -604,7 +594,7 @@
604594
"rgba(237, 129, 40, 0.89)",
605595
"rgba(50, 172, 45, 0.97)"
606596
],
607-
"datasource": "${DS_INFLUXDB}",
597+
"datasource": "InfluxDB",
608598
"decimals": 2,
609599
"editable": true,
610600
"error": false,
@@ -716,7 +706,7 @@
716706
"rgba(237, 129, 40, 0.89)",
717707
"rgba(50, 172, 45, 0.97)"
718708
],
719-
"datasource": "${DS_INFLUXDB}",
709+
"datasource": "InfluxDB",
720710
"editable": true,
721711
"error": false,
722712
"format": "none",
@@ -852,7 +842,7 @@
852842
{
853843
"aliasColors": {},
854844
"bars": true,
855-
"datasource": "${DS_INFLUXDB}",
845+
"datasource": "InfluxDB",
856846
"editable": true,
857847
"error": false,
858848
"fill": 1,
@@ -1173,7 +1163,7 @@
11731163
{
11741164
"aliasColors": {},
11751165
"bars": false,
1176-
"datasource": "${DS_INFLUXDB}",
1166+
"datasource": "InfluxDB",
11771167
"editable": true,
11781168
"error": false,
11791169
"fill": 1,
@@ -1312,4 +1302,4 @@
13121302
"collapse": false
13131303
}
13141304
]
1315-
}
1305+
}

‎demo/mib/dashboards/overview.json‎

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
{
2-
"__inputs": [
3-
{
4-
"name": "DS_INFLUXDB",
5-
"label": "InfluxDB",
6-
"description": "",
7-
"type": "datasource",
8-
"pluginId": "influxdb",
9-
"pluginName": "InfluxDB"
10-
}
11-
],
122
"__requires": [
133
{
144
"type": "panel",
@@ -77,7 +67,7 @@
7767
{
7868
"allValue": null,
7969
"current": {},
80-
"datasource": "${DS_INFLUXDB}",
70+
"datasource": "InfluxDB",
8171
"hide": 0,
8272
"includeAll": false,
8373
"label": "Organization",
@@ -96,7 +86,7 @@
9686
{
9787
"allValue": null,
9888
"current": {},
99-
"datasource": "${DS_INFLUXDB}",
89+
"datasource": "InfluxDB",
10090
"hide": 0,
10191
"includeAll": false,
10292
"label": "Space",
@@ -115,7 +105,7 @@
115105
{
116106
"allValue": null,
117107
"current": {},
118-
"datasource": "${DS_INFLUXDB}",
108+
"datasource": "InfluxDB",
119109
"hide": 0,
120110
"includeAll": false,
121111
"label": "Application",
@@ -236,7 +226,7 @@
236226
"annotations": {
237227
"list": [
238228
{
239-
"datasource": "${DS_INFLUXDB}",
229+
"datasource": "InfluxDB",
240230
"enable": true,
241231
"iconColor": "rgba(255, 96, 96, 1)",
242232
"limit": 100,
@@ -259,7 +249,7 @@
259249
{
260250
"aliasColors": {},
261251
"bars": false,
262-
"datasource": "${DS_INFLUXDB}",
252+
"datasource": "InfluxDB",
263253
"editable": true,
264254
"error": false,
265255
"fill": 1,
@@ -411,7 +401,7 @@
411401
{
412402
"aliasColors": {},
413403
"bars": false,
414-
"datasource": "${DS_INFLUXDB}",
404+
"datasource": "InfluxDB",
415405
"editable": true,
416406
"error": false,
417407
"fill": 1,
@@ -563,7 +553,7 @@
563553
{
564554
"aliasColors": {},
565555
"bars": false,
566-
"datasource": "${DS_INFLUXDB}",
556+
"datasource": "InfluxDB",
567557
"editable": true,
568558
"error": false,
569559
"fill": 1,
@@ -704,7 +694,7 @@
704694
{
705695
"aliasColors": {},
706696
"bars": false,
707-
"datasource": "${DS_INFLUXDB}",
697+
"datasource": "InfluxDB",
708698
"editable": true,
709699
"error": false,
710700
"fill": 1,
@@ -762,7 +752,7 @@
762752
],
763753
"hide": false,
764754
"measurement": "memory used_bytes",
765-
"policy": "one_week",
755+
"policy": "default",
766756
"query": "SELECT mean(\"value\") FROM \"autogen\".\"memory used_bytes\" WHERE \"state\" = 'ok' AND \"host\" =~ /^$app_name$/ AND $timeFilter GROUP BY time($interval), \"instance\", \"host\" fill(none)",
767757
"rawQuery": false,
768758
"refId": "A",
@@ -825,7 +815,7 @@
825815
}
826816
],
827817
"measurement": "memory total_bytes",
828-
"policy": "one_week",
818+
"policy": "default",
829819
"query": "SELECT mean(\"value\") FROM \"autogen\".\"memory total_bytes\" WHERE \"state\" = 'ok' AND $timeFilter GROUP BY time($interval), \"instance\" fill(null)",
830820
"rawQuery": false,
831821
"refId": "B",
@@ -904,7 +894,7 @@
904894
{
905895
"aliasColors": {},
906896
"bars": false,
907-
"datasource": "${DS_INFLUXDB}",
897+
"datasource": "InfluxDB",
908898
"editable": true,
909899
"error": false,
910900
"fill": 1,
@@ -962,7 +952,7 @@
962952
],
963953
"hide": false,
964954
"measurement": "disk used_bytes",
965-
"policy": "one_week",
955+
"policy": "default",
966956
"query": "SELECT mean(\"value\") FROM \"autogen\".\"disk used_bytes\" WHERE \"state\" = 'ok' AND $timeFilter GROUP BY time($interval), \"instance\" fill(none)",
967957
"rawQuery": false,
968958
"refId": "A",
@@ -1025,7 +1015,7 @@
10251015
}
10261016
],
10271017
"measurement": "disk total_bytes",
1028-
"policy": "one_week",
1018+
"policy": "default",
10291019
"refId": "B",
10301020
"resultFormat": "time_series",
10311021
"select": [
@@ -1120,7 +1110,7 @@
11201110
"rgba(237, 129, 40, 0.89)",
11211111
"rgba(50, 172, 45, 0.97)"
11221112
],
1123-
"datasource": "${DS_INFLUXDB}",
1113+
"datasource": "InfluxDB",
11241114
"editable": true,
11251115
"error": false,
11261116
"format": "none",
@@ -1235,7 +1225,7 @@
12351225
"rgba(237, 129, 40, 0.89)",
12361226
"rgba(50, 172, 45, 0.97)"
12371227
],
1238-
"datasource": "${DS_INFLUXDB}",
1228+
"datasource": "InfluxDB",
12391229
"decimals": null,
12401230
"editable": true,
12411231
"error": false,
@@ -1358,7 +1348,7 @@
13581348
"rgba(237, 129, 40, 0.89)",
13591349
"rgba(50, 172, 45, 0.97)"
13601350
],
1361-
"datasource": "${DS_INFLUXDB}",
1351+
"datasource": "InfluxDB",
13621352
"editable": true,
13631353
"error": false,
13641354
"format": "none",
@@ -1480,7 +1470,7 @@
14801470
"rgba(237, 129, 40, 0.89)",
14811471
"rgba(50, 172, 45, 0.97)"
14821472
],
1483-
"datasource": "${DS_INFLUXDB}",
1473+
"datasource": "InfluxDB",
14841474
"editable": true,
14851475
"error": false,
14861476
"format": "none",
@@ -1596,7 +1586,7 @@
15961586
{
15971587
"aliasColors": {},
15981588
"bars": false,
1599-
"datasource": "${DS_INFLUXDB}",
1589+
"datasource": "InfluxDB",
16001590
"editable": true,
16011591
"error": false,
16021592
"fill": 1,
@@ -1785,7 +1775,7 @@
17851775
{
17861776
"aliasColors": {},
17871777
"bars": false,
1788-
"datasource": "${DS_INFLUXDB}",
1778+
"datasource": "InfluxDB",
17891779
"editable": true,
17901780
"error": false,
17911781
"fill": 1,
@@ -1930,4 +1920,4 @@
19301920
"collapse": false
19311921
}
19321922
]
1933-
}
1923+
}

‎demo/mib/scripts/configure_dashboards.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -ex
44

5-
for dashboard in /home/vagrant/*.json; do
5+
for dashboard in /home/vagrant/dashboards/*.json; do
66
dashboard_json=$(cat $dashboard)
77
curl -X POST \
88
-H "Content-Type: application/json" \

0 commit comments

Comments
 (0)