From b038d1b60262941e42c7d7e4d7a3509b1c3c80e4 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Mon, 9 Mar 2026 15:48:50 +0100 Subject: [PATCH] Recommit for updates in build 193 --- ...onfdroid_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- ...droid_nagios_3A_3Aserver_3A_3Aservice.html | 36 +++++++++++++++++-- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Aconfig.html index f80eec5..3d2bc44 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Aconfig.html @@ -123,7 +123,7 @@ class confdroid_nagios::main::config ( include confdroid_nagios::server::service } - if $fqdn != $ng_nagios_server { + if $ng_enable_target == true { include confdroid_nagios::client::target } } diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html index 6d44f15..7faa551 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html @@ -159,7 +159,23 @@ 61 62 63 -64 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80
# File 'manifests/server/service.pp', line 6
@@ -188,6 +204,23 @@ class confdroid_nagios::server::service (
       require    => Exec['ng_restart_httpd'],
     }
 
+    @@nagios_host { 'localhost':
+      ensure              => $ng_ping_ensure,
+      alias               => 'localhost',
+      address             => '127.0.0.1',
+      use                 => 'linux-server',
+      target              => $ng_target_localhost,
+      hostgroups          => 'linux-servers',
+      contacts            => $ng_contact_name,
+      max_check_attempts  => $ng_max_check_attempts,
+      notification_period => '24x7',
+      owner               => $ng_user,
+      group               => $ng_user,
+      mode                => '0640',
+      check_command       => "check_ping!${ng_ping_warn}!${ng_ping_crit}",
+      notify              => Service[$ng_service],
+    }
+
     resources { ['nagios_host',
         'nagios_hostgroup',
         'nagios_hostdependency',
@@ -220,7 +253,6 @@ class confdroid_nagios::server::service (
     Nagios_contactgroup <<||>> { notify  => Service['nagios'] }
     Nagios_command <<||>> { notify  => Service['nagios'] }
     Nagios_timeperiod <<||>> { notify  => Service['nagios'] }
-
   }
 }