IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix legend

Browse Source
This commit is contained in:
Rashid Khan
2013-12-09 16:23:23 -07:00
parent 931ad9e9b9
commit 4ce88ee7b7
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/panels/histogram/module.html
+4 -4
View File
@@ -43,11 +43,11 @@
<!--<a class='small' ng-click='zoom(0.5)'><i class='icon-zoom-in'></i> Zoom In</a>-->
<a class='small' ng-click='zoom(2)'><i class='icon-zoom-out'></i> Zoom Out</a> |&nbsp
</span>
<span ng-show="panel.legend" ng-repeat='series in data' class="histogram-legend">
<i class='icon-circle' ng-style="{color: series.info.color}"></i>
<span ng-show="panel.legend" ng-repeat='series in legend' class="histogram-legend">
<i class='icon-circle' ng-style="{color: series.color}"></i>
<span class='small histogram-legend-item'>
<span ng-if="panel.show_query">{{series.info.alias || series.info.query}}</span>
<span ng-if="!panel.show_query">{{series.info.alias}}</span>
<span ng-if="panel.show_query">{{series.alias || series.query}}</span>
<span ng-if="!panel.show_query">{{series.alias}}</span>
<span ng-show="panel.legend_counts"> ({{series.hits}})</span>
</span>
</span>
src/app/panels/histogram/module.js
+6 -1
View File
@@ -380,6 +380,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
return results.then(function(results) {
$scope.panelMeta.loading = false;
if(segment === 0) {
$scope.legend = [];
$scope.hits = 0;
data = [];
$scope.annotations = [];
@@ -423,6 +424,9 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
hits += entry.count; // The series level hits counter
$scope.hits += entry.count; // Entire dataset level hits counter
});
$scope.legend[i] = q;
data[i] = {
info: q,
time_series: time_series,
@@ -530,7 +534,8 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
});
// Receive render events
scope.$on('render',function(event,data){
scope.$on('render',function(event,d){
data = d || data;
render_panel(data);
});