Skip to content
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

Jump to bottom

Add eslint no-var check. Closes #23. #27

Merged
merged 1 commit into from
Sep 7, 2016
Merged

Add eslint no-var check. Closes #23. #27

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"single"
],
"max-len": 0,
"no-var": "error",
"semi": [
"error",
"always"
Expand Down
8 changes: 4 additions & 4 deletions src/lib/es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ const usage_doc_type = 'UsageEntry';
const ACTIVITY_INITIALIZED = 'HUBOTBLUEMIX.ALERT.INITIALIZED';


var AUDIT_ENDPOINT = process.env.HUBOT_AUDIT_ENDPOINT;
let AUDIT_ENDPOINT = process.env.HUBOT_AUDIT_ENDPOINT;
const groupId = process.env.group_id || 'DEFAULT_GROUP';

let esHost;
var esClient;
let esClient;

function auditDisabled() {
var isDisabled = (process.env.HUBOT_BLUEMIX_AUDIT_DISABLED && (process.env.HUBOT_BLUEMIX_AUDIT_DISABLED === 'TRUE' ||
let isDisabled = (process.env.HUBOT_BLUEMIX_AUDIT_DISABLED && (process.env.HUBOT_BLUEMIX_AUDIT_DISABLED === 'TRUE' ||
process.env.HUBOT_BLUEMIX_AUDIT_DISABLED === 'true'));
var isNotDefined = !AUDIT_ENDPOINT;
let isNotDefined = !AUDIT_ENDPOINT;
return isDisabled || isNotDefined;
}

Expand Down
6 changes: 3 additions & 3 deletions src/scripts/app.alert.help.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
*/
'use strict';

var path = require('path');
var TAG = path.basename(__filename);
const path = require('path');
const TAG = path.basename(__filename);

// --------------------------------------------------------------
// i18n (internationalization)
// It will read from a peer messages.json file. Later, these
// messages can be referenced throughout the module.
// --------------------------------------------------------------
var i18n = new (require('i18n-2'))({
const i18n = new (require('i18n-2'))({
locales: ['en'],
extension: '.json',
// Add more languages to the list of locales when the files are created.
Expand Down
56 changes: 28 additions & 28 deletions src/scripts/app.alerts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
*/
'use strict';

var path = require('path');
var TAG = path.basename(__filename);
const path = require('path');
const TAG = path.basename(__filename);

// --------------------------------------------------------------
// i18n (internationalization)
// It will read from a peer messages.json file. Later, these
// messages can be referenced throughout the module.
// --------------------------------------------------------------
var i18n = new (require('i18n-2'))({
const i18n = new (require('i18n-2'))({
locales: ['en'],
extension: '.json',
// Add more languages to the list of locales when the files are created.
Expand Down Expand Up @@ -68,8 +68,8 @@ const COLOR_RED = palette.negative;

// determines the best color to use when showing event in slack.
function getEventColor(event) {
var state = '';
var color = COLOR_NEUTRAL;
let state = '';
let color = COLOR_NEUTRAL;

if (event.metadata && event.metadata.request && event.metadata.request.state) {
state = event.metadata.request.state;
Expand All @@ -91,7 +91,7 @@ function getEventColor(event) {

// a friendly description to represent the event.
function getEventDescription(event) {
var description = '';
let description = '';

// covers app start/stop events.
if (event.metadata && event.metadata.request && event.metadata.request.state) {
Expand Down Expand Up @@ -126,7 +126,7 @@ function getEventDescription(event) {
}

function getEventActivityId(event) {
var activity_id = 'activity.app.event';
let activity_id = 'activity.app.event';

if (event.type === 'app.crash') {
activity_id = 'activity.app.crash';
Expand All @@ -148,7 +148,7 @@ function enableAlerts(contextKey, robot, space, type, res) {
type = type.trim().toLowerCase();

// get alert config for the space, create if needed.
var spaceConfig = alertContext.spaceConfig[space.guid];
let spaceConfig = alertContext.spaceConfig[space.guid];
if (!spaceConfig) {
spaceConfig = {
guid: space.guid,
Expand Down Expand Up @@ -205,15 +205,15 @@ function enableAlerts(contextKey, robot, space, type, res) {
// space: cf.activeSpace
// type: alert type. undefined means 'all'
function disableAlerts(contextKey, robot, space, type) {
var responseText = '';
let responseText = '';
const alertContext = robot.brain.get(contextKey);

if (!type) {
type = 'all';
}
type = type.trim().toLowerCase();

var spaceConfig = alertContext.spaceConfig[space.guid];
let spaceConfig = alertContext.spaceConfig[space.guid];
if (!spaceConfig) {
responseText = i18n.__('app.alert.disabled.no.alerts', space.name);
}
Expand All @@ -238,7 +238,7 @@ function disableAlerts(contextKey, robot, space, type) {
}

function listAlerts(contextKey, robot) {
var responseText = '';
let responseText = '';
const alertContext = robot.brain.get(contextKey);
const enabledConfigs = getSpacesWithEnabledAlerts(alertContext);

Expand Down Expand Up @@ -269,7 +269,7 @@ function listAlerts(contextKey, robot) {
// type: alert type. cannot be all or undefined.
// threshold: caller must pass a #. This method will check bounds.
function configAlert(contextKey, robot, space, type, threshold) {
var responseText = '';
let responseText = '';
const alertContext = robot.brain.get(contextKey);

if (threshold < 1 || threshold > 100) {
Expand All @@ -295,7 +295,7 @@ function configAlert(contextKey, robot, space, type, threshold) {
// threshold: caller must pass a #. This method will check bounds.
// res: Optional - only used by default context, to provide a way to tie back the asynchronous event notifications to the room where the alerts got enabled.
function enableAndSet(contextKey, robot, space, type, threshold, res) {
var responseText = '';
let responseText = '';

if (threshold < 1 || threshold > 100) {
responseText += i18n.__('app.alert.enable.and.set.invalid', threshold, '%s');
Expand All @@ -321,7 +321,7 @@ function enableAppEvents(contextKey, robot, space, res) {
// the stats of other apps.
function getSingleAppStats(robot, spaceGuid, spaceName, appGuid, appName, app) {
return new Promise((resolve, reject) => {
var appStats = [];
let appStats = [];

try {
robot.logger.info(`${TAG}: Async call using cf module to get stats for appGuid:${appGuid}`);
Expand Down Expand Up @@ -361,13 +361,13 @@ function buildOverallMsgs(overallAppAlert, app, cpuViolation, memoryViolation, d
const INCREASE_MEMORY = 256;
const INCREASE_DISK = 512;

var textMsgId = 'app.alert.monitor.resource.text' + (cpuViolation ? '.cpu' : '') + (memoryViolation ? '.memory' : '') + (diskViolation ? '.disk' : '');
var textMsg = i18n.__(textMsgId, overallAppAlert.app_name, overallAppAlert.space_name);
let textMsgId = 'app.alert.monitor.resource.text' + (cpuViolation ? '.cpu' : '') + (memoryViolation ? '.memory' : '') + (diskViolation ? '.disk' : '');
let textMsg = i18n.__(textMsgId, overallAppAlert.app_name, overallAppAlert.space_name);

var scaleCmd = `app scale ${app.name} to` + (cpuViolation ? ` ${app.instances + INCREASE_INSTANCES} instances` : '') + (memoryViolation ? ` ${app.memory + INCREASE_MEMORY} memory` : '') + (diskViolation ? ` ${app.disk_quota + INCREASE_DISK} disk` : '');
var simpleScaleCmd = `app scale ${app.name}`;
var simpleRestartCmd = `app restart ${app.name}`;
var recommendationMsg = i18n.__('app.command.or', scaleCmd) + i18n.__('app.command.or', simpleScaleCmd) + i18n.__('app.command.last', simpleRestartCmd);
let scaleCmd = `app scale ${app.name} to` + (cpuViolation ? ` ${app.instances + INCREASE_INSTANCES} instances` : '') + (memoryViolation ? ` ${app.memory + INCREASE_MEMORY} memory` : '') + (diskViolation ? ` ${app.disk_quota + INCREASE_DISK} disk` : '');
let simpleScaleCmd = `app scale ${app.name}`;
let simpleRestartCmd = `app restart ${app.name}`;
let recommendationMsg = i18n.__('app.command.or', scaleCmd) + i18n.__('app.command.or', simpleScaleCmd) + i18n.__('app.command.last', simpleRestartCmd);

overallAppAlert.textMsg = textMsg;
overallAppAlert.recommendationMsg = recommendationMsg;
Expand All @@ -377,13 +377,13 @@ function buildOverallMsgs(overallAppAlert, app, cpuViolation, memoryViolation, d
// gets "thresholds alerts" describing any resource usage violation based on the thresholds in the provide space config.
function getThresholdAlerts(robot, spaceConfig) {
return new Promise((resolve, reject) => {
var thresholdAlerts = [];
let thresholdAlerts = [];

try {
robot.logger.info(`${TAG}: Async call using cf module to get summary for space:${spaceConfig.guid}`);
cf.Spaces.getSummary(spaceConfig.guid).then((result) => {
if (result.apps && result.apps.length) {
var appStatsPromises = [];
let appStatsPromises = [];
result.apps.forEach((app) => {
if (app.state === 'STARTED') {
appStatsPromises.push(getSingleAppStats(robot, spaceConfig.guid, spaceConfig.name, app.guid, app.name, app));
Expand Down Expand Up @@ -503,7 +503,7 @@ function getThresholdAlerts(robot, spaceConfig) {
// thresholdReq - optional: indicates to only consider threshold alerts (used in case we expand in future)
// alertType - optional: only return configs that have a specific type of alert enabled.
function getSpacesWithEnabledAlerts(alertContext, thresholdReq, alertType) {
var configs = [];
let configs = [];

for (let guid in alertContext.spaceConfig) {
let spaceConfig = alertContext.spaceConfig[guid];
Expand All @@ -527,11 +527,11 @@ function getSpacesWithEnabledAlerts(alertContext, thresholdReq, alertType) {
}

function getRoom(robot, res) {
var room;
let room;

if (robot && robot.adapter && robot.adapter.client && robot.adapter.client.rtm && robot.adapter.client.rtm.dataStore &&
res && res.message && res.message.room) {
var roomObj = robot.adapter.client.rtm.dataStore.getChannelGroupOrDMById(res.message.room);
let roomObj = robot.adapter.client.rtm.dataStore.getChannelGroupOrDMById(res.message.room);
if (roomObj.name) {
room = roomObj.name;
}
Expand All @@ -541,7 +541,7 @@ function getRoom(robot, res) {
}

function allAlertsDisabled(spaceConfig) {
var enabled = false;
let enabled = false;

for (let type in spaceConfig.alerts) {
let alert = spaceConfig.alerts[type];
Expand All @@ -567,8 +567,8 @@ function monitorAppResources(robot) {

// promise for the processing of each space. These promises wouldn't be rejected, so that rescheduling
// wouldn't take place until processing of each space has completed regardless if 1 space fails to process.
var spacePromises = [];
var processSpace = function(spaceConfig) {
let spacePromises = [];
let processSpace = function(spaceConfig) {
return new Promise((resolve, reject) => {
robot.logger.info(`${TAG}: Async call to getThresholdAlerts() for space:${spaceConfig.guid}`);
getThresholdAlerts(robot, spaceConfig).then((result) => {
Expand Down
24 changes: 12 additions & 12 deletions src/scripts/app.problems.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
*/
'use strict';

var path = require('path');
var TAG = path.basename(__filename);
const path = require('path');
const TAG = path.basename(__filename);

// --------------------------------------------------------------
// i18n (internationalization)
// It will read from a peer messages.json file. Later, these
// messages can be referenced throughout the module.
// --------------------------------------------------------------
var i18n = new (require('i18n-2'))({
const i18n = new (require('i18n-2'))({
locales: ['en'],
extension: '.json',
// Add more languages to the list of locales when the files are created.
Expand Down Expand Up @@ -54,7 +54,7 @@ function getTrailingS(count) {
* Create display string based upon the given counts.
*/
function getDisplayString(probIndex, appName, crashCount, cpuCount, memoryCount, diskCount) {
var dispString = `\n${probIndex}. The \`${appName}\` application `;
let dispString = `\n${probIndex}. The \`${appName}\` application `;

// Add crash count with slack annotations to display string
if (crashCount > 0) {
Expand All @@ -70,8 +70,8 @@ function getDisplayString(probIndex, appName, crashCount, cpuCount, memoryCount,
dispString += 'had ';

// Figure out separating text to put before memory and disk counts
var memPreText = '';
var diskPreText = '';
let memPreText = '';
let diskPreText = '';
if (cpuCount > 0) {
if (memoryCount > 0) {
if (diskCount > 0) {
Expand Down Expand Up @@ -129,8 +129,8 @@ function getMostProblematic(robot, timeframe) {
}

return new Promise((resolve, reject) => {
var startTime = new Date();
var endTime = new Date();
let startTime = new Date();
let endTime = new Date();
let dispTimeframe = ' ' + timeframe;
if (!timeframe) {
startTime.setTime(0);
Expand All @@ -142,7 +142,7 @@ function getMostProblematic(robot, timeframe) {
}
else if (timeframe.indexOf('week') > -1) {
// 7 days from now.
var seven_days_in_ms = 1000 * 60 * 60 * 24 * 7;
let seven_days_in_ms = 1000 * 60 * 60 * 24 * 7;
startTime = new Date(startTime - seven_days_in_ms);
}

Expand All @@ -168,9 +168,9 @@ function getMostProblematic(robot, timeframe) {
if (result && result.aggregations && result.aggregations.app_problems && result.aggregations.app_problems.buckets) {
let buckets = result.aggregations.app_problems.buckets;
let problematicApps = '';
var problematicAppCount = 0;
let problematicAppCount = 0;

for (var i = 0; (i < buckets.length && problematicAppCount < MAX_PROBLEMATIC_APPS); i++) {
for (let i = 0; (i < buckets.length && problematicAppCount < MAX_PROBLEMATIC_APPS); i++) {
let bucket = buckets[i];
let appName = bucket.key;
let crashCount = 0;
Expand All @@ -179,7 +179,7 @@ function getMostProblematic(robot, timeframe) {
let diskThresholdViolationCount = 0;
if (bucket.app_activity_type && bucket.app_activity_type.buckets) {
let subbuckets = bucket.app_activity_type.buckets;
for (var j = 0; j < subbuckets.length; j++) {
for (let j = 0; j < subbuckets.length; j++) {
let subbucket = subbuckets[j];
if (subbucket.key === 'activity.app.crash') {
crashCount += subbucket.doc_count;
Expand Down