Skip to content

Commit b3d5e78

Browse files
klaasgklaasg
committed
12UL 2023 Update by bobby nutty francis flynn redfast00 klagoeth
1 parent 60db053 commit b3d5e78

18 files changed

Lines changed: 3007 additions & 1667 deletions

‎config_prod.env‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
MONITORING_MASTER_PASSWORD=supersecretpassword
2-
MONITORING_DB_PASSWORD=foobar
1+
MONITORING_MASTER_PASSWORD=veranderditmaar
2+
MONITORING_DB_PASSWORD=enditook
33

44
RONNY01_IP=172.12.50.101
55
RONNY01_PORT=8000
@@ -32,4 +32,4 @@ CLIENT1_IP=172.12.50.21
3232

3333
CLIENT2_IP=172.12.50.22
3434

35-
ROUTER_IP=172.12.50.1
35+
ROUTER_IP=172.12.50.1

‎docker-compose.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ services:
2222
- "--web.console.templates=/usr/share/prometheus/consoles"
2323
network_mode: host
2424
depends_on:
25-
depends_on:
2625
- blackbox
2726
- snmp
2827
# ports:

‎grafana/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ FROM grafana/grafana:9.3.6
44
RUN grafana-cli plugins install grafana-piechart-panel
55
RUN grafana-cli plugins install simpod-json-datasource
66
RUN grafana-cli plugins install marcusolsson-json-datasource
7+
RUN grafana-cli plugins install grafana-clock-panel
78

89

910
EXPOSE 3000

‎grafana/config.monitoring‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
GF_SECURITY_ADMIN_PASSWORD=supersecretpassword
1+
GF_SECURITY_ADMIN_PASSWORD=veranderditmaar
22
GF_USERS_ALLOW_SIGN_UP=false

