Skip to content

Commit 0a4b988

Browse files
authored
Merge pull request #6 from RedisGrafana/feat/grafana-8
Update to Grafana 8.0 and use Base64 panel from Grafana repository
2 parents eb297a1 + b7b09ae commit 0a4b988

16 files changed

+70
-412
lines changed

CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Change Log
22

3+
## v1.1.0 (IN PROGRESS)
4+
5+
### Features / Enhancements
6+
7+
- Add requirements for the Camera #2
8+
- Update paths and remove ai-loader #3
9+
- Update AI docker image and AI.MODELSTORE #4
10+
- Update to Grafana 8.0 and use Base64 panel from Grafana repository
11+
312
## v1.0.0 (2021-05-27)
413

514
### Features / Enhancements

dashboards/camera-processing.json

+52-31
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "grafana",
66
"id": "grafana",
77
"name": "Grafana",
8-
"version": "7.5.7"
8+
"version": "8.0.0"
99
},
1010
{
1111
"type": "datasource",
@@ -40,8 +40,8 @@
4040
{
4141
"type": "panel",
4242
"id": "volkovlabs-image-panel",
43-
"name": "volkovlabs-image-panel",
44-
"version": "1.0.0"
43+
"name": "Base64 Image/PDF",
44+
"version": "1.0.1"
4545
}
4646
],
4747
"annotations": {
@@ -61,15 +61,11 @@
6161
"gnetId": null,
6262
"graphTooltip": 0,
6363
"id": null,
64-
"iteration": 1622136215191,
64+
"iteration": 1623266058782,
6565
"links": [],
6666
"panels": [
6767
{
6868
"datasource": "$redis",
69-
"fieldConfig": {
70-
"defaults": {},
71-
"overrides": []
72-
},
7369
"gridPos": {
7470
"h": 22,
7571
"w": 14,
@@ -115,7 +111,8 @@
115111
"hideFrom": {
116112
"graph": false,
117113
"legend": false,
118-
"tooltip": false
114+
"tooltip": false,
115+
"viz": false
119116
},
120117
"lineInterpolation": "linear",
121118
"lineStyle": {
@@ -127,7 +124,14 @@
127124
"type": "linear"
128125
},
129126
"showPoints": "auto",
130-
"spanNulls": false
127+
"spanNulls": false,
128+
"stacking": {
129+
"group": "A",
130+
"mode": "none"
131+
},
132+
"thresholdsStyle": {
133+
"mode": "off"
134+
}
131135
},
132136
"mappings": [],
133137
"thresholds": {
@@ -159,7 +163,7 @@
159163
"displayMode": "hidden",
160164
"placement": "bottom"
161165
},
162-
"tooltipOptions": {
166+
"tooltip": {
163167
"mode": "single"
164168
}
165169
},
@@ -196,7 +200,8 @@
196200
"hideFrom": {
197201
"graph": false,
198202
"legend": false,
199-
"tooltip": false
203+
"tooltip": false,
204+
"viz": false
200205
},
201206
"lineInterpolation": "linear",
202207
"lineWidth": 1,
@@ -205,7 +210,14 @@
205210
"type": "linear"
206211
},
207212
"showPoints": "never",
208-
"spanNulls": true
213+
"spanNulls": true,
214+
"stacking": {
215+
"group": "A",
216+
"mode": "none"
217+
},
218+
"thresholdsStyle": {
219+
"mode": "off"
220+
}
209221
},
210222
"mappings": [],
211223
"thresholds": {
@@ -235,7 +247,7 @@
235247
"displayMode": "hidden",
236248
"placement": "bottom"
237249
},
238-
"tooltipOptions": {
250+
"tooltip": {
239251
"mode": "single"
240252
}
241253
},
@@ -289,7 +301,8 @@
289301
"hideFrom": {
290302
"graph": false,
291303
"legend": false,
292-
"tooltip": false
304+
"tooltip": false,
305+
"viz": false
293306
},
294307
"lineInterpolation": "linear",
295308
"lineWidth": 1,
@@ -298,7 +311,14 @@
298311
"type": "linear"
299312
},
300313
"showPoints": "never",
301-
"spanNulls": true
314+
"spanNulls": true,
315+
"stacking": {
316+
"group": "A",
317+
"mode": "none"
318+
},
319+
"thresholdsStyle": {
320+
"mode": "off"
321+
}
302322
},
303323
"mappings": [],
304324
"thresholds": {
@@ -332,7 +352,7 @@
332352
"displayMode": "hidden",
333353
"placement": "bottom"
334354
},
335-
"tooltipOptions": {
355+
"tooltip": {
336356
"mode": "single"
337357
}
338358
},
@@ -356,10 +376,6 @@
356376
},
357377
{
358378
"datasource": "$redis",
359-
"fieldConfig": {
360-
"defaults": {},
361-
"overrides": []
362-
},
363379
"gridPos": {
364380
"h": 12,
365381
"w": 14,
@@ -385,6 +401,7 @@
385401
"defaults": {
386402
"custom": {
387403
"align": null,
404+
"displayMode": "auto",
388405
"filterable": false
389406
},
390407
"mappings": [],
@@ -544,7 +561,7 @@
544561
"showHeader": true,
545562
"sortBy": []
546563
},
547-
"pluginVersion": "7.5.7",
564+
"pluginVersion": "8.0.0",
548565
"targets": [
549566
{
550567
"command": "rg.dumpregistrations",
@@ -616,7 +633,8 @@
616633
"hideFrom": {
617634
"graph": false,
618635
"legend": false,
619-
"tooltip": false
636+
"tooltip": false,
637+
"viz": false
620638
},
621639
"lineInterpolation": "linear",
622640
"lineWidth": 1,
@@ -625,7 +643,14 @@
625643
"type": "linear"
626644
},
627645
"showPoints": "never",
628-
"spanNulls": true
646+
"spanNulls": true,
647+
"stacking": {
648+
"group": "A",
649+
"mode": "none"
650+
},
651+
"thresholdsStyle": {
652+
"mode": "off"
653+
}
629654
},
630655
"mappings": [],
631656
"thresholds": {
@@ -659,7 +684,7 @@
659684
"displayMode": "table",
660685
"placement": "bottom"
661686
},
662-
"tooltipOptions": {
687+
"tooltip": {
663688
"mode": "multi"
664689
}
665690
},
@@ -685,10 +710,6 @@
685710
},
686711
{
687712
"datasource": "$redis",
688-
"fieldConfig": {
689-
"defaults": {},
690-
"overrides": []
691-
},
692713
"gridPos": {
693714
"h": 18,
694715
"w": 24,
@@ -703,7 +724,7 @@
703724
"type": "redis-gears-panel"
704725
}
705726
],
706-
"schemaVersion": 27,
727+
"schemaVersion": 30,
707728
"style": "dark",
708729
"tags": [],
709730
"templating": {
@@ -738,5 +759,5 @@
738759
"timezone": "",
739760
"title": "Camera Processing",
740761
"uid": "DtsbVE3Mk",
741-
"version": 41
762+
"version": 2
742763
}

dashboards/camera.json

+7-11
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "grafana",
66
"id": "grafana",
77
"name": "Grafana",
8-
"version": "7.5.7"
8+
"version": "8.0.0"
99
},
1010
{
1111
"type": "datasource",
@@ -22,8 +22,8 @@
2222
{
2323
"type": "panel",
2424
"id": "volkovlabs-image-panel",
25-
"name": "volkovlabs-image-panel",
26-
"version": "1.0.0"
25+
"name": "Base64 Image/PDF",
26+
"version": "1.0.1"
2727
}
2828
],
2929
"annotations": {
@@ -43,7 +43,7 @@
4343
"gnetId": null,
4444
"graphTooltip": 0,
4545
"id": null,
46-
"iteration": 1622127451824,
46+
"iteration": 1623265798336,
4747
"links": [],
4848
"panels": [
4949
{
@@ -98,7 +98,7 @@
9898
"text": {},
9999
"textMode": "auto"
100100
},
101-
"pluginVersion": "7.5.7",
101+
"pluginVersion": "8.0.0",
102102
"targets": [
103103
{
104104
"command": "xinfoStream",
@@ -159,7 +159,7 @@
159159
"text": {},
160160
"textMode": "auto"
161161
},
162-
"pluginVersion": "7.5.7",
162+
"pluginVersion": "8.0.0",
163163
"targets": [
164164
{
165165
"command": "ts.get",
@@ -179,10 +179,6 @@
179179
},
180180
{
181181
"datasource": "$redis",
182-
"fieldConfig": {
183-
"defaults": {},
184-
"overrides": []
185-
},
186182
"gridPos": {
187183
"h": 20,
188184
"w": 24,
@@ -211,7 +207,7 @@
211207
"type": "volkovlabs-image-panel"
212208
}
213209
],
214-
"schemaVersion": 27,
210+
"schemaVersion": 30,
215211
"style": "dark",
216212
"tags": [],
217213
"templating": {

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818
- GF_AUTH_BASIC_ENABLED=false
1919
- GF_ENABLE_GZIP=true
2020
- GF_USERS_DEFAULT_THEME=light
21+
- GF_INSTALL_PLUGINS=volkovlabs-image-panel
2122
volumes:
22-
- ./volkovlabs-image-panel:/var/lib/grafana/plugins/volkovlabs-image-panel
2323
- ./provisioning:/etc/grafana/provisioning
2424
- ./dashboards:/var/lib/grafana/dashboards

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"start": "docker-compose pull && docker-compose up",
99
"stop": "docker-compose down"
1010
},
11-
"version": "1.0.0"
11+
"version": "1.1.0"
1212
}

volkovlabs-image-panel/CHANGELOG.md

-5
This file was deleted.

0 commit comments

Comments
 (0)