openstack/monasca-grafana-datasource
Code Issues Proposed changes

Switch templating to use dimension values endpoint

Browse Source 
Change-Id: Iebd7fd20a371a9857c412aee21ba4e8e5780221a
This commit is contained in:
Ryan Bak
2016-07-26 13:37:24 -06:00
parent eb7b0c6c89
commit 19a5c26744
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
datasource.js
View File

@@ -120,6 +120,10 @@ function (angular, _, moment, sdk, dateMath, kbn) {
return data; return data;
}; };
MonascaDatasource.prototype.dimensionValuesQuery = function(params) {
return this._limitedMonascaRequest('/v2.0/metrics/dimensions/names/values', params).catch(function(err) {throw err});
};
MonascaDatasource.prototype.buildDataQuery = function(options, from, to) { MonascaDatasource.prototype.buildDataQuery = function(options, from, to) {
var params = {}; var params = {};
params.name = options.metric; params.name = options.metric;
@@ -468,19 +472,13 @@ function (angular, _, moment, sdk, dateMath, kbn) {
}; };
MonascaDatasource.prototype.metricFindQuery = function(query) { MonascaDatasource.prototype.metricFindQuery = function(query) {
return this.metricsQuery({}).then(function(data) { return this.dimensionValuesQuery({'dimension_name': query}).then(function(data) {
var values = []; var values = [];
data = data.data.elements; data = data.data.elements;
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
var dim_set = data[i].dimensions; values.push(data[i].values);
if (query in dim_set) {
var value = dim_set[query];
if (values.indexOf(value) == -1) {
values.push(value);
} }
} return _.map(_.flatten(values), function(value) {
}
return _.map(values, function(value) {
return {text: value}; return {text: value};
}); });
}); });