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

feat(cloudwatch): refactoring and cleanup of backend code, started moving hard coded stuff in the frontend to the backend, changed name of metricFind queries region() -> regions() , and namespace() -> namespaces() to be more consistent with the others, #684

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-10-02 11:10:21 +02:00
parent 04f4454974
commit 180ba33ac8
6 changed files with 175 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,9 +20,6 @@ function (angular, _) {
this.defaultRegion = datasource.jsonData.defaultRegion;
/* jshint -W101 */
this.supportedRegion = [
'us-east-1', 'us-west-2', 'us-west-1', 'eu-west-1', 'eu-central-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'sa-east-1'
];
this.supportedMetrics = {
'AWS/AutoScaling': [
@@ -265,7 +262,6 @@ function (angular, _) {
CloudWatchDatasource.prototype.performTimeSeriesQuery = function(query, start, end) {
return this.awsRequest({
region: query.region,
service: 'CloudWatch',
action: 'GetMetricStatistics',
parameters: {
namespace: query.namespace,
@@ -280,7 +276,7 @@ function (angular, _) {
};
CloudWatchDatasource.prototype.getRegions = function() {
return $q.when(this.supportedRegion);
return this.awsRequest({action: '__GetRegions'});
};
CloudWatchDatasource.prototype.getNamespaces = function() {
@@ -300,7 +296,6 @@ function (angular, _) {
CloudWatchDatasource.prototype.getDimensionValues = function(region, namespace, metricName, dimensions) {
var request = {
region: templateSrv.replace(region),
service: 'CloudWatch',
action: 'ListMetrics',
parameters: {
namespace: templateSrv.replace(namespace),
@@ -321,7 +316,6 @@ function (angular, _) {
CloudWatchDatasource.prototype.performEC2DescribeInstances = function(region, filters, instanceIds) {
return this.awsRequest({
region: region,
service: 'EC2',
action: 'DescribeInstances',
parameters: {
filter: filters,
@@ -341,12 +335,12 @@ function (angular, _) {
});
};
var regionQuery = query.match(/^region\(\)/);
var regionQuery = query.match(/^regions\(\)/);
if (regionQuery) {
return this.getRegions().then(transformSuggestData);
return this.getRegions();
}
var namespaceQuery = query.match(/^namespace\(\)/);
var namespaceQuery = query.match(/^namespaces\(\)/);
if (namespaceQuery) {
return this.getNamespaces().then(transformSuggestData);
}