Update follow-redirects package and minor updates (#73)

RedisGrafana · Jan 18, 2022 · 9ed8002 · 9ed8002
1 parent 1f14039
commit 9ed8002
Show file tree

Hide file tree

Showing 8 changed files with 851 additions and 863 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -95,6 +95,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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-## 2.1.0 (IN PROGRESS)
+## 2.1.0 (2022-01-17)
 
 ### Features / Enhancements
 
@@ -10,7 +10,10 @@
 - Update to Grafana 8.2.3 (#64)
 - Return no events found message if no events returned (#65)
 - Add Cluster Alerts and separate them from Overview (#66)
-- Upgrade to Grafana 8.3.0
+- Upgrade to Grafana 8.3.0 (#68)
+- Update workflow and add Grafana Marketplace (#69)
+- Update Components naming (#70)
+- Update follow-redirects package and minor updates
 
 ## 2.0.0 (2021-06-24)
 

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/dev.yml b/docker-compose/dev.yml
@@ -13,8 +13,7 @@ services:
       - GF_ENABLE_GZIP=true
       - GF_USERS_DEFAULT_THEME=light
       - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=redis-explorer-app
-      - 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
@@ -13,8 +13,7 @@ services:
       - GF_ENABLE_GZIP=true
       - GF_USERS_DEFAULT_THEME=light
       - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=redis-explorer-app
-      - 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
@@ -8,9 +8,9 @@
     "@grafana/ui": "8.3.0",
     "@testing-library/jest-dom": "5.16.1",
     "@testing-library/react": "^12.1.2",
-    "@types/enzyme": "^3.10.10",
+    "@types/enzyme": "^3.10.11",
     "@types/enzyme-adapter-react-16": "^1.0.6",
-    "@types/lodash": "4.14.177",
+    "@types/lodash": "4.14.178",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.6",
     "tslib": "^2.3.1"

diff --git a/src/plugin.json b/src/plugin.json
@@ -7,7 +7,7 @@
         "id": "redis-app",
         "name": "Redis Application plugin",
         "type": "app",
-        "version": "^2.1.0"
+        "version": "^2.2.0"
       }
     ]
   },

diff --git a/yarn.lock b/yarn.lock