Merge pull request #9 from RedisGrafana/feat/dashboards-update

Update dashboards for Grafana 8.2

Author: mikhail-vl

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## v1.3.0 (IN PROGRESS)
+
+### Features / Enhancements
+
+- Update dashboards for Grafana 8.2 #9
+
+### Bugfix
+
+- Using opencv-python-headless Python library for Docker
+
 ## v1.2.0 (2021-08-18)
 
 ### Features / Enhancements

Dockerfile

@@ -8,17 +8,14 @@ ARG MODULES=/var/opt/redislabs/lib/modules
 ARG RG=${MODULES}/redisgears.so
 ARG REDIS="redis-server --loadmodule ${RG} Plugin /var/opt/redislabs/modules/rg/plugin/gears_python.so"
 
-ARG DEPS="python3-opencv"
 ARG REQ="numpy \
     Pillow \
-    opencv-python"
+    opencv-python-headless"
 
 # Set up a build environment
 WORKDIR /data
 RUN set -ex;\
-    deps="$DEPS";\
-    apt-get update;\
-    apt-get install -y --no-install-recommends $deps;
+    apt-get update;
 
 # Copy RedisTimeSeries
 COPY --from=redistimeseries ${LD_LIBRARY_PATH}/*.so ${LD_LIBRARY_PATH}/
@@ -28,7 +25,7 @@ COPY --from=redisai ${LD_LIBRARY_PATH}/redisai.so ${LD_LIBRARY_PATH}/
 COPY --from=redisai ${LD_LIBRARY_PATH}/backends ${LD_LIBRARY_PATH}/backends
 
 # Start Redis and install Deps
-RUN nohup bash -c "${REDIS}&" && sleep 4 && redis-cli RG.PYEXECUTE "GearsBuilder().run()" REQUIREMENTS $REQ \
+RUN nohup bash -c "${REDIS}&" && sleep 4 && redis-cli RG.PYEXECUTE "import cv2; GearsBuilder().run()" REQUIREMENTS $REQ \
     && redis-cli save
 
 ENTRYPOINT ["redis-server"]

README.md

@@ -2,7 +2,7 @@
 
 ![Redis-Camera-AI](https://raw.githubusercontent.com/RedisGrafana/redis-camera-ai/main/images/batman-ai.gif)
 
-[![Grafana 7](https://img.shields.io/badge/Grafana-7-orange)](https://www.grafana.com)
+[![Grafana 8](https://img.shields.io/badge/Grafana-8-orange)](https://www.grafana.com)
 [![Redis Data Source](https://img.shields.io/badge/dynamic/json?color=blue&label=Redis%20Data%20Source&query=%24.version&url=https%3A%2F%2Fgrafana.com%2Fapi%2Fplugins%2Fredis-datasource)](https://grafana.com/grafana/plugins/redis-datasource)
 [![Redis Application plug-in](https://img.shields.io/badge/dynamic/json?color=blue&label=Redis%20Application%20plug-in&query=%24.version&url=https%3A%2F%2Fgrafana.com%2Fapi%2Fplugins%2Fredis-app)](https://grafana.com/grafana/plugins/redis-app)
 [![Docker](https://github.com/RedisGrafana/redis-camera-ai/actions/workflows/docker.yml/badge.svg)](https://github.com/RedisGrafana/redis-camera-ai/actions/workflows/docker.yml)

dashboards/camera-processing.json

@@ -5,7 +5,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "8.0.0"
+      "version": "8.1.4"
     },
     {
       "type": "datasource",
@@ -41,7 +41,7 @@
       "type": "panel",
       "id": "volkovlabs-image-panel",
       "name": "Base64 Image/PDF",
-      "version": "1.0.1"
+      "version": "2.1.1"
     }
   ],
   "annotations": {
@@ -53,6 +53,12 @@
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
         "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
         "type": "dashboard"
       }
     ]
@@ -61,7 +67,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1623266058782,
+  "iteration": 1632251645770,
   "links": [],
   "panels": [
     {
@@ -74,8 +80,12 @@
       },
       "id": 2,
       "options": {
+        "height": 0,
+        "heightMode": "auto",
         "name": "img",
-        "type": "image/jpeg"
+        "type": "image/jpeg",
+        "width": 0,
+        "widthMode": "auto"
       },
       "pluginVersion": "7.5.7",
       "targets": [
@@ -561,7 +571,7 @@
         "showHeader": true,
         "sortBy": []
       },
-      "pluginVersion": "8.0.0",
+      "pluginVersion": "8.1.4",
       "targets": [
         {
           "command": "rg.dumpregistrations",
@@ -759,5 +769,5 @@
   "timezone": "",
   "title": "Camera Processing",
   "uid": "DtsbVE3Mk",
-  "version": 2
+  "version": 1
 }

dashboards/camera.json

@@ -5,7 +5,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "8.0.0"
+      "version": "8.1.4"
     },
     {
       "type": "datasource",
@@ -23,7 +23,7 @@
       "type": "panel",
       "id": "volkovlabs-image-panel",
       "name": "Base64 Image/PDF",
-      "version": "1.0.1"
+      "version": "2.1.1"
     }
   ],
   "annotations": {
@@ -35,6 +35,12 @@
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
         "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
         "type": "dashboard"
       }
     ]
@@ -43,7 +49,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1623265798336,
+  "iteration": 1632251688059,
   "links": [],
   "panels": [
     {
@@ -98,7 +104,7 @@
         "text": {},
         "textMode": "auto"
       },
-      "pluginVersion": "8.0.0",
+      "pluginVersion": "8.1.4",
       "targets": [
         {
           "command": "xinfoStream",
@@ -159,7 +165,7 @@
         "text": {},
         "textMode": "auto"
       },
-      "pluginVersion": "8.0.0",
+      "pluginVersion": "8.1.4",
       "targets": [
         {
           "command": "ts.get",
@@ -187,8 +193,12 @@
       },
       "id": 2,
       "options": {
+        "height": 0,
+        "heightMode": "auto",
         "name": "img",
-        "type": "image/jpeg"
+        "type": "image/jpeg",
+        "width": 0,
+        "widthMode": "auto"
       },
       "pluginVersion": "7.5.7",
       "targets": [
@@ -242,5 +252,5 @@
   "timezone": "",
   "title": "Camera",
   "uid": "gohAty3Mk",
-  "version": 2
+  "version": 1
 }

package.json

@@ -8,5 +8,5 @@
     "start": "docker-compose pull && docker-compose up",
     "stop": "docker-compose down"
   },
-  "version": "1.2.0"
+  "version": "1.3.0"
 }