From 57590d86e527e5544539802635ce2bc372ce5012 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 1 Mar 2026 16:03:55 +0100 Subject: [PATCH] Recommit for updates in build 93 --- ...nfdroid_nagios_3A_3Anagios_3A_3Aconfig.html | 6 +----- ...os_3A_3Aobjects_3A_3Aadd_contact_rules.html | 18 +++++++++++++++++- ...3Aobjects_3A_3Aadd_contactgroups_rules.html | 16 +++++++++++++++- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html index bc9a929..34b2cbd 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html @@ -114,9 +114,7 @@ 16 17 18 -19 -20 -21 +19
# File 'manifests/nagios/config.pp', line 6
@@ -130,9 +128,7 @@ class confdroid_nagios::nagios::config (
     require confdroid_nagios::nagios::objects::add_contact_rules
     require confdroid_nagios::nagios::objects::add_contactgroups_rules
     require confdroid_nagios::nagios::objects::add_hostgroup_rules
-    #require confdroid_nagios::nagios::objects::servicegroups
     #require confdroid_nagios::nagios::objects::add_servicegroup_rules
-    #require confdroid_nagios::nagios::objects::timeperiods
     #require confdroid_nagios::nagios::objects::add_timeperiod_rules
     require confdroid_nagios::nagios::resources::resource
   }
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 9f04391..b9cfe79 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
@@ -145,7 +145,15 @@ ng_contact_email => 'example@example.net',
 37
 38
 39
-40
+40 +41 +42 +43 +44 +45 +46 +47 +48
# File 'manifests/nagios/objects/add_contact_rules.pp', line 13
@@ -176,6 +184,14 @@ class confdroid_nagios::nagios::objects::add_contact_rules (
       content => template($ng_contacts_head_erb),
       order   => '000',
     }
+
+    # add main contact through define via parameters
+    confdroid_nagios::nagios::objects::add_contact { $ng_contact_name:
+      ng_contact_name   => $ng_contact_name,
+      ng_contact_alias  => $ng_contact_alias,
+      ng_contact_groups => $ng_contact_groups,
+      ng_contact_email  => $ng_contact_email,
+    }
   }
 }
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 6102778..4fa3347 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 @@ -141,7 +141,14 @@ and populates through define and external puppet rules 37 38 39 -40 +40 +41 +42 +43 +44 +45 +46 +47
# File 'manifests/nagios/objects/add_contactgroups_rules.pp', line 13
@@ -172,6 +179,13 @@ class confdroid_nagios::nagios::objects::add_contactgroups_rules (
       content => template($ng_cntctgrps_head_erb),
       order   => '000',
     }
+
+    # add main contact group through define via parameters
+    confdroid_nagios::nagios::objects::add_contactgroups { $ng_contactgroup_name:
+      ng_contactgroup_name   => $ng_contactgroup_name,
+      ng_contactgroup_alias  => $ng_contactgroup_alias,
+      ng_contactgroup_ensure => $ng_contactgroup_ensure,
+    }
   }
 }