Recommit for updates in build 135

doc/file.README.html

@@ -195,7 +195,7 @@ Re-type new password:
 
 <h3 id="label-Additional+UI+users">Additional UI users</h3>
 
-<p>The main user is automatically created. If you want to add more users, this should be done via the define confdroid_nagios::server::access. In your control repo, site.pp etc. address the access define like this:</p>
+<p>The main user is automatically created. If you want to add more users, this should be done via the define <code>confdroid_nagios::server::access</code>. In your control repo, site.pp etc. address the access define like this:</p>
 
 <pre class="code ruby"><code class="ruby">confdroid_nagios::server::access { &#39;example&#39;:
   ng_htpasswd_user     =&gt; &#39;example_user&#39;,
@@ -217,6 +217,24 @@ Re-type new password:
 
 <p>This requires the contact groups to be in place as well.</p>
 
+<p>Alternatively you also can create a custom class within this module and use the export command like this:</p>
+
+<pre class="code ruby"><code class="ruby">@@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; &#39;ops@example.net&#39;,
+      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;,
+    }
+</code></pre>
+
 <h3 id="label-Adding+contact+groups">Adding contact groups</h3>
 
 <p>In order to add contact groups for the notifications, address the define <code>confdroid_nagios::nagios::objects::add_contactgroups</code> in your config repo, site.pp etc. like this:</p>
@@ -228,6 +246,20 @@ Re-type new password:
   }
 </code></pre>
 
+<p>Alternatively you also can create a custom class within this module and use the export command like this:</p>
+
+<pre class="code ruby"><code class="ruby">@@nagios_contactgroup { &#39;operations&#39;:
+    ensure            =&gt; present,
+    alias             =&gt; &#39;Operations Team&#39;,
+    contactgroup_name =&gt; &#39;operations&#39;,
+    owner             =&gt; $ng_user,
+    group             =&gt; $ng_user,
+    mode              =&gt; &#39;0640&#39;,
+    register          =&gt; &#39;1&#39;,
+    target            =&gt; $ng_tgt_contactgroup_base,
+  }
+</code></pre>
+
 <h3 id="label-Adding+host+groups">Adding host groups</h3>
 
 <p>In order to add host groups, address the define <code>confdroid_nagios::nagios::objects::add_hostgroups</code> in your config repo, site.pp etc. like this:</p>
@@ -238,22 +270,109 @@ Re-type new password:
   }
 </code></pre>
 
-<p>Hosts will be populated through the target.pp dynamically.</p>
+<p>Alternatively you also can create a custom class within this module and use the export command like this:</p>
+
+<pre class="code ruby"><code class="ruby">@@nagios_hostgroup { &#39;rhel-servers&#39;:
+    ensure         =&gt; present,
+    hostgroup_name =&gt; &#39;rhel-servers&#39;,
+    alias          =&gt; &#39;RHEL Servers&#39;,
+    owner          =&gt; $ng_user,
+    group          =&gt; $ng_user,
+    mode           =&gt; &#39;0640&#39;,
+    register       =&gt; &#39;1&#39;,
+    target         =&gt; $ng_target_hostgroup_base,
+  }
+</code></pre>
+
+<p>Hosts themselves will be populated through the target.pp dynamically.</p>
 
 <h3 id="label-Adding+service+groups">Adding service groups</h3>
 
-<p>ToDo</p>
+<p>In order to add service groups, address the define <code>confdroid_nagios::nagios::objects::add_servicegroups</code> in your config repo, site.pp etc. like this:</p>
+
+<pre class="code ruby"><code class="ruby">confdroid_nagios::nagios::objects::add_servicegroups { &#39;example_servicegroup&#39;:
+    ng_servicegroup_name   =&gt; &#39;example_servicegroup&#39;,
+    ng_servicegroup_alias  =&gt; &#39;Example servicegroup&#39;,
+  }
+</code></pre>
+
+<p>Alternatively you also can create a custom class within this module and use the export command like this:</p>
+
+<pre class="code ruby"><code class="ruby">@@nagios_servicegroup { &#39;network-services&#39;:
+    ensure            =&gt; present,
+    servicegroup_name =&gt; &#39;network-services&#39;,
+    alias             =&gt; &#39;Network Services&#39;,
+    owner             =&gt; $ng_user,
+    group             =&gt; $ng_user,
+    mode              =&gt; &#39;0640&#39;,
+    register          =&gt; &#39;1&#39;,
+    target            =&gt; $ng_target_svcgrp_base,
+  }
+</code></pre>
 
 <h3 id="label-Adding+time+periods">Adding time periods</h3>
 
