Adding multitail into nodo::utils

diff --git a/manifests/subsystem/monitor.pp b/manifests/subsystem/monitor.pp
index 59e453ea3e517d9374df9801055622b7df08aa9f..8e1c4d87bb2f0f2663edc28108367f07314eea78 100644 (file)
--- 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 3b112a669b061b5dbc340a7148f1a4635d8a144d..8ce7ef5f5cfd5ed7d9fa01f2f0f993fdd5e4cea0 100644 (file)
--- 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,
   }