IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

re-implement get regions

Browse Source
This commit is contained in:
Mitsuhiro Tanda
2017-09-10 04:24:39 +09:00
parent 0c95148486
commit feed90c0e2
4 changed files with 311 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
public/app/plugins/datasource/cloudwatch/datasource.js
View File

@@ -11,7 +11,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
'use strict';
/** @ngInject */
function CloudWatchDatasource(instanceSettings, $q, backendSrv, templateSrv) {
function CloudWatchDatasource(instanceSettings, $q, backendSrv, templateSrv, timeSrv) {
this.type = 'cloudwatch';
this.name = instanceSettings.name;
this.supportMetrics = true;
@@ -133,7 +133,21 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
};
this.getRegions = function() {
return this.awsRequest({action: '__GetRegions'});
var range = timeSrv.timeRange();
return backendSrv.post('/api/tsdb/query', {
from: range.from,
to: range.to,
queries: [
{
refId: 'metricFindQuery',
intervalMs: 1, // dummy
maxDataPoints: 1, // dummy
datasourceId: this.instanceSettings.id,
type: 'metricFindQuery',
subtype: 'regions'
}
]
});
};
this.getNamespaces = function() {
@@ -200,6 +214,14 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
var namespace;
var metricName;
var transformSuggestDataFromTable = function(suggestData) {
return _.map(suggestData.results['metricFindQuery'].tables[0].rows, function (v) {
return {
text: v[0],
value: v[1]
};
});
};
var transformSuggestData = function(suggestData) {
return _.map(suggestData, function(v) {
return { text: v };
@@ -208,7 +230,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
var regionQuery = query.match(/^regions\(\)/);
if (regionQuery) {
return this.getRegions();
return this.getRegions().then(function (r) { return transformSuggestDataFromTable(r); });
}
var namespaceQuery = query.match(/^namespaces\(\)/);