-<p>ToDo</p>
+<p>In order to add time periods, address the define <code>confdroid_nagios::nagios::objects::add_timeperiods</code> in your config repo, site.pp etc. like this:</p>
+
+<pre class="code ruby"><code class="ruby">confdroid_nagios::nagios::objects::add_timeperiods { &#39;example_timeperiod&#39;:
+    ng_timep_name        =&gt; &#39;example_timeperiod&#39;,
+    ng_timep_alias       =&gt; &#39;Example timeperiod&#39;,
+    ng_timep_monday      =&gt; &#39;00:00-00:00&#39;,
+    ng_timep_tuesday     =&gt; &#39;00:00-00:00&#39;,
+    ng_timep_wednesday   =&gt; &#39;00:00-00:00&#39;,
+    ng_timep_thursday    =&gt; &#39;00:00-00:00&#39;,
+    ng_timep_friday      =&gt; &#39;00:00-00:00&#39;,
+    ng_timep_saturday    =&gt; &#39;00:00-00:00&#39;,
+    ng_timep_sunday      =&gt; &#39;00:00-00:00&#39;,
+  }
+</code></pre>
+
+<p>Alternatively you also can create a custom class within this module and use the export command like this:</p>
+
+<pre class="code ruby"><code class="ruby">@@nagios_timeperiod { &#39;office_hours&#39;:
+    ensure          =&gt; present,
+    timeperiod_name =&gt; &#39;office_hours&#39;,
+    alias           =&gt; &#39;Office hours only, 5 Days A Week 09-05&#39;,
+    monday          =&gt; &#39;09:00-17:00&#39;,
+    tuesday         =&gt; &#39;09:00-17:00&#39;,
+    wednesday       =&gt; &#39;09:00-17:00&#39;,
+    thursday        =&gt; &#39;09:00-17:00&#39;,
+    friday          =&gt; &#39;09:00-17:00&#39;,
+    saturday        =&gt; &#39;00:00-00:00&#39;,
+    sunday          =&gt; &#39;00:00-00:00&#39;,
+    owner           =&gt; $ng_user,
+    group           =&gt; $ng_user,
+    mode            =&gt; &#39;0640&#39;,
+    register        =&gt; &#39;1&#39;,
+    target          =&gt; $ng_tgt_timeperiods_base,
+  }
+</code></pre>
 
 <h3 id="label-Adding+custom+commands">Adding custom commands</h3>
 
-<p>ToDo</p>
+<p>Commands are defined in <code>confdroid_nagios::nagios::objects::commands</code> and deployed /etc/nagios/conf.d/nagios_commands_base.cfg through PuppetDB exports like this:</p>
+
+<pre class="code ruby"><code class="ruby">@@nagios_command { &#39;check_disk&#39;:
+    ensure       =&gt; present,
+    command_name =&gt; &#39;check_disk&#39;,
+    command_line =&gt; &#39;$USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$&#39;,
+    owner        =&gt; $ng_user,
+    group        =&gt; $ng_user,
+    mode         =&gt; &#39;0640&#39;,
+    target       =&gt; $ng_target_command,
+  }
+</code></pre>
 
 <h3 id="label-Adding+templates">Adding templates</h3>
 
+<p>In order to add time periods, address the define <code>confdroid_nagios::nagios::objects::add_templates</code> in your config repo, site.pp etc. like this:</p>
+
+<pre class="code ruby"><code class="ruby">confdroid_nagios::nagios::objects::templates { &#39;generic contact&#39;:
+    ng_template_object      =&gt; &#39;contact&#39;,
+    ng_template_object_name =&gt; &#39;generic-contact&#39;,
+  }
+</code></pre>
+
 <h2 id="label-PuppetDB">PuppetDB</h2>
 
 <p>A working instance of PuppetDB connected to the Puppet master is required for this to work. Installation and configuration of PuppetDB is out of scope for this module, however <a href="https://gitlab.confdroid.com/puppet/cd_puppetdb">cd_puppetdb</a> is available to automate this task for you as well within a few minutes.</p>

doc/index.html

@@ -195,7 +195,7 @@ Re-type new password:
 
 <h3 id="label-Additional+UI+users">Additional UI users</h3>
 
