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

Merge pull request #9855 from mtanda/cw_inspector

Browse Source 
(cloudwatch) fix query inspector
This commit is contained in:
Carl Bergquist 2017-11-13 07:43:21 +01:00 committed by GitHub
commit c30947df61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable) {
}; };
this.performTimeSeriesQuery = function(request) { this.performTimeSeriesQuery = function(request) {
return backendSrv.post('/api/tsdb/query', request).then(function (res) { return this.awsRequest('/api/tsdb/query', request).then(function (res) {
var data = []; var data = [];
if (res.results) { if (res.results) {
@ -139,7 +139,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable) {
this.doMetricQueryRequest = function (subtype, parameters) { this.doMetricQueryRequest = function (subtype, parameters) {
var range = timeSrv.timeRange(); var range = timeSrv.timeRange();
return backendSrv.post('/api/tsdb/query', { return this.awsRequest('/api/tsdb/query', {
from: range.from.valueOf().toString(), from: range.from.valueOf().toString(),
to: range.to.valueOf().toString(), to: range.to.valueOf().toString(),
queries: [ queries: [
@ -277,7 +277,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable) {
alarmNamePrefix: annotation.alarmNamePrefix || '' alarmNamePrefix: annotation.alarmNamePrefix || ''
}; };
return backendSrv.post('/api/tsdb/query', { return this.awsRequest('/api/tsdb/query', {
from: options.range.from.valueOf().toString(), from: options.range.from.valueOf().toString(),
to: options.range.to.valueOf().toString(), to: options.range.to.valueOf().toString(),
queries: [ queries: [
@ -325,15 +325,15 @@ function (angular, _, moment, dateMath, kbn, templatingVariable) {
}); });
}; };
this.awsRequest = function(data) { this.awsRequest = function(url, data) {
var options = { var options = {
method: 'POST', method: 'POST',
url: this.proxyUrl, url: url,
data: data data: data
}; };
return backendSrv.datasourceRequest(options).then(function(result) { return backendSrv.datasourceRequest(options).then(function(result) {
return result.data; return result;
}); });
}; };

14
public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
View File

@ -66,8 +66,8 @@ describe('CloudWatchDatasource', function() {
}; };
beforeEach(function() { beforeEach(function() {
ctx.backendSrv.post = function(path, params) { ctx.backendSrv.datasourceRequest = function(params) {
requestParams = params; requestParams = params.data;
return ctx.$q.when(response); return ctx.$q.when(response);
}; };
}); });
@ -211,8 +211,8 @@ describe('CloudWatchDatasource', function() {
}; };
beforeEach(function() { beforeEach(function() {
ctx.backendSrv.post = function(path, params) { ctx.backendSrv.datasourceRequest = function(params) {
requestParams = params; requestParams = params.data;
return ctx.$q.when(response); return ctx.$q.when(response);
}; };
}); });
@ -234,11 +234,7 @@ describe('CloudWatchDatasource', function() {
beforeEach(() => { beforeEach(() => {
setupCallback(); setupCallback();
ctx.backendSrv.datasourceRequest = args => { ctx.backendSrv.datasourceRequest = args => {
scenario.request = args; scenario.request = args.data;
return ctx.$q.when({ data: scenario.requestResponse });
};
ctx.backendSrv.post = (path, args) => {
scenario.request = args;
return ctx.$q.when(scenario.requestResponse); return ctx.$q.when(scenario.requestResponse);
}; };
ctx.ds.metricFindQuery(query).then(args => { ctx.ds.metricFindQuery(query).then(args => {