Recommit for updates in build 108

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_name    => $ng_contactgroup_name,
-      ng_contactgroup_alias  => $ng_contactgroup_alias,
+      ng_contactgroup_alias   => $ng_contactgroup_alias,
-      ng_contactgroup_ensure => $ng_contactgroup_ensure,
+      ng_contactgroup_members => $ng_contactgroup_members,
     }
   }
 }</pre>

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
+45</pre>
-46</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_hostgroup_rules.pp', line 12</span>
@@ -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   =&gt; $ng_hostgroup_name,
+      ng_hostgroup_name  =&gt; $ng_hostgroup_name,
-      ng_hostgroup_alias  =&gt; $ng_hostgroup_alias,
+      ng_hostgroup_alias =&gt; $ng_hostgroup_alias,
-      ng_hostgroup_ensure =&gt; $ng_hostgroup_ensure,
     }
   }
 }</pre>

doc/puppet_classes/confdroid_nagios_3A_3Aparams.html

@@ -757,24 +757,6 @@ inherited by all classes except defines.
       
     </li>
   
-    <li>
-      
-        <span class='name'>ng_contactgroup_ensure</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>The ensure value for the default contact group. Default is ‘present’.</p>
-</div>
-      
-    </li>
-  
     <li>
       
         <span class='name'>ng_contact_name</span>
@@ -883,24 +865,6 @@ inherited by all classes except defines.
       
     </li>
   
-    <li>
-      
-        <span class='name'>ng_hostgroup_ensure</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>The ensure value for the default host group Default is ‘present’.</p>
-</div>
-      
-    </li>
-  
     <li>
       
         <span class='name'>ng_max_check_attempts</span>
@@ -984,6 +948,10 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
+101
+102
+103
+104
 105
 106
 107
@@ -1148,16 +1116,10 @@ inherited by all classes except defines.
 266
 267
 268
-269
+269</pre>
-270
-271
-272
-273
-274
-275</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 105</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 101</span>
 
 class confdroid_nagios::params (
 
@@ -1176,7 +1138,6 @@ class confdroid_nagios::params (
 # contact groups
   String $ng_contactgroup_name       = &#39;admins&#39;,
   String $ng_contactgroup_alias      = &#39;Nagios Administrators&#39;,
-  String $ng_contactgroup_ensure     = &#39;present&#39;,
 
 # contacts
   String $ng_contact_name            = &#39;nagiosadmin&#39;,
@@ -1187,7 +1148,6 @@ class confdroid_nagios::params (
 # hostgroups
   String $ng_hostgroup_name         = &#39;linux-servers&#39;,
   String $ng_hostgroup_alias        = &#39;Linux Servers&#39;,
-  String $ng_hostgroup_ensure       = &#39;present&#39;,
 
 # nagios.cfg
   String $ng_log_file               = &#39;/var/log/nagios/nagios.log&#39;,

doc/puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html

@@ -138,6 +138,24 @@ external puppet rules.
         —
         <div class='inline'>
 <p>Specify whether the contact group should be registered in Nagios.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_contactgroup_members</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;admins&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Specify the members of the contact group.</p>
 </div>
       
     </li>
@@ -153,8 +171,6 @@ external puppet rules.
         <pre class="lines">
 
 
-13
-14
 15
 16
 17
@@ -171,15 +187,19 @@ external puppet rules.
 28
 29
 30
-31</pre>
+31
+32
+33
+34</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_contactgroups.pp', line 13</span>
+        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_contactgroups.pp', line 15</span>
 
 define confdroid_nagios::nagios::objects::add_contactgroups (
 
   Optional[String] $ng_contactgroup_name     = undef,
   Optional[String] $ng_contactgroup_alias    = undef,
+  String $ng_contactgroup_members            = &#39;admins&#39;,
   String $ng_contactgroup_register           = &#39;1&#39;,
 
 ) {