From a5978428e47ae10d3b04c0a49386f56f18f2aafa Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 1 Mar 2026 18:41:44 +0100 Subject: [PATCH] Recommit for updates in build 112 --- ...fdroid_nagios_3A_3Aclient_3A_3Atarget.html | 4 +-- ...s_3A_3Aobjects_3A_3Aadd_contact_rules.html | 2 +- ...Aobjects_3A_3Aadd_contactgroups_rules.html | 2 +- ...3A_3Aobjects_3A_3Aadd_hostgroup_rules.html | 2 +- ...3Aobjects_3A_3Aadd_servicegroup_rules.html | 2 +- ...3Anagios_3A_3Aresources_3A_3Aresource.html | 2 +- .../confdroid_nagios_3A_3Aparams.html | 4 +-- ...nfdroid_nagios_3A_3Aserver_3A_3Afiles.html | 32 ++----------------- ...droid_nagios_3A_3Aserver_3A_3Aservice.html | 12 +++---- ...fdroid_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- 10 files changed, 16 insertions(+), 48 deletions(-) diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html index d956ac2..156bb5c 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html @@ -232,7 +232,7 @@ class confdroid_nagios::client::target ( @@nagios_host { $fqdn: ensure => $ng_ping_ensure, - alias => $fqdn, + alias => $hostname, address => $fqdn, use => 'linux-server', target => $ng_target_host, @@ -244,7 +244,7 @@ class confdroid_nagios::client::target ( group => 'nagios', mode => '0640', check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}", - notify => Service[$ng_nagios_service], + notify => Service[$ng_service], } @@nagios_service { "root_partition_${fqdn}": diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html index 0da6eac..172c5e1 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html @@ -174,7 +174,7 @@ class confdroid_nagios::nagios::objects::add_contact_rules ( selrole => object_r, seltype => nagios_etc_t, seluser => system_u, - notify => Service[$ng_nagios_service], + notify => Service[$ng_service], } # manage file header diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html index 901cc01..d8728cb 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html @@ -169,7 +169,7 @@ class confdroid_nagios::nagios::objects::add_contactgroups_rules ( selrole => object_r, seltype => nagios_etc_t, seluser => system_u, - notify => Service[$ng_nagios_service], + notify => Service[$ng_service], } # manage file header diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html index 8e83be2..45a33f1 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html @@ -167,7 +167,7 @@ class confdroid_nagios::nagios::objects::add_hostgroup_rules ( selrole => object_r, seltype => nagios_etc_t, seluser => system_u, - notify => Service[$ng_nagios_service], + notify => Service[$ng_service], } # manage file header diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html index ad6cd3e..f00301b 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html @@ -161,7 +161,7 @@ class confdroid_nagios::nagios::objects::add_servicegroup_rules ( selrole => object_r, seltype => nagios_etc_t, seluser => system_u, - notify => Service[$ng_nagios_service], + notify => Service[$ng_service], } # manage file header diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource.html b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource.html index 2e81a53..36938d0 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource.html @@ -170,7 +170,7 @@ class confdroid_nagios::nagios::resources::resource ( selrole => object_r, seltype => nagios_etc_t, seluser => system_u, - notify => Service[$ng_nagios_service], + notify => Service[$ng_service], } concat::fragment { 'header': diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html index 62f0709..2dc9577 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html @@ -1238,7 +1238,7 @@ class confdroid_nagios::params ( $os_release = $facts['os']['release']['major'] # service - $ng_nagios_service = 'nagios' + $ng_service = 'nagios' # directories $ng_main_dir = '/etc/nagios' @@ -1293,7 +1293,7 @@ class confdroid_nagios::params ( $ng_cntctgrps_head_erb = 'confdroid_nagios/nagios/contactgroups_cfg_head.erb' $ng_cntctgrps_rule_erb = 'confdroid_nagios/nagios/contactgroups_cfg_rule.erb' $ng_target_command = "${ng_conf_d_dir}/nagios_commands_base.cfg" - $ng_nagios_service_cmd = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios' + $ng_service_cmd = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios' $ng_htpasswd_file = "${ng_main_dir}/passwd" $ng_htpasswd_head = 'confdroid_nagios/nagios/htpasswd_head.erb' $ng_htpasswd_rule = 'confdroid_nagios/nagios/htpasswd_rule.erb' diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html index 03741b0..1e10889 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html @@ -115,21 +115,7 @@ 17 18 19 -20 -21 -22 -23 -24 -25 -26 -27 -28 -29 -30 -31 -32 -33 -34 +20 
# File 'manifests/server/files.pp', line 6
@@ -145,22 +131,8 @@ class confdroid_nagios::server::files (
       group   => 'nagios',
       mode    => '0644',
       content => template($ng_nagios_cfg_erb),
-      notify  => Service[$ng_nagios_service],
+      notify  => Service[$ng_service],
     }
-    # custom cfg files
-    ## temp place holder, this will be done via defines 
-    ## and PuppetDB exports and imports in the future
-    #file { $ng_target_command:
-    #  ensure   => file,
-    #  owner    => 'nagios',
-    #  group    => 'nagios',
-    #  mode     => '0644',
-    #  selrange => s0,
-    #  selrole  => object_r,
-    #  seltype  => nagios_etc_t,
-    #  seluser  => system_u,
-    #  notify   => Service[$ng_nagios_service],
-    #}
   }
 }
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 db6d79d..ed71483 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html @@ -296,9 +296,7 @@ 198 199 200 -201 -202 -203 +201 
# File 'manifests/server/service.pp', line 6
@@ -317,9 +315,9 @@ class confdroid_nagios::server::service (
       refreshonly => true,
     }
 
-    service { $ng_nagios_service:
+    service { $ng_service:
       ensure     => running,
-      name       => $ng_nagios_service,
+      name       => $ng_service,
       enable     => true,
       hasrestart => true,
       hasstatus  => true,
@@ -344,7 +342,7 @@ class confdroid_nagios::server::service (
     }
 
     @@nagios_service { 'check_nagios_localhost':
-      check_command       => $ng_nagios_service_cmd,
+      check_command       => $ng_service_cmd,
       use                 => 'generic-service',
       host_name           => 'localhost',
       notification_period => '24x7',
@@ -497,8 +495,6 @@ class confdroid_nagios::server::service (
     Nagios_contactgroup <<||>> { notify  => Service['nagios'] }
     Nagios_command <<||>> { notify  => Service['nagios'] }
     Nagios_timeperiod <<||>> { notify  => Service['nagios'] }
-
-
   }
 }
diff --git a/doc/puppet_defined_types/confdroid_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/confdroid_nagios_3A_3Aserver_3A_3Aaccess.html index bdf6fd9..f67c7fc 100644 --- a/doc/puppet_defined_types/confdroid_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/confdroid_nagios_3A_3Aserver_3A_3Aaccess.html @@ -173,7 +173,7 @@ define confdroid_nagios::server::access ( $ng_nagios_server = $confdroid_nagios::params::ng_nagios_server $ng_htpasswd_file = $confdroid_nagios::params::ng_htpasswd_file $ng_htpasswd_rule = $confdroid_nagios::params::ng_htpasswd_rule - $ng_nagios_service = $confdroid_nagios::params::ng_nagios_service + $ng_service = $confdroid_nagios::params::ng_service if $fqdn == $ng_nagios_server { # create password rules