Recommit for updates in build 93

doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html

@@ -114,9 +114,7 @@
 16
 17
 18
-19
+19</pre>
-20
-21</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/nagios/config.pp', line 6</span>
@@ -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
   }

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</pre>
+40
+41
+42
+43
+44
+45
+46
+47
+48</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_contact_rules.pp', line 13</span>
@@ -176,6 +184,14 @@ class confdroid_nagios::nagios::objects::add_contact_rules (
       content =&gt; template($ng_contacts_head_erb),
       order   =&gt; &#39;000&#39;,
     }
+
+    # add main contact through define via parameters
+    confdroid_nagios::nagios::objects::add_contact { $ng_contact_name:
+      ng_contact_name   =&gt; $ng_contact_name,
+      ng_contact_alias  =&gt; $ng_contact_alias,
+      ng_contact_groups =&gt; $ng_contact_groups,
+      ng_contact_email  =&gt; $ng_contact_email,
+    }
   }
 }</pre>
       </td>

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</pre>
+40
+41
+42
+43
+44
+45
+46
+47</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_contactgroups_rules.pp', line 13</span>
@@ -172,6 +179,13 @@ class confdroid_nagios::nagios::objects::add_contactgroups_rules (
       content =&gt; template($ng_cntctgrps_head_erb),
       order   =&gt; &#39;000&#39;,
     }
+
+    # add main contact group through define via parameters
+    confdroid_nagios::nagios::objects::add_contactgroups { $ng_contactgroup_name:
+      ng_contactgroup_name   =&gt; $ng_contactgroup_name,
+      ng_contactgroup_alias  =&gt; $ng_contactgroup_alias,
+      ng_contactgroup_ensure =&gt; $ng_contactgroup_ensure,
+    }
   }
 }</pre>
       </td>