|
|
@@ -217,7 +217,8 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
|
|
|
targets: [],
|
|
|
|
|
|
aliasColors: {},
|
|
|
- aliasYAxis: {}
|
|
|
+ aliasYAxis: {},
|
|
|
+ aliasFillStyle: {}
|
|
|
};
|
|
|
|
|
|
_.defaults($scope.panel,_d);
|
|
|
@@ -338,15 +339,18 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
|
|
|
if(results.length === 0 ) {
|
|
|
return [];
|
|
|
}
|
|
|
+ _.each(results, function(targetData) {
|
|
|
+ var alias = targetData.target;
|
|
|
+ var color = $scope.panel.aliasColors[alias] || $scope.colors[data.length];
|
|
|
+ var yaxis = $scope.panel.aliasYAxis[alias] || 1;
|
|
|
|
|
|
- var tsOpts = {
|
|
|
- interval: $scope.interval,
|
|
|
- start_date: $scope.range && $scope.range.from,
|
|
|
- end_date: $scope.range && $scope.range.to,
|
|
|
- fill_style: 'no'
|
|
|
- };
|
|
|
+ var tsOpts = {
|
|
|
+ interval: $scope.interval,
|
|
|
+ start_date: $scope.range && $scope.range.from,
|
|
|
+ end_date: $scope.range && $scope.range.to,
|
|
|
+ fill_style: $scope.panel.aliasFillStyle[alias] || 'no',
|
|
|
+ };
|
|
|
|
|
|
- _.each(results, function(targetData) {
|
|
|
var time_series = new timeSeries.ZeroFilled(tsOpts);
|
|
|
|
|
|
_.each(targetData.datapoints, function(valueArray) {
|
|
|
@@ -355,10 +359,6 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- var alias = targetData.target;
|
|
|
- var color = $scope.panel.aliasColors[alias] || $scope.colors[data.length];
|
|
|
- var yaxis = $scope.panel.aliasYAxis[alias] || 1;
|
|
|
-
|
|
|
var seriesInfo = {
|
|
|
alias: alias,
|
|
|
color: color,
|