Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172980
Change subject: nagios_common: Parameterize path used for ircecho
......................................................................
nagios_common: Parameterize path used for ircecho
Change-Id: Ie3419b9d9fd068e4eb8413d1ca147bef6f8ea475
---
M modules/nagios_common/manifests/notification_commands.pp
M modules/nagios_common/templates/notification_commands.cfg.erb
2 files changed, 15 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/172980/1
diff --git a/modules/nagios_common/manifests/notification_commands.pp
b/modules/nagios_common/manifests/notification_commands.pp
index ecdbb91..dbb32bb 100644
--- a/modules/nagios_common/manifests/notification_commands.pp
+++ b/modules/nagios_common/manifests/notification_commands.pp
@@ -21,12 +21,17 @@
# Name of thing that gives the recipient love when notifying
# them via email of bad things that have happened
#
+# [*irc_dir_path*]
+# Directory containing files that are used by ircecho to
+# echo notifications to IRC
+#
class nagios_common::notification_commands(
$ensure = present,
$config_dir = '/etc/icinga',
$owner = 'icinga',
$group = 'icinga',
$lover_name = 'Icinga',
+ $irc_dir_path = '/var/log/icinga',
) {
file { "$config_dir/notification_commands.cfg":
ensure => $ensure,
diff --git a/modules/nagios_common/templates/notification_commands.cfg.erb
b/modules/nagios_common/templates/notification_commands.cfg.erb
index 81f85f0..ea2cf48 100644
--- a/modules/nagios_common/templates/notification_commands.cfg.erb
+++ b/modules/nagios_common/templates/notification_commands.cfg.erb
@@ -61,45 +61,45 @@
# global IRC output for operations
define command{
command_name notify-host-by-irc
- command_line echo "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is
$HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >>
/var/log/icinga/irc.log
+ command_line echo "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is
$HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >> <%=
@irc_dir_path %>/irc.log
}
define command{
command_name notify-service-by-irc
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
/var/log/icinga/irc.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc.log
}
# IRC output for wikidata
define command{
command_name notify-host-by-irc-wikidata
- command_line echo "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is
$HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >>
/var/log/icinga/irc-wikidata.log
+ command_line echo "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is
$HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >> <%=
@irc_dir_path %>/irc-wikidata.log
}
define command{
command_name notify-service-by-irc-wikidata
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
/var/log/icinga/irc-wikidata.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc-wikidata.log
}
# IRC output for QA team
define command{
command_name notify-host-by-irc-qa
- command_line echo "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is
$HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >>
/var/log/icinga/irc-qa.log
+ command_line echo "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is
$HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >> <%=
@irc_dir_path %>/irc-qa.log
}
define command{
command_name notify-service-by-irc-qa
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
/var/log/icinga/irc-qa.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc-qa.log
}
# IRC output for (tool)labs
define command{
command_name notify-host-by-irc-labs
- command_line echo "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is
$HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >>
/var/log/icinga/irc-labs.log
+ command_line echo "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is
$HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >> <%=
@irc_dir_path %>/irc-labs.log
}
define command{
command_name notify-service-by-irc-labs
- command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
/var/log/icinga/irc-labs.log
+ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc-labs.log
}
################################################################################
@@ -117,12 +117,12 @@
# 'process-host-perfdata' command definition
define command{
command_name process-host-perfdata
- command_line /usr/bin/printf "%b"
"$LASTHOSTCHECK$\t$HOSTNAME$\t$HOSTSTATE$\t$HOSTATTEMPT$\t$HOSTSTATETYPE$\t$HOSTEXECUTIONTIME$\t$HOSTOUTPUT$\t$HOSTPERFDATA$\n"
>> /var/log/icinga/host-perfdata.out
+ command_line /usr/bin/printf "%b"
"$LASTHOSTCHECK$\t$HOSTNAME$\t$HOSTSTATE$\t$HOSTATTEMPT$\t$HOSTSTATETYPE$\t$HOSTEXECUTIONTIME$\t$HOSTOUTPUT$\t$HOSTPERFDATA$\n"
>> <%= @irc_dir_path %>/host-perfdata.out
}
# 'process-service-perfdata' command definition
define command{
command_name process-service-perfdata
- command_line /usr/bin/printf "%b"
"$LASTSERVICECHECK$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATE$\t$SERVICEATTEMPT$\t$SERVICESTATETYPE$\t$SERVICEEXECUTIONTIME$\t$SERVICELATENCY$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n"
>> /var/log/icinga/service-perfdata.out
+ command_line /usr/bin/printf "%b"
"$LASTSERVICECHECK$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATE$\t$SERVICEATTEMPT$\t$SERVICESTATETYPE$\t$SERVICEEXECUTIONTIME$\t$SERVICELATENCY$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n"
>> <%= @irc_dir_path %>/service-perfdata.out
}
--
To view, visit https://gerrit.wikimedia.org/r/172980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3419b9d9fd068e4eb8413d1ca147bef6f8ea475
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
