From 0915f00b4b5ed7fe8b61eaace4ec05725544b759 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Mon, 9 Mar 2026 16:22:24 +0100 Subject: [PATCH] Recommit for updates in build 198 --- doc/_index.html | 5 - doc/puppet_class_list.html | 9 +- .../confdroid_nagios_3A_3Aparams.html | 2 - ...droid_nagios_3A_3Aserver_3A_3Aservice.html | 226 +++++++++++++++++- 4 files changed, 225 insertions(+), 17 deletions(-) diff --git a/doc/_index.html b/doc/_index.html index e8739cc..37cbf86 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -153,11 +153,6 @@ -
  • - confdroid_nagios::server::nagios - -
    • -
  • confdroid_nagios::server::service diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index c43f018..e78eab8 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -159,14 +159,7 @@
    • -
  • -
    - confdroid_nagios::server::nagios -
    -
    • - - -
  • +
  • confdroid_nagios::server::service
    diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html index c0b2717..a25c977 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html @@ -79,8 +79,6 @@ confdroid_nagios::nagios::config
    - confdroid_nagios::server::nagios
    - confdroid_nagios::server::service
    confdroid_nagios::server::access_rules
    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 a84a997..3d0a7c5 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html @@ -175,7 +175,118 @@ 77 78 79 -80 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96 +97 +98 +99 +100 +101 +102 +103 +104 +105 +106 +107 +108 +109 +110 +111 +112 +113 +114 +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +127 +128 +129 +130 +131 +132 +133 +134 +135 +136 +137 +138 +139 +140 +141 +142 +143 +144 +145 +146 +147 +148 +149 +150 +151 +152 +153 +154 +155 +156 +157 +158 +159 +160 +161 +162 +163 +164 +165 +166 +167 +168 +169 +170 +171 +172 +173 +174 +175 +176 +177 +178 +179 +180 +181 +182 +183 +184 +185 +186 +187 +188 +189 +190 +191 
    # File 'manifests/server/service.pp', line 6
@@ -187,7 +298,6 @@ class confdroid_nagios::server::service (
   if $ng_nagios_server == $fqdn {
     require confdroid_nagios::server::access_rules
     require confdroid_nagios::nagios::config
-    require confdroid_nagios::server::nagios
 
     exec { 'ng_restart_httpd':
       command     => 'systemctl restart httpd',
@@ -221,6 +331,118 @@ class confdroid_nagios::server::service (
       notify              => Service[$ng_service],
     }
 
+    @@nagios_service { 'check_nagios_localhost':
+      check_command       => "check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios",
+      use                 => 'generic-service',
+      host_name           => 'localhost',
+      notification_period => '24x7',
+      service_description => 'localhost_nagios_service',
+      target              => $ng_target_service,
+      owner               => $ng_user,
+      group               => $ng_user,
+      mode                => '0640',
+      contacts            => $ng_contact_name,
+      notify              => Service[$ng_service],
+    }
+
+    @@nagios_service { 'root_partition_localhost':
+      ensure              => $ng_disk_ensure,
+      check_command       => "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/",
+      use                 => 'generic-service',
+      host_name           => 'localhost',
+      contacts            => $ng_contact_name,
+      notification_period => '24x7',
+      service_description => 'localhost_root_partition',
+      servicegroups       => 'linux-services',
+      target              => $ng_target_service,
+      owner               => $ng_user,
+      group               => $ng_user,
+      mode                => '0640',
+      notify              => Service[$ng_service],
+    }
+
+    if $ng_enable_swap_check == true {
+      @@nagios_service { 'Swap_Usage_localhost':
+        ensure              => $ng_swap_ensure,
+        check_command       => "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}",
+        use                 => 'generic-service',
+        host_name           => 'localhost',
+        contacts            => $ng_contact_name,
+        notification_period => '24x7',
+        service_description => 'localhost_swap_usage',
+        servicegroups       => 'linux-services',
+        target              => $ng_target_service,
+        owner               => $ng_user,
+        group               => $ng_user,
+        mode                => '0640',
+        notify              => Service[$ng_service],
+      }
+    }
+
+    @@nagios_service { 'Local_Users_localhost':
+      ensure              => $ng_users_ensure,
+      check_command       => "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}",
+      use                 => 'generic-service',
+      host_name           => 'localhost',
+      contacts            => $ng_contact_name,
+      notification_period => '24x7',
+      service_description => 'localhost_local_users',
+      servicegroups       => 'linux-services',
+      target              => $ng_target_service,
+      owner               => $ng_user,
+      group               => $ng_user,
+      mode                => '0640',
+      notify              => Service[$ng_service],
+    }
+
+    @@nagios_service { 'Total_Processes_localhost':
+      ensure              => $ng_procs_tot_ensure,
+      check_command       => "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}",
+      use                 => 'generic-service',
+      host_name           => 'localhost',
+      contacts            => $ng_contact_name,
+      notification_period => '24x7',
+      service_description => 'localhost_total_processes',
+      servicegroups       => 'linux-services',
+      target              => $ng_target_service,
+      owner               => $ng_user,
+      group               => $ng_user,
+      mode                => '0640',
+      notify              => Service[$ng_service],
+    }
+
+    @@nagios_service { 'Zombie_Processes_localhost':
+      ensure              => $ng_procs_z_ensure,
+      check_command       => "check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}",
+      use                 => 'generic-service',
+      host_name           => 'localhost',
+      contacts            => $ng_contact_name,
+      notification_period => '24x7',
+      service_description => 'localhost_zombie_processes',
+      servicegroups       => 'linux-services',
+      target              => $ng_target_service,
+      owner               => $ng_user,
+      group               => $ng_user,
+      mode                => '0640',
+      notify              => Service[$ng_service],
+    }
+
+    @@nagios_service { 'Current_Load_localhost':
+      ensure              => $ng_load_ensure,
+      check_command       => "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}",
+      use                 => 'generic-service',
+      host_name           => 'localhost',
+      contacts            => $ng_contact_name,
+      notification_period => '24x7',
+      service_description => 'localhost_current_load',
+      servicegroups       => 'linux-services',
+      target              => $ng_target_service,
+      owner               => $ng_user,
+      group               => $ng_user,
+      mode                => '0640',
+      notify              => Service[$ng_service],
+    }
+
     resources { ['nagios_host',
         'nagios_hostgroup',
         'nagios_hostdependency',