Skip to content

Commit 724ffb1

Browse files
committed
Release v1.1.2
1 parent 5cc1f5e commit 724ffb1

13 files changed

+100
-25
lines changed

dist/README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,17 @@ Example, JSON posted on [the Hawkular's REST API](http://www.hawkular.org/hawkul
104104

105105
In the case of Hawkular Alerts events, you need to provide the trigger ID (several comma-separated IDs are allowed).
106106

107+
### Legend
108+
109+
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: `{{(.*)}}`
110+
111+
_Example:_
112+
> 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}`
113+
>
114+
> Legend: `HAProxy Server Bytes In {{namespace=([^,}]+)}} / {{pod=([^,}]+)}}`
115+
>
116+
> Result: `HAProxy Server Bytes In my-namespace / web-45-6f464`
117+
107118
## Installing from sources
108119

109120
Additional information on installing from sources can be found on [hawkular.org](http://www.hawkular.org/hawkular-clients/grafana/docs/quickstart-guide/).

dist/partials/query.editor.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,13 @@
7878
</div>
7979
</div>
8080
</div>
81+
<!-- chart panel -->
82+
<div ng-if="ctrl.panel.type !== 'singlestat'">
83+
<div class="gf-form-inline">
84+
<div class="gf-form">
85+
<label class="gf-form-label query-keyword fix-query-keyword">Legend</label>
86+
<input type="text" class="gf-form-input" ng-model="ctrl.target.legend" ng-change="ctrl.onChangeInternal()" placeholder="default">
87+
</div>
88+
</div>
89+
</div>
8190
</query-editor-row>

dist/plugin.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"url": "https://github.com/hawkular/hawkular-grafana-datasource"
2525
}
2626
],
27-
"version": "1.1.1",
28-
"updated": "2017-11-14"
27+
"version": "1.1.2",
28+
"updated": "2018-02-09"
2929
},
3030
"dependencies": {
3131
"grafanaVersion": "3.x.x",

dist/queryProcessor.js

Lines changed: 25 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/queryProcessor.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/test/queryProcessor.js

Lines changed: 25 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/test/queryProcessor.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/test/spec/datasource-downsamples_spec.js

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/test/spec/datasource-downsamples_spec.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/test/spec/datasource_spec.js

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)