‎grafana/provisioning/dashboards/ExternalLapperStats.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
"editable": true,
2525
"fiscalYearStartMonth": 0,
2626
"graphTooltip": 0,
27-
"id": 13,
2827
"links": [],
2928
"liveNow": false,
3029
"panels": [
@@ -76,7 +75,7 @@
7675
},
7776
"showHeader": true
7877
},
79-
"pluginVersion": "8.5.0",
78+
"pluginVersion": "9.3.6",
8079
"targets": [
8180
{
8281
"body": "",
@@ -171,7 +170,7 @@
171170
},
172171
"showHeader": true
173172
},
174-
"pluginVersion": "8.5.0",
173+
"pluginVersion": "9.3.6",
175174
"targets": [
176175
{
177176
"cacheDurationSeconds": 300,
@@ -242,7 +241,7 @@
242241
},
243242
"showHeader": true
244243
},
245-
"pluginVersion": "8.5.0",
244+
"pluginVersion": "9.3.6",
246245
"targets": [
247246
{
248247
"body": "",
@@ -289,7 +288,7 @@
289288
"type": "table"
290289
}
291290
],
292-
"schemaVersion": 36,
291+
"schemaVersion": 37,
293292
"style": "dark",
294293
"tags": [],
295294
"templating": {

‎grafana/provisioning/dashboards/IllionGrafiek.json‎

Lines changed: 101 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
"editable": true,
2525
"fiscalYearStartMonth": 0,
2626
"graphTooltip": 0,
27-
"id": 14,
28-
"iteration": 1678357333017,
2927
"links": [],
3028
"liveNow": false,
3129
"panels": [
@@ -40,6 +38,8 @@
4038
"mode": "palette-classic"
4139
},
4240
"custom": {
41+
"axisCenteredZero": false,
42+
"axisColorMode": "text",
4343
"axisLabel": "",
4444
"axisPlacement": "auto",
4545
"barAlignment": 0,
@@ -100,7 +100,8 @@
100100
"max"
101101
],
102102
"displayMode": "table",
103-
"placement": "right"
103+
"placement": "right",
104+
"showLegend": true
104105
},
105106
"tooltip": {
106107
"mode": "single",
@@ -113,11 +114,12 @@
113114
"type": "postgres",
114115
"uid": "P153BFFACB2904795"
115116
},
117+
"editorMode": "code",
116118
"format": "time_series",
117119
"group": [],
118120
"metricColumn": "none",
119121
"rawQuery": true,
120-
"rawSql": "SELECT\n $__time(\"timestamp\"),\n station_id::text,\n avg(\"rssi\") as \"rssi\"\nFROM detection\nWHERE\n $__timeFilter(\"timestamp\") AND baton_id IN ([[baton]])\nGROUP BY 1, 2\nORDER BY 1",
122+
"rawSql": "SELECT\n $__time(\"timestamp\" - interval '2 hour'),\n station_id::text,\n -- avg(\"rssi\") as \"rssi\"\n rssi\nFROM detection\nWHERE\n $__timeFilter(\"timestamp\" - interval '2 hour') AND baton_id IN ([[baton]])\n-- GROUP BY 1, 2\nORDER BY 1",
121123
"refId": "A",
122124
"select": [
123125
[
@@ -135,6 +137,23 @@
135137
}
136138
]
137139
],
140+
"sql": {
141+
"columns": [
142+
{
143+
"parameters": [],
144+
"type": "function"
145+
}
146+
],
147+
"groupBy": [
148+
{
149+
"property": {
150+
"type": "string"
151+
},
152+
"type": "groupBy"
153+
}
154+
],
155+
"limit": 50
156+
},
138157
"table": "detection",
139158
"timeColumn": "\"timestamp\"",
140159
"timeColumnType": "timestamp",
@@ -170,6 +189,8 @@
170189
"mode": "palette-classic"
171190
},
172191
"custom": {
192+
"axisCenteredZero": false,
193+
"axisColorMode": "text",
173194
"axisLabel": "",
174195
"axisPlacement": "auto",
175196
"barAlignment": 0,
@@ -213,32 +234,7 @@
213234
},
214235
"unit": "dBm"
215236
},
216-
"overrides": [
217-
{
218-
"__systemRef": "hideSeriesFrom",
219-
"matcher": {
220-
"id": "byNames",
221-
"options": {
222-
"mode": "exclude",
223-
"names": [
224-
"rssi 1"
225-
],
226-
"prefix": "All except:",
227-
"readOnly": true
228-
}
229-
},
230-
"properties": [
231-
{
232-
"id": "custom.hideFrom",
233-
"value": {
234-
"legend": false,
235-
"tooltip": false,
236-
"viz": true
237-
}
238-
}
239-
]
240-
}
241-
]
237+
"overrides": []
242238
},
243239
"gridPos": {
244240
"h": 10,
@@ -255,7 +251,8 @@
255251
"max"
256252
],
257253
"displayMode": "table",
258-
"placement": "right"
254+
"placement": "right",
255+
"showLegend": true
259256
},
260257
"tooltip": {
261258
"mode": "single",
@@ -268,11 +265,12 @@
268265
"type": "postgres",
269266
"uid": "P153BFFACB2904795"
270267
},
268+
"editorMode": "code",
271269
"format": "time_series",
272270
"group": [],
273271
"metricColumn": "none",
274272
"rawQuery": true,
275-
"rawSql": "SELECT\n $__time(\"timestamp\"),\n baton_id::text,\n avg(\"rssi\") as \"rssi\"\nFROM detection\nWHERE\n $__timeFilter(\"timestamp\")\nGROUP BY 1, 2\nORDER BY 1",
273+
"rawSql": "SELECT\n $__time(\"timestamp\" - interval '2 hour'),\n baton_id::text,\n avg(\"rssi\") as \"rssi\"\nFROM detection\nWHERE\n $__timeFilter(\"timestamp\" - interval '2 hour')\nGROUP BY 1, 2\nORDER BY 1",
276274
"refId": "A",
277275
"select": [
278276
[
@@ -290,6 +288,23 @@
290288
}
291289
]
292290
],
291+
"sql": {
292+
"columns": [
293+
{
294+
"parameters": [],
295+
"type": "function"
296+
}
297+
],
298+
"groupBy": [
299+
{
300+
"property": {
301+
"type": "string"
302+
},
303+
"type": "groupBy"
304+
}
305+
],
306+
"limit": 50
307+
},
293308
"table": "detection",
294309
"timeColumn": "\"timestamp\"",
295310
"timeColumnType": "timestamp",
@@ -315,44 +330,88 @@
315330
"type": "timeseries"
316331
}
317332
],
318-
"refresh": false,
319-
"schemaVersion": 36,
333+
"refresh": "",
334+
"schemaVersion": 37,
320335
"style": "dark",
321336
"tags": [],
322337
"templating": {
323338
"list": [
324339
{
325340
"current": {
326-
"selected": true,
341+
"selected": false,
327342
"text": [
328-
"1"
343+
"C (HILOK)",
344+
"B (VTK)",
345+
"K (VLK)",
346+
"D (VGK)",
347+
"F (VEK - Moeder Lies)",
348+
"G (Wetenschappen - VLAK - VETO)",
349+
"H (none)",
350+
"I (Hermes - GFK)",
351+
"J (Politeia)",
352+
"L (HK)",
353+
"M (VRG)",
354+
"N (VPPK)",
355+
"A (none)",
356+
"P (SK)",
357+
"T (Lombrosiana - VBK)",
358+
"Q (LILA)",
359+
"R (Antilopen)",
360+
"O (none)",
361+
"Y (HILOK Roze)",
362+
"U (Blandinia)",
363+
"V (none)",
364+
"W (none)",
365+
"X (none)"
329366
],
330367
"value": [
331-
"1"
368+
"2",
369+
"3",
370+
"4",
371+
"5",
372+
"7",
373+
"8",
374+
"9",
375+
"10",
376+
"11",
377+
"12",
378+
"13",
379+
"14",
380+
"15",
381+
"16",
382+
"17",
383+
"18",
384+
"19",
385+
"20",
386+
"21",
387+
"22",
388+
"23",
389+
"24",
390+
"25"
332391
]
333392
},
334393
"datasource": {
335394
"type": "postgres",
336395
"uid": "P153BFFACB2904795"
337396
},
338-
"definition": "select id from baton",
397+
"definition": "select b.id as __value, b.name || ' (' || COALESCE(t.name, 'none') || ')' as __text from baton b\nleft join team t on b.id = t.baton_id",
339398
"hide": 0,
340399
"includeAll": false,
341400
"multi": true,
342401
"name": "baton",
343402
"options": [],
344-
"query": "select id from baton",
403+
"query": "select b.id as __value, b.name || ' (' || COALESCE(t.name, 'none') || ')' as __text from baton b\nleft join team t on b.id = t.baton_id",
345404
"refresh": 1,
346405
"regex": "",
347406
"skipUrlSync": false,
348-
"sort": 0,
407+
"sort": 1,
349408
"type": "query"
350409
}
351410
]
352411
},
353412
"time": {
354-
"from": "2022-03-31T18:10:56.000Z",
355-
"to": "2022-03-31T18:12:31.000Z"
413+
"from": "now-40s",
414+
"to": "now"
356415
},
357416
"timepicker": {},
358417
"timezone": "",

0 commit comments

Comments
 (0)