Merge branch 'jenkins' into 'master'

Jenkins

See merge request !51

CHANGELOG.md

@@ -8,6 +8,21 @@ Changelog of Git Changelog.
 <h2> No issue </h2>
 
 
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/62feddee64c23f9">62feddee64c23f9</a> Jenkins Server <i>2017-07-25 18:04:08</i>
+<p>
+<h3>recommit for updates in build 96</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/099828e47a377d2">099828e47a377d2</a> Arne Teuke <i>2017-07-25 18:02:29</i>
+<p>
+<h3>testing templates</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/336e03f6090e222">336e03f6090e222</a> Arne Teuke <i>2017-07-25 18:01:03</i>
+<p>
+<h3>testing templates</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a23722a67a2afb6">a23722a67a2afb6</a> Jenkins Server <i>2017-07-25 17:56:39</i>
 <p>
 <h3>recommit for updates in build 93</h3>

README.md

@@ -46,6 +46,8 @@ Configuration
 * manage nagios.cfg through parameters
 * manage Nagios users through external Puppet rules via define
 * manage Nagios commands through Puppet exports
+* manage Nagios template definitions through external Puppet rules via define
+* manage Nagios main contacts through Puppet exports. Additional contacts can be created through external Puppet rules via define, to avoid having to alter the module code.
 * configure NRPE on clients (optional)
 * configure firewall (optional)
 * configure selinux policies (optional)
