Release version 1.2.0

dist/README.md

@@ -90,9 +90,11 @@ Gnocchi Datasource Plugin provides following functions in `Variables values quer
 
 Name | Description
 | ------- | --------|
-`metrics(resource_id)`  | Returns a list of metrics avialable for the resource identified by ‘resource_id’
+`metrics(resource_id)`  | Returns a list of metrics available for the resource identified by ‘resource_id’
 `resources(resource_type, `attribute`, query)` | Returns a list of resource `attribute` matching `query`.
 
+  ![](https://raw.githubusercontent.com/gnocchixyz/grafana-gnocchi-datasource/master/docs/gnocchi_templating.png)
+
 For details of `Query` format, please refer to the Gnocchi and Gnocchi client documentations.
 
 - [Search for resource - Gnocchi client Documentation](http://gnocchi.xyz/gnocchiclient/shell.html#gnocchi-resource-search) for expression format

dist/docs/example_dashboard.json

@@ -88,12 +88,12 @@
             {
               "aggregator": "mean",
               "hide": false,
-              "label": "",
+              "label": "display_name",
               "metric_name": "cpu_util",
               "queryMode": "resource_search",
               "refId": "A",
               "resource_id": "",
-              "resource_search": "{\"like\": {\"original_resource_id\": \"%\"}}",
+              "resource_search": "original_resource_id like '%'",
               "resource_type": "instance",
               "validQuery": true
             }
@@ -184,11 +184,11 @@
             {
               "aggregator": "mean",
               "hide": false,
-              "label": "",
+              "label": "display_name",
               "metric_name": "memory.usage",
               "queryMode": "resource_search",
               "refId": "A",
-              "resource_search": "{\"like\": {\"display_name\": \"%\"}}",
+              "resource_search": "original_resource_id like '%'",
               "resource_type": "instance",
               "validQuery": true
             }
@@ -283,7 +283,7 @@
               "metric_name": "disk.device.write.bytes.rate",
               "queryMode": "resource_search",
               "refId": "A",
-              "resource_search": "{\"like\": {\"original_resource_id\": \"%\"}}",
+              "resource_search": "original_resource_id like '%'",
               "resource_type": "instance_disk",
               "validQuery": true
             }
@@ -370,7 +370,7 @@
               "metric_name": "disk.device.write.bytes",
               "queryMode": "resource_search",
               "refId": "A",
-              "resource_search": "{\"like\": {\"original_resource_id\": \"%\"}}",
+              "resource_search": "original_resource_id like '%'",
               "resource_type": "instance_disk",
               "validQuery": true
             }
@@ -464,7 +464,7 @@
               "metric_name": "disk.device.read.bytes.rate",
               "queryMode": "resource_search",
               "refId": "A",
-              "resource_search": "{\"like\": {\"original_resource_id\": \"%\"}}",
+              "resource_search": "original_resource_id like '%'",
               "resource_type": "instance_disk",
               "validQuery": true
             }
@@ -550,7 +550,7 @@
               "metric_name": "disk.device.read.bytes",
               "queryMode": "resource_search",
               "refId": "A",
-              "resource_search": "{\"like\": {\"original_resource_id\": \"%\"}}",
+              "resource_search": "original_resource_id like '%'",
               "resource_type": "instance_disk",
               "validQuery": true
             }
@@ -644,7 +644,7 @@
               "metric_name": "network.outgoing.bytes.rate",
               "queryMode": "resource_search",
               "refId": "A",
-              "resource_search": "{\"like\": {\"original_resource_id\": \"instance-%\"}}",
+              "resource_search": "original_resource_id like '%'",
               "resource_type": "instance_network_interface",
               "validQuery": true
             }
@@ -730,7 +730,7 @@
               "metric_name": "network.outgoing.bytes",
               "queryMode": "resource_search",
               "refId": "A",
-              "resource_search": "{\"like\": {\"original_resource_id\": \"instance-%\"}}",
+              "resource_search": "original_resource_id like '%'",
               "resource_type": "instance_network_interface",
               "validQuery": true
             }
@@ -824,7 +824,7 @@
               "metric_name": "network.incoming.bytes.rate",
               "queryMode": "resource_search",
               "refId": "A",
-              "resource_search": "{\"like\": {\"original_resource_id\": \"instance-%\"}}",
+              "resource_search": "original_resource_id like '%'",
               "resource_type": "instance_network_interface",
               "validQuery": true
             }
@@ -910,7 +910,7 @@
               "metric_name": "network.incoming.bytes",
               "queryMode": "resource_search",
               "refId": "A",
-              "resource_search": "{\"like\": {\"original_resource_id\": \"instance-%\"}}",
+              "resource_search": "original_resource_id like '%'",
               "resource_type": "instance_network_interface",
               "validQuery": true
             }

dist/partials/config.html

@@ -2,10 +2,10 @@
 </datasource-http-settings>
 
 <div class="gf-info-box" style="margin: 10px 0 30px 0" ng-if="ctrl.current.access == 'direct'">
-    When "direct" access is used, Gnocchi and Keystone MUST have CORS configured correctly on the server side.<br />
+    When "direct" access is used, Gnocchi and Keystone MUST have CORS configured correctly on the server side.<br /><br />
 </div>
 <h3>Gnocchi Details</h3>
-<div class="gf-form-group">
+<div class="gf-form-group" ng-if="!ctrl.current.basicAuth">
     <div class="gf-form-inline">
         <div class="gf-form max-width-30">
             <span class="gf-form-label width-7">Auth Mode</span>
@@ -20,6 +20,7 @@ <h3>Gnocchi Details</h3>
         </div>
     </div>
     <div style="padding:5px">
+        <span ng-if="ctrl.current.jsonData.mode == 'noauth'">noauth is deprecated</span>
         <span ng-if="ctrl.current.access == 'direct' && ctrl.current.jsonData.mode == 'keystone'">The Keystone URL is expected in Http settings</span>
         <span ng-if="ctrl.current.access == 'proxy' && ctrl.current.jsonData.mode == 'keystone'">This configuration can't works, select another 'Access' or 'Auth Mode'</span>
         <span ng-if="ctrl.current.jsonData.mode != 'keystone'">The Gnocchi URL is expected in Http settings</span>

dist/partials/query.editor.html

@@ -46,7 +46,8 @@
             <select ng-model="ctrl.target.aggregator" class="gf-form-input input-small" ng-options="a for a in ctrl.aggregators" ng-change="ctrl.queryUpdated()"> </select>
         </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">Label <span ng-if="target.queryMode !== 'resource_aggregation'">attribute</span></label>
+            <label class="gf-form-label query-keyword width-8" ng-if="target.queryMode !== 'resource_aggregation'">Label</label>
+            <label class="gf-form-label query-keyword width-8" ng-if="target.queryMode === 'resource_aggregation'">Resource attribute or label</label>
             <input type="text" class="gf-form-input" ng-model="ctrl.target.label" spellcheck='false' placeholder="id" data-min-length=0 ng-model-onblur ng-blur="ctrl.queryUpdated()">
         </div>
     </div>

dist/plugin.json

@@ -27,7 +27,7 @@
     ],
     "screenshots": [
     ],
-    "version": "1.1.0",
+    "version": "1.2.0",
     "updated": "2016-07-04"
   },