Update Loading state for Streaming for Grafana 7.4 (#158)

* Update docker-compose files

* Refactor Data Source and add Cypher

* Update dashboards

* Add 7.4 dashboard using Time-Series

Author: mikhail-vl

Magefile.go

@@ -55,12 +55,12 @@ func Integration() error {
 
 // up docker-compose environment from integration tests
 func Up() error {
-	return sh.RunV("docker-compose", "-f", "docker-compose-test.yml", "-p", "grd-integration", "up", "-d")
+	return sh.RunV("docker-compose", "-f", "docker-compose/test.yml", "-p", "grd-integration", "up", "-d")
 }
 
 // down docker-compose environment from integration tests
 func Down() error {
-	return sh.RunV("docker-compose", "-f", "docker-compose-test.yml", "-p", "grd-integration", "down")
+	return sh.RunV("docker-compose", "-f", "docker-compose/test.yml", "-p", "grd-integration", "down")
 }
 
 // Default configures the default target.

README.md

@@ -120,10 +120,10 @@ If Redis is running as Docker container on Linux, please update host to `redis`
 
 ### Run using `docker-compose` for development
 
-Data Source have to be built following [BUILD](https://github.com/RedisGrafana/grafana-redis-datasource/blob/master/BUILD.md) instructions before starting using `docker-compose-dev.yml` file.
+Data Source have to be built following [BUILD](https://github.com/RedisGrafana/grafana-redis-datasource/blob/master/BUILD.md) instructions before starting using `docker-compose/dev.yml` file.
 
 ```bash
-docker-compose -f docker-compose-dev.yml up
+docker-compose -f docker-compose/dev.yml up
 ```
 
 ## Supported commands

docker-compose.yml

@@ -6,10 +6,6 @@ services:
     image: redislabs/redismod:latest
     ports:
       - '6379:6379'
-    # Uncomment and edit the local path in the following line to have
-    # Redis' data persisted to the host's filesystem.
-    # volumes:
-    #   - ./dump.rdb:/data/dump.rdb
 
   grafana:
     container_name: grafana

docker-compose-dev.yml renamed to docker-compose/dev.yml

@@ -7,7 +7,7 @@ services:
     ports:
       - '6379:6379'
     volumes:
-      - './data:/data/:rw'
+      - '../data:/data/:rw'
 
   grafana:
     container_name: grafana
@@ -24,8 +24,8 @@ services:
       # Uncomment to run in debug mode
       # - GF_LOG_LEVEL=debug
     volumes:
-      - ./dist:/var/lib/grafana/plugins/redis-datasource
-      - ./provisioning/datasources:/etc/grafana/provisioning/datasources
-      - ./provisioning/dashboards:/etc/grafana/provisioning/dashboards
+      - ../dist:/var/lib/grafana/plugins/redis-datasource
+      - ../provisioning/datasources:/etc/grafana/provisioning/datasources
+      - ../provisioning/dashboards:/etc/grafana/provisioning/dashboards
       # Uncomment to preserve Grafana configuration
       # - ./data:/var/lib/grafana

docker-compose/master.yml

@@ -0,0 +1,31 @@
+version: '3.4'
+
+services:
+  redis:
+    container_name: redismod
+    image: redislabs/redismod:latest
+    ports:
+      - '6379:6379'
+    volumes:
+      - '../data:/data/:rw'
+
+  grafana:
+    container_name: grafana
+    image: grafana/grafana:master
+    ports:
+      - '3000:3000'
+    environment:
+      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
+      - GF_AUTH_ANONYMOUS_ENABLED=true
+      - GF_AUTH_BASIC_ENABLED=false
+      - GF_ENABLE_GZIP=true
+      - GF_USERS_DEFAULT_THEME=light
+      - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=redis-datasource
+      # Uncomment to run in debug mode
+      # - GF_LOG_LEVEL=debug
+    volumes:
+      - ../dist:/var/lib/grafana/plugins/redis-datasource
+      - ../provisioning/datasources:/etc/grafana/provisioning/datasources
+      - ../provisioning/dashboards:/etc/grafana/provisioning/dashboards
+      # Uncomment to preserve Grafana configuration
+      # - ./data:/var/lib/grafana

docker-compose-test.yml renamed to docker-compose/test.yml

@@ -7,4 +7,4 @@ services:
     ports:
       - '63790:6379'
     volumes:
-      - './data:/data/:rw'
+      - '../data:/data/:rw'

package.json

@@ -24,7 +24,9 @@
     "dev": "grafana-toolkit plugin:dev",
     "format": "prettier --write \"**\"",
     "start": "docker-compose up",
-    "start:dev": "docker-compose -f docker-compose-dev.yml up",
+    "start:dev": "docker-compose -f docker-compose/dev.yml up",
+    "start:master": "docker-compose pull && docker-compose -f docker-compose/master.yml up",
+    "stop": "docker-compose down",
     "test": "grafana-toolkit plugin:test --coverage",
     "test:backend": "mage cover",
     "test:integration": "mage integration",