Release v1.1.2

hawkular · Feb 9, 2018 · 724ffb1 · 724ffb1
1 parent 5cc1f5e
commit 724ffb1
Show file tree

Hide file tree

Showing 13 changed files with 100 additions and 25 deletions.
diff --git a/dist/README.md b/dist/README.md
@@ -104,6 +104,17 @@ Example, JSON posted on [the Hawkular's REST API](http://www.hawkular.org/hawkul
 
 In the case of Hawkular Alerts events, you need to provide the trigger ID (several comma-separated IDs are allowed).
 
+### Legend
+
+Metric names can be customized in chart legend. The `Legend` field can receive regular expressions in that purpose. Regex must be written between double curly braces, and include a parentheses group to point to what must be written: `{{(.*)}}`
+
+_Example:_
+>  From metric name `pod/c6e2a9ab-8d1c-11e7-b7be-06415eb17bbf/custom/haproxy_server_bytes_in_total{namespace=my-namespace,pod=web-45-6f464,route=web,server=10.1.10.138:8080,service=web}`
+>
+>  Legend: `HAProxy Server Bytes In {{namespace=([^,}]+)}} / {{pod=([^,}]+)}}`
+>
+>  Result: `HAProxy Server Bytes In my-namespace / web-45-6f464`
+
 ## Installing from sources
 
 Additional information on installing from sources can be found on [hawkular.org](http://www.hawkular.org/hawkular-clients/grafana/docs/quickstart-guide/).

diff --git a/dist/partials/query.editor.html b/dist/partials/query.editor.html
@@ -78,4 +78,13 @@
 			</div>
 		</div>
 	</div>
+	<!-- chart panel -->
+	<div ng-if="ctrl.panel.type !== 'singlestat'">
+		<div class="gf-form-inline">
+			<div class="gf-form">
+				<label class="gf-form-label query-keyword fix-query-keyword">Legend</label>
+				<input type="text" class="gf-form-input" ng-model="ctrl.target.legend" ng-change="ctrl.onChangeInternal()" placeholder="default">
+			</div>
+		</div>
+	</div>
 </query-editor-row>
diff --git a/dist/plugin.json b/dist/plugin.json
@@ -24,8 +24,8 @@
         "url": "https://github.com/hawkular/hawkular-grafana-datasource"
       }
     ],
-    "version": "1.1.1",
-    "updated": "2017-11-14"
+    "version": "1.1.2",
+    "updated": "2018-02-09"
   },
   "dependencies": {
     "grafanaVersion": "3.x.x",

diff --git a/dist/queryProcessor.js b/dist/queryProcessor.js
diff --git a/dist/queryProcessor.js.map b/dist/queryProcessor.js.map
diff --git a/dist/test/queryProcessor.js b/dist/test/queryProcessor.js
diff --git a/dist/test/queryProcessor.js.map b/dist/test/queryProcessor.js.map
diff --git a/dist/test/spec/datasource-downsamples_spec.js b/dist/test/spec/datasource-downsamples_spec.js
diff --git a/dist/test/spec/datasource-downsamples_spec.js.map b/dist/test/spec/datasource-downsamples_spec.js.map
diff --git a/dist/test/spec/datasource_spec.js b/dist/test/spec/datasource_spec.js
diff --git a/dist/test/spec/datasource_spec.js.map b/dist/test/spec/datasource_spec.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hawkular-grafana-datasource",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Hawkular Datasource for Grafana",
   "homepage": "https://github.com/hawkular/hawkular-grafana-datasource",
   "repository": {

diff --git a/plugin.json b/plugin.json
@@ -24,8 +24,8 @@
         "url": "https://github.com/hawkular/hawkular-grafana-datasource"
       }
     ],
-    "version": "1.1.1",
-    "updated": "2017-11-14"
+    "version": "1.1.2",
+    "updated": "2018-02-09"
   },
   "dependencies": {
     "grafanaVersion": "3.x.x",