public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CloudWatch: Avoid exception while accessing results (#17283)

Browse Source 
When accessing the `series` property of query results, if a query is
hidden, an exception is thrown. This is caused by lack of checks to
verify that the query result exists before accessing the `series`
property.

Closes #17112

(cherry picked from commit 5fa5d4bdd5)
This commit is contained in:
Joshua Piccari
2019-05-29 00:10:09 -07:00
committed by Andrej Ocenas
parent 9e40b07fd7
commit c3e5e69e73
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/cloudwatch/datasource.ts
+7 -5
View File
@@ -141,12 +141,14 @@ export default class CloudWatchDatasource implements DataSourceApi<CloudWatchQue
if (res.results) {
for (const query of request.queries) {
const queryRes = res.results[query.refId];
for (const series of queryRes.series) {
const s = { target: series.name, datapoints: series.points } as any;
if (queryRes.meta.unit) {
s.unit = queryRes.meta.unit;
if (queryRes) {
for (const series of queryRes.series) {
const s = { target: series.name, datapoints: series.points } as any;
if (queryRes.meta.unit) {
s.unit = queryRes.meta.unit;
}
data.push(s);
}
data.push(s);
}
}
}