Upgrade Grafana dependencies 7.5.4 (#53)

Author: mikhail-vl

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: push
+on: [push, pull_request]
 
 jobs:
   build:

.prettierignore

@@ -18,4 +18,3 @@ dist
 redis-datasource
 img
 .idea
-redis

BUILD.md

@@ -1,67 +1,3 @@
-# How to install and build Grafana with Redis Application plug-in on RPM-based Linux
+# How to build and install Redis Application plug-in
 
-## Clone repository
-
-```bash
-git clone https://github.com/RedisGrafana/grafana-redis-app.git
-```
-
-## Install Grafana
-
-- Follow [Install on RPM-based Linux](https://grafana.com/docs/grafana/latest/installation/rpm/) to install and start Grafana
-
-- Open Grafana in web-browser `http://X.X.X.X:3000`
-
-## Build Application
-
-- Install the latest version of Node.js using [Node Version Manager](https://github.com/nvm-sh/nvm)
-
-- Install `yarn` to build Application
-
-```bash
-npm install yarn -g
-```
-
-- Install dependencies
-
-```bash
-yarn install
-```
-
-- Build Application
-
-```bash
-yarn build
-```
-
-## Update Grafana Configuration
-
-- Move distribution to Grafana's `plugins/` folder
-
-```bash
-mv dist/ /var/lib/grafana/plugins/redis-app
-```
-
-- Add `redis-app` to allowed unsigned plugins
-
-```bash
-vi /etc/grafana/grafana.ini
-```
-
-```
-[plugins]
-;enable_alpha = false
-;app_tls_skip_verify_insecure = false
-# Enter a comma-separated list of plugin identifiers to identify plugins that are allowed to be loaded even if they lack a valid signature.
-allow_loading_unsigned_plugins = redis-app
-```
-
-- Verify that plugin is registered
-
-```bash
-tail -100 /var/log/grafana/grafana.log
-```
-
-- Enable Redis Application in Grafana using `Configuration` -> `Plugins`
-
-If you have questions, enhancement ideas or running into issues, please just open an issue on the repository: https://github.com/RedisGrafana/grafana-redis-app
+You can find detailed instructions in the [Documentation](https://redisgrafana.github.io/development/redis-app/).

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ### Features / Enhancements
 
-- Update Grafana dependencies to 7.4.2
+- Update Grafana dependencies to 7.5.4
 
 ## v1.1.0 (2021-02-07)
 

docker-compose.yml

@@ -20,7 +20,6 @@ services:
       - GF_USERS_DEFAULT_THEME=light
       - GF_INSTALL_PLUGINS=redis-app
     volumes:
-      - ./provisioning/plugins:/etc/grafana/provisioning/plugins
-      - ./provisioning/datasources:/etc/grafana/provisioning/datasources
+      - ./provisioning:/etc/grafana/provisioning
       # Uncomment to preserve Grafana configuration
       # - ./data:/var/lib/grafana

docker-compose/dev-7.2.1.yml

@@ -29,7 +29,6 @@ services:
       # Redis Data Source should be cloned and built
       - ../../grafana-redis-datasource/dist:/var/lib/grafana/plugins/redis-datasource
       - ../dist:/var/lib/grafana/plugins/redis-app
-      - ../provisioning/datasources:/etc/grafana/provisioning/datasources
-      - ../provisioning/plugins:/etc/grafana/provisioning/plugins
+      - ../provisioning:/etc/grafana/provisioning
       # Uncomment to preserve Grafana configuration
       # - ./data:/var/lib/grafana

docker-compose/dev.yml

@@ -29,7 +29,6 @@ services:
       # Redis Data Source should be cloned and built
       - ../../grafana-redis-datasource/dist:/var/lib/grafana/plugins/redis-datasource
       - ../dist:/var/lib/grafana/plugins/redis-app
-      - ../provisioning/datasources:/etc/grafana/provisioning/datasources
-      - ../provisioning/plugins:/etc/grafana/provisioning/plugins
+      - ../provisioning:/etc/grafana/provisioning
       # Uncomment to preserve Grafana configuration
       # - ./data:/var/lib/grafana

docker-compose/master.yml

@@ -29,7 +29,6 @@ services:
       # Redis Data Source should be cloned and built
       - ../../grafana-redis-datasource/dist:/var/lib/grafana/plugins/redis-datasource
       - ../dist:/var/lib/grafana/plugins/redis-app
-      - ../provisioning/datasources:/etc/grafana/provisioning/datasources
-      - ../provisioning/plugins:/etc/grafana/provisioning/plugins
+      - ../provisioning:/etc/grafana/provisioning
       # Uncomment to preserve Grafana configuration
       # - ./data:/var/lib/grafana

package.json

@@ -2,13 +2,13 @@
   "author": "Redis Labs",
   "description": "Redis Application for Grafana",
   "devDependencies": {
-    "@grafana/data": "7.4.2",
-    "@grafana/runtime": "7.4.2",
-    "@grafana/toolkit": "7.4.2",
-    "@grafana/ui": "7.4.2",
-    "@monaco-editor/react": "^4.0.10",
+    "@grafana/data": "7.5.4",
+    "@grafana/runtime": "7.5.4",
+    "@grafana/toolkit": "7.5.4",
+    "@grafana/ui": "7.5.4",
+    "@monaco-editor/react": "^4.1.1",
     "@types/enzyme": "^3.10.8",
-    "@wojtekmaj/enzyme-adapter-react-17": "^0.4.1",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
     "emotion": "10.0.27",
     "enzyme": "^3.11.0"
   },

src/redis-latency-panel/components/redis-latency-panel-table/redis-latency-panel-table.test.tsx

@@ -1,5 +1,5 @@
-import React from 'react';
 import { shallow } from 'enzyme';
+import React from 'react';
 import { dateTime, FieldType, toDataFrame } from '@grafana/data';
 import { Table } from '@grafana/ui';
 import { DisplayNameByFieldName, FieldName } from '../../constants';
@@ -49,7 +49,7 @@ describe('RedisLatencyPanel', () => {
 
       const tableDataFrame = RedisLatencyPanelTable.getTableDataFrame(dataFrame, seriesMap);
       const expectedDataFrame = toDataFrame({
-        name: 'tableDataFrame',
+        name: 'TableDataFrame',
         fields: [
           ...fields,
           {
@@ -97,7 +97,7 @@ describe('RedisLatencyPanel', () => {
           {
             type: FieldType.number,
             name: FieldName.Latency,
-            values: [null, null],
+            values: [undefined, undefined],
           },
         ].map((field) => ({
           ...field,