Recommit for updates in build 12

README.md

@@ -44,7 +44,6 @@ CONFIGURATION
 - manages the main alloy pipeline for loki and prometheus
 - manages log rotation for rsyslog to allow adm membership
 - manage service
-- optional: include nagios target for the alloy service (set `ay_manage_nagios`to `true`)
 
 ## Repo Documentation
 
@@ -54,8 +53,6 @@ See the full Puppet documentation including parameters in `docs/index.html`
 
 All dependencies must be included in the catalogue.
 
-- [confdroid_nagios](https://sourcecode.confdroid.com/confdroid/confdroid_nagios) if nagios monitoring is desired
-
 ## Deployment
 
 - native Puppet deployment

doc/file.README.html

@@ -119,8 +119,6 @@
 <p>manages log rotation for rsyslog to allow adm membership</p>
 </li><li>
 <p>manage service</p>
-</li><li>
-<p>optional: include nagios target for the alloy service (set <code>ay_manage_nagios</code>to <code>true</code>)</p>
 </li></ul>
 
 <h2 id="label-Repo+Documentation">Repo Documentation</h2>
@@ -130,9 +128,6 @@
 <h2 id="label-Dependencies">Dependencies</h2>
 
 <p>All dependencies must be included in the catalogue.</p>
-<ul><li>
-<p><a href="https://sourcecode.confdroid.com/confdroid/confdroid_nagios">confdroid_nagios</a> if nagios monitoring is desired</p>
-</li></ul>
 
 <h2 id="label-Deployment">Deployment</h2>
 <ul><li>

doc/index.html

@@ -119,8 +119,6 @@
 <p>manages log rotation for rsyslog to allow adm membership</p>
 </li><li>
 <p>manage service</p>
-</li><li>
-<p>optional: include nagios target for the alloy service (set <code>ay_manage_nagios</code>to <code>true</code>)</p>
 </li></ul>
 
 <h2 id="label-Repo+Documentation">Repo Documentation</h2>
@@ -130,9 +128,6 @@
 <h2 id="label-Dependencies">Dependencies</h2>
 
 <p>All dependencies must be included in the catalogue.</p>
-<ul><li>
-<p><a href="https://sourcecode.confdroid.com/confdroid/confdroid_nagios">confdroid_nagios</a> if nagios monitoring is desired</p>
-</li></ul>
 
 <h2 id="label-Deployment">Deployment</h2>
 <ul><li>

doc/puppet_classes/confdroid_alloy_3A_3Amonitoring_3A_3Atarget.html

@@ -128,7 +128,7 @@ class confdroid_alloy::monitoring::target (
 ) inherits confdroid_alloy::params {
   if $ay_manage_nagios == true {
     @@nagios_service { "check_alloy_${fqdn}":
-      check_command       => "check_nrpe!check_alloy!${ay_procs_allowed}!alloy",
+      check_command       => "check_nrpe!check_alloy!${fn_procs_allowed}!alloy-server",
       use                 => 'generic-service',
       host_name           => $fqdn,
       notification_period => '24x7',

doc/puppet_classes/confdroid_alloy_3A_3Aparams.html

@@ -412,24 +412,6 @@
         —
         <div class='inline'>
 <p>the contacts for nagios service exports</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ay_procs_allowed</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;1:&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>the allowed number of processes for nagios service exports</p>
 </div>
       
     </li>
@@ -445,6 +427,7 @@
         <pre class="lines">
 
 
+25
 26
 27
 28
@@ -482,15 +465,10 @@
 60
 61
 62
-63
-64
-65
-66
-67
-68</pre>
+63</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 26</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 25</span>
 
 class confdroid_alloy::params (
 
@@ -517,12 +495,8 @@ class confdroid_alloy::params (
   Boolean $ay_manage_nagios                   = false,
   String $ay_target_service                   = &#39;/etc/nagios/conf.d/alloy_service.cfg&#39;,
   Array $ay_target_contacts                   = [&#39;nagiosadmin&#39;],
-  String $ay_procs_allowed                    = &#39;1:&#39;
 
 ) {
-  # defaults
-  $fqdn               = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
-
   # service
   $ay_service         = &#39;alloy&#39;
 

manifests/monitoring/target.pp

@@ -8,7 +8,7 @@ class confdroid_alloy::monitoring::target (
 ) inherits confdroid_alloy::params {
   if $ay_manage_nagios == true {
     @@nagios_service { "check_alloy_${fqdn}":
-      check_command       => "check_nrpe!check_alloy!${ay_procs_allowed}!alloy",
+      check_command       => "check_nrpe!check_alloy!${fn_procs_allowed}!alloy-server",
       use                 => 'generic-service',
       host_name           => $fqdn,
       notification_period => '24x7',

manifests/params.pp

@@ -20,7 +20,6 @@
 # @param [Boolean] ay_manage_nagios whether to manage nagios service exports
 # @param [String] ay_target_service the target file for nagios service exports
 # @param [Array] ay_target_contacts the contacts for nagios service exports
-# @param [String] ay_procs_allowed the allowed number of processes for nagios service exports
 # @summary Class contains all parameters for the confdroid_alloy module.
 ##############################################################################
 class confdroid_alloy::params (
@@ -48,12 +47,8 @@ class confdroid_alloy::params (
   Boolean $ay_manage_nagios                   = false,
   String $ay_target_service                   = '/etc/nagios/conf.d/alloy_service.cfg',
   Array $ay_target_contacts                   = ['nagiosadmin'],
-  String $ay_procs_allowed                    = '1:'
 
 ) {
-  # defaults
-  $fqdn               = $facts['networking']['fqdn']
-
   # service
   $ay_service         = 'alloy'