Fix issue with upgrading panels from version 2.3.0 and older (#63)

* Fix issue with upgrading panels from version 2.3.0 and older * linting
scalyr · Jan 4, 2021 · 7073038 · 7073038
1 parent dfbb312
commit 7073038
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.3.2
+
+Fix issue with migrating panels from versions 2.3.0 and older to version 2.3.1 (TBD) (Yan Shnayder)
+
 ## 2.3.1
 
 Align terminology with Scalyr API (#59) (Rein Achten)

diff --git a/dist/README.md b/dist/README.md
@@ -35,7 +35,7 @@ can find documentation on API Keys [here](https://www.scalyr.com/help/api#scalyr
 
    ```bash
    grafana-cli --pluginUrl \
-   https://github.com/scalyr/scalyr-grafana-datasource-plugin/releases/download/2.3.1/scalyr_grafana_plugin_d8e1e08.zip \
+   https://github.com/scalyr/scalyr-grafana-datasource-plugin/releases/download/2.3.1/scalyr_grafana_plugin_31da5c7.zip \
    plugins install scalyr-datasource
    ```
 
@@ -78,7 +78,7 @@ from GitHub.
     Stable version:
 
     ```bash
-    tar -xvf scalyr_grafana_plugin_d8e1e08.tar.gz
+    tar -xvf scalyr_grafana_plugin_31da5c7.tar.gz
     cp -rf dist/ /var/lib/grafana/plugins/scalyr/
     ```
 

diff --git a/dist/module.js b/dist/module.js
diff --git a/dist/plugin.json b/dist/plugin.json
@@ -6,7 +6,7 @@
   "name": "Scalyr",
   "id": "scalyr-datasource",
   "info": {
-    "version": "2.3.1",
+    "version": "2.3.2",
     "description": "Scalyr Observability Platform",
     "author": {
       "name": "Scalyr",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scalyr-grafana-datasource-plugin",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "This grafana plugin allows Scalyr as a datasource for metrics and graphs",
   "main": "webpack.config.js",
   "scripts": {

diff --git a/src/datasource.js b/src/datasource.js
@@ -37,6 +37,14 @@ export class GenericDatasource {
    * @param {*} options - query settings/options https://grafana.com/docs/plugins/developing/datasources/#query
    */
   query(options) {
+    // Migrate filters from versions 2.3.0 and older
+    for (let i = 0; i < options.targets.length; i += 1) {
+      if (options.targets[i].queryText) {
+        options.targets[i].filter = options.targets[i].queryText;
+        options.targets[i].queryText = null;
+      }
+    }
+
     const queryType = options.targets[0].queryType;
     if (!options.targets.every(x => x.queryType === queryType)) {
       return {

diff --git a/src/plugin.json b/src/plugin.json
@@ -6,7 +6,7 @@
   "name": "Scalyr",
   "id": "scalyr-datasource",
   "info": {
-    "version": "2.3.1",
+    "version": "2.3.2",
     "description": "Scalyr Observability Platform",
     "author": {
       "name": "Scalyr",

diff --git a/src/query_ctrl.js b/src/query_ctrl.js
@@ -22,6 +22,12 @@ export class GenericDatasourceQueryCtrl extends QueryCtrl {
     this.target.dataLink = createDataLinkURL(this.target.queryText, this.getScalyrDatasourceUrl());
 
     this.target.copyText = "Copy";
+
+    // Migrate filters from versions 2.3.0 and older
+    if (this.target.queryText) {
+      this.target.filter = this.target.queryText;
+      this.target.queryText = null;
+    }
   }
 
   /**