Update "Can't retrieve a list of commands" error message (#101)

RedisGrafana · Jan 18, 2022 · 9eb13ea · 9eb13ea
1 parent b6e97cf
commit 9eb13ea
Show file tree

Hide file tree

Showing 12 changed files with 846 additions and 866 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -117,6 +117,7 @@ jobs:
           echo "::set-output name=checksum::$(cat ./${{ steps.metadata.outputs.archive-checksum }} | cut -d' ' -f1)"
 
       - name: Lint plugin
+        continue-on-error: true
         run: |
           git clone https://github.com/grafana/plugin-validator
           pushd ./plugin-validator/pkg/cmd/plugincheck
@@ -156,9 +157,3 @@ jobs:
           asset_path: ./${{ steps.metadata.outputs.archive-checksum }}
           asset_name: ${{ steps.metadata.outputs.archive-checksum }}
           asset_content_type: text/plain
-
-      - name: Publish to Grafana.com
-        run: |
-          echo A draft release has been created for your plugin. Please review and publish it. Then submit your plugin to grafana.com/plugins by opening a PR to https://github.com/grafana/grafana-plugin-repository with the following entry:
-          echo
-          echo '{ "id": "${{ steps.metadata.outputs.plugin-id }}", "type": "${{ steps.metadata.outputs.plugin-type }}", "url": "https://github.com/${{ github.repository }}", "versions": [ { "version": "${{ steps.metadata.outputs.plugin-version }}", "commit": "${{ github.sha }}", "url": "https://github.com/${{ github.repository }}", "download": { "any": { "url": "https://github.com/${{ github.repository }}/releases/download/v${{ steps.metadata.outputs.plugin-version }}/${{ steps.metadata.outputs.archive }}", "md5": "${{ steps.package-plugin.outputs.checksum }}" } } } ] }' | jq .
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-## 2.2.0 (IN PROGRESS)
+## 2.2.0 (2022-01-17)
 
 ### Features / Enhancements
 
@@ -10,6 +10,9 @@
 - Upgrade to Grafana 8.3.0 (#93)
 - Fix LGTM and Update Panel Options (#95)
 - Add Redis CPU Usage panel (#96)
+- Update Components naming (#97)
+- Add CPU Usage Stacking and Gradient (#98)
+- Update "Can't retrieve a list of commands" error message (#100)
 
 ## 2.1.0 (2021-11-10)
 

diff --git a/Dockerfile b/Dockerfile
@@ -8,8 +8,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 # Set Grafana options
 ENV GF_ENABLE_GZIP="true"
 ENV GF_USERS_DEFAULT_THEME="light"
-ENV GF_FEATURE_TOGGLES_ENABLE="ngalert"
-ENV GF_PLUGINS_PLUGIN_ADMIN_ENABLED="true"
 
 # Paths
 ENV GF_PATHS_PROVISIONING="/etc/grafana/provisioning"

diff --git a/LICENSE b/LICENSE
@@ -187,7 +187,7 @@
       identification within third-party archives.
 
    Copyright 2020 Redis Labs
-   Copyright 2021 Mikhail Volkov
+   Copyright 2021-2022 Volkov Labs
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,8 +19,6 @@ services:
       - GF_ENABLE_GZIP=true
       - GF_USERS_DEFAULT_THEME=light
       - GF_INSTALL_PLUGINS=redis-app
-      - GF_FEATURE_TOGGLES_ENABLE=ngalert
-      - GF_PLUGINS_PLUGIN_ADMIN_ENABLED=true
     volumes:
       - ./provisioning:/etc/grafana/provisioning
       # Uncomment to preserve Grafana configuration

diff --git a/docker-compose/dev.yml b/docker-compose/dev.yml
@@ -23,8 +23,7 @@ services:
       - GF_ENABLE_GZIP=true
       - GF_USERS_DEFAULT_THEME=light
       - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=redis-app,redis-datasource
-      - GF_FEATURE_TOGGLES_ENABLE=ngalert
-      - GF_PLUGINS_PLUGIN_ADMIN_ENABLED=true
+      - GF_DEFAULT_APP_MODE=development
       # Uncomment to run in debug mode
       # - GF_LOG_LEVEL=debug
     volumes:

diff --git a/docker-compose/master.yml b/docker-compose/master.yml
@@ -23,8 +23,7 @@ services:
       - GF_ENABLE_GZIP=true
       - GF_USERS_DEFAULT_THEME=light
       - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=redis-app,redis-datasource
-      - GF_FEATURE_TOGGLES_ENABLE=ngalert
-      - GF_PLUGINS_PLUGIN_ADMIN_ENABLED=true
+      - GF_DEFAULT_APP_MODE=development
       # Uncomment to run in debug mode
       # - GF_LOG_LEVEL=debug
     volumes:

diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "@grafana/toolkit": "8.3.0",
     "@grafana/ui": "8.3.0",
     "@monaco-editor/react": "^4.3.1",
-    "@types/enzyme": "^3.10.10",
+    "@types/enzyme": "^3.10.11",
     "@types/enzyme-adapter-react-16": "^1.0.6",
     "emotion": "11.0.0",
     "enzyme": "^3.11.0",

diff --git a/src/components/DataSourceList/DataSourceList.test.tsx b/src/components/DataSourceList/DataSourceList.test.tsx
@@ -39,7 +39,7 @@ describe('DataSourceList', () => {
   };
   const TITLES = {
     success: 'Working as expected',
-    error: `Can't retrieve a list of commands`,
+    error: `Can't retrieve a list of commands. Check that user has permissions to see a list of all commands.`,
   };
 
   beforeEach(() => {

diff --git a/src/components/DataSourceList/DataSourceList.tsx b/src/components/DataSourceList/DataSourceList.tsx
@@ -97,7 +97,9 @@ export const DataSourceList: FC<Props> = ({ dataSources }) => {
       <section className="card-section card-list-layout-list">
         <ol className="card-list">
           {dataSources.map((redis, index) => {
-            const title = redis.commands?.length ? 'Working as expected' : "Can't retrieve a list of commands";
+            const title = redis.commands?.length
+              ? 'Working as expected'
+              : "Can't retrieve a list of commands. Check that user has permissions to see a list of all commands.";
             const fill = redis.commands?.length ? '#DC382D' : '#A7A7A7';
             const url = redis.url ? redis.url : 'Not specified';
 

diff --git a/src/plugin.json b/src/plugin.json
@@ -7,7 +7,7 @@
         "id": "redis-datasource",
         "name": "Redis Data Source",
         "type": "datasource",
-        "version": "^2.0.0"
+        "version": "^2.1.0"
       }
     ]
   },