Merge branch 'jenkins' into 'master'

Jenkins

See merge request !47

CHANGELOG.md

@@ -8,6 +8,41 @@ Changelog of Git Changelog.
 <h2> No issue </h2>
 
 
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/cc2d2cbf2968cce">cc2d2cbf2968cce</a> Jenkins Server <i>2017-07-25 15:57:28</i>
+<p>
+<h3>recommit for updates in build 90</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/6a57847a121f632">6a57847a121f632</a> Arne Teuke <i>2017-07-25 15:57:10</i>
+<p>
+<h3>added contact stanza</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/8a97768e4b258d7">8a97768e4b258d7</a> Arne Teuke <i>2017-07-25 15:46:00</i>
+<p>
+<h3>added template concat</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/53e7b9d0b24391e">53e7b9d0b24391e</a> Arne Teuke <i>2017-07-25 15:39:28</i>
+<p>
+<h3>added template concat</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/f5657930f604a9a">f5657930f604a9a</a> Arne Teuke <i>2017-07-25 15:32:38</i>
+<p>
+<h3>added and linked template_rules</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/633f59375b02f4b">633f59375b02f4b</a> Arne Teuke <i>2017-07-25 15:30:03</i>
+<p>
+<h3>added and linked template_rules</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/0f8cf13c3ea9b4a">0f8cf13c3ea9b4a</a> Arne Teuke <i>2017-07-25 14:56:52</i>
+<p>
+<h3>linked commands.pp</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/b4b3de53a39ef00">b4b3de53a39ef00</a> Jenkins Server <i>2017-07-25 14:48:58</i>
 <p>
 <h3>recommit for updates in build 84</h3>

REPOSTRUCTURE.md

@@ -18,6 +18,7 @@
 |   |   |-- cd_nagios_3A_3Amain_3A_3Ainstall.html
 |   |   |-- cd_nagios_3A_3Amain_3A_3Auser.html
 |   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
+|   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
 |   |   |-- cd_nagios_3A_3Aparams.html
 |   |   |-- cd_nagios_3A_3Aselinux_3A_3Aconfig.html
 |   |   |-- cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -25,6 +26,7 @@
 |   |   |-- cd_nagios_3A_3Aserver_3A_3Aservice.html
 |   |   `-- cd_nagios.html
 |   |-- puppet_defined_types
+|   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
 |   |   `-- cd_nagios_3A_3Aserver_3A_3Aaccess.html
 |   |-- file.README.html
 |   |-- frames.html
@@ -88,4 +90,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-20 directories, 68 files
+20 directories, 70 files

doc/_index.html

@@ -201,7 +201,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 17:57:18 2017 by
+  Generated on Tue Jul 25 18:13:33 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

@@ -338,7 +338,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Tue Jul 25 17:57:19 2017 by
+  Generated on Tue Jul 25 18:13:35 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

@@ -338,7 +338,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Tue Jul 25 17:57:18 2017 by
+  Generated on Tue Jul 25 18:13:34 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.html

