Skip to content

Log the service states every time there's an alert, instead of on int… #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dotanrs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Log the service states every time there's an alert, instead of on int… #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/Checker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
const moment = require('moment');
const _ = require('lodash');

const { getLogger } = require('./logger');
const { DEPLOYMENT_STATES } = require('./consts');

class Checker {
Expand Down Expand Up @@ -30,14 +31,23 @@ class Checker {

this._updateTaskDefs(serviceNames, serviceStates);

return {
serviceDeployStates,
const alerts = {
serviceDeployingAlerts,
serviceScalingAlerts,
serviceRecoverAlerts,
serviceDeployDoneAlerts,
serviceDeployTimeoutAlerts,
};

if (this._hasAlerts(alerts)) {
getLogger().debug('An alert was created', { ...serviceDeployStates });
Copy link
Copy Markdown
Contributor

@shaharke shaharke Dec 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you see debug messages? We're not filtering them?

Copy link
Copy Markdown
Contributor Author

@dotanrs dotanrs Dec 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For me they're on by default in DDG. But even if not, these logs are really just for debugging so you can just turn them on

}

return { ...alerts, serviceDeployStates };
}

_hasAlerts(iterationResults) {
return _.some(_.mapValues(iterationResults, list => list.length > 0));
}

_getDeploymentStates(serviceNames, newStates) {
Expand Down
6 changes: 1 addition & 5 deletions src/checker-loop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ const { getLogger, loggerInit } = require('./logger');
const Checker = require('./Checker');
const ecsApi = require('./ecs-api');
const Messager = require('./Messager');
const utils = require('./utils');
const defaults = require('./defaults');

const { DEPLOYMENT_STATES } = require('./consts');

async function runCheck(params, messageSender, messageFormatter) {
const { providedLogger, serviceNamesOverride, checkIntervalSeconds, secondsUntilAlert, logInterval, refreshServicesInterval, ecsCluster, ecsRegion } = _.merge(defaults, params);
const { providedLogger, serviceNamesOverride, checkIntervalSeconds, secondsUntilAlert, refreshServicesInterval, ecsCluster, ecsRegion } = _.merge(defaults, params);
loggerInit(providedLogger);
ecsApi.initECS(ecsRegion);

Expand All @@ -30,13 +29,10 @@ async function runCheck(params, messageSender, messageFormatter) {

const initialServiceStates = await ecsApi.runCheckInBatches(ecsCluster, serviceNameBatches);
const checker = new Checker(secondsUntilAlert, initialServiceStates);
const intervalLogger = utils.runInInterval(logInterval, utils.printLogContent);

setInterval(async () => {
const serviceStates = await ecsApi.runCheckInBatches(ecsCluster, serviceNameBatches);
const results = checker.iterate(serviceStates);

intervalLogger(results.serviceDeployStates);
await messager.sendMessages(results);
}, checkIntervalSeconds * 1000);
}
Expand Down
1 change: 0 additions & 1 deletion src/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ module.exports = {
serviceNamesOverride: [],
checkIntervalSeconds: 5,
secondsUntilAlert: 60,
logInterval: 5,
refreshServicesInterval: 20,
ecsCluster: null,
};
23 changes: 0 additions & 23 deletions src/utils.js
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions tests/checker-alert-creation.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
const moment = require('moment');
const { mockResults, checkAlerts } = require('./test-utils');
const Checker = require('../src/Checker');
const { loggerInit } = require('../src/logger');

loggerInit(console);

describe('Deployment checker', () => {
let checker;
Expand Down
3 changes: 3 additions & 0 deletions tests/checker-status-calculations.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
const { DEPLOYMENT_STATES } = require('../src/consts');
const { mockResults } = require('./test-utils');
const Checker = require('../src/Checker');
const { loggerInit } = require('../src/logger');

loggerInit(console);

describe('Deployment checker', () => {
let checker;
Expand Down