Ottomata has submitted this change and it was merged.
Change subject: Updating udp2log.pp so that udp2log instance monitoring is not
configured if $misc::udp2log::monitor == false
......................................................................
Updating udp2log.pp so that udp2log instance monitoring is not configured
if $misc::udp2log::monitor == false
RT 6023
Change-Id: Ia71bec79446f5f68bdbe475c116bd35f3ac88422
---
M manifests/misc/udp2log.pp
1 file changed, 13 insertions(+), 9 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index 765242e..8e204e4 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -24,6 +24,7 @@
# required for monitoring udp2log instances
if $monitor {
include
+ # TODO: Should probably include icincga package here.
misc::udp2log::monitoring,
misc::udp2log::iptables
}
@@ -154,15 +155,18 @@
require => [Package["udplog"], File["/etc/udp2log/${name}"],
File["/etc/init.d/udp2log-${name}"]],
}
- # include monitoring for this udp2log instance.
- misc::udp2log::instance::monitoring { $name:
- log_directory => $log_directory,
- ensure => $ensure,
- packet_loss_log => $packet_loss_log,
- monitor_packet_loss => $monitor_packet_loss,
- monitor_processes => $monitor_processes,
- monitor_log_age => $monitor_log_age,
- require => Service["udp2log-${name}"],
+ # only set up instance monitoring if the monitoring scripts are
installed
+ if $::misc::udp2log::monitor {
+ # include monitoring for this udp2log instance.
+ misc::udp2log::instance::monitoring { $name:
+ log_directory => $log_directory,
+ ensure => $ensure,
+ packet_loss_log => $packet_loss_log,
+ monitor_packet_loss => $monitor_packet_loss,
+ monitor_processes => $monitor_processes,
+ monitor_log_age => $monitor_log_age,
+ require => Service["udp2log-${name}"],
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/91768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia71bec79446f5f68bdbe475c116bd35f3ac88422
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