@@ -67,6 +69,8 @@ All dependencies must be included in the catalogue.
 * [cd_firewall](https://gitlab.puppetsoft.com/12WW1160/cd_firewall) or [puppetlabs firewall](https://github.com/puppetlabs/puppetlabs-firewall) (optional)
 * [cd_selinux](https://gitlab.puppetsoft.com/12WW1160/cd_selinux) for selinux  policy adjustments
 * [cd_certbot](https://gitlab.puppetsoft.com/12WW1160/cd_certbot) to auto-manage TLS certificates (optional)
+* [cd_stdlib](https://gitlab.puppetsoft.com/12WW1160/cd_stdlib) or [puppetlabs stdlib](https://github.com/puppetlabs/puppetlabs-stdlib) to facilitate concat
+* [cd-concat](https://gitlab.puppetsoft.com/12WW1160/cd_stdlib) or [puppetlabs concat](https://github.com/puppetlabs/puppetlabs-concat) to concatenate configuration files from different sources.
 
 ### Deployment
 

REPOSTRUCTURE.md

@@ -49,7 +49,11 @@
 |   |   `-- user.pp
 |   |-- nagios
 |   |   `-- objects
+|   |       |-- add_contact.pp
+|   |       |-- add_contact_rules.pp
 |   |       |-- commands.pp
+|   |       |-- config.pp
+|   |       |-- contacts.pp
 |   |       |-- template_rules.pp
 |   |       `-- templates.pp
 |   |-- selinux
@@ -72,9 +76,11 @@
 |   |   `-- nagios_ssl_vhost.erb
 |   |-- nagios
 |   |   |-- cgi_cfg.erb
+|   |   |-- contacts_cfg.erb
+|   |   |-- contacts_cfg_head.erb
+|   |   |-- contacts_cfg_rule.erb
 |   |   |-- htpasswd_rule.erb
 |   |   |-- nagios_cfg.erb
-|   |   |-- templates_cfg.erb
 |   |   |-- templates_cfg_head.erb
 |   |   `-- templates_cfg_rule.erb
 |   `-- selinux
@@ -90,4 +96,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-20 directories, 70 files
+20 directories, 76 files

doc/_index.html

@@ -108,11 +108,26 @@
       
             </li>
     
+            <li>
+      <span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html" title="puppet_classes::cd_nagios::nagios::objects::add_contact_rules (puppet_class)">cd_nagios::nagios::objects::add_contact_rules</a></span>
+      
+            </li>
+    
             <li>
       <span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html" title="puppet_classes::cd_nagios::nagios::objects::commands (puppet_class)">cd_nagios::nagios::objects::commands</a></span>
       
             </li>
     
+            <li>
+      <span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html" title="puppet_classes::cd_nagios::nagios::objects::config (puppet_class)">cd_nagios::nagios::objects::config</a></span>
+      
+            </li>
+    
+            <li>
+      <span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html" title="puppet_classes::cd_nagios::nagios::objects::contacts (puppet_class)">cd_nagios::nagios::objects::contacts</a></span>
+      
+            </li>
+    
             <li>
       <span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html" title="puppet_classes::cd_nagios::nagios::objects::template_rules (puppet_class)">cd_nagios::nagios::objects::template_rules</a></span>
       
@@ -163,6 +178,11 @@
         <li class="letter">C</li>
           <ul>
     
+            <li>
+      <span class='object_link'><a href="puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html" title="puppet_defined_types::cd_nagios::nagios::objects::add_contact (puppet_defined_type)">cd_nagios::nagios::objects::add_contact</a></span>
+      
+            </li>
+    
             <li>
       <span class='object_link'><a href="puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html" title="puppet_defined_types::cd_nagios::nagios::objects::templates (puppet_defined_type)">cd_nagios::nagios::objects::templates</a></span>
       
@@ -201,7 +221,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:03:58 2017 by
+  Generated on Wed Jul 26 13:16:39 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/file.README.html

@@ -145,14 +145,20 @@ parameters
 through external Puppet rules via define
 * manage Nagios commands through
 Puppet exports
-* configure NRPE on clients (optional)
+* manage Nagios template definitions through external Puppet
-* configure firewall
+rules via define
-(optional)
+* manage Nagios main contacts through Puppet exports.
-* configure selinux policies (optional)
+Additional contacts can be created through external Puppet rules via
-* configure forwarding
+define, to avoid having to alter the module code.
-http to https including accesing the /nagios url directly (optional)
+* configure NRPE on
-*
+clients (optional)
-manage TLS certificates through certbot (optional)</p>
+* configure firewall (optional)
+* configure selinux
+policies (optional)
+* configure forwarding http to https including accesing
+the /nagios url directly (optional)
+* manage TLS certificates through
+certbot (optional)</p>
 
 <p>Service
 * manage Nagios service on server
@@ -184,6 +190,14 @@ for selinux policy adjustments</p>
 </li><li>
 <p><a href="https://gitlab.puppetsoft.com/12WW1160/cd_certbot">cd_certbot</a>
 to auto-manage TLS certificates (optional)</p>
+</li><li>
+<p><a href="https://gitlab.puppetsoft.com/12WW1160/cd_stdlib">cd_stdlib</a> or
+<a href="https://github.com/puppetlabs/puppetlabs-stdlib">puppetlabs
+stdlib</a> to facilitate concat</p>
+</li><li>
+<p><a href="https://gitlab.puppetsoft.com/12WW1160/cd_stdlib">cd-concat</a> or
+<a href="https://github.com/puppetlabs/puppetlabs-concat">puppetlabs
+concat</a> to concatenate configuration files from different sources.</p>
 </li></ul>
 
 <h3 id="label-Deployment">Deployment</h3>
@@ -338,7 +352,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:03:59 2017 by
+  Generated on Wed Jul 26 13:16:40 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/index.html

@@ -145,14 +145,20 @@ parameters
 through external Puppet rules via define
 * manage Nagios commands through
 Puppet exports
-* configure NRPE on clients (optional)
+* manage Nagios template definitions through external Puppet
-* configure firewall
+rules via define
-(optional)
+* manage Nagios main contacts through Puppet exports.
-* configure selinux policies (optional)
+Additional contacts can be created through external Puppet rules via
-* configure forwarding
+define, to avoid having to alter the module code.
-http to https including accesing the /nagios url directly (optional)
+* configure NRPE on
-*
+clients (optional)
-manage TLS certificates through certbot (optional)</p>
+* configure firewall (optional)
+* configure selinux
+policies (optional)
+* configure forwarding http to https including accesing
+the /nagios url directly (optional)
+* manage TLS certificates through
+certbot (optional)</p>
 
 <p>Service
 * manage Nagios service on server
@@ -184,6 +190,14 @@ for selinux policy adjustments</p>
 </li><li>
 <p><a href="https://gitlab.puppetsoft.com/12WW1160/cd_certbot">cd_certbot</a>
 to auto-manage TLS certificates (optional)</p>
+</li><li>
+<p><a href="https://gitlab.puppetsoft.com/12WW1160/cd_stdlib">cd_stdlib</a> or
+<a href="https://github.com/puppetlabs/puppetlabs-stdlib">puppetlabs
+stdlib</a> to facilitate concat</p>
+</li><li>
+<p><a href="https://gitlab.puppetsoft.com/12WW1160/cd_stdlib">cd-concat</a> or
+<a href="https://github.com/puppetlabs/puppetlabs-concat">puppetlabs
+concat</a> to concatenate configuration files from different sources.</p>
 </li></ul>
 
 <h3 id="label-Deployment">Deployment</h3>
@@ -338,7 +352,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:03:58 2017 by
+  Generated on Wed Jul 26 13:16:39 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_class_list.html

@@ -96,49 +96,70 @@
     </li>
     
 
-    <li id="object_puppet_classes::cd_nagios::nagios::objects::commands" class="odd">
+    <li id="object_puppet_classes::cd_nagios::nagios::objects::add_contact_rules" class="odd">
+      <div class="item">
+        <span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html" title="puppet_classes::cd_nagios::nagios::objects::add_contact_rules (puppet_class)">cd_nagios::nagios::objects::add_contact_rules</a></span>
+      </div>
+    </li>
+    
+
+    <li id="object_puppet_classes::cd_nagios::nagios::objects::commands" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html" title="puppet_classes::cd_nagios::nagios::objects::commands (puppet_class)">cd_nagios::nagios::objects::commands</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::cd_nagios::nagios::objects::template_rules" class="even">
+    <li id="object_puppet_classes::cd_nagios::nagios::objects::config" class="odd">
+      <div class="item">
+        <span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html" title="puppet_classes::cd_nagios::nagios::objects::config (puppet_class)">cd_nagios::nagios::objects::config</a></span>
+      </div>
+    </li>
+    
+
+    <li id="object_puppet_classes::cd_nagios::nagios::objects::contacts" class="even">
+      <div class="item">
+        <span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html" title="puppet_classes::cd_nagios::nagios::objects::contacts (puppet_class)">cd_nagios::nagios::objects::contacts</a></span>
+      </div>
+    </li>
+    
+
+    <li id="object_puppet_classes::cd_nagios::nagios::objects::template_rules" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html" title="puppet_classes::cd_nagios::nagios::objects::template_rules (puppet_class)">cd_nagios::nagios::objects::template_rules</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::cd_nagios::params" class="odd">
+    <li id="object_puppet_classes::cd_nagios::params" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Aparams.html" title="puppet_classes::cd_nagios::params (puppet_class)">cd_nagios::params</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::cd_nagios::selinux::config" class="even">
+    <li id="object_puppet_classes::cd_nagios::selinux::config" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html" title="puppet_classes::cd_nagios::selinux::config (puppet_class)">cd_nagios::selinux::config</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::cd_nagios::server::access_rules" class="odd">
+    <li id="object_puppet_classes::cd_nagios::server::access_rules" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html" title="puppet_classes::cd_nagios::server::access_rules (puppet_class)">cd_nagios::server::access_rules</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::cd_nagios::server::files" class="even">
+    <li id="object_puppet_classes::cd_nagios::server::files" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html" title="puppet_classes::cd_nagios::server::files (puppet_class)">cd_nagios::server::files</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::cd_nagios::server::service" class="odd">
+    <li id="object_puppet_classes::cd_nagios::server::service" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::cd_nagios::server::service (puppet_class)">cd_nagios::server::service</a></span>
       </div>

doc/puppet_classes/cd_nagios.html

@@ -139,7 +139,7 @@ class cd_nagios {
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:03:59 2017 by
+  Generated on Wed Jul 26 13:16:40 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html

@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:03 2017 by
+  Generated on Wed Jul 26 13:16:45 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html

@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:04 2017 by
+  Generated on Wed Jul 26 13:16:45 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html

@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:04 2017 by
+  Generated on Wed Jul 26 13:16:45 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html

@@ -195,7 +195,7 @@ class cd_nagios::main::config (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:03 2017 by
+  Generated on Wed Jul 26 13:16:44 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html

@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:03 2017 by
+  Generated on Wed Jul 26 13:16:44 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html

@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:03 2017 by
+  Generated on Wed Jul 26 13:16:44 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html

@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:03 2017 by
+  Generated on Wed Jul 26 13:16:44 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html

@@ -0,0 +1,238 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Puppet Class: cd_nagios::nagios::objects::add_contact_rules
+  
+    &mdash; Documentation by YARD 0.9.9
+  
+</title>
+
+  <link rel="stylesheet" href="../css/style.css" type="text/css" charset="utf-8" />
+
+  <link rel="stylesheet" href="../css/common.css" type="text/css" charset="utf-8" />
+
+<script type="text/javascript" charset="utf-8">
+  pathId = "puppet_classes::cd_nagios::nagios::objects::add_contact_rules";
+  relpath = '../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../puppet_class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../_index.html">Index (c)</a> &raquo;
+    <span class='title'><span class='object_link'>Puppet Classes</span></span>
+     &raquo; 
+    <span class="title">cd_nagios::nagios::objects::add_contact_rules</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="puppet_class_list_link"
+        href="../puppet_class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Puppet Class: cd_nagios::nagios::objects::add_contact_rules</h1>
+<div class="box_info">
+  
+  <dl>
+    <dt>Inherits:</dt>
+    <dd><span class='object_link'><a href="cd_nagios_3A_3Aparams.html" title="puppet_classes::cd_nagios::params (puppet_class)">cd_nagios::params</a></span></dd>
+  </dl>
+  
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>
+      manifests/nagios/objects/add_contact_rules.pp
+    </dd>
+  </dl>
+</div>
+
+  <h2>Summary</h2>
+  Class manages /etc/nagios/conf.d/nagios_add_contact.cfg through
+concat.
+
+<h2>Overview</h2>
+<div class="docstring">
+  <div class="discussion">
+    
+<p>cd_nagios::nagios::objects::add_contact_rules.pp
+Module name:
+cd_nagios
+Author: Arne Teuke (arne_teuke@ConfDroid.com)</p>
+
+<h1 id="label-License%3A">License:</h1>
+
+<p>This file is part of cd_nagios.</p>
+
+<p>cd_nagios is used for providing automatic configuration of Nagios
+
+Copyright (C) 2016 ConfDroid (copyright@ConfDroid.com)
+ This program is
+free software: you can redistribute it and/or modify
+ it under the terms of
+the GNU General Public License as published by
+ the Free Software
+Foundation, either version 3 of the License, or
+ (at your option) any later
+version.</p>
+
+<p>This program is distributed in the hope that it will be useful,
+ but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License
+for more details.</p>
+
+<p>You should have received a copy of the GNU General Public License
+ along
+with this program. If not, see <a
+href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.
+cd_nagios::nagios::objects::add_contact
+{ &#39;example_user&#39;:
+ ng_contact_name =&gt; &#39;example_user&#39;,
+
+ng_contact_alias =&gt; &#39;Example User&#39;,
+ ng_contact_groups =&gt;
+&#39;admins&#39;,
+ ng_contact_email =&gt; &#39;example@example.net&#39;,
+ }</p>
+
+  </div>
+</div>
+<div class="tags">
+  
+
+</div><div class="method_details_list">
+  <table class="source_code">
+    <tr>
+      <td>
+        <pre class="lines">
+
+
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69</pre>
+      </td>
+      <td>
+        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_contact_rules.pp', line 31</span>
+
+class cd_nagios::nagios::objects::add_contact_rules (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    # manage /etc/nagios/conf.d/nagios_add_contacts.cfg
+
+    concat { $ng_target_add_contact:
+      ensure    =&gt;  present,
+      path      =&gt;  $ng_target_add_contact,
+      owner     =&gt;  $ng_user,
+      group     =&gt;  $ng_user,
+      mode      =&gt;  &#39;0640&#39;,
+      selrange  =&gt;  s0,
+      selrole   =&gt;  object_r,
+      seltype   =&gt;  nagios_etc_t,
+      seluser   =&gt;  system_u,
+      notify    =&gt;  Service[$ng_service],
+    }
+
+    # manage file header
+
+    concat::fragment { &#39;header&#39;:
+      target    =&gt;  $ng_target_add_contact,
+      content   =&gt;  template($ng_contacts_head_erb),
+      order     =&gt;  &#39;000&#39;,
+    }
+
+    # example rule for testing
+
+    cd_nagios::nagios::objects::add_contact { &#39;example_user&#39;:
+      ng_contact_name   =&gt;  &#39;example_user&#39;,
+      ng_contact_alias  =&gt;  &#39;Example User&#39;,
+      ng_contact_groups =&gt;  &#39;admins&#39;,
+      ng_contact_email  =&gt;  &#39;example@example.net&#39;,
+    }
+  }
+}</pre>
+      </td>
+    </tr>
+  </table>
+</div>
+</div>
+
+      <div id="footer">
+  Generated on Wed Jul 26 13:16:46 2017 by
+  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.9 (ruby-2.0.0).
+</div>
+
+    </div>
+  </body>
+</html>

doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html

@@ -595,7 +595,7 @@ class cd_nagios::nagios::objects::commands (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:04 2017 by
+  Generated on Wed Jul 26 13:16:45 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html

@@ -0,0 +1,174 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Puppet Class: cd_nagios::nagios::objects::config
+  
+    &mdash; Documentation by YARD 0.9.9
+  
+</title>
+
+  <link rel="stylesheet" href="../css/style.css" type="text/css" charset="utf-8" />
+
+  <link rel="stylesheet" href="../css/common.css" type="text/css" charset="utf-8" />
+
+<script type="text/javascript" charset="utf-8">
+  pathId = "puppet_classes::cd_nagios::nagios::objects::config";
+  relpath = '../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../puppet_class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../_index.html">Index (c)</a> &raquo;
+    <span class='title'><span class='object_link'>Puppet Classes</span></span>
+     &raquo; 
+    <span class="title">cd_nagios::nagios::objects::config</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="puppet_class_list_link"
+        href="../puppet_class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Puppet Class: cd_nagios::nagios::objects::config</h1>
+<div class="box_info">
+  
+  <dl>
+    <dt>Inherits:</dt>
+    <dd><span class='object_link'><a href="cd_nagios_3A_3Aparams.html" title="puppet_classes::cd_nagios::params (puppet_class)">cd_nagios::params</a></span></dd>
+  </dl>
+  
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>
+      manifests/nagios/objects/config.pp
+    </dd>
+  </dl>
+</div>
+
+  <h2>Summary</h2>
+  Class manages the nagios objects definitions.
+
+<h2>Overview</h2>
+<div class="docstring">
+  <div class="discussion">
+    
+<p>cd_nagios::server::nagios::objects::config.pp
+Module name:
+cd_nagios
+Author: Arne Teuke (arne_teuke@ConfDroid.com)</p>
+
+<h1 id="label-License%3A">License:</h1>
+
+<p>This file is part of cd_nagios.</p>
+
+<p>cd_nagios is used for providing automatic configuration of Nagios
+
+Copyright (C) 2016 ConfDroid (copyright@ConfDroid.com)
+ This program is
+free software: you can redistribute it and/or modify
+ it under the terms of
+the GNU General Public License as published by
+ the Free Software
+Foundation, either version 3 of the License, or
+ (at your option) any later
+version.</p>
+
+<p>This program is distributed in the hope that it will be useful,
+ but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License
+for more details.</p>
+
+<p>You should have received a copy of the GNU General Public License
+ along
+with this program. If not, see <a
+href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
+
+  </div>
+</div>
+<div class="tags">
+  
+
+</div><div class="method_details_list">
+  <table class="source_code">
+    <tr>
+      <td>
+        <pre class="lines">
+
+
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34</pre>
+      </td>
+      <td>
+        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/config.pp', line 23</span>
+
+class cd_nagios::nagios::objects::config (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    require cd_nagios::nagios::objects::commands
+    require cd_nagios::nagios::objects::template_rules
+    require cd_nagios::nagios::objects::add_contact_rules
+
+  }
+}</pre>
+      </td>
+    </tr>
+  </table>
+</div>
+</div>
+
+      <div id="footer">
+  Generated on Wed Jul 26 13:16:45 2017 by
+  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.9 (ruby-2.0.0).
+</div>
+
+    </div>
+  </body>
+</html>

doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html

@@ -0,0 +1,290 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Puppet Class: cd_nagios::nagios::objects::contacts
+  
+    &mdash; Documentation by YARD 0.9.9
+  
+</title>
+
+  <link rel="stylesheet" href="../css/style.css" type="text/css" charset="utf-8" />
+
+  <link rel="stylesheet" href="../css/common.css" type="text/css" charset="utf-8" />
+
+<script type="text/javascript" charset="utf-8">
+  pathId = "puppet_classes::cd_nagios::nagios::objects::contacts";
+  relpath = '../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../puppet_class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../_index.html">Index (c)</a> &raquo;
+    <span class='title'><span class='object_link'>Puppet Classes</span></span>
+     &raquo; 
+    <span class="title">cd_nagios::nagios::objects::contacts</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="puppet_class_list_link"
+        href="../puppet_class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Puppet Class: cd_nagios::nagios::objects::contacts</h1>
+<div class="box_info">
+  
+  <dl>
+    <dt>Inherits:</dt>
+    <dd><span class='object_link'><a href="cd_nagios_3A_3Aparams.html" title="puppet_classes::cd_nagios::params (puppet_class)">cd_nagios::params</a></span></dd>
+  </dl>
+  
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>
+      manifests/nagios/objects/contacts.pp
+    </dd>
+  </dl>
+</div>
+
+  <h2>Summary</h2>
+  Class manages basic contacts known to NAGIOS through Puppet exports,
+and populates /etc/nagios/conf.d/nagios_base_contacts.cfg.
+
+<h2>Overview</h2>
+<div class="docstring">
+  <div class="discussion">
+    
+<p>cd_nagios::nagios::objects::contacts.pp
+Module name: cd_nagios
+Author: Arne
+Teuke (arne_teuke@ConfDroid.com)</p>
+
+<h1 id="label-License%3A">License:</h1>
+
+<p>This file is part of cd_nagios.</p>
+
+<p>cd_nagios is used for providing automatic configuration of Nagios
+
+Copyright (C) 2016 ConfDroid (copyright@ConfDroid.com)
+ This program is
+free software: you can redistribute it and/or modify
+ it under the terms of
+the GNU General Public License as published by
+ the Free Software
+Foundation, either version 3 of the License, or
+ (at your option) any later
+version.</p>
+
+<p>This program is distributed in the hope that it will be useful,
+ but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License
+for more details.</p>
+
+<p>You should have received a copy of the GNU General Public License
+ along
+with this program. If not, see <a
+href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
+
+  </div>
+</div>
+<div class="tags">
+  
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+    
+      
+      <pre class="example code"><code>@@nagios_contact { &#39;admin&#39;:
+  ensure              =&gt;  present,
+  alias               =&gt;  &#39;Nagios Admin&#39;,
+  contact_name        =&gt;  &#39;admin&#39;,
+  contactgroups       =&gt;  &#39;admins&#39;,
+  email               =&gt;  &quot;admin@${::domain}&quot;,
+  can_submit_commands =&gt;  &#39;1&#39;,
+  register            =&gt;  &#39;1&#39;,
+  use                 =&gt;  &#39;generic-contact&#39;,
+  target              =&gt;  $ng_target_base_contact,
+  owner               =&gt;  &#39;root&#39;,
+  group               =&gt;  &#39;nagios&#39;,
+  mode                =&gt;  &#39;0664&#39;,
+}</code></pre>
+    
+  </div>
+
+
+</div><div class="method_details_list">
+  <table class="source_code">
+    <tr>
+      <td>
+        <pre class="lines">
+
+
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97</pre>
+      </td>
+      <td>
+        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/contacts.pp', line 39</span>
+
+class cd_nagios::nagios::objects::contacts (
+
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    #  admin contact
+
+    @@nagios_contact { &#39;admin&#39;:
+      ensure              =&gt;  present,
+      alias               =&gt;  &#39;Nagios Admin&#39;,
+      contact_name        =&gt;  &#39;admin&#39;,
+      contactgroups       =&gt;  &#39;admins&#39;,
+      email               =&gt;  &quot;admin@${::domain}&quot;,
+      can_submit_commands =&gt;  &#39;1&#39;,
+      register            =&gt;  &#39;1&#39;,
+      use                 =&gt;  &#39;generic-contact&#39;,
+      target              =&gt;  $ng_target_base_contact,
+      owner               =&gt;  $ng_user,
+      group               =&gt;  $ng_user,
+      mode                =&gt;  &#39;0640&#39;,
+    }
+
+    # ops contact
+
+    @@nagios_contact { &#39;ops&#39;:
+      ensure              =&gt;  present,
+      alias               =&gt;  &#39;Operations&#39;,
+      contact_name        =&gt;  &#39;ops&#39;,
+      contactgroups       =&gt;  &#39;operations&#39;,
+      email               =&gt;  &quot;ops@${::domain}&quot;,
+      can_submit_commands =&gt;  &#39;1&#39;,
+      register            =&gt;  &#39;1&#39;,
+      use                 =&gt;  &#39;generic-contact&#39;,
+      target              =&gt;  $ng_target_base_contact,
+      owner               =&gt;  $ng_user,
+      group               =&gt;  $ng_user,
+      mode                =&gt;  &#39;0640&#39;,
+    }
+
+   # support contact
+
+    @@nagios_contact { &#39;support&#39;:
+      ensure              =&gt;  present,
+      alias               =&gt;  &#39;support&#39;,
+      contact_name        =&gt;  &#39;support&#39;,
+      contactgroups       =&gt;  &#39;support&#39;,
+      email               =&gt;  &quot;support@${::domain}&quot;,
+      can_submit_commands =&gt;  &#39;1&#39;,
+      register            =&gt;  &#39;1&#39;,
+      use                 =&gt;  &#39;generic-contact&#39;,
+      target              =&gt;  $ng_target_base_contact,
+      owner               =&gt;  $ng_user,
+      group               =&gt;  $ng_user,
+      mode                =&gt;  &#39;0640&#39;,
+    }
+  }
+}</pre>
+      </td>
+    </tr>
+  </table>
+</div>
+</div>
+
+      <div id="footer">
+  Generated on Wed Jul 26 13:16:45 2017 by
+  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.9 (ruby-2.0.0).
+</div>
+
+    </div>
+  </body>
+</html>

doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html

@@ -77,7 +77,8 @@
 </div>
 
   <h2>Summary</h2>
-  Class manages /etc/nagios/conf.d/templates.cfg through concat.
+  Class manages /etc/nagios/conf.d/nagios_templates.cfg through
+concat.
 
 <h2>Overview</h2>
 <div class="docstring">
@@ -143,7 +144,6 @@ ng_template_object_name =&gt;  &#39;generic-contact&#39;,
         <pre class="lines">
 
 
-27
 28
 29
 30
@@ -216,10 +216,11 @@ ng_template_object_name =&gt;  &#39;generic-contact&#39;,
 97
 98
 99
-100</pre>
+100
+101</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/template_rules.pp', line 27</span>
+        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/template_rules.pp', line 28</span>
 
 class cd_nagios::nagios::objects::template_rules (
 
@@ -302,7 +303,7 @@ class cd_nagios::nagios::objects::template_rules (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:04 2017 by
+  Generated on Wed Jul 26 13:16:46 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Aparams.html

@@ -89,10 +89,16 @@
       
       <span class='object_link'><a href="cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html" title="puppet_classes::cd_nagios::server::access_rules (puppet_class)">cd_nagios::server::access_rules</a></span><br/>
       
+      <span class='object_link'><a href="cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html" title="puppet_classes::cd_nagios::nagios::objects::config (puppet_class)">cd_nagios::nagios::objects::config</a></span><br/>
+      
       <span class='object_link'><a href="cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html" title="puppet_classes::cd_nagios::nagios::objects::commands (puppet_class)">cd_nagios::nagios::objects::commands</a></span><br/>
       
+      <span class='object_link'><a href="cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html" title="puppet_classes::cd_nagios::nagios::objects::contacts (puppet_class)">cd_nagios::nagios::objects::contacts</a></span><br/>
+      
       <span class='object_link'><a href="cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html" title="puppet_classes::cd_nagios::nagios::objects::template_rules (puppet_class)">cd_nagios::nagios::objects::template_rules</a></span><br/>
       
+      <span class='object_link'><a href="cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html" title="puppet_classes::cd_nagios::nagios::objects::add_contact_rules (puppet_class)">cd_nagios::nagios::objects::add_contact_rules</a></span><br/>
+      
     </dd>
   </dl>
   
@@ -5207,7 +5213,10 @@ up</p>
 980
 981
 982
-983</pre>
+983
+984
+985
+986</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 646</span>
@@ -5528,7 +5537,7 @@ $ng_certbot_check         = &quot;${ng_certbot_archive}/${ng_webserver_name}/cer
 $ng_certbot_live          = &quot;${ng_certbot_main_dir}/live&quot;
 
 # nagios
-$ng_target_templates      = &quot;${ng_conf_d_dir}/templates.cfg&quot;
+$ng_target_templates      = &quot;${ng_conf_d_dir}/nagios_templates.cfg&quot;
 $ng_templates_head_erb    = &#39;cd_nagios/nagios/templates_cfg_head.erb&#39;
 $ng_templates_rule_erb    = &#39;cd_nagios/nagios/templates_cfg_rule.erb&#39;
 $ng_target_timeperiods    = &quot;${ng_conf_d_dir}/timeperiods.cfg&quot;
@@ -5540,7 +5549,10 @@ $ng_target_hostesc        = &quot;${ng_conf_d_dir}/nagios_hostescalation.cfg&quo
 $ng_target_hostext        = &quot;${ng_conf_d_dir}/nagios_hostextinfo.cfg&quot;
 $ng_target_service        = &quot;${ng_conf_d_dir}/nagios_service.cfg&quot;
 $ng_target_servicegroup   = &quot;${ng_conf_d_dir}/nagios_servicegroup.cfg&quot;
-$ng_target_contact        = &quot;${ng_conf_d_dir}/nagios_contact.cfg&quot;
+$ng_target_base_contact   = &quot;${ng_conf_d_dir}/nagios_base_contact.cfg&quot;
+$ng_target_add_contact    = &quot;${ng_conf_d_dir}/nagios_add_contact.cfg&quot;
+$ng_contacts_head_erb     = &#39;cd_nagios/nagios/contacts_cfg_head.erb&#39;
+$ng_contact_rule_erb      = &#39;cd_nagios/nagios/contact_cfg_rule.erb&#39;
 $ng_target_contactgroup   = &quot;${ng_conf_d_dir}/nagios_contactgroup.cfg&quot;
 $ng_target_command        = &quot;${ng_conf_d_dir}/nagios_command.cfg&quot;
 
@@ -5557,7 +5569,7 @@ $ng_target_command        = &quot;${ng_conf_d_dir}/nagios_command.cfg&quot;
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:03 2017 by
+  Generated on Wed Jul 26 13:16:44 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html

@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:04 2017 by
+  Generated on Wed Jul 26 13:16:45 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html

@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:04 2017 by
+  Generated on Wed Jul 26 13:16:45 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html

@@ -334,7 +334,7 @@ class cd_nagios::server::files (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:03 2017 by
+  Generated on Wed Jul 26 13:16:45 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html

@@ -192,8 +192,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 83
 84
 85
-86
+86</pre>
-87</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 23</span>
@@ -206,8 +205,7 @@ class cd_nagios::server::service (
 
     require cd_nagios::server::files
     require cd_nagios::server::access_rules
-    require cd_nagios::nagios::objects::commands
+    require cd_nagios::nagios::objects::config
-    require cd_nagios::nagios::objects::template_rules
 
     service { $ng_service:
       ensure      =&gt; running,
@@ -270,7 +268,7 @@ class cd_nagios::server::service (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:04 2017 by
+  Generated on Wed Jul 26 13:16:45 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_defined_type_list.html

@@ -40,14 +40,21 @@
       <ul id="full_list" class="puppet_defined_type">
         
 
-    <li id="object_puppet_defined_types::cd_nagios::nagios::objects::templates" class="odd">
+    <li id="object_puppet_defined_types::cd_nagios::nagios::objects::add_contact" class="odd">
+      <div class="item">
+        <span class='object_link'><a href="puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html" title="puppet_defined_types::cd_nagios::nagios::objects::add_contact (puppet_defined_type)">cd_nagios::nagios::objects::add_contact</a></span>
+      </div>
+    </li>
+    
+
+    <li id="object_puppet_defined_types::cd_nagios::nagios::objects::templates" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html" title="puppet_defined_types::cd_nagios::nagios::objects::templates (puppet_defined_type)">cd_nagios::nagios::objects::templates</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_defined_types::cd_nagios::server::access" class="even">
+    <li id="object_puppet_defined_types::cd_nagios::server::access" class="odd">
       <div class="item">
         <span class='object_link'><a href="puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html" title="puppet_defined_types::cd_nagios::server::access (puppet_defined_type)">cd_nagios::server::access</a></span>
       </div>

doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html

@@ -0,0 +1,235 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Defined Type: cd_nagios::nagios::objects::add_contact
+  
+    &mdash; Documentation by YARD 0.9.9
+  
+</title>
+
+  <link rel="stylesheet" href="../css/style.css" type="text/css" charset="utf-8" />
+
+  <link rel="stylesheet" href="../css/common.css" type="text/css" charset="utf-8" />
+
+<script type="text/javascript" charset="utf-8">
+  pathId = "puppet_defined_types::cd_nagios::nagios::objects::add_contact";
+  relpath = '../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../puppet_defined_type_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../_index.html">Index (c)</a> &raquo;
+    <span class='title'><span class='object_link'>Defined Types</span></span>
+     &raquo; 
+    <span class="title">cd_nagios::nagios::objects::add_contact</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="puppet_class_list_link"
+        href="../puppet_class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Defined Type: cd_nagios::nagios::objects::add_contact</h1>
+<div class="box_info">
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>
+      manifests/nagios/objects/add_contact.pp
+    </dd>
+  </dl>
+</div>
+
+  <h2>Summary</h2>
+  Define manages additional contacts known to NAGIOS through external
+Puppet rules, and populates /etc/nagios/conf.d/nagios_add_contact.cfg.
+
+<h2>Overview</h2>
+<div class="docstring">
+  <div class="discussion">
+    
+<p>cd_nagios::nagios::objects::add_contact.pp
+Module name: cd_nagios
+Author:
+Arne Teuke (arne_teuke@ConfDroid.com)</p>
+
+<h1 id="label-License%3A">License:</h1>
+
+<p>This file is part of cd_nagios.</p>
+
+<p>cd_nagios is used for providing automatic configuration of Nagios
+
+Copyright (C) 2016 ConfDroid (copyright@ConfDroid.com)
+ This program is
+free software: you can redistribute it and/or modify
+ it under the terms of
+the GNU General Public License as published by
+ the Free Software
+Foundation, either version 3 of the License, or
+ (at your option) any later
+version.</p>
+
+<p>This program is distributed in the hope that it will be useful,
+ but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License
+for more details.</p>
+
+<p>You should have received a copy of the GNU General Public License
+ along
+with this program. If not, see <a
+href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
+
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>ng_contact_name</span>
+      
+      
+        <span class='type'>(<tt>Any</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>undef</tt>)</em>
+      
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_contact_use</span>
+      
+      
+        <span class='type'>(<tt>Any</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;generic-contact&#39;</tt>)</em>
+      
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_contact_alias</span>
+      
+      
+        <span class='type'>(<tt>Any</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>undef</tt>)</em>
+      
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_contact_email</span>
+      
+      
+        <span class='type'>(<tt>Any</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>undef</tt>)</em>
+      
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_contact_groups</span>
+      
+      
+        <span class='type'>(<tt>Any</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>undef</tt>)</em>
+      
+      
+    </li>
+  
+</ul>
+
+
+</div><div class="method_details_list">
+  <table class="source_code">
+    <tr>
+      <td>
+        <pre class="lines">
+
+
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35</pre>
+      </td>
+      <td>
+        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/add_contact.pp', line 25</span>
+
+define cd_nagios::nagios::objects::add_contact (
+
+$ng_contact_name    = undef,
+$ng_contact_use     = &#39;generic-contact&#39;,
+$ng_contact_alias   = undef,
+$ng_contact_email   = undef,
+$ng_contact_groups  = undef,
+
+) {
+
+}</pre>
+      </td>
+    </tr>
+  </table>
+</div>
+</div>
+
+      <div id="footer">
+  Generated on Wed Jul 26 13:16:46 2017 by
+  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  0.9.9 (ruby-2.0.0).
+</div>
+
+    </div>
+  </body>
+</html>

doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html

@@ -180,7 +180,7 @@ notifications for service events, i.e.
   
     <li>
       
-        <span class='name'>ng_svc_notification_period</span>
+        <span class='name'>ng_host_notification_period</span>
       
       
         <span class='type'>(<tt>string</tt>)</span>
@@ -405,8 +405,6 @@ Valid options are <code>0</code> and
         <span class='type'>(<tt>string</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
-      
       
         &mdash;
         <div class='inline'>
@@ -591,6 +589,22 @@ maximal.</p>
       
     </li>
   
+    <li>
+      
+        <span class='name'>ng_check_command</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>The command to use for host checks.</p>
+</div>
+      
+    </li>
+  
     <li>
       
         <span class='name'>ng_notification_options</span>
@@ -791,20 +805,7 @@ until a hard state can be determined.</p>
   
     <li>
       
-        <span class='name'>ng_host_notification_period</span>
+        <span class='name'>ng_host_check_command</span>
-      
-      
-        <span class='type'>(<tt>Any</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;24x7&#39;</tt>)</em>
-      
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ng_check_command</span>
       
       
         <span class='type'>(<tt>Any</tt>)</span>
@@ -825,7 +826,6 @@ until a hard state can be determined.</p>
         <pre class="lines">
 
 
-101
 102
 103
 104
@@ -877,7 +877,7 @@ until a hard state can be determined.</p>
 150</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/templates.pp', line 101</span>
+        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/templates.pp', line 102</span>
 
 define cd_nagios::nagios::objects::templates (
 $ng_template_object               = undef,
@@ -893,7 +893,6 @@ $ng_template_object_use           = undef,
 $ng_notifications_enabled         = &#39;1&#39;,
 $ng_event_handler_enabled         = &#39;1&#39;,
 $ng_flap_detection_enabled        = &#39;1&#39;,
-$ng_failure_prediction_enabled    = &#39;1&#39;,
 $ng_process_perf_data             = &#39;1&#39;,
 $ng_retain_status_information     = &#39;1&#39;,
 $ng_retain_nonstatus_information  = &#39;1&#39;,
@@ -903,7 +902,7 @@ $ng_check_period                  = &#39;24x7&#39;,
 $ng_check_interval                = &#39;5&#39;,
 $ng_retry_interval                = &#39;1&#39;,
 $ng_max_check_attempts            = &#39;10&#39;,
-$ng_check_command                 = &#39;check-host-alive&#39;,
+$ng_host_check_command            = &#39;check-host-alive&#39;,
 $ng_notification_options          = undef,
 $ng_contact_groups                = &#39;admins&#39;,
 $ng_active_checks_enabled         = &#39;1&#39;,
@@ -936,7 +935,7 @@ $ng_templates_rule_erb  = $::cd_nagios::params::ng_templates_rule_erb
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:05 2017 by
+  Generated on Wed Jul 26 13:16:46 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html

@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:04:04 2017 by
+  Generated on Wed Jul 26 13:16:46 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/top-level-namespace.html

@@ -90,7 +90,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 20:03:59 2017 by
+  Generated on Wed Jul 26 13:16:40 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

manifests/nagios/objects/add_contact.pp

@@ -0,0 +1,35 @@
+## cd_nagios::nagios::objects::add_contact.pp
+# Module name: cd_nagios
+# Author: Arne Teuke (arne_teuke@ConfDroid.com)
+# # License:
+#    This file is part of cd_nagios.
+#
+#    cd_nagios is used for providing automatic configuration of Nagios
+#    Copyright (C) 2016  ConfDroid (copyright@ConfDroid.com)
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# @summary  Define manages additional contacts known to NAGIOS through external
+#   Puppet rules, and populates /etc/nagios/conf.d/nagios_add_contact.cfg.
+# @example
+################################################################################
+define cd_nagios::nagios::objects::add_contact (
+
+$ng_contact_name    = undef,
+$ng_contact_use     = 'generic-contact',
+$ng_contact_alias   = undef,
+$ng_contact_email   = undef,
+$ng_contact_groups  = undef,
+
+) {
+
+}

manifests/nagios/objects/add_contact_rules.pp

@@ -0,0 +1,69 @@
+## cd_nagios::nagios::objects::add_contact_rules.pp
+# Module name: cd_nagios
+# Author: Arne Teuke (arne_teuke@ConfDroid.com)
+# # License:
+#    This file is part of cd_nagios.
+#
+#    cd_nagios is used for providing automatic configuration of Nagios
+#    Copyright (C) 2016  ConfDroid (copyright@ConfDroid.com)
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# @summary  Class manages /etc/nagios/conf.d/nagios_add_contact.cfg through
+#   concat.
+# @example
+# cd_nagios::nagios::objects::add_contact { 'example_user':
+#   ng_contact_name   =>  'example_user',
+#   ng_contact_alias  =>  'Example User',
+#   ng_contact_groups =>  'admins',
+#   ng_contact_email  =>  'example@example.net',
+#   }
+################################################################################
+class cd_nagios::nagios::objects::add_contact_rules (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    # manage /etc/nagios/conf.d/nagios_add_contacts.cfg
+
+    concat { $ng_target_add_contact:
+      ensure    =>  present,
+      path      =>  $ng_target_add_contact,
+      owner     =>  $ng_user,
+      group     =>  $ng_user,
+      mode      =>  '0640',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_etc_t,
+      seluser   =>  system_u,
+      notify    =>  Service[$ng_service],
+    }
+
+    # manage file header
+
+    concat::fragment { 'header':
+      target    =>  $ng_target_add_contact,
+      content   =>  template($ng_contacts_head_erb),
+      order     =>  '000',
+    }
+
+    # example rule for testing
+
+    cd_nagios::nagios::objects::add_contact { 'example_user':
+      ng_contact_name   =>  'example_user',
+      ng_contact_alias  =>  'Example User',
+      ng_contact_groups =>  'admins',
+      ng_contact_email  =>  'example@example.net',
+    }
+  }
+}

manifests/nagios/objects/config.pp

@@ -0,0 +1,34 @@
+## cd_nagios::server::nagios::objects::config.pp
+# Module name: cd_nagios
+# Author: Arne Teuke (arne_teuke@ConfDroid.com)
+# # License:
+#    This file is part of cd_nagios.
+#
+#    cd_nagios is used for providing automatic configuration of Nagios
+#    Copyright (C) 2016  ConfDroid (copyright@ConfDroid.com)
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# @summary  Class manages the nagios objects definitions.
+#############################################################################
+class cd_nagios::nagios::objects::config (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    require cd_nagios::nagios::objects::commands
+    require cd_nagios::nagios::objects::template_rules
+    require cd_nagios::nagios::objects::add_contact_rules
+
+  }
+}

manifests/nagios/objects/contacts.pp

@@ -0,0 +1,97 @@
+## cd_nagios::nagios::objects::contacts.pp
+# Module name: cd_nagios
+# Author: Arne Teuke (arne_teuke@ConfDroid.com)
+# # License:
+#    This file is part of cd_nagios.
+#
+#    cd_nagios is used for providing automatic configuration of Nagios
+#    Copyright (C) 2016  ConfDroid (copyright@ConfDroid.com)
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# @summary  Class manages basic contacts known to NAGIOS through Puppet exports,
+#   and populates /etc/nagios/conf.d/nagios_base_contacts.cfg.
+# @example
+#   @@nagios_contact { 'admin':
+#     ensure              =>  present,
+#     alias               =>  'Nagios Admin',
+#     contact_name        =>  'admin',
+#     contactgroups       =>  'admins',
+#     email               =>  "admin@${::domain}",
+#     can_submit_commands =>  '1',
+#     register            =>  '1',
+#     use                 =>  'generic-contact',
+#     target              =>  $ng_target_base_contact,
+#     owner               =>  'root',
+#     group               =>  'nagios',
+#     mode                =>  '0664',
+#   }
+################################################################################
+class cd_nagios::nagios::objects::contacts (
+
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    #  admin contact
+
+    @@nagios_contact { 'admin':
+      ensure              =>  present,
+      alias               =>  'Nagios Admin',
+      contact_name        =>  'admin',
+      contactgroups       =>  'admins',
+      email               =>  "admin@${::domain}",
+      can_submit_commands =>  '1',
+      register            =>  '1',
+      use                 =>  'generic-contact',
+      target              =>  $ng_target_base_contact,
+      owner               =>  $ng_user,
+      group               =>  $ng_user,
+      mode                =>  '0640',
+    }
+
+    # ops contact
+
+    @@nagios_contact { 'ops':
+      ensure              =>  present,
+      alias               =>  'Operations',
+      contact_name        =>  'ops',
+      contactgroups       =>  'operations',
+      email               =>  "ops@${::domain}",
+      can_submit_commands =>  '1',
+      register            =>  '1',
+      use                 =>  'generic-contact',
+      target              =>  $ng_target_base_contact,
+      owner               =>  $ng_user,
+      group               =>  $ng_user,
+      mode                =>  '0640',
+    }
+
+   # support contact
+
+    @@nagios_contact { 'support':
+      ensure              =>  present,
+      alias               =>  'support',
+      contact_name        =>  'support',
+      contactgroups       =>  'support',
+      email               =>  "support@${::domain}",
+      can_submit_commands =>  '1',
+      register            =>  '1',
+      use                 =>  'generic-contact',
+      target              =>  $ng_target_base_contact,
+      owner               =>  $ng_user,
+      group               =>  $ng_user,
+      mode                =>  '0640',
+    }
+  }
+}

manifests/nagios/objects/template_rules.pp

@@ -18,7 +18,8 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# @summary  Class manages /etc/nagios/conf.d/templates.cfg through concat.
+# @summary  Class manages /etc/nagios/conf.d/nagios_templates.cfg through
+#   concat.
 # @example      cd_nagios::nagios::objects::templates { 'generic contact':
 #   ng_template_object      => 'contact',
 #   ng_template_object_name =>  'generic-contact',

manifests/nagios/objects/templates.pp

@@ -25,7 +25,7 @@
 #   i.e. `generic-contact`, `generic-host`, `generic-service`.
 # @param  [string] ng_svc_notification_period Period in which to send out
 #   notifications for service events, i.e. `24x7`.
-# @param  [string] ng_svc_notification_period Period in which to send out
+# @param  [string] ng_host_notification_period Period in which to send out
 #   notifications for host events , i.e. `24x7`.
 # @param  [string] ng_service_notification_options What service events to send
 #   out notifications for:
@@ -77,6 +77,7 @@
 #   retries for the defined object.
 # @param  [string]  ng_max_check_attempts how often to check the defined object
 #   maximal.
+# @param  [string] ng_check_command The command to use for host checks.
 # @param [string] ng_notification_options see `ng_service_notification_options`
 #   and `ng_host_notification_options`.
 # @param  [string] ng_contact_groups contact groups for the defined oject.
@@ -112,7 +113,6 @@ $ng_template_object_use           = undef,
 $ng_notifications_enabled         = '1',
 $ng_event_handler_enabled         = '1',
 $ng_flap_detection_enabled        = '1',
-$ng_failure_prediction_enabled    = '1',
 $ng_process_perf_data             = '1',
 $ng_retain_status_information     = '1',
 $ng_retain_nonstatus_information  = '1',
@@ -122,7 +122,7 @@ $ng_check_period                  = '24x7',
 $ng_check_interval                = '5',
 $ng_retry_interval                = '1',
 $ng_max_check_attempts            = '10',
-$ng_check_command                 = 'check-host-alive',
+$ng_host_check_command            = 'check-host-alive',
 $ng_notification_options          = undef,
 $ng_contact_groups                = 'admins',
 $ng_active_checks_enabled         = '1',

manifests/params.pp

@@ -959,7 +959,7 @@ $ng_certbot_check         = "${ng_certbot_archive}/${ng_webserver_name}/cert1.pe
 $ng_certbot_live          = "${ng_certbot_main_dir}/live"
 
 # nagios
-$ng_target_templates      = "${ng_conf_d_dir}/templates.cfg"
+$ng_target_templates      = "${ng_conf_d_dir}/nagios_templates.cfg"
 $ng_templates_head_erb    = 'cd_nagios/nagios/templates_cfg_head.erb'
 $ng_templates_rule_erb    = 'cd_nagios/nagios/templates_cfg_rule.erb'
 $ng_target_timeperiods    = "${ng_conf_d_dir}/timeperiods.cfg"
@@ -971,7 +971,10 @@ $ng_target_hostesc        = "${ng_conf_d_dir}/nagios_hostescalation.cfg"
 $ng_target_hostext        = "${ng_conf_d_dir}/nagios_hostextinfo.cfg"
 $ng_target_service        = "${ng_conf_d_dir}/nagios_service.cfg"
 $ng_target_servicegroup   = "${ng_conf_d_dir}/nagios_servicegroup.cfg"
-$ng_target_contact        = "${ng_conf_d_dir}/nagios_contact.cfg"
+$ng_target_base_contact   = "${ng_conf_d_dir}/nagios_base_contact.cfg"
+$ng_target_add_contact    = "${ng_conf_d_dir}/nagios_add_contact.cfg"
+$ng_contacts_head_erb     = 'cd_nagios/nagios/contacts_cfg_head.erb'
+$ng_contact_rule_erb      = 'cd_nagios/nagios/contact_cfg_rule.erb'
 $ng_target_contactgroup   = "${ng_conf_d_dir}/nagios_contactgroup.cfg"
 $ng_target_command        = "${ng_conf_d_dir}/nagios_command.cfg"
 

manifests/server/service.pp

@@ -28,8 +28,7 @@ class cd_nagios::server::service (
 
     require cd_nagios::server::files
     require cd_nagios::server::access_rules
-    require cd_nagios::nagios::objects::commands
+    require cd_nagios::nagios::objects::config
-    require cd_nagios::nagios::objects::template_rules
 
     service { $ng_service:
       ensure      => running,

templates/nagios/contacts_cfg.erb

@@ -0,0 +1,54 @@
+###############################################################################
+# CONTACTS.CFG - SAMPLE CONTACT/CONTACTGROUP DEFINITIONS
+#
+#
+# NOTES: This config file provides you with some example contact and contact
+#        group definitions that you can reference in host and service
+#        definitions.
+#       
+#        You don't need to keep these definitions in a separate file from your
+#        other object definitions.  This has been done just to make things
+#        easier to understand.
+#
+###############################################################################
+
+
+
+###############################################################################
+###############################################################################
+#
+# CONTACTS
+#
+###############################################################################
+###############################################################################
+
+# Just one contact defined by default - the Nagios admin (that's you)
+# This contact definition inherits a lot of default values from the 'generic-contact' 
+# template which is defined elsewhere.
+
+define contact{
+        contact_name                    nagiosadmin		; Short name of user
+	use				generic-contact		; Inherit default values from generic-contact template (defined above)
+        alias                           Nagios Admin		; Full name of user
+
+        email                           nagios@localhost	; <<***** CHANGE THIS TO YOUR EMAIL ADDRESS ******
+        }
+
+
+
+###############################################################################
+###############################################################################
+#
+# CONTACT GROUPS
+#
+###############################################################################
+###############################################################################
+
+# We only have one contact in this simple configuration file, so there is
+# no need to create more than one contact group.
+
+define contactgroup{
+        contactgroup_name       admins
+        alias                   Nagios Administrators
+        members                 nagiosadmin
+        }

templates/nagios/contacts_cfg_head.erb

@@ -0,0 +1,8 @@
+###############################################################################
+##########         nagios_add_contact.cfg created by Puppet          ##########
+##########            manual changes are overwritten!                ##########
+###############################################################################
+##########        Full reference file available at                   ##########
+##########      https://confdroid.com/2017/07/nagios-contacts-cfg/   ##########
+###############################################################################
+# rules are created below by external puppet rules.

templates/nagios/contacts_cfg_rule.erb

@@ -0,0 +1,7 @@
+define contact {
+  contact_name  <%= @ng_contact_name %>
+  use           <%= @ng_contact_use %>
+  alias         <%= @ng_contact_alias %>
+  email         <%= @ng_contact_email %>
+  contactgroups <%= @ng_contact_groups %>
+  }

templates/nagios/templates_cfg.erb

@@ -1,197 +0,0 @@
-###############################################################################
-# TEMPLATES.CFG - SAMPLE OBJECT TEMPLATES
-#
-#
-# NOTES: This config file provides you with some example object definition
-#        templates that are refered by other host, service, contact, etc.
-#        definitions in other config files.
-#       
-#        You don't need to keep these definitions in a separate file from your
-#        other object definitions.  This has been done just to make things
-#        easier to understand.
-#
-###############################################################################
-
-
-
-###############################################################################
-###############################################################################
-#
-# CONTACT TEMPLATES
-#
-###############################################################################
-###############################################################################
-
-# Generic contact definition template - This is NOT a real contact, just a template!
-
-define contact{
-        name                            generic-contact    	; The name of this contact template
-        service_notification_period     24x7			; service notifications can be sent anytime
-        host_notification_period        24x7			; host notifications can be sent anytime
-        service_notification_options    w,u,c,r,f,s		; send notifications for all service states, flapping events, and scheduled downtime events
-        host_notification_options       d,u,r,f,s		; send notifications for all host states, flapping events, and scheduled downtime events
-        service_notification_commands   notify-service-by-email	; send service notifications via email
-        host_notification_commands      notify-host-by-email	; send host notifications via email
-        register                        0       		; DONT REGISTER THIS DEFINITION - ITS NOT A REAL CONTACT, JUST A TEMPLATE!
-        }
-
-
-
-
-###############################################################################
-###############################################################################
-#
-# HOST TEMPLATES
-#
-###############################################################################
-###############################################################################
-
-# Generic host definition template - This is NOT a real host, just a template!
-
-define host{
-        name                            generic-host    ; The name of this host template
-        notifications_enabled           1       	; Host notifications are enabled
-        event_handler_enabled           1       	; Host event handler is enabled
-        flap_detection_enabled          1       	; Flap detection is enabled
-        process_perf_data               1       	; Process performance data
-        retain_status_information       1       	; Retain status information across program restarts
-        retain_nonstatus_information    1       	; Retain non-status information across program restarts
-	notification_period		24x7		; Send host notifications at any time
-        register                        0       	; DONT REGISTER THIS DEFINITION - ITS NOT A REAL HOST, JUST A TEMPLATE!
-        }
-
-
-# Linux host definition template - This is NOT a real host, just a template!
-
-define host{
-	name				linux-server	; The name of this host template
-	use				generic-host	; This template inherits other values from the generic-host template
-	check_period			24x7		; By default, Linux hosts are checked round the clock
-	check_interval			5		; Actively check the host every 5 minutes
-	retry_interval			1		; Schedule host check retries at 1 minute intervals
-	max_check_attempts		10		; Check each Linux host 10 times (max)
-        check_command           	check-host-alive ; Default command to check Linux hosts
-	notification_period		workhours	; Linux admins hate to be woken up, so we only notify during the day
-							; Note that the notification_period variable is being overridden from
-							; the value that is inherited from the generic-host template!
-	notification_interval		120		; Resend notifications every 2 hours
-	notification_options		d,u,r		; Only send notifications for specific host states
-	contact_groups			admins		; Notifications get sent to the admins by default
-	register			0		; DONT REGISTER THIS DEFINITION - ITS NOT A REAL HOST, JUST A TEMPLATE!
-	}
-
-
-
-# Windows host definition template - This is NOT a real host, just a template!
-
-define host{
-	name			windows-server	; The name of this host template
-	use			generic-host	; Inherit default values from the generic-host template
-	check_period		24x7		; By default, Windows servers are monitored round the clock
-	check_interval		5		; Actively check the server every 5 minutes
-	retry_interval		1		; Schedule host check retries at 1 minute intervals
-	max_check_attempts	10		; Check each server 10 times (max)
-	check_command		check-host-alive	; Default command to check if servers are "alive"
-	notification_period	24x7		; Send notification out at any time - day or night
-	notification_interval	30		; Resend notifications every 30 minutes
-	notification_options	d,r		; Only send notifications for specific host states
-	contact_groups		admins		; Notifications get sent to the admins by default
-	hostgroups		windows-servers ; Host groups that Windows servers should be a member of
-	register		0		; DONT REGISTER THIS - ITS JUST A TEMPLATE
-	}
-
-
-# We define a generic printer template that can be used for most printers we monitor
-
-define host{
-	name			generic-printer	; The name of this host template
-	use			generic-host	; Inherit default values from the generic-host template
-	check_period		24x7		; By default, printers are monitored round the clock
-	check_interval		5		; Actively check the printer every 5 minutes
-	retry_interval		1		; Schedule host check retries at 1 minute intervals
-	max_check_attempts	10		; Check each printer 10 times (max)
-	check_command		check-host-alive	; Default command to check if printers are "alive"
-	notification_period	workhours		; Printers are only used during the workday
-	notification_interval	30		; Resend notifications every 30 minutes
-	notification_options	d,r		; Only send notifications for specific host states
-	contact_groups		admins		; Notifications get sent to the admins by default
-	statusmap_image		printer.png
-	register		0		; DONT REGISTER THIS - ITS JUST A TEMPLATE
-	}
-
-
-# Define a template for switches that we can reuse
-define host{
-	name			generic-switch	; The name of this host template
-	use			generic-host	; Inherit default values from the generic-host template
-	check_period		24x7		; By default, switches are monitored round the clock
-	check_interval		5		; Switches are checked every 5 minutes
-	retry_interval		1		; Schedule host check retries at 1 minute intervals
-	max_check_attempts	10		; Check each switch 10 times (max)
-	check_command		check-host-alive	; Default command to check if routers are "alive"
-	notification_period	24x7		; Send notifications at any time
-	notification_interval	30		; Resend notifications every 30 minutes
-	notification_options	d,r		; Only send notifications for specific host states
-	contact_groups		admins		; Notifications get sent to the admins by default
-	statusmap_image		switch.png
-	register		0		; DONT REGISTER THIS - ITS JUST A TEMPLATE
-	}
-
-# Define a template for routers that we can reuse
-define host{
-	name			generic-router	; The name of this host template
-	use			generic-switch	; Inherit default values from the generic-host template
-	statusmap_image		router.png
-	register		0		; DONT REGISTER THIS - ITS JUST A TEMPLATE
-	}
-
-
-
-
-###############################################################################
-###############################################################################
-#
-# SERVICE TEMPLATES
-#
-###############################################################################
-###############################################################################
-
-# Generic service definition template - This is NOT a real service, just a template!
-
-define service{
-        name                            generic-service 	; The 'name' of this service template
-        active_checks_enabled           1       		; Active service checks are enabled
-        passive_checks_enabled          1    		   	; Passive service checks are enabled/accepted
-        parallelize_check               1       		; Active service checks should be parallelized (disabling this can lead to major performance problems)
-        obsess_over_service             1       		; We should obsess over this service (if necessary)
-        check_freshness                 0       		; Default is to NOT check service 'freshness'
-        notifications_enabled           1       		; Service notifications are enabled
-        event_handler_enabled           1       		; Service event handler is enabled
-        flap_detection_enabled          1       		; Flap detection is enabled
-        process_perf_data               1       		; Process performance data
-        retain_status_information       1       		; Retain status information across program restarts
-        retain_nonstatus_information    1       		; Retain non-status information across program restarts
-        is_volatile                     0       		; The service is not volatile
-        check_period                    24x7			; The service can be checked at any time of the day
-        max_check_attempts              3			; Re-check the service up to 3 times in order to determine its final (hard) state
-        check_interval           10			; Check the service every 10 minutes under normal conditions
-        retry_interval            2			; Re-check the service every two minutes until a hard state can be determined
-        contact_groups                  admins			; Notifications get sent out to everyone in the 'admins' group
-	notification_options		w,u,c,r			; Send notifications about warning, unknown, critical, and recovery events
-        notification_interval           60			; Re-notify about service problems every hour
-        notification_period             24x7			; Notifications can be sent out at any time
-         register                        0       		; DONT REGISTER THIS DEFINITION - ITS NOT A REAL SERVICE, JUST A TEMPLATE!
-        }
-
-
-# Local service definition template - This is NOT a real service, just a template!
-
-define service{
-	name				local-service 		; The name of this service template
-	use				generic-service		; Inherit default values from the generic-service definition
-        max_check_attempts              4			; Re-check the service up to 4 times in order to determine its final (hard) state
-        check_interval           5			; Check the service every 5 minutes under normal conditions
-        retry_interval            1			; Re-check the service every minute until a hard state can be determined
-        register                        0       		; DONT REGISTER THIS DEFINITION - ITS NOT A REAL SERVICE, JUST A TEMPLATE!
-	}
-

templates/nagios/templates_cfg_head.erb

@@ -1,5 +1,5 @@
 ###############################################################################
-### templates.cfg generated by Puppet | manual changes will be overwritten! ###
+### nagios_templates.cfg created by Puppet | manual changes are overwritten!###
 ###############################################################################
 ##########        Full reference file available at                   ##########
 ##########      https://confdroid.com/2017/07/nagios-templates-cfg/  ##########

templates/nagios/templates_cfg_rule.erb

@@ -17,7 +17,6 @@ define <%= @ng_template_object %>{
   notifications_enabled         <%= @ng_notifications_enabled %>
   event_handler_enabled         <%= @ng_event_handler_enabled %>
   flap_detection_enabled        <%= @ng_flap_detection_enabled %>
-  failure_prediction_enabled    <%= @ng_failure_prediction_enabled %>
   process_perf_data             <%= @ng_process_perf_data %>
   retain_status_information     <%= @ng_retain_status_information %>
   retain_nonstatus_information  <%= @ng_retain_nonstatus_information %>
@@ -33,7 +32,7 @@ define <%= @ng_template_object %>{
   check_interval                <%= @ng_check_interval %>
   retry_interval                <%= @ng_retry_interval %>
   max_check_attempts            <%= @ng_ng_max_check_attempts %>
-  check_command                 <%= @ng_check_command %>
+  check_command                 <%= @ng_host_check_command %>
   notification_period           <%= @ng_notification_period %>
   notification_interval         <%= @ng_notification_interval %>
   notification_options          <%= @ng_notification_options %>
@@ -41,7 +40,7 @@ define <%= @ng_template_object %>{
   hostgroups                    linux-servers
   register                      <%= @ng_object_register %>
   }
-<% end %>
+<% end -%>
 <% if @ng_template_object_name == 'windows-server' -%>
 define <%= @ng_template_object %>{
   name                          <%= @ng_template_object_name %>
@@ -50,7 +49,7 @@ define <%= @ng_template_object %>{
   check_interval                <%= @ng_check_interval %>
   retry_interval                <%= @ng_retry_interval %>
   max_check_attempts            <%= @ng_max_check_attempts %>
-  check_command                 <%= @ng_check_command %>
+  check_command                 <%= @ng_host_check_command %>
   notification_period           <%= @ng_notification_period %>
   notification_interval         <%= @ng_notification_interval %>
   notification_options          <%= @ng_notification_options %>
@@ -58,7 +57,7 @@ define <%= @ng_template_object %>{
   hostgroups                    windows-servers
   register                      <%= @ng_object_register %>
   }
-<% end %>
+<% end -%>
 <% if @ng_template_object_name == 'generic_printer' -%>
 define <%= @ng_template_object %>{
   name                          <%= @ng_template_object_name %>
@@ -67,7 +66,7 @@ define <%= @ng_template_object %>{
   check_interval                <%= @ng_check_interval %>
   retry_interval                <%= @ng_retry_interval %>
   max_check_attempts            <%= @ng_max_check_attempts %>
-  check_command                 <%= @ng_check_command %>
+  check_command                 <%= @ng_host_check_command %>
   notification_period           <%= @ng_notification_period %>
   notification_interval         <%= @ng_notification_interval %>
   notification_options          <%= @ng_notification_options %>
@@ -75,7 +74,7 @@ define <%= @ng_template_object %>{
   statusmap_image               printer.png
   register                      <%= @ng_object_register %>
   }
-<% end %>
+<% end -%>
 <% if @ng_template_object_name == 'generic_switch' -%>
 define <%= @ng_template_object %>{
   name                          <%= @ng_template_object_name %>
@@ -84,7 +83,7 @@ define <%= @ng_template_object %>{
   check_interval                <%= @ng_check_interval %>
   retry_interval                <%= @ng_retry_interval %>
   max_check_attempts            <%= @ng_max_check_attempts %>
-  check_command                 <%= @ng_check_command %>
+  check_command                 <%= @ng_host_check_command %>
   notification_period           <%= @ng_notification_period %>
   notification_interval         <%= @ng_notification_interval %>
   notification_options          <%= @ng_notification_options %>
@@ -92,7 +91,7 @@ define <%= @ng_template_object %>{
   statusmap_image               switch.png
   register                      <%= @ng_object_register %>
   }
-<% end %>
+<% end -%>
 <% elsif @ng_template_object == 'service' -%>
 <% if @ng_template_object_name == 'generic-service' -%>
 define <%= @ng_template_object %>{
@@ -105,7 +104,6 @@ define <%= @ng_template_object %>{
   notifications_enabled         <%= @ng_notifications_enabled %>
   event_handler_enabled         <%= @ng_event_handler_enabled %>
   flap_detection_enabled        <%= @ng_flap_detection_enabled %>
-  failure_prediction_enabled    <%= @ng_failure_prediction_enabled  %>
   process_perf_data             <%= @ng_process_perf_data %>
   retain_status_information     <%= @ng_retain_status_information %>
   retain_nonstatus_information  <%= @ng_retain_nonstatus_information %>