Yuvipanda has submitted this change and it was merged.
Change subject: icinga: Move ircecho code into module
......................................................................
icinga: Move ircecho code into module
Change-Id: I92f850d4e86e13e1af8f775c3e0affed101ead5f
---
D manifests/role/echoirc.pp
M manifests/role/icinga.pp
M manifests/site.pp
A modules/icinga/manifests/ircbot.pp
4 files changed, 40 insertions(+), 42 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
Giuseppe Lavagetto: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/role/echoirc.pp b/manifests/role/echoirc.pp
deleted file mode 100644
index ba72105..0000000
--- a/manifests/role/echoirc.pp
+++ /dev/null
@@ -1,40 +0,0 @@
-# role class for Icinga IRC bot
-class role::echoirc {
-
- system::role { 'echoirc': description => 'server running icinga irc bot' }
-
- case $::realm {
- 'production': {
- $ircecho_logs = {
- '/var/log/icinga/irc.log' => '#wikimedia-operations',
- '/var/log/icinga/irc-wikidata.log' => '#wikidata',
- '/var/log/icinga/irc-qa.log' => '#wikimedia-qa',
- '/var/log/icinga/irc-labs.log' => '#wikimedia-labs',
- }
- $ircecho_nick = 'icinga-wm'
- $ircecho_server = 'chat.freenode.net'
- }
- 'labs': {
- $ircecho_logs = { '/var/log/icinga/irc.log' => '#wikimedia-labs'
}
- $ircecho_nick = 'icinga-wm-labs'
- $ircecho_server = 'chat.freenode.net'
- }
- default: {
- fail('unknown realm, please use labs or production')
- }
- }
-
- class { '::ircecho':
- ircecho_logs => $ircecho_logs,
- ircecho_nick => $ircecho_nick,
- ircecho_server => $ircecho_server,
- }
-
- # bug 26784 - IRC bots process need nagios monitoring
- nrpe::monitor_service { 'ircecho':
- description => 'ircecho_service_running',
- nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1:20 -a
ircecho',
- }
-
-}
-
diff --git a/manifests/role/icinga.pp b/manifests/role/icinga.pp
index ad93ea6..abd5560 100644
--- a/manifests/role/icinga.pp
+++ b/manifests/role/icinga.pp
@@ -2,7 +2,15 @@
#
# Sets up a icinga instance which checks services
# and hosts for Wikimedia Production cluster
-class role::icinga {
+#
+# = Parameters
+#
+# [*ircbot*]
+# Setup an ircbot using ircecho to support echoing notifications
+#
+class role::icinga(
+ $ircbot = true,
+){
include facilities::pdu_monitoring
include icinga::monitor::checkpaging
include icinga::nsca::firewall
@@ -18,6 +26,10 @@
include nrpe
include certificates::globalsign_ca
+ if $ircbot {
+ include icinga::ircbot
+ }
+
class { '::icinga': }
class { '::icinga::web': }
class { '::icinga::naggen': }
diff --git a/manifests/site.pp b/manifests/site.pp
index 44a0df8..e5caad7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2112,7 +2112,6 @@
include admin
include role::icinga
include role::ishmael
- include role::echoirc
include role::tendril
include role::tcpircbot
}
diff --git a/modules/icinga/manifests/ircbot.pp
b/modules/icinga/manifests/ircbot.pp
new file mode 100644
index 0000000..322372e
--- /dev/null
+++ b/modules/icinga/manifests/ircbot.pp
@@ -0,0 +1,27 @@
+# = Class: icinga::ircbot
+#
+# Sets up an ircecho instance that sends icinga alerts to IRC
+class icinga::ircbot {
+
+ $ircecho_logs = {
+ '/var/log/icinga/irc.log' => '#wikimedia-operations',
+ '/var/log/icinga/irc-wikidata.log' => '#wikidata',
+ '/var/log/icinga/irc-qa.log' => '#wikimedia-qa',
+ '/var/log/icinga/irc-labs.log' => '#wikimedia-labs',
+ }
+ $ircecho_nick = 'icinga-wm'
+ $ircecho_server = 'chat.freenode.net'
+
+ class { '::ircecho':
+ ircecho_logs => $ircecho_logs,
+ ircecho_nick => $ircecho_nick,
+ ircecho_server => $ircecho_server,
+ }
+
+ # bug 26784 - IRC bots process need nagios monitoring
+ nrpe::monitor_service { 'ircecho':
+ description => 'ircecho_service_running',
+ nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1:20 -a
ircecho',
+ }
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/172916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I92f850d4e86e13e1af8f775c3e0affed101ead5f
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
