Skip to content

Commit 7400ae7

Browse files
committed
Version 1.0.8
- Added success message when enabling/disabling alert snooze (better UX). - Added 18 hour option for alert snooze. - Added server IP address to "new server added" activity message and web hook. - Added app name prefix to all activity web hook messages (client/name).
1 parent 2091e48 commit 7400ae7

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

htdocs/js/app.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ app.extend({
294294
this.getTimeMenuItem( 3600 * 3 ),
295295
this.getTimeMenuItem( 3600 * 6 ),
296296
this.getTimeMenuItem( 3600 * 12 ),
297+
this.getTimeMenuItem( 3600 * 18 ),
297298
this.getTimeMenuItem( 86400 ),
298299
this.getTimeMenuItem( 86400 * 2 ),
299300
this.getTimeMenuItem( 86400 * 3 ),
@@ -338,11 +339,11 @@ app.extend({
338339
app.api.post( 'app/update_state', new_state, function(resp) {
339340

340341
if (alert_snooze) {
341-
// app.showMessage('success', "Alerts will be snoozed for " + get_text_from_seconds(alert_snooze, false, true));
342+
app.showMessage('success', "Alerts will be snoozed for " + get_text_from_seconds(alert_snooze, false, true) + ".");
342343
$('#d_alert_ctrl').html( '<i class="mdi mdi-bell-off mdi-lg">&nbsp;</i>Snooze' );
343344
}
344345
else {
345-
// app.showMessage('success', "Alerts have been reactivated.");
346+
app.showMessage('success', "Alerts have been reactivated.");
346347
$('#d_alert_ctrl').html( '<i class="mdi mdi-bell mdi-lg">&nbsp;</i>Active' );
347348
}
348349

lib/api/submit.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ module.exports = Class.create({
279279
if (!data) {
280280
// brand new server
281281
data = { data: { monitors: {} }, alerts: {} };
282-
self.logTransaction('server_add', "New server added to group: " + group_def.title + ": " + params.hostname, {
282+
self.logTransaction('server_add', "New server added to group: " + group_def.title + ": " + params.hostname + " (" + params.ip + ")", {
283283
group: group_def,
284284
hostname: params.hostname,
285285
ip: params.ip
@@ -288,7 +288,7 @@ module.exports = Class.create({
288288
else {
289289
// if server data is stale, consider it new (just for the purposes of logging / web hooks)
290290
if (data.date < Tools.timeNow() - 86400) {
291-
self.logTransaction('server_add', "New server added to group: " + group_def.title + ": " + params.hostname, {
291+
self.logTransaction('server_add', "New server added to group: " + group_def.title + ": " + params.hostname + " (" + params.ip + ")", {
292292
group: group_def,
293293
hostname: params.hostname,
294294
ip: params.ip

lib/engine.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,7 @@ module.exports = Class.create({
586586
hook_args.text = hook_args.description;
587587
delete hook_args.description;
588588
}
589+
hook_args.text = this.server.config.getPath('client/name') + ": " + hook_args.text;
589590
this.logDebug(9, "Firing web hook for " + action + ": " + web_hook_url);
590591
this.request.json( web_hook_url, hook_args, function(err, resp, data) {
591592
// log response

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "performa",
3-
"version": "1.0.7",
3+
"version": "1.0.8",
44
"description": "A multi-server monitoring system with a web based UI.",
55
"author": "Joseph Huckaby <jhuckaby@gmail.com>",
66
"homepage": "https://github.com/jhuckaby/performa",

0 commit comments

Comments
 (0)