Merge pull request #58 from Financial-Times/cloudwatch-mk2

CloudWatch sample window fix v2
Financial-Times · Mar 28, 2017 · fce7a75 · fce7a75
2 parents 8a0417b + 1309236
commit fce7a75
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/checks/cloudWatchThreshold.check.js b/src/checks/cloudWatchThreshold.check.js
@@ -28,12 +28,9 @@ class CloudWatchThresholdCheck extends Check {
 	}
 
 	generateParams() {
-		// use a larger window when gathering stats with a 60s period, because
-		// CloudWatch can take its time with populating new datapoints.
-		let timeWindow = this.samplePeriod;
-		if(timeWindow === 60) {
-			timeWindow = 90;
-		}
+		// use a larger window when gathering stats, because CloudWatch
+		// can take its sweet time with populating new datapoints.
+		let timeWindow = this.samplePeriod * 1.5;
 		return  {
 			EndTime: moment().toISOString(),
 			StartTime: moment().subtract(timeWindow, 'seconds').toISOString(),

diff --git a/test/cloudWatchThreshold.check.spec.js b/test/cloudWatchThreshold.check.spec.js
@@ -54,7 +54,7 @@ describe('CloudWatch Threshold Check', () => {
 		});
 	});
 
-	it('should be unhealty if below threshold', done => {
+	it('should be unhealthy if below threshold', done => {
 		cloudWatchMock = cloudWatchDatapointMock;
 		check = new Check(getCheckConfig({
 			threshold: 40
@@ -79,7 +79,7 @@ describe('CloudWatch Threshold Check', () => {
 		});
 	});
 
-	it('should be unhealty if above threshold', done => {
+	it('should be unhealthy if above threshold', done => {
 		cloudWatchMock = cloudWatchDatapointMock;
 		check = new Check(getCheckConfig({
 			threshold: 100,
@@ -178,7 +178,7 @@ describe('CloudWatch Threshold Check', () => {
 		});
 	});
 
-	it('should use a 300 second window for a 300 second period', (done) => {
+	it('should use a 450 second window for a 300 second period', (done) => {
 		cloudWatchMock = cloudWatchDatapointMock;
 		check = new Check(getCheckConfig({
 			samplePeriod: 300
@@ -187,7 +187,7 @@ describe('CloudWatch Threshold Check', () => {
 		setTimeout(() => {
 			let args = cloudWatchMock.firstCall.args[0];
 			let timeWindow = new Date(args.EndTime) - new Date(args.StartTime);
-			expect(timeWindow).to.equal(300 * 1000);
+			expect(timeWindow).to.equal(450 * 1000);
 			done();
 		});
 	});