Apply alias functions.
This commit is contained in:
@@ -106,6 +106,11 @@ function (angular, _, moment, utils) {
|
|||||||
return _.max(values);
|
return _.max(values);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.setAlias = function(alias, timeseries) {
|
||||||
|
timeseries.target = alias;
|
||||||
|
return timeseries;
|
||||||
|
};
|
||||||
|
|
||||||
this.aggregationFunctions = {
|
this.aggregationFunctions = {
|
||||||
avg: this.AVERAGE,
|
avg: this.AVERAGE,
|
||||||
min: this.MIN,
|
min: this.MIN,
|
||||||
@@ -127,6 +132,7 @@ function (angular, _, moment, utils) {
|
|||||||
average: _.partial(this.aggregateWrapper, this.AVERAGE),
|
average: _.partial(this.aggregateWrapper, this.AVERAGE),
|
||||||
min: _.partial(this.aggregateWrapper, this.MIN),
|
min: _.partial(this.aggregateWrapper, this.MIN),
|
||||||
max: _.partial(this.aggregateWrapper, this.MAX),
|
max: _.partial(this.aggregateWrapper, this.MAX),
|
||||||
|
setAlias: this.setAlias,
|
||||||
};
|
};
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -171,10 +171,16 @@ function (angular, _, dateMath, utils, metricFunctions) {
|
|||||||
return _.contains(
|
return _.contains(
|
||||||
_.map(metricFunctions.getCategories()['Aggregate'], 'name'), func.def.name);
|
_.map(metricFunctions.getCategories()['Aggregate'], 'name'), func.def.name);
|
||||||
});
|
});
|
||||||
timeseries_data = {
|
timeseries_data = [{
|
||||||
target: lastAgg.text,
|
target: lastAgg.text,
|
||||||
datapoints: dp
|
datapoints: dp
|
||||||
};
|
}];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Apply alias functions
|
||||||
|
var aliasFunctions = bindFunctionDefs(target.functions, 'Alias');
|
||||||
|
for (var j = 0; j < aliasFunctions.length; j++) {
|
||||||
|
_.each(timeseries_data, aliasFunctions[j]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return timeseries_data;
|
return timeseries_data;
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ function (_, $) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
addFuncDef({
|
addFuncDef({
|
||||||
name: 'alias',
|
name: 'setAlias',
|
||||||
category: 'Alias',
|
category: 'Alias',
|
||||||
params: [
|
params: [
|
||||||
{ name: 'alias', type: 'string'}
|
{ name: 'alias', type: 'string'}
|
||||||
|
|||||||
Reference in New Issue
Block a user