Volans has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391237 )
Change subject: Icinga notification: use notes_url in messages
......................................................................
Icinga notification: use notes_url in messages
* Use the notes_url in some of the alert notification messages, to
include the links to Grafana dashboards, when set.
Don't include them in the notification by SMS for readability and to
avoid them being cut by the SMS length limitations.
Bug: T170353
Change-Id: I4b3b38646d7ec082fcf0129f9537bfa0b21dca0c
---
M modules/nagios_common/templates/notification_commands.cfg.erb
1 file changed, 13 insertions(+), 13 deletions(-)
Approvals:
jenkins-bot: Verified
Volans: Looks good to me, approved
diff --git a/modules/nagios_common/templates/notification_commands.cfg.erb
b/modules/nagios_common/templates/notification_commands.cfg.erb
index 61eb75e..f3281fe 100644
--- a/modules/nagios_common/templates/notification_commands.cfg.erb
+++ b/modules/nagios_common/templates/notification_commands.cfg.erb
@@ -33,7 +33,7 @@
# 'notify-by-email' command definition
define command{
command_name notify-by-email
- command_line /usr/bin/printf "%b" "Notification Type:
$NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress:
$HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional
Info:\n\n$SERVICEOUTPUT$" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ alert -
$HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
+ command_line /usr/bin/printf "%b" "Notification Type:
$NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress:
$HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nNotes URL:
$SERVICENOTESURL$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | /usr/bin/mail -s
"** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **"
$CONTACTEMAIL$
}
# 'notify-by-sms-gateway' command definitions
@@ -54,7 +54,7 @@
define command{
command_name notify-service-by-irc
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc.log
}
# IRC output for wikidata
@@ -65,7 +65,7 @@
define command{
command_name notify-service-by-irc-wikidata
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc-wikidata.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc-wikidata.log
}
# IRC output for interactive
@@ -76,7 +76,7 @@
define command{
command_name notify-service-by-irc-interactive
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc-interactive.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc-interactive.log
}
# IRC output for RelEng team
@@ -87,7 +87,7 @@
define command{
command_name notify-service-by-irc-releng
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc-releng.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc-releng.log
}
# IRC output for (tool)labs
@@ -98,7 +98,7 @@
define command{
command_name notify-service-by-irc-labs
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc-labs.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc-labs.log
}
# IRC output for Analytics
@@ -109,7 +109,7 @@
define command{
command_name notify-service-by-irc-analytics
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc-analytics.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc-analytics.log
}
# IRC output for Countervandalism Network
@@ -120,7 +120,7 @@
define command{
command_name notify-service-by-irc-cvn
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc-cvn.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc-cvn.log
}
# IRC output for WMT
@@ -131,7 +131,7 @@
define command{
command_name notify-service-by-irc-wmt
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc-wmt.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc-wmt.log
}
# IRC output for ORES
@@ -142,7 +142,7 @@
define command{
command_name notify-service-by-irc-ores
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc-ores.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc-ores.log
}
# IRC output for performance
@@ -153,7 +153,7 @@
define command{
command_name notify-service-by-irc-performance
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc-performance.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc-performance.log
}
# IRC output for fundraising
@@ -164,7 +164,7 @@
define command{
command_name notify-service-by-irc-fundraising
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc-fundraising.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc-fundraising.log
}
# IRC output for Reading Web
@@ -175,5 +175,5 @@
define command{
command_name notify-service-by-irc-reading-web
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc-reading-web.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc-reading-web.log
}
--
To view, visit https://gerrit.wikimedia.org/r/391237
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b3b38646d7ec082fcf0129f9537bfa0b21dca0c
Gerrit-PatchSet: 11
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