-<p>The main user is automatically created. If you want to add more users, this should be done via the define confdroid_nagios::server::access. In your control repo, site.pp etc. address the access define like this:</p>
+<p>The main user is automatically created. If you want to add more users, this should be done via the define <code>confdroid_nagios::server::access</code>. In your control repo, site.pp etc. address the access define like this:</p>
 
 <pre class="code ruby"><code class="ruby">confdroid_nagios::server::access { &#39;example&#39;:
   ng_htpasswd_user     =&gt; &#39;example_user&#39;,
@@ -217,6 +217,24 @@ Re-type new password:
 
 <p>This requires the contact groups to be in place as well.</p>
 
+<p>Alternatively you also can create a custom class within this module and use the export command like this:</p>
+
+<pre class="code ruby"><code class="ruby">@@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; &#39;ops@example.net&#39;,
+      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;,
+    }
+</code></pre>
+
 <h3 id="label-Adding+contact+groups">Adding contact groups</h3>
 
 <p>In order to add contact groups for the notifications, address the define <code>confdroid_nagios::nagios::objects::add_contactgroups</code> in your config repo, site.pp etc. like this:</p>
@@ -228,6 +246,20 @@ Re-type new password:
   }
 </code></pre>
 
+<p>Alternatively you also can create a custom class within this module and use the export command like this:</p>
+
+<pre class="code ruby"><code class="ruby">@@nagios_contactgroup { &#39;operations&#39;:
+    ensure            =&gt; present,
+    alias             =&gt; &#39;Operations Team&#39;,
+    contactgroup_name =&gt; &#39;operations&#39;,
+    owner             =&gt; $ng_user,
+    group             =&gt; $ng_user,
+    mode              =&gt; &#39;0640&#39;,
+    register          =&gt; &#39;1&#39;,
+    target            =&gt; $ng_tgt_contactgroup_base,
+  }
+</code></pre>
+
 <h3 id="label-Adding+host+groups">Adding host groups</h3>
 
 <p>In order to add host groups, address the define <code>confdroid_nagios::nagios::objects::add_hostgroups</code> in your config repo, site.pp etc. like this:</p>
@@ -238,22 +270,109 @@ Re-type new password:
   }
 </code></pre>
 
-<p>Hosts will be populated through the target.pp dynamically.</p>
+<p>Alternatively you also can create a custom class within this module and use the export command like this:</p>
+
+<pre class="code ruby"><code class="ruby">@@nagios_hostgroup { &#39;rhel-servers&#39;:
+    ensure         =&gt; present,
+    hostgroup_name =&gt; &#39;rhel-servers&#39;,
+    alias          =&gt; &#39;RHEL Servers&#39;,
+    owner          =&gt; $ng_user,
+    group          =&gt; $ng_user,
+    mode           =&gt; &#39;0640&#39;,
+    register       =&gt; &#39;1&#39;,
+    target         =&gt; $ng_target_hostgroup_base,
+  }
+</code></pre>
+
+<p>Hosts themselves will be populated through the target.pp dynamically.</p>
 
 <h3 id="label-Adding+service+groups">Adding service groups</h3>
 
-<p>ToDo</p>
+<p>In order to add service groups, address the define <code>confdroid_nagios::nagios::objects::add_servicegroups</code> in your config repo, site.pp etc. like this:</p>
+
+<pre class="code ruby"><code class="ruby">confdroid_nagios::nagios::objects::add_servicegroups { &#39;example_servicegroup&#39;:
+    ng_servicegroup_name   =&gt; &#39;example_servicegroup&#39;,
+    ng_servicegroup_alias  =&gt; &#39;Example servicegroup&#39;,
+  }
+</code></pre>
+
+<p>Alternatively you also can create a custom class within this module and use the export command like this:</p>
+
+<pre class="code ruby"><code class="ruby">@@nagios_servicegroup { &#39;network-services&#39;:
+    ensure            =&gt; present,
+    servicegroup_name =&gt; &#39;network-services&#39;,
+    alias             =&gt; &#39;Network Services&#39;,
+    owner             =&gt; $ng_user,
+    group             =&gt; $ng_user,
+    mode              =&gt; &#39;0640&#39;,
+    register          =&gt; &#39;1&#39;,
+    target            =&gt; $ng_target_svcgrp_base,
+  }
+</code></pre>
 
 <h3 id="label-Adding+time+periods">Adding time periods</h3>
 
