From 4254aa5f5a27271f88b74f6b86b27813c2e09015 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Tanda Date: Fri, 20 Nov 2015 13:06:25 +0900 Subject: [PATCH] (cloudwatch) fix null point mode --- public/app/plugins/datasource/cloudwatch/datasource.js | 2 +- .../app/plugins/datasource/cloudwatch/specs/datasource_specs.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js index 91b00f8f84a..79f4a6a00c7 100644 --- a/public/app/plugins/datasource/cloudwatch/datasource.js +++ b/public/app/plugins/datasource/cloudwatch/datasource.js @@ -263,7 +263,7 @@ function (angular, _) { }) .each(function(dp) { var timestamp = new Date(dp.Timestamp).getTime(); - if (lastTimestamp && (timestamp - lastTimestamp) > periodMs * 2) { + if (lastTimestamp && (timestamp - lastTimestamp) > periodMs) { dps.push([null, lastTimestamp + periodMs]); } lastTimestamp = timestamp; diff --git a/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts b/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts index 95526e38489..39d48e273b3 100644 --- a/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts +++ b/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts @@ -55,7 +55,7 @@ describe('CloudWatchDatasource', function() { }, { Average: 5, - Timestamp: 'Wed Dec 31 1969 16:20:00 GMT-0800 (PST)' + Timestamp: 'Wed Dec 31 1969 16:15:00 GMT-0800 (PST)' } ], Label: 'CPUUtilization'