Update to Grafana 7.1 and the latest version of Radix

docker-compose.yml

@@ -22,6 +22,8 @@ services:
       - GF_AUTH_BASIC_ENABLED=false
       - GF_ENABLE_GZIP=true
       - 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:/etc/grafana/provisioning

go.mod

@@ -3,6 +3,7 @@ module github.com/redistimeseries/grafana-redis-datasource
 go 1.14
 
 require (
-	github.com/grafana/grafana-plugin-sdk-go v0.70.0
-	github.com/mediocregopher/radix/v3 v3.5.1
+	github.com/grafana/grafana-plugin-sdk-go v0.75.0
+	github.com/magefile/mage v1.10.0 // indirect
+	github.com/mediocregopher/radix/v3 v3.5.2
 )

go.sum

@@ -56,6 +56,8 @@ github.com/grafana/grafana-plugin-sdk-go v0.69.0 h1:bcqQEq1g71GG2icJeVlm6l1DErDG
 github.com/grafana/grafana-plugin-sdk-go v0.69.0/go.mod h1:w855JyiC5PDP3naWUJP0h/vY8RlzlE4+4fodyoXph+4=
 github.com/grafana/grafana-plugin-sdk-go v0.70.0 h1:tbwf0KMp8QEQQYF3bDBOOv/npegD6YP8T90OWbLr7n4=
 github.com/grafana/grafana-plugin-sdk-go v0.70.0/go.mod h1:NvxLzGkVhnoBKwzkst6CFfpMFKwAdIUZ1q8ssuLeF60=
+github.com/grafana/grafana-plugin-sdk-go v0.75.0 h1:b0Ugpn88VNx17Q8MA1MsWkD3ddBEbRvFxzid+Nka3F0=
+github.com/grafana/grafana-plugin-sdk-go v0.75.0/go.mod h1:NvxLzGkVhnoBKwzkst6CFfpMFKwAdIUZ1q8ssuLeF60=
 github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 h1:0IKlLyQ3Hs9nDaiK5cSHAGmcQEIC8l2Ts1u6x5Dfrqg=
 github.com/grpc-ecosystem/go-grpc-middleware v1.2.0/go.mod h1:mJzapYve32yjrKlk9GbyCZHuPgZsrbyIbyKhSzOpg6s=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
@@ -87,6 +89,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/magefile/mage v1.9.0 h1:t3AU2wNwehMCW97vuqQLtw6puppWXHO+O2MHo5a50XE=
 github.com/magefile/mage v1.9.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
+github.com/magefile/mage v1.10.0 h1:3HiXzCUY12kh9bIuyXShaVe529fJfyqoVM42o/uom2g=
+github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
 github.com/mattetti/filebuffer v1.0.0 h1:ixTvQ0JjBTwWbdpDZ98lLrydo7KRi8xNRIi5RFszsbY=
 github.com/mattetti/filebuffer v1.0.0/go.mod h1:X6nyAIge2JGVmuJt2MFCqmHrb/5IHiphfHtot0s5cnI=
 github.com/mattn/go-colorable v0.0.0-20170327083344-ded68f7a9561 h1:isR/L+BIZ+rqODWYR/f526ygrBMGKZYFhaaFRDGvuZ8=
@@ -101,6 +105,8 @@ github.com/mediocregopher/radix/v3 v3.5.0 h1:8QHQmNh2ne9aFxTD3z63u/bkPPiOtknHoz8
 github.com/mediocregopher/radix/v3 v3.5.0/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
 github.com/mediocregopher/radix/v3 v3.5.1 h1:IOYgQUMA380N4khaL5eNT4v/P2LnHa8b0wnVdwZMFsY=
 github.com/mediocregopher/radix/v3 v3.5.1/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
+github.com/mediocregopher/radix/v3 v3.5.2 h1:A9u3G7n4+fWmDZ2ZDHtlK+cZl4q55T+7RjKjR0/MAdk=
+github.com/mediocregopher/radix/v3 v3.5.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
 github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 h1:7GoSOOW2jpsfkntVKaS2rAr1TJqfcxotyaUcuxoZSzg=
 github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE=

package.json

@@ -13,11 +13,11 @@
   "author": "Redis Labs",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@grafana/data": "7.0.5",
-    "@grafana/runtime": "7.0.5",
-    "@grafana/toolkit": "7.0.5",
-    "@grafana/ui": "7.0.5",
-    "@types/lodash": "4.14.157"
+    "@grafana/data": "7.1.0",
+    "@grafana/runtime": "7.1.0",
+    "@grafana/toolkit": "7.1.0",
+    "@grafana/ui": "7.1.0",
+    "@types/lodash": "4.14.158"
   },
   "engines": {
     "node": ">=12"

src/ConfigEditor.tsx

@@ -301,6 +301,7 @@ export class ConfigEditor extends PureComponent<Props, State> {
               ) : (
                 <div className="gf-form gf-form--grow">
                   <TextArea
+                    css=""
                     rows={7}
                     className="gf-form-input gf-form-textarea"
                     placeholder="Begins with -----BEGIN CERTIFICATE-----"
@@ -321,6 +322,7 @@ export class ConfigEditor extends PureComponent<Props, State> {
                   </Button>
                 ) : (
                   <TextArea
+                    css=""
                     rows={7}
                     className="gf-form-input gf-form-textarea"
                     placeholder="Begins with -----BEGIN PRIVATE KEY-----"
@@ -341,6 +343,7 @@ export class ConfigEditor extends PureComponent<Props, State> {
               ) : (
                 <div className="gf-form gf-form--grow">
                   <TextArea
+                    css=""
                     rows={7}
                     className="gf-form-input gf-form-textarea"
                     placeholder="Begins with -----BEGIN CERTIFICATE-----"

src/QueryEditor.tsx

@@ -161,7 +161,7 @@ export class QueryEditor extends PureComponent<Props> {
           {type === QueryTypeValue.CLI && (
             <>
               <InlineFormLabel width={8}>Command</InlineFormLabel>
-              <TextArea value={query} className="gf-form-input" onChange={this.onQueryChange} />
+              <TextArea css="" value={query} className="gf-form-input" onChange={this.onQueryChange} />
             </>
           )}
           {type && type !== QueryTypeValue.CLI && (

src/plugin.json

@@ -33,6 +33,7 @@
   },
   "dependencies": {
     "grafanaVersion": "7.x.x",
+    "grafanaDependency": ">=7.0.0",
     "plugins": []
   }
 }