Skip to content

Commit a09f568

Browse files
dastine0308dastine0308
authored
Merge pull request #2 from UCSolarCarTeam/TEL-317-Revert-Websocket-changes
Update dashboard configuration to use MQTT datasource and remove WebSocket API datasource
2 parents 2a53620 + 934ed9f commit a09f568

2 files changed

Lines changed: 48 additions & 44 deletions

File tree

‎grafana/dashboards/Das Telemetry Base Dashboard-1763418239880.json‎

Lines changed: 48 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"showThresholdMarkers": true,
100100
"sizing": "auto"
101101
},
102-
"pluginVersion": "12.2.0",
102+
"pluginVersion": "12.3.1",
103103
"targets": [
104104
{
105105
"datasource": {
@@ -236,7 +236,7 @@
236236
"sort": "none"
237237
}
238238
},
239-
"pluginVersion": "12.2.0",
239+
"pluginVersion": "12.3.1",
240240
"targets": [
241241
{
242242
"datasource": {
@@ -295,8 +295,8 @@
295295
},
296296
{
297297
"datasource": {
298-
"type": "golioth-websocket-datasource",
299-
"uid": "bf4fqic90e41se"
298+
"type": "grafana-mqtt-datasource",
299+
"uid": "P51B197A508373975"
300300
},
301301
"description": "",
302302
"fieldConfig": {
@@ -342,11 +342,11 @@
342342
"fields": "",
343343
"values": false
344344
},
345-
"showPercentChange": true,
345+
"showPercentChange": false,
346346
"textMode": "auto",
347347
"wideLayout": true
348348
},
349-
"pluginVersion": "12.2.0",
349+
"pluginVersion": "12.3.1",
350350
"targets": [
351351
{
352352
"datasource": {
@@ -362,6 +362,7 @@
362362
],
363363
"path": "",
364364
"refId": "A",
365+
"topic": "lapdata",
365366
"withStreaming": true
366367
}
367368
],
@@ -377,6 +378,7 @@
377378
"path": "energyConsumed"
378379
}
379380
],
381+
"replace": true,
380382
"source": "data"
381383
}
382384
}
@@ -385,8 +387,8 @@
385387
},
386388
{
387389
"datasource": {
388-
"type": "golioth-websocket-datasource",
389-
"uid": "bf4fqic90e41se"
390+
"type": "grafana-mqtt-datasource",
391+
"uid": "P51B197A508373975"
390392
},
391393
"description": "",
392394
"fieldConfig": {
@@ -432,11 +434,11 @@
432434
"fields": "",
433435
"values": false
434436
},
435-
"showPercentChange": true,
437+
"showPercentChange": false,
436438
"textMode": "auto",
437439
"wideLayout": true
438440
},
439-
"pluginVersion": "12.2.0",
441+
"pluginVersion": "12.3.1",
440442
"targets": [
441443
{
442444
"datasource": {
@@ -452,6 +454,7 @@
452454
],
453455
"path": "",
454456
"refId": "A",
457+
"topic": "lapdata",
455458
"withStreaming": true
456459
}
457460
],
@@ -467,6 +470,7 @@
467470
"path": "totalPowerIn"
468471
}
469472
],
473+
"replace": true,
470474
"source": "data"
471475
}
472476
}
@@ -475,8 +479,8 @@
475479
},
476480
{
477481
"datasource": {
478-
"type": "golioth-websocket-datasource",
479-
"uid": "bf4fqic90e41se"
482+
"type": "grafana-mqtt-datasource",
483+
"uid": "P51B197A508373975"
480484
},
481485
"fieldConfig": {
482486
"defaults": {
@@ -521,11 +525,11 @@
521525
"fields": "",
522526
"values": false
523527
},
524-
"showPercentChange": true,
528+
"showPercentChange": false,
525529
"textMode": "auto",
526530
"wideLayout": true
527531
},
528-
"pluginVersion": "12.2.0",
532+
"pluginVersion": "12.3.1",
529533
"targets": [
530534
{
531535
"datasource": {
@@ -541,6 +545,7 @@
541545
],
542546
"path": "",
543547
"refId": "A",
548+
"topic": "lapdata",
544549
"withStreaming": true
545550
}
546551
],
@@ -565,8 +570,8 @@
565570
},
566571
{
567572
"datasource": {
568-
"type": "golioth-websocket-datasource",
569-
"uid": "bf4fqic90e41se"
573+
"type": "grafana-mqtt-datasource",
574+
"uid": "P51B197A508373975"
570575
},
571576
"description": "",
572577
"fieldConfig": {
@@ -612,11 +617,11 @@
612617
"fields": "",
613618
"values": false
614619
},
615-
"showPercentChange": true,
620+
"showPercentChange": false,
616621
"textMode": "auto",
617622
"wideLayout": true
618623
},
619-
"pluginVersion": "12.2.0",
624+
"pluginVersion": "12.3.1",
620625
"targets": [
621626
{
622627
"datasource": {
@@ -632,6 +637,7 @@
632637
],
633638
"path": "",
634639
"refId": "A",
640+
"topic": "lapdata",
635641
"withStreaming": true
636642
}
637643
],
@@ -647,6 +653,7 @@
647653
"path": "totalPowerOut"
648654
}
649655
],
656+
"replace": true,
650657
"source": "data"
651658
}
652659
}
@@ -655,8 +662,8 @@
655662
},
656663
{
657664
"datasource": {
658-
"type": "golioth-websocket-datasource",
659-
"uid": "bf4fqic90e41se"
665+
"type": "grafana-mqtt-datasource",
666+
"uid": "P51B197A508373975"
660667
},
661668
"fieldConfig": {
662669
"defaults": {
@@ -705,7 +712,7 @@
705712
"textMode": "auto",
706713
"wideLayout": true
707714
},
708-
"pluginVersion": "12.2.0",
715+
"pluginVersion": "12.3.1",
709716
"targets": [
710717
{
711718
"datasource": {
@@ -721,6 +728,7 @@
721728
],
722729
"path": "",
723730
"refId": "A",
731+
"topic": "lapdata",
724732
"withStreaming": true
725733
}
726734
],
@@ -758,8 +766,8 @@
758766
},
759767
{
760768
"datasource": {
761-
"type": "golioth-websocket-datasource",
762-
"uid": "bf4fqic90e41se"
769+
"type": "grafana-mqtt-datasource",
770+
"uid": "P51B197A508373975"
763771
},
764772
"description": "",
765773
"fieldConfig": {
@@ -805,11 +813,11 @@
805813
"fields": "",
806814
"values": false
807815
},
808-
"showPercentChange": true,
816+
"showPercentChange": false,
809817
"textMode": "auto",
810818
"wideLayout": true
811819
},
812-
"pluginVersion": "12.2.0",
820+
"pluginVersion": "12.3.1",
813821
"targets": [
814822
{
815823
"datasource": {
@@ -825,6 +833,7 @@
825833
],
826834
"path": "",
827835
"refId": "A",
836+
"topic": "lapdata",
828837
"withStreaming": true
829838
}
830839
],
@@ -840,6 +849,7 @@
840849
"path": "averageSpeed"
841850
}
842851
],
852+
"replace": true,
843853
"source": "data"
844854
}
845855
}
@@ -848,8 +858,8 @@
848858
},
849859
{
850860
"datasource": {
851-
"type": "golioth-websocket-datasource",
852-
"uid": "bf4fqic90e41se"
861+
"type": "grafana-mqtt-datasource",
862+
"uid": "P51B197A508373975"
853863
},
854864
"description": "",
855865
"fieldConfig": {
@@ -900,7 +910,7 @@
900910
"textMode": "auto",
901911
"wideLayout": true
902912
},
903-
"pluginVersion": "12.2.0",
913+
"pluginVersion": "12.3.1",
904914
"targets": [
905915
{
906916
"datasource": {
@@ -916,6 +926,7 @@
916926
],
917927
"path": "",
918928
"refId": "A",
929+
"topic": "lapdata",
919930
"withStreaming": true
920931
}
921932
],
@@ -932,7 +943,7 @@
932943
}
933944
],
934945
"keepTime": false,
935-
"replace": false,
946+
"replace": true,
936947
"source": "data"
937948
}
938949
}
@@ -1058,7 +1069,7 @@
10581069
"sort": "none"
10591070
}
10601071
},
1061-
"pluginVersion": "12.2.0",
1072+
"pluginVersion": "12.3.1",
10621073
"targets": [
10631074
{
10641075
"datasource": {
@@ -1205,7 +1216,7 @@
12051216
"sort": "none"
12061217
}
12071218
},
1208-
"pluginVersion": "12.2.0",
1219+
"pluginVersion": "12.3.1",
12091220
"targets": [
12101221
{
12111222
"datasource": {
@@ -1275,8 +1286,8 @@
12751286
},
12761287
{
12771288
"datasource": {
1278-
"type": "golioth-websocket-datasource",
1279-
"uid": "bf4fqic90e41se"
1289+
"type": "grafana-mqtt-datasource",
1290+
"uid": "P51B197A508373975"
12801291
},
12811292
"fieldConfig": {
12821293
"defaults": {
@@ -1321,11 +1332,11 @@
13211332
"fields": "",
13221333
"values": false
13231334
},
1324-
"showPercentChange": true,
1335+
"showPercentChange": false,
13251336
"textMode": "auto",
13261337
"wideLayout": true
13271338
},
1328-
"pluginVersion": "12.2.0",
1339+
"pluginVersion": "12.3.1",
13291340
"targets": [
13301341
{
13311342
"datasource": {
@@ -1341,6 +1352,7 @@
13411352
],
13421353
"path": "",
13431354
"refId": "A",
1355+
"topic": "lapdata",
13441356
"withStreaming": true
13451357
}
13461358
],
@@ -1379,5 +1391,5 @@
13791391
"timezone": "browser",
13801392
"title": "Das Telemetry Base Dashboard",
13811393
"uid": "40c53014-a3c2-47e8-8c8b-3ce15a6ecc61",
1382-
"version": 8
1394+
"version": 14
13831395
}

‎grafana/provisioning/datasources/datasources.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@ datasources:
1111
jsonData:
1212
username: ${MQTT_USERNAME}
1313
uri: host.docker.internal:1883
14-
15-
- name: WebSocket API
16-
type: golioth-websocket-datasource
17-
editable: true
18-
isDefault: false
19-
jsonData:
20-
host: ws://host.docker.internal:3001/grafana-ws
21-
2214
# - name: Postgres
2315
# type: postgres
2416
# url: postgres:5432

0 commit comments

Comments
 (0)