Release version 1.3.0

gnocchixyz · Jun 28, 2017 · ce62e21 · ce62e21
1 parent fdebf08
commit ce62e21
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 38 deletions.
diff --git a/dist/datasource.js b/dist/datasource.js
diff --git a/dist/datasource.js.map b/dist/datasource.js.map
diff --git a/dist/module.js b/dist/module.js
diff --git a/dist/module.js.map b/dist/module.js.map
diff --git a/dist/partials/query.editor.html b/dist/partials/query.editor.html
@@ -17,7 +17,7 @@
     <div ng-if="['resource_search', 'resource_aggregation'].indexOf(ctrl.target.queryMode) >= 0" class="gf-form-inline">
         <div class="gf-form max-width">
             <label class="gf-form-label query-keyword width-8">Query</label>
-            <input type="text" class="gf-form-input" ng-model="ctrl.target.resource_search" spellcheck='false' placeholder="attribute1='value' and attribute2='%contain%'" data-min-length=0 ng-model-onblur ng-blur="ctrl.queryUpdated()" >
+            <input type="text" class="gf-form-input" ng-model="ctrl.target.resource_search" spellcheck='false' placeholder="attribute1='value' and attribute2 like '%contain%'" data-min-length=0 ng-model-onblur ng-blur="ctrl.queryUpdated()" >
         </div>
     </div>
     <div class="gf-form-inline">
@@ -34,8 +34,9 @@
             <input type="text" class="gf-form-input" ng-model="ctrl.target.resource_type" spellcheck='false' placeholder="generic" data-min-length=0 ng-model-onblur ng-blur="ctrl.queryUpdated()">
         </div>
         <div class="gf-form max-width-20" ng-if="['resource', 'resource_search', 'resource_aggregation'].indexOf(ctrl.target.queryMode) >= 0">
-            <label class="gf-form-label query-keyword width-8">Metric name</label>
-            <input type="text" class="gf-form-input" ng-model="ctrl.target.metric_name" bs-typeahead="ctrl.suggestMetricNames" spellcheck='false' placeholder="metric name" data-min-length=0 ng-model-onblur ng-blur="ctrl.queryUpdated()">
+            <label class="gf-form-label query-keyword width-8" ng-if="['resource_search'].indexOf(ctrl.target.queryMode) >= 0">Metric wildcard</label>
+            <label class="gf-form-label query-keyword width-8" ng-if="['resource_search'].indexOf(ctrl.target.queryMode) < 0">Metric name</label>
+            <input type="text" class="gf-form-input" ng-model="ctrl.target.metric_name" bs-typeahead="ctrl.suggestMetricNames" spellcheck='false' placeholder="metric" data-min-length=0 ng-model-onblur ng-blur="ctrl.queryUpdated()">
         </div>
         <div class="gf-form max-width-20" ng-if="['resource', 'resource_search', 'resource_aggregation'].indexOf(ctrl.target.queryMode) >= 0" >
             <label class="gf-form-label query-keyword width-8">Granularity</label>

diff --git a/dist/plugin.json b/dist/plugin.json
@@ -27,7 +27,7 @@
     ],
     "screenshots": [
     ],
-    "version": "1.2.1",
+    "version": "1.3.0",
     "updated": "2016-07-04"
   },
 

diff --git a/dist/query_ctrl.js b/dist/query_ctrl.js
diff --git a/dist/query_ctrl.js.map b/dist/query_ctrl.js.map