Gehel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/294498
Change subject: Adding a "interactive-team" icinga group for alerting.
......................................................................
Adding a "interactive-team" icinga group for alerting.
This adds an icinga group for the interactive team (yurik, MaxSem and gehel).
It also sends notifications to #wikimedia-interactive.
This requires the contacts for yurik and MaxSem to be added in our private
git repo.
Bug: T137869
Change-Id: I5ad6fcb369985939bc6f4d9a6a87891bc0f0f7fb
---
M modules/icinga/manifests/ircbot.pp
M modules/nagios_common/files/contactgroups.cfg
M modules/nagios_common/templates/notification_commands.cfg.erb
3 files changed, 24 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/98/294498/1
diff --git a/modules/icinga/manifests/ircbot.pp
b/modules/icinga/manifests/ircbot.pp
index 3b25e94..6cd2ae9 100644
--- a/modules/icinga/manifests/ircbot.pp
+++ b/modules/icinga/manifests/ircbot.pp
@@ -4,12 +4,13 @@
class icinga::ircbot {
$ircecho_logs = {
- '/var/log/icinga/irc.log' => '#wikimedia-operations',
- '/var/log/icinga/irc-wikidata.log' => '#wikidata',
- '/var/log/icinga/irc-releng.log' => '#wikimedia-releng',
- '/var/log/icinga/irc-labs.log' => '#wikimedia-labs',
- '/var/log/icinga/irc-analytics.log' => '#wikimedia-analytics',
- '/var/log/icinga/irc-ores.log' => '#wikimedia-ai',
+ '/var/log/icinga/irc.log' => '#wikimedia-operations',
+ '/var/log/icinga/irc-wikidata.log' => '#wikidata',
+ '/var/log/icinga/irc-releng.log' => '#wikimedia-releng',
+ '/var/log/icinga/irc-labs.log' => '#wikimedia-labs',
+ '/var/log/icinga/irc-analytics.log' => '#wikimedia-analytics',
+ '/var/log/icinga/irc-ores.log' => '#wikimedia-ai',
+ '/var/log/icinga/irc-interactive.log' => '#wikimedia-interactive',
}
$ircecho_nick = 'icinga-wm'
$ircecho_server = 'chat.freenode.net'
diff --git a/modules/nagios_common/files/contactgroups.cfg
b/modules/nagios_common/files/contactgroups.cfg
index 90ea442..05c4da2 100644
--- a/modules/nagios_common/files/contactgroups.cfg
+++ b/modules/nagios_common/files/contactgroups.cfg
@@ -74,3 +74,8 @@
contactgroup_name team-discovery
members discovery-alerts,irc
}
+
+define contactgroup {
+ contactgroup_name team-interactive
+ members irc-interactive,yurik,MaxSem,gehel
+}
diff --git a/modules/nagios_common/templates/notification_commands.cfg.erb
b/modules/nagios_common/templates/notification_commands.cfg.erb
index 22b8bfb..607110d 100644
--- a/modules/nagios_common/templates/notification_commands.cfg.erb
+++ b/modules/nagios_common/templates/notification_commands.cfg.erb
@@ -68,7 +68,18 @@
command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >>
<%= @irc_dir_path %>/irc-wikidata.log
}
-# IRC output for RelEng team
+# IRC output for interactive
+define command{
+ command_name notify-host-by-irc-interactive
+ command_line echo "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is
$HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >> <%=
@irc_dir_path %>/irc-interactive.log
+ }
+
+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
+ }
+
+ # IRC output for RelEng team
define command{
command_name notify-host-by-irc-releng
command_line echo "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is
$HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >> <%=
@irc_dir_path %>/irc-releng.log
--
To view, visit https://gerrit.wikimedia.org/r/294498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ad6fcb369985939bc6f4d9a6a87891bc0f0f7fb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <gleder...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
