diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-06-03 16:07:52 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-06-03 16:07:52 -0300 |
| commit | 2970d840eff89d8cc028f18cba22cfb155f54fcb (patch) | |
| tree | 402163889f21ceb36154ec69901a492e27d7fb7a | |
| parent | a539886c7202430d30b1fe8acd94b9be94b222f2 (diff) | |
| download | puppet-nodo-2970d840eff89d8cc028f18cba22cfb155f54fcb.tar.gz puppet-nodo-2970d840eff89d8cc028f18cba22cfb155f54fcb.tar.bz2 | |
Adding multitail into nodo::utils
| -rw-r--r-- | manifests/subsystem/monitor.pp | 12 | ||||
| -rw-r--r-- | manifests/utils.pp | 3 |
2 files changed, 7 insertions, 8 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, } } diff --git a/manifests/utils.pp b/manifests/utils.pp index 3b112a6..8ce7ef5 100644 --- a/manifests/utils.pp +++ b/manifests/utils.pp @@ -2,7 +2,8 @@ class nodo::utils { package { [ 'screen', 'less', 'bzip2', 'openssl', 'lynx', 'wget', 'unzip', 'nmap', 'telnet', 'tree', 'whois', 'dosfstools', 'dnsutils', 'logcheck-database', - 'bc', 'lsof', 'wipe', 'vrms', 'nsca-client', 'logcheck', 'vim-nox' ]: + 'bc', 'lsof', 'wipe', 'vrms', 'nsca-client', 'logcheck', 'vim-nox', + 'multitail' ]: ensure => installed, } |