mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
url decode metric names #327
This commit is contained in:
parent
21b96068e4
commit
5d6998cf0b
2
src/app/directives/grafanaGraph.js
Normal file → Executable file
2
src/app/directives/grafanaGraph.js
Normal file → Executable file
@ -313,7 +313,7 @@ function (angular, $, kbn, moment, _) {
|
||||
if (seriesInfo.alias) {
|
||||
group = '<small style="font-size:0.9em;">' +
|
||||
'<i class="icon-circle" style="color:'+item.series.color+';"></i>' + ' ' +
|
||||
(seriesInfo.alias || seriesInfo.query)+
|
||||
(decodeURIComponent(seriesInfo.alias) || seriesInfo.query)+
|
||||
'</small><br>';
|
||||
} else {
|
||||
group = kbn.query_color_dot(item.series.color, 15) + ' ';
|
||||
|
6
src/app/filters/all.js
Normal file → Executable file
6
src/app/filters/all.js
Normal file → Executable file
@ -114,4 +114,10 @@ define(['angular', 'jquery', 'underscore', 'moment'], function (angular, $, _, m
|
||||
};
|
||||
});
|
||||
|
||||
module.filter('urlDecode', function() {
|
||||
return function(input) {
|
||||
return decodeURIComponent(input);
|
||||
};
|
||||
});
|
||||
|
||||
});
|
2
src/app/panels/filtering/module.html
Normal file → Executable file
2
src/app/panels/filtering/module.html
Normal file → Executable file
@ -17,7 +17,7 @@
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li ng-repeat="option in filter.options">
|
||||
<a ng-click="filterOptionSelected(filter, option)">{{option.text}}</a>
|
||||
<a ng-click="filterOptionSelected(filter, option)">{{option.text | urlDecode}}</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
2
src/app/panels/graphite/legend.html
Normal file → Executable file
2
src/app/panels/graphite/legend.html
Normal file → Executable file
@ -9,7 +9,7 @@
|
||||
</i>
|
||||
<span class='small histogram-legend-item'>
|
||||
<a ng-click="toggleSeries(series, $event)" data-unique="1" data-placement="{{series.yaxis === 2 ? 'bottomRight' : 'bottomLeft'}}">
|
||||
{{series.alias}}
|
||||
{{series.alias | urlDecode }}
|
||||
</a>
|
||||
<span ng-if="panel.legend.values">
|
||||
<span ng-show="panel.legend.current">
|
||||
|
2
src/app/partials/graphite/editor.html
Normal file → Executable file
2
src/app/partials/graphite/editor.html
Normal file → Executable file
@ -70,7 +70,7 @@
|
||||
</a>
|
||||
<ul class="dropdown-menu scrollable grafana-segment-dropdown-menu" role="menu">
|
||||
<li ng-repeat="altSegment in altSegments" role="menuitem">
|
||||
<a href="javascript:void(0)" tabindex="1" ng-click="setSegment($index, $parent.$index)" ng-bind-html-unsafe="altSegment.html"></a>
|
||||
<a href="javascript:void(0)" tabindex="1" ng-click="setSegment($index, $parent.$index)" ng-bind-html-unsafe="altSegment.html | urlDecode"></a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
Loading…
Reference in New Issue
Block a user