@@ -139,7 +139,7 @@ class cd_nagios {
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 17:57:19 2017 by
+  Generated on Tue Jul 25 18:13:35 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 17:57:23 2017 by
+  Generated on Tue Jul 25 18:13: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_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 17:57:24 2017 by
+  Generated on Tue Jul 25 18:13: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_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 17:57:24 2017 by
+  Generated on Tue Jul 25 18:13: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_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 17:57:23 2017 by
+  Generated on Tue Jul 25 18:13: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_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 17:57:23 2017 by
+  Generated on Tue Jul 25 18:13:38 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 17:57:23 2017 by
+  Generated on Tue Jul 25 18:13: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_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 17:57:23 2017 by
+  Generated on Tue Jul 25 18:13:38 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_3Acommands.html

@@ -595,7 +595,7 @@ class cd_nagios::nagios::objects::commands (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 17:57:24 2017 by
+  Generated on Tue Jul 25 18:13: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_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html

@@ -169,7 +169,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.
 50
 51
 52
-53</pre>
+53
+54</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/nagios/objects/template_rules.pp', line 26</span>
@@ -197,8 +198,9 @@ class cd_nagios::nagios::objects::template_rules (
     }
 
     # example rule 
-    cd_nagios::objects::templates { $name:
+    cd_nagios::objects::templates { &#39;generic contact&#39;:
-      ng_template_object =&gt; &#39;contact&#39;,
+      ng_template_object      =&gt; &#39;contact&#39;,
+      ng_template_object_name =&gt;  &#39;generic-contact&#39;,
     }
   }
 }</pre>
@@ -209,7 +211,7 @@ class cd_nagios::nagios::objects::template_rules (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 17:57:24 2017 by
+  Generated on Tue Jul 25 18:13: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_3Aparams.html

@@ -5557,7 +5557,7 @@ $ng_target_command        = "${ng_conf_d_dir}/nagios_command.cfg"
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 17:57:23 2017 by
+  Generated on Tue Jul 25 18:13:38 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 17:57:24 2017 by
+  Generated on Tue Jul 25 18:13: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_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 17:57:24 2017 by
+  Generated on Tue Jul 25 18:13: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_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 17:57:23 2017 by
+  Generated on Tue Jul 25 18:13: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_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html

@@ -270,7 +270,7 @@ class cd_nagios::server::service (
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 17:57:24 2017 by
+  Generated on Tue Jul 25 18:13: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_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html

@@ -121,12 +121,19 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
         <span class='name'>ng_template_object</span>
       
       
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
       
       
         <em class="default">(defaults to: <tt>undef</tt>)</em>
       
       
+        &mdash;
+        <div class='inline'>
+<p>the object type for the templates.
+valid options are <code>contact</code>,
+<code>host</code> and <code>service</code>.</p>
+</div>
+      
     </li>
   
     <li>
@@ -134,12 +141,19 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
         <span class='name'>ng_template_object_name</span>
       
       
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
       
       
         <em class="default">(defaults to: <tt>undef</tt>)</em>
       
       
+        &mdash;
+        <div class='inline'>
+<p>populates the name field,
+i.e. <code>generic-contact</code>,
+<code>generic-host</code>, <code>generic-service</code>.</p>
+</div>
+      
     </li>
   
     <li>
@@ -147,12 +161,158 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
         <span class='name'>ng_svc_notification_period</span>
       
       
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
       
       
         <em class="default">(defaults to: <tt>&#39;24x7&#39;</tt>)</em>
       
       
+        &mdash;
+        <div class='inline'>
+<p>Period in which to send out
+notifications for service events, i.e.
+<code>24x7</code>.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_svc_notification_period</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;24x7&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Period in which to send out
+notifications for host events , i.e.
+<code>24x7</code>.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_service_notification_options</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;w,u,c,r,f,s&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>What service events to send
+out notifications for:
+w = notify on WARNING
+service states,
+u = notify on UNKNOWN service states,
+c = notify on
+CRITICAL service states,
+r = notify on service recoveries (OK states),
+f =
+notify when the service starts and stops flapping.
+n = none (the contact
+will not receive any type of service notifications).</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_host_notification_options</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;d,u,r,f,s&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>What host events to send
+out notifications for:
+d = notify on DOWN host
+states,
+u = notify on UNREACHABLE host states,
+r = notify on host
+recoveries (UP states),
+f = notify when the host starts and stops
+flapping,
+s = snotify when host or service scheduled downtime starts and
+ends.
+n = none (the contact will not receive any type of host
+notifications).</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_service_notification_commands</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;notify-service-by-email&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Command to use for
+service event notification. Command must be defined in
+commands.cfg</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_host_notification_commands</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;notify-host-by-email&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Command to use for
+host event notification. Command must be defined in
+commands.cfg.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_object_register</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;0&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Whether to register the object to Nagios.
+Since this is a template
+definition, we do not want to register those.</p>
+</div>
+      
     </li>
   
     <li>
@@ -168,71 +328,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
       
     </li>
   
-    <li>
-      
-        <span class='name'>ng_service_notification_options</span>
-      
-      
-        <span class='type'>(<tt>Any</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;w,u,c,r,f,s&#39;</tt>)</em>
-      
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ng_host_notification_options</span>
-      
-      
-        <span class='type'>(<tt>Any</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;d,u,r,f,s&#39;</tt>)</em>
-      
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ng_service_notification_commands</span>
-      
-      
-        <span class='type'>(<tt>Any</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;notify-service-by-email&#39;</tt>)</em>
-      
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ng_host_notification_commands</span>
-      
-      
-        <span class='type'>(<tt>Any</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;notify-host-by-email&#39;</tt>)</em>
-      
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ng_object_register</span>
-      
-      
-        <span class='type'>(<tt>Any</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;0&#39;</tt>)</em>
-      
-      
-    </li>
-  
 </ul>
 
 
@@ -243,35 +338,35 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
         <pre class="lines">
 
 
-23
+53
-24
+54
-25
+55
-26
+56
-27
+57
-28
+58
-29
+59
-30
+60
-31
+61
-32
+62
-33
+63
-34
+64
-35
+65
-36
+66
-37
+67
-38
+68
-39
+69
-40
+70
-41
+71
-42
+72
-43
+73
-44
+74
-45
+75
-46
+76
-47
+77
-48</pre>
+78</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/templates.pp', line 23</span>
+        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/templates.pp', line 53</span>
 
 define cd_nagios::nagios::objects::templates (
 
@@ -306,7 +401,7 @@ $ng_templates_rule_erb  = $::cd_nagios::params::ng_templates_rule_erb
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 17:57:24 2017 by
+  Generated on Tue Jul 25 18:13: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_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 17:57:24 2017 by
+  Generated on Tue Jul 25 18:13: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/top-level-namespace.html

@@ -90,7 +90,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Jul 25 17:57:19 2017 by
+  Generated on Tue Jul 25 18:13:35 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/template_rules.pp

@@ -46,8 +46,9 @@ class cd_nagios::nagios::objects::template_rules (
     }
 
     # example rule 
-    cd_nagios::objects::templates { $name:
+    cd_nagios::objects::templates { 'generic contact':
-      ng_template_object => 'contact',
+      ng_template_object      => 'contact',
+      ng_template_object_name =>  'generic-contact',
     }
   }
 }

manifests/nagios/objects/templates.pp

@@ -19,6 +19,36 @@
 #    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 populates /etc/nagios/conf.d/templates.cfg.
+# @param  [string] ng_template_object the object type for the templates.
+#   valid options are `contact`, `host` and `service`.
+# @param  [string] ng_template_object_name populates the name field,
+#   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
+#   notifications for host events , i.e. `24x7`.
+# @param  [string] ng_service_notification_options What service events to send
+#   out notifications for:
+#   w = notify on WARNING service states,
+#   u = notify on UNKNOWN service states,
+#   c = notify on CRITICAL service states,
+#   r = notify on service recoveries (OK states),
+#   f = notify when the service starts and stops flapping.
+#   n =  none (the contact will not receive any type of service notifications).
+# @param  [string] ng_host_notification_options What host events to send
+#   out notifications for:
+#   d = notify on DOWN host states,
+#   u = notify on UNREACHABLE host states,
+#   r = notify on host recoveries (UP states),
+#   f = notify when the host starts and stops flapping,
+#   s = snotify when host or service scheduled downtime starts and ends.
+#   n =  none (the contact will not receive any type of host  notifications).
+# @param  [string] ng_service_notification_commands Command to use for
+#   service event notification. Command must be defined in commands.cfg
+# @param  [string] ng_host_notification_commands Command to use for
+#   host event notification. Command must be defined in commands.cfg.
+# @param  [string]  ng_object_register Whether to register the object to Nagios.
+#   Since this is a template definition, we do not want to register those.
 ################################################################################
 define cd_nagios::nagios::objects::templates (