Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
119f5427
Commit
119f5427
authored
Nov 16, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: fix cloudwatch metricFindQuery error that stopped it working completely, fixes #9876
parent
5b674ce2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
public/app/plugins/datasource/cloudwatch/datasource.js
+1
-1
public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
+3
-3
No files found.
public/app/plugins/datasource/cloudwatch/datasource.js
View file @
119f5427
...
...
@@ -333,7 +333,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable) {
};
return
backendSrv
.
datasourceRequest
(
options
).
then
(
function
(
result
)
{
return
result
;
return
result
.
data
;
});
};
...
...
public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
View file @
119f5427
...
...
@@ -68,7 +68,7 @@ describe('CloudWatchDatasource', function() {
beforeEach
(
function
()
{
ctx
.
backendSrv
.
datasourceRequest
=
function
(
params
)
{
requestParams
=
params
.
data
;
return
ctx
.
$q
.
when
(
response
);
return
ctx
.
$q
.
when
(
{
data
:
response
}
);
};
});
...
...
@@ -213,7 +213,7 @@ describe('CloudWatchDatasource', function() {
beforeEach
(
function
()
{
ctx
.
backendSrv
.
datasourceRequest
=
function
(
params
)
{
requestParams
=
params
.
data
;
return
ctx
.
$q
.
when
(
response
);
return
ctx
.
$q
.
when
(
{
data
:
response
}
);
};
});
...
...
@@ -235,7 +235,7 @@ describe('CloudWatchDatasource', function() {
setupCallback
();
ctx
.
backendSrv
.
datasourceRequest
=
args
=>
{
scenario
.
request
=
args
.
data
;
return
ctx
.
$q
.
when
(
scenario
.
requestResponse
);
return
ctx
.
$q
.
when
(
{
data
:
scenario
.
requestResponse
}
);
};
ctx
.
ds
.
metricFindQuery
(
query
).
then
(
args
=>
{
scenario
.
result
=
args
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment