aboutsummaryrefslogtreecommitdiff
path: root/manifests/subsystem
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-06-03 16:07:52 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-06-03 16:07:52 -0300
commit2970d840eff89d8cc028f18cba22cfb155f54fcb (patch)
tree402163889f21ceb36154ec69901a492e27d7fb7a /manifests/subsystem
parenta539886c7202430d30b1fe8acd94b9be94b222f2 (diff)
downloadpuppet-nodo-2970d840eff89d8cc028f18cba22cfb155f54fcb.tar.gz
puppet-nodo-2970d840eff89d8cc028f18cba22cfb155f54fcb.tar.bz2
Adding multitail into nodo::utils
Diffstat (limited to 'manifests/subsystem')
-rw-r--r--manifests/subsystem/monitor.pp12
1 files changed, 5 insertions, 7 deletions
diff --git a/manifests/subsystem/monitor.pp b/manifests/subsystem/monitor.pp
index 59e453e..8e1c4d8 100644
--- a/manifests/subsystem/monitor.pp
+++ b/manifests/subsystem/monitor.pp
@@ -1,7 +1,7 @@
class nodo::subsystem::monitor(
$type = 'vserver',
$use_nagios = hiera('nodo::subsystem::monitor::use_nagios', True),
- $use_fqdn = hiera('nodo::subsystem::monitor::use_nagios_fqdn', false),
+ $addresss = hiera('nodo::subsystem::monitor::address', $::ipaddress),
$ping_rate = hiera('nodo::subsystem::monitor::ping_rate', '!100.0,20%!500.0,60%')
) {
@@ -15,13 +15,11 @@ class nodo::subsystem::monitor(
}
if $type == 'host' {
- if $use_fqdn == true {
- include nagios::target::fqdn
+ class{ 'nagios::target':
+ address => $address,
}
- else {
- include nagios::target
- }
- nagios::service::ping { "${::fqdn}":
+
+ nagios::service::ping { "$address":
ping_rate => $ping_rate,
}
}