-<p>ToDo</p>
+<p>In order to add time periods, address the define <code>confdroid_nagios::nagios::objects::add_timeperiods</code> in your config repo, site.pp etc. like this:</p>
+
+<pre class="code ruby"><code class="ruby">confdroid_nagios::nagios::objects::add_timeperiods { &#39;example_timeperiod&#39;:
+    ng_timep_name        =&gt; &#39;example_timeperiod&#39;,
+    ng_timep_alias       =&gt; &#39;Example timeperiod&#39;,
+    ng_timep_monday      =&gt; &#39;00:00-00:00&#39;,
+    ng_timep_tuesday     =&gt; &#39;00:00-00:00&#39;,
+    ng_timep_wednesday   =&gt; &#39;00:00-00:00&#39;,
+    ng_timep_thursday    =&gt; &#39;00:00-00:00&#39;,
+    ng_timep_friday      =&gt; &#39;00:00-00:00&#39;,
+    ng_timep_saturday    =&gt; &#39;00:00-00:00&#39;,
+    ng_timep_sunday      =&gt; &#39;00:00-00:00&#39;,
+  }
+</code></pre>
+
+<p>Alternatively you also can create a custom class within this module and use the export command like this:</p>
+
+<pre class="code ruby"><code class="ruby">@@nagios_timeperiod { &#39;office_hours&#39;:
+    ensure          =&gt; present,
+    timeperiod_name =&gt; &#39;office_hours&#39;,
+    alias           =&gt; &#39;Office hours only, 5 Days A Week 09-05&#39;,
+    monday          =&gt; &#39;09:00-17:00&#39;,
+    tuesday         =&gt; &#39;09:00-17:00&#39;,
+    wednesday       =&gt; &#39;09:00-17:00&#39;,
+    thursday        =&gt; &#39;09:00-17:00&#39;,
+    friday          =&gt; &#39;09:00-17:00&#39;,
+    saturday        =&gt; &#39;00:00-00:00&#39;,
+    sunday          =&gt; &#39;00:00-00:00&#39;,
+    owner           =&gt; $ng_user,
+    group           =&gt; $ng_user,
+    mode            =&gt; &#39;0640&#39;,
+    register        =&gt; &#39;1&#39;,
+    target          =&gt; $ng_tgt_timeperiods_base,
+  }
+</code></pre>
 
 <h3 id="label-Adding+custom+commands">Adding custom commands</h3>
 
-<p>ToDo</p>
+<p>Commands are defined in <code>confdroid_nagios::nagios::objects::commands</code> and deployed /etc/nagios/conf.d/nagios_commands_base.cfg through PuppetDB exports like this:</p>
+
+<pre class="code ruby"><code class="ruby">@@nagios_command { &#39;check_disk&#39;:
+    ensure       =&gt; present,
+    command_name =&gt; &#39;check_disk&#39;,
+    command_line =&gt; &#39;$USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$&#39;,
+    owner        =&gt; $ng_user,
+    group        =&gt; $ng_user,
+    mode         =&gt; &#39;0640&#39;,
+    target       =&gt; $ng_target_command,
+  }
+</code></pre>
 
 <h3 id="label-Adding+templates">Adding templates</h3>
 
+<p>In order to add time periods, address the define <code>confdroid_nagios::nagios::objects::add_templates</code> in your config repo, site.pp etc. like this:</p>
+
+<pre class="code ruby"><code class="ruby">confdroid_nagios::nagios::objects::templates { &#39;generic contact&#39;:
+    ng_template_object      =&gt; &#39;contact&#39;,
+    ng_template_object_name =&gt; &#39;generic-contact&#39;,
+  }
+</code></pre>
+
 <h2 id="label-PuppetDB">PuppetDB</h2>
 
 <p>A working instance of PuppetDB connected to the Puppet master is required for this to work. Installation and configuration of PuppetDB is out of scope for this module, however <a href="https://gitlab.confdroid.com/puppet/cd_puppetdb">cd_puppetdb</a> is available to automate this task for you as well within a few minutes.</p>

doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html

@@ -327,8 +327,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'notify-host-by-email',
       command_line => '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTADDRESS$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTADDRESS$ is $HOSTSTATE$ **" $CONTACTEMAIL$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -337,8 +337,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'notify-service-by-email',
       command_line => '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$\n" | /bin/mail -s "** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -347,8 +347,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check-host-alive',
       command_line => '$USER1$/check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 5',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -357,8 +357,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_disk',
       command_line => '$USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -367,8 +367,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_local_load',
       command_line => '$USER1$/check_load -w $ARG1$ -c $ARG2$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -377,8 +377,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_local_procs',
       command_line => '$USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -387,8 +387,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_local_users',
       command_line => '$USER1$/check_users -w $ARG1$ -c $ARG2$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -397,8 +397,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_local_swap',
       command_line => '$USER1$/check_swap -w $ARG1$ -c $ARG2$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -407,8 +407,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_ftp',
       command_line => '$USER1$/check_ftp -H $HOSTADDRESS$ $ARG1$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -417,8 +417,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_snmp',
       command_line => '$USER1$/check_snmp -H $HOSTADDRESS$ $ARG1$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -427,8 +427,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_http',
       command_line => '$USER1$/check_http -I $HOSTADDRESS$ $ARG1$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -437,8 +437,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_ssh',
       command_line => '$USER1$/check_ssh $ARG1$ $HOSTADDRESS$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -447,8 +447,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_ping',
       command_line => '$USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -457,8 +457,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_tcp',
       command_line => '$USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -467,8 +467,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_udp',
       command_line => '$USER1$/check_udp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -477,8 +477,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_nrpe',
       command_line => '$USER1$/check_nrpe -t 30 -H $HOSTADDRESS$ -c $ARG1$  -a $ARG2$ $ARG3$ $ARG4$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -487,8 +487,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_nagios',
       command_line => '$USER1$/check_nagios -F $ARG1$ -e $ARG2$ -C $ARG3$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -497,8 +497,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_bandwidth',
       command_line => '$USER1$/check_bandwidth.sh -t 30 -H $HOSTADDRESS$ linux  $ARG1$  $ARG2$ $ARG3$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -507,8 +507,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'process-service-perfdata-file',
       command_line => '/bin/mv /var/log/pnp4nagios/service-perfdata /var/spool/pnp4nagios/service-perfdata.$TIMET$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -517,18 +517,18 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'process-host-perfdata-file',
       command_line => '/bin/mv /var/log/pnp4nagios/host-perfdata /var/spool/pnp4nagios/host-perfdata.$TIMET$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
 
-    @@nagios_command {  'check_ntp_time':
+    @@nagios_command { 'check_ntp_time':
       ensure       => present,
       command_name => 'check_ntp_time',
       command_line => '$USER1$/check_ntp_time -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }

doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html

@@ -97,12 +97,9 @@ concat.
     <p class="tag_title">Examples:</p>
     
       
-        <p class="example_title"><div class='inline'>
-<p>confdroid_nagios::nagios::objects::templates { ‘generic contact’:</p>
-</div></p>
-      
-      <pre class="example code"><code>ng_template_object      =&gt; &#39;contact&#39;,
-ng_template_object_name =&gt; &#39;generic-contact&#39;,
+      <pre class="example code"><code>confdroid_nagios::nagios::objects::templates { &#39;generic contact&#39;:
+  ng_template_object      =&gt; &#39;contact&#39;,
+  ng_template_object_name =&gt; &#39;generic-contact&#39;,
 }</code></pre>
     
   </div>
@@ -116,7 +113,6 @@ ng_template_object_name =&gt; &#39;generic-contact&#39;,
         <pre class="lines">
 
 
-11
 12
 13
 14
@@ -187,10 +183,11 @@ ng_template_object_name =&gt; &#39;generic-contact&#39;,
 79
 80
 81
-82</pre>
+82
+83</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/template_rules.pp', line 11</span>
+        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/template_rules.pp', line 12</span>
 
 class confdroid_nagios::nagios::objects::template_rules (
 

doc/puppet_classes/confdroid_nagios_3A_3Aparams.html

@@ -1334,7 +1334,7 @@ class confdroid_nagios::params (
   $ng_tgt_svcgrp_head_erb     = 'confdroid_nagios/nagios/svcgroups_cfg_head.erb'
   $ng_tgt_svcgrp_rule_erb     = 'confdroid_nagios/nagios/svcgroups_cfg_rule.erb'
   $ng_target_base_contact     = "${ng_conf_d_dir}/nagios_contact_base.cfg"
-  $ng_target_add_contact      = "${ng_conf_d_dir}/nagios_contact_add.cfg"
+  $ng_target_add_contact      = "${ng_conf_d_dir}/nagios_contact.cfg"
   $ng_contacts_head_erb       = 'confdroid_nagios/nagios/contacts_cfg_head.erb'
   $ng_contacts_rule_erb       = 'confdroid_nagios/nagios/contacts_cfg_rule.erb'
   $ng_tgt_contactgroup_base   = "${ng_conf_d_dir}/nagios_contactgroup_base.cfg"