Просмотр исходного кода

Merge pull request #3292 from mtanda/cloudwatch_null_pointmode

(cloudwatch) fix null point mode
Torkel Ödegaard 10 лет назад
Родитель
Сommit
7d4326a397

+ 1 - 1
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;

+ 1 - 1
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'