Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/358975 )
Change subject: ircecho: add support for the ensure parameter
......................................................................
ircecho: add support for the ensure parameter
Add support for the ensure parameter in ircecho and then use it in
icinga::ircbot to vary ircecho's running status on it's own ensure
parameter
Change-Id: Idd5a3d3428216342ee261964bc092250e1578f0f
---
M modules/icinga/manifests/ircbot.pp
M modules/ircecho/manifests/init.pp
2 files changed, 27 insertions(+), 26 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/icinga/manifests/ircbot.pp
b/modules/icinga/manifests/ircbot.pp
index 3e549a8..7c99002 100644
--- a/modules/icinga/manifests/ircbot.pp
+++ b/modules/icinga/manifests/ircbot.pp
@@ -4,32 +4,32 @@
class icinga::ircbot(
$ensure='present'
) {
- if $ensure == 'present' {
- $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-cloud',
- '/var/log/icinga/irc-analytics.log' => '#wikimedia-analytics',
- '/var/log/icinga/irc-ores.log' => '#wikimedia-ai',
- '/var/log/icinga/irc-interactive.log' => '#wikimedia-interactive',
- '/var/log/icinga/irc-performance.log' => '#wikimedia-perf-bots',
- '/var/log/icinga/irc-fundraising.log' => '#wikimedia-fundraising',
- '/var/log/icinga/irc-reading-web.log' =>
'#wikimedia-reading-web-bots',
- }
- $ircecho_nick = 'icinga-wm'
- $ircecho_server = 'chat.freenode.net'
+ $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-cloud',
+ '/var/log/icinga/irc-analytics.log' => '#wikimedia-analytics',
+ '/var/log/icinga/irc-ores.log' => '#wikimedia-ai',
+ '/var/log/icinga/irc-interactive.log' => '#wikimedia-interactive',
+ '/var/log/icinga/irc-performance.log' => '#wikimedia-perf-bots',
+ '/var/log/icinga/irc-fundraising.log' => '#wikimedia-fundraising',
+ '/var/log/icinga/irc-reading-web.log' => '#wikimedia-reading-web-bots',
+ }
+ $ircecho_nick = 'icinga-wm'
+ $ircecho_server = 'chat.freenode.net'
- class { '::ircecho':
- ircecho_logs => $ircecho_logs,
- ircecho_nick => $ircecho_nick,
- ircecho_server => $ircecho_server,
- }
+ class { '::ircecho':
+ ensure => $ensure,
+ ircecho_logs => $ircecho_logs,
+ ircecho_nick => $ircecho_nick,
+ ircecho_server => $ircecho_server,
+ }
- # T28784 - 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',
- }
+ # T28784 - IRC bots process need nagios monitoring
+ nrpe::monitor_service { 'ircecho':
+ ensure => $ensure,
+ description => 'ircecho_service_running',
+ nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1:20 -a
ircecho',
}
}
diff --git a/modules/ircecho/manifests/init.pp
b/modules/ircecho/manifests/init.pp
index d1a43e6..3196ac5 100644
--- a/modules/ircecho/manifests/init.pp
+++ b/modules/ircecho/manifests/init.pp
@@ -12,6 +12,7 @@
$ircecho_logs,
$ircecho_nick,
$ircecho_server = 'chat.freenode.net',
+ $ensure = 'present',
) {
require_package(['python-pyinotify', 'python-irc'])
@@ -33,7 +34,7 @@
}
base::service_unit { 'ircecho':
- ensure => 'present',
+ ensure => $ensure,
systemd => true,
upstart => false,
sysvinit => true,
--
To view, visit https://gerrit.wikimedia.org/r/358975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd5a3d3428216342ee261964bc092250e1578f0f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
