From d98ba4550e4d9600d9b3950eea9bb80a7a13738d Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 8 Sep 2026 13:11:27 +0200 Subject: [PATCH] Recommit for updates in build 26 --- doc/file.README.html | 13 +++++++ doc/index.html | 13 +++++++ ...id_puppet_3A_3Amonitoring_3A_3Atarget.html | 36 ++++++++++++++++++- 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/doc/file.README.html b/doc/file.README.html index 959bfe6..4c3e8f6 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -76,6 +76,8 @@

  • Directories, Files and Services

  • +

    Nagios monitoring

    +

  • Optional

  • R10k service

    @@ -147,6 +149,17 @@

    start services as required

    • +

    Nagios monitoring

    + +

    When $pt_manage_nagios is true, the module exports a Puppet agent check on every node and a Puppet Server check on the Puppet Server node. The target Nagios installation must provide the NRPE command alias used by the export. The Puppet Server check can use the standard check_procs plugin:

    + +
    command[check_puppet_server]=/usr/lib64/nagios/plugins/check_procs -c $ARG1$ -a $ARG2$
+
    + +

    With the exported command, check_puppet_server!1:!puppetserver alerts when no running process has puppetserver in its full command line. It does not check whether the systemd service is enabled.

    + +

    The modules confdroid_nagios and confdroid_nrpe include the proper commands already.

    +

    Optional

    R10k service

    diff --git a/doc/index.html b/doc/index.html index d71ce2c..3f56da6 100644 --- a/doc/index.html +++ b/doc/index.html @@ -76,6 +76,8 @@

  • Directories, Files and Services

  • +

    Nagios monitoring

    +

  • Optional

  • R10k service

    @@ -147,6 +149,17 @@

    start services as required

    • +

    Nagios monitoring

    + +

    When $pt_manage_nagios is true, the module exports a Puppet agent check on every node and a Puppet Server check on the Puppet Server node. The target Nagios installation must provide the NRPE command alias used by the export. The Puppet Server check can use the standard check_procs plugin:

    + +
    command[check_puppet_server]=/usr/lib64/nagios/plugins/check_procs -c $ARG1$ -a $ARG2$
+
    + +

    With the exported command, check_puppet_server!1:!puppetserver alerts when no running process has puppetserver in its full command line. It does not check whether the systemd service is enabled.

    + +

    The modules confdroid_nagios and confdroid_nrpe include the proper commands already.

    +

    Optional

    R10k service

    diff --git a/doc/puppet_classes/confdroid_puppet_3A_3Amonitoring_3A_3Atarget.html b/doc/puppet_classes/confdroid_puppet_3A_3Amonitoring_3A_3Atarget.html index 59ba328..ea055f1 100644 --- a/doc/puppet_classes/confdroid_puppet_3A_3Amonitoring_3A_3Atarget.html +++ b/doc/puppet_classes/confdroid_puppet_3A_3Amonitoring_3A_3Atarget.html @@ -118,7 +118,24 @@ 20 21 22 -23 +23 +24 +25 +26 +27 +28 +29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 
    # File 'manifests/monitoring/target.pp', line 6
@@ -127,6 +144,7 @@ class confdroid_puppet::monitoring::target (
 
 ) inherits confdroid_puppet::params {
   if $pt_manage_nagios == true {
+    # puppet agent service
     @@nagios_service { "check_puppet_${fqdn}":
       check_command       => "check_nrpe!check_puppet!${pt_procs_allowed}!puppet",
       use                 => 'generic-service',
@@ -139,6 +157,22 @@ class confdroid_puppet::monitoring::target (
       mode                => '0640',
       contacts            => $pt_target_contacts,
     }
+
+    if $fqdn == $pt_pm_fqdn {
+      # puppet server service
+      @@nagios_service { "check_puppet_server_${fqdn}":
+        check_command       => "check_nrpe!check_puppet_server!${pt_procs_allowed}!puppet",
+        use                 => 'generic-service',
+        host_name           => $fqdn,
+        notification_period => '24x7',
+        service_description => "${fqdn}_check_puppet_server",
+        target              => $pt_target_service,
+        owner               => 'nagios',
+        group               => 'nagios',
+        mode                => '0640',
+        contacts            => $pt_target_contacts,
+      }
+    }
   }
 }