From d0bcb7a9cbfb48ce526f952053279d95f5e0cfa3 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 1 Mar 2026 17:18:26 +0100 Subject: [PATCH] Recommit for updates in build 108 --- ...Aobjects_3A_3Aadd_contactgroups_rules.html | 6 +-- ...3A_3Aobjects_3A_3Aadd_hostgroup_rules.html | 8 ++- .../confdroid_nagios_3A_3Aparams.html | 52 +++---------------- ...s_3A_3Aobjects_3A_3Aadd_contactgroups.html | 28 ++++++++-- 4 files changed, 36 insertions(+), 58 deletions(-) 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 c91330b..901cc01 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 @@ -182,9 +182,9 @@ class confdroid_nagios::nagios::objects::add_contactgroups_rules ( # 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, + ng_contactgroup_name => $ng_contactgroup_name, + ng_contactgroup_alias => $ng_contactgroup_alias, + ng_contactgroup_members => $ng_contactgroup_members, } } } 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 2ea71d8..8e83be2 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 @@ -146,8 +146,7 @@ additional hostgroups through external Puppet rules via define. 42 43 44 -45 -46 +45 
# File 'manifests/nagios/objects/add_hostgroup_rules.pp', line 12
@@ -181,9 +180,8 @@ class confdroid_nagios::nagios::objects::add_hostgroup_rules (
 
     # add hostgroup rules through defines and parameters
     confdroid_nagios::nagios::objects::add_hostgroups { $ng_hostgroup_name:
-      ng_hostgroup_name   => $ng_hostgroup_name,
-      ng_hostgroup_alias  => $ng_hostgroup_alias,
-      ng_hostgroup_ensure => $ng_hostgroup_ensure,
+      ng_hostgroup_name  => $ng_hostgroup_name,
+      ng_hostgroup_alias => $ng_hostgroup_alias,
     }
   }
 }
diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html index 1f45e11..66b9a0a 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html @@ -757,24 +757,6 @@ inherited by all classes except defines. -
  • - - ng_contactgroup_ensure - - - (String) - - - (defaults to: 'present') - - - — -
    -

    The ensure value for the default contact group. Default is ‘present’.

    -
    - -
    • -
  • ng_contact_name @@ -883,24 +865,6 @@ inherited by all classes except defines.
    • -
  • - - ng_hostgroup_ensure - - - (String) - - - (defaults to: 'present') - - - — -
    -

    The ensure value for the default host group Default is ‘present’.

    -
    - -
    • -
  • ng_max_check_attempts @@ -984,6 +948,10 @@ inherited by all classes except defines. 
     
 
+101
+102
+103
+104
 105
 106
 107
@@ -1148,16 +1116,10 @@ inherited by all classes except defines.
 266
 267
 268
-269
-270
-271
-272
-273
-274
-275
    +269 - 
    # File 'manifests/params.pp', line 105
+        
    # File 'manifests/params.pp', line 101
 
 class confdroid_nagios::params (
 
@@ -1176,7 +1138,6 @@ class confdroid_nagios::params (
 # contact groups
   String $ng_contactgroup_name       = 'admins',
   String $ng_contactgroup_alias      = 'Nagios Administrators',
-  String $ng_contactgroup_ensure     = 'present',
 
 # contacts
   String $ng_contact_name            = 'nagiosadmin',
@@ -1187,7 +1148,6 @@ class confdroid_nagios::params (
 # hostgroups
   String $ng_hostgroup_name         = 'linux-servers',
   String $ng_hostgroup_alias        = 'Linux Servers',
-  String $ng_hostgroup_ensure       = 'present',
 
 # nagios.cfg
   String $ng_log_file               = '/var/log/nagios/nagios.log',
diff --git a/doc/puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html b/doc/puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
index 044b6da..9ce9231 100644
--- a/doc/puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
+++ b/doc/puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
@@ -138,6 +138,24 @@ external puppet rules.
         —
         
    
 
    Specify whether the contact group should be registered in Nagios.
    
+
    
+      
+
    • + +
  • + + ng_contactgroup_members + + + (String) + + + (defaults to: 'admins') + + + — +
    +

    Specify the members of the contact group.

    • @@ -153,8 +171,6 @@ external puppet rules. 
     
 
-13
-14
 15
 16
 17
@@ -171,15 +187,19 @@ external puppet rules.
 28
 29
 30
-31
    +31 +32 +33 +34 - 
    # File 'manifests/nagios/objects/add_contactgroups.pp', line 13
+        
    # File 'manifests/nagios/objects/add_contactgroups.pp', line 15
 
 define confdroid_nagios::nagios::objects::add_contactgroups (
 
   Optional[String] $ng_contactgroup_name     = undef,
   Optional[String] $ng_contactgroup_alias    = undef,
+  String $ng_contactgroup_members            = 'admins',
   String $ng_contactgroup_register           = '1',
 
 ) {