Skip to content

N
nexpie-grafana-theme
Commit d7d20a5b by Mitsuhiro Tanda Committed by Torkel Ödegaard
Options

CloudWatch: fix color order (#16408) 

* fix cloudwatch color order

* fix test

* use for-of
parent 3c21a121
Showing with 10 additions and 4 deletions
public/app/plugins/datasource/cloudwatch/datasource.ts
...@@ -138,15 +138,16 @@ export default class CloudWatchDatasource { ...@@ -138,15 +138,16 @@ export default class CloudWatchDatasource {
const data = []; const data = [];
if (res.results) { if (res.results) {
_.forEach(res.results, queryRes => { for (const query of request.queries) {
_.forEach(queryRes.series, series => { const queryRes = res.results[query.refId];
for (const series of queryRes.series) {
const s = { target: series.name, datapoints: series.points } as any; const s = { target: series.name, datapoints: series.points } as any;
if (queryRes.meta.unit) { if (queryRes.meta.unit) {
s.unit = queryRes.meta.unit; s.unit = queryRes.meta.unit;
} }
data.push(s); data.push(s);
}); }
}); }
} }
return { data: data }; return { data: data };
......
public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts
...@@ -42,6 +42,7 @@ describe('CloudWatchDatasource', () => { ...@@ -42,6 +42,7 @@ describe('CloudWatchDatasource', () => {
rangeRaw: { from: 1483228800, to: 1483232400 }, rangeRaw: { from: 1483228800, to: 1483232400 },
targets: [ targets: [
{ {
refId: 'A',
region: 'us-east-1', region: 'us-east-1',
namespace: 'AWS/EC2', namespace: 'AWS/EC2',
metricName: 'CPUUtilization', metricName: 'CPUUtilization',
...@@ -103,6 +104,7 @@ describe('CloudWatchDatasource', () => { ...@@ -103,6 +104,7 @@ describe('CloudWatchDatasource', () => {
rangeRaw: { from: 1483228800, to: 1483232400 }, rangeRaw: { from: 1483228800, to: 1483232400 },
targets: [ targets: [
{ {
refId: 'A',
region: 'us-east-1', region: 'us-east-1',
namespace: 'AWS/EC2', namespace: 'AWS/EC2',
metricName: 'CPUUtilization', metricName: 'CPUUtilization',
...@@ -128,6 +130,7 @@ describe('CloudWatchDatasource', () => { ...@@ -128,6 +130,7 @@ describe('CloudWatchDatasource', () => {
rangeRaw: { from: 1483228800, to: 1483232400 }, rangeRaw: { from: 1483228800, to: 1483232400 },
targets: [ targets: [
{ {
refId: 'A',
region: 'us-east-1', region: 'us-east-1',
namespace: 'AWS/EC2', namespace: 'AWS/EC2',
metricName: 'CPUUtilization', metricName: 'CPUUtilization',
...@@ -178,6 +181,7 @@ describe('CloudWatchDatasource', () => { ...@@ -178,6 +181,7 @@ describe('CloudWatchDatasource', () => {
rangeRaw: { from: 1483228800, to: 1483232400 }, rangeRaw: { from: 1483228800, to: 1483232400 },
targets: [ targets: [
{ {
refId: 'A',
region: 'default', region: 'default',
namespace: 'AWS/EC2', namespace: 'AWS/EC2',
metricName: 'CPUUtilization', metricName: 'CPUUtilization',
...@@ -203,6 +207,7 @@ describe('CloudWatchDatasource', () => { ...@@ -203,6 +207,7 @@ describe('CloudWatchDatasource', () => {
rangeRaw: { from: 1483228800, to: 1483232400 }, rangeRaw: { from: 1483228800, to: 1483232400 },
targets: [ targets: [
{ {
refId: 'A',
region: 'us-east-1', region: 'us-east-1',
namespace: 'AWS/ApplicationELB', namespace: 'AWS/ApplicationELB',
metricName: 'TargetResponseTime', metricName: 'TargetResponseTime',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment