IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

small changes to influxdb aliasing, and help text, #525

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-07-03 09:27:11 +02:00
parent 6c93dc6a4c
commit 0fc8c4e071
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/partials/influxdb/editor.html
View File

@ -154,16 +154,16 @@
</div>
</div>
<div class="pull-left" style="margin-top: 30px;">
<div class="pull-left metrics-editor-help" style="margin-top: 30px;">
<div class="span6">
<span>
<i class="icon-question-sign"></i> alias patterns:
<ul>
<li>$s = seriesName</li>
<li>$g = group by value</li>
<li>$[0-9] part of series name for series names seperated by dots.</li>
<ul>
</span>
<ul class="hide">
<li>$s = series name</li>
<li>$g = group by</li>
<li>$[0-9] part of series name for series names seperated by dots.</li>
<ul>
</div>
</div>
</div>

2
src/app/services/influxdb/influxSeries.js
View File

@ -52,7 +52,7 @@ function (_) {
datapoints[i] = [metricValue, groupPoints[i][timeCol]];
}
seriesName = series.name;
seriesName = series.name + '.' + key;
if (self.alias) {
seriesName = self.createNameForSeries(series.name, key);

2
src/css/bootstrap.dark.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
src/css/bootstrap.light.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
src/css/default.min.css vendored
View File

File diff suppressed because one or more lines are too long

7
src/css/less/grafana.less
View File

@ -468,3 +468,10 @@ select.grafana-target-segment-input {
padding-top: 15px;
text-align: left;
}
.metrics-editor-help:hover {
.hide {
display: block;
}
}