Greg Grossmeier has uploaded a new change for review. https://gerrit.wikimedia.org/r/184199
Change subject: Move notices to -releng from -qa ...................................................................... Move notices to -releng from -qa Also general s/qa/releng/, which I hope was done correctly. Bug: T86053 Change-Id: I094610fb1c6dbde83c62d4a03fb1baab8c30d2ca --- M files/logstash/filter-irc-banglog.conf M manifests/role/logstash.pp M modules/icinga/files/contactgroups.cfg M modules/icinga/manifests/ircbot.pp M modules/nagios_common/templates/notification_commands.cfg.erb M modules/shinken/files/contactgroups.cfg M modules/shinken/files/contacts.cfg M modules/shinken/manifests/ircbot.pp 8 files changed, 16 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/99/184199/1 diff --git a/files/logstash/filter-irc-banglog.conf b/files/logstash/filter-irc-banglog.conf index cfa2315..44cfb5c 100644 --- a/files/logstash/filter-irc-banglog.conf +++ b/files/logstash/filter-irc-banglog.conf @@ -11,7 +11,7 @@ } } - if [channel] == "#wikimedia-qa" or [channel] == "#wikimedia-releng" { + if [channel] == "#wikimedia-releng" { mutate { add_field => [ "project", "qa" ] } diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp index 2c3c949..a1eebe7 100644 --- a/manifests/role/logstash.pp +++ b/manifests/role/logstash.pp @@ -133,7 +133,7 @@ logstash::input::irc { 'freenode': user => $irc_name, nick => $irc_name, - channels => ['#wikimedia-labs', '#wikimedia-qa', '#wikimedia-releng'], + channels => ['#wikimedia-labs', '#wikimedia-releng'], } logstash::input::tcp { 'tcp_json': diff --git a/modules/icinga/files/contactgroups.cfg b/modules/icinga/files/contactgroups.cfg index bc1dde6..efee916 100644 --- a/modules/icinga/files/contactgroups.cfg +++ b/modules/icinga/files/contactgroups.cfg @@ -36,7 +36,7 @@ define contactgroup { contactgroup_name contint - members krinkle,amusso,irc-qa,irc + members krinkle,amusso,irc-releng,irc } define contactgroup { diff --git a/modules/icinga/manifests/ircbot.pp b/modules/icinga/manifests/ircbot.pp index 9b61202..57062ce 100644 --- a/modules/icinga/manifests/ircbot.pp +++ b/modules/icinga/manifests/ircbot.pp @@ -6,10 +6,7 @@ $ircecho_logs = { '/var/log/icinga/irc.log' => '#wikimedia-operations', '/var/log/icinga/irc-wikidata.log' => '#wikidata', - '/var/log/icinga/irc-qa.log' => [ - '#wikimedia-qa', - '#wikimedia-releng', - ], + '/var/log/icinga/irc-releng.log' => '#wikimedia-releng', '/var/log/icinga/irc-labs.log' => '#wikimedia-labs', } $ircecho_nick = 'icinga-wm' diff --git a/modules/nagios_common/templates/notification_commands.cfg.erb b/modules/nagios_common/templates/notification_commands.cfg.erb index 3854ddd..c7c52af 100644 --- a/modules/nagios_common/templates/notification_commands.cfg.erb +++ b/modules/nagios_common/templates/notification_commands.cfg.erb @@ -80,15 +80,15 @@ command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >> <%= @irc_dir_path %>/irc-wikidata.log } -# IRC output for QA team +# IRC output for RelEng team define command{ - command_name notify-host-by-irc-qa - command_line echo "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is $HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >> <%= @irc_dir_path %>/irc-qa.log + command_name notify-host-by-irc-releng + command_line echo "$NOTIFICATIONTYPE$ - Host $HOSTALIAS$ is $HOSTSTATE$: $HOSTOUTPUT$ $HOSTACKAUTHOR$ $HOSTACKCOMMENT$" >> <%= @irc_dir_path %>/irc-releng.log } define command{ - command_name notify-service-by-irc-qa - command_line echo "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >> <%= @irc_dir_path %>/irc-qa.log + 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 } # IRC output for (tool)labs diff --git a/modules/shinken/files/contactgroups.cfg b/modules/shinken/files/contactgroups.cfg index 3e3ee91..f7afe89 100644 --- a/modules/shinken/files/contactgroups.cfg +++ b/modules/shinken/files/contactgroups.cfg @@ -16,7 +16,7 @@ define contactgroup { contactgroup_name deployment-prep alias Beta Cluster Administrators - members guest,yuvipanda,greg_g,cmcmahon,amusso,twentyafterfour,betacluster-alerts-list,irc-qa,kart_ + members guest,yuvipanda,greg_g,cmcmahon,amusso,twentyafterfour,betacluster-alerts-list,irc-releng,kart_ } define contactgroup { diff --git a/modules/shinken/files/contacts.cfg b/modules/shinken/files/contacts.cfg index 0fa0aa6..6f92046 100644 --- a/modules/shinken/files/contacts.cfg +++ b/modules/shinken/files/contacts.cfg @@ -31,15 +31,16 @@ } define contact{ - contact_name irc-qa - alias qa-irc-bot + contact_name irc-releng + alias releng-irc-bot host_notification_period 24x7 service_notification_period 24x7 host_notification_options d,r,f service_notification_options c,r,f email irc@irc - host_notification_commands notify-host-by-irc-qa - service_notification_commands notify-service-by-irc-qa + host_notification_commands notify-host-by-irc-releng + service_notification_commands notify-service-by-irc-releng + } define contact{ diff --git a/modules/shinken/manifests/ircbot.pp b/modules/shinken/manifests/ircbot.pp index 73335f1..f6cf3e2 100644 --- a/modules/shinken/manifests/ircbot.pp +++ b/modules/shinken/manifests/ircbot.pp @@ -25,10 +25,7 @@ $ircecho_logs = { '/var/log/ircecho/irc.log' => '#wikimedia-operations', - '/var/log/ircecho/irc-qa.log' => [ - '#wikimedia-qa', - '#wikimedia-releng', - ], + '/var/log/ircecho/irc-releng.log' => '#wikimedia-releng', '/var/log/ircecho/irc-labs.log' => '#wikimedia-labs', } -- To view, visit https://gerrit.wikimedia.org/r/184199 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I094610fb1c6dbde83c62d4a03fb1baab8c30d2ca Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Greg Grossmeier <g...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits