Recommit for updates in build 17

README.md

@@ -44,6 +44,7 @@ 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
 
@@ -53,6 +54,8 @@ 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,6 +119,8 @@
 <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>
@@ -128,6 +130,9 @@
 <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,6 +119,8 @@
 <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>
@@ -128,6 +130,9 @@
 <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_3Aparams.html

@@ -424,7 +424,7 @@
         <span class='type'>(<tt>String</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>&#39;1:1&#39;</tt>)</em>
+        <em class="default">(defaults to: <tt>&#39;1:&#39;</tt>)</em>
       
       
         &mdash;
@@ -517,7 +517,7 @@ 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:1&#39;
+  String $ay_procs_allowed                    = &#39;1:&#39;
 
 ) {
   # defaults

manifests/params.pp

@@ -48,7 +48,7 @@ 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:1'
+  String $ay_procs_allowed                    = '1:'
 
 ) {
   # defaults