Fix issue with power queries not sending proper request (#65)

Author: yanscalyr

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.3.3
+
+Fix issue with power queries not sending proper data in the request (TBD) (Yan Shnayder)
+
 ## 2.3.2
 
 Fix issue with migrating panels from versions 2.3.0 and older to version 2.3.1 (#63) (Yan Shnayder)

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_31da5c7.zip \
+   https://github.com/scalyr/scalyr-grafana-datasource-plugin/releases/download/2.3.2/scalyr_grafana_plugin_7073038.zip \
    plugins install scalyr-datasource
    ```
 
@@ -78,7 +78,7 @@ from GitHub.
     Stable version:
 
     ```bash
-    tar -xvf scalyr_grafana_plugin_31da5c7.tar.gz
+    tar -xvf scalyr_grafana_plugin_7073038.tar.gz
     cp -rf dist/ /var/lib/grafana/plugins/scalyr/
     ```
 

dist/module.js

@@ -10,7 +10,7 @@
   <div class="gf-form-inline" ng-if="ctrl.target.queryType === ctrl.queryTypes.POWER_QUERY">
     <div class="gf-form">
       <span class="gf-form-label width-10">Query</span>
-      <textarea rows="5" cols="100" class="gf-form-input" ng-blur="ctrl.onChangeInternal()" ng-model="ctrl.target.queryText"></textarea>
+      <textarea rows="5" cols="100" class="gf-form-input" ng-blur="ctrl.onChangeInternal()" ng-model="ctrl.target.filter"></textarea>
     </div>
   </div>
   <div ng-if="ctrl.target.queryType === ctrl.queryTypes.STANDARD_QUERY">

dist/partials/query.editor.html

@@ -6,7 +6,7 @@
   "name": "Scalyr",
   "id": "scalyr-datasource",
   "info": {
-    "version": "2.3.2",
+    "version": "2.3.3",
     "description": "Scalyr Observability Platform",
     "author": {
       "name": "Scalyr",

dist/plugin.json

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

package.json

@@ -348,7 +348,7 @@ export class GenericDatasource {
    */
   performPowerQuery(options, visualizationType) {
     const target = options.targets[0];
-    const query = this.createPowerQuery(target.queryText, options.range.from.valueOf(), options.range.to.valueOf(), options);
+    const query = this.createPowerQuery(target.filter, options.range.from.valueOf(), options.range.to.valueOf(), options);
     return this.backendSrv.datasourceRequest(query).then( (response) => {
       const data = response && response.data;
       return this.transformPowerQueryData(data, visualizationType);

src/datasource.js

@@ -10,7 +10,7 @@
   <div class="gf-form-inline" ng-if="ctrl.target.queryType === ctrl.queryTypes.POWER_QUERY">
     <div class="gf-form">
       <span class="gf-form-label width-10">Query</span>
-      <textarea rows="5" cols="100" class="gf-form-input" ng-blur="ctrl.onChangeInternal()" ng-model="ctrl.target.queryText"></textarea>
+      <textarea rows="5" cols="100" class="gf-form-input" ng-blur="ctrl.onChangeInternal()" ng-model="ctrl.target.filter"></textarea>
     </div>
   </div>
   <div ng-if="ctrl.target.queryType === ctrl.queryTypes.STANDARD_QUERY">

src/partials/query.editor.html

@@ -6,7 +6,7 @@
   "name": "Scalyr",
   "id": "scalyr-datasource",
   "info": {
-    "version": "2.3.2",
+    "version": "2.3.3",
     "description": "Scalyr Observability Platform",
     "author": {
       "name": "Scalyr",