Recommit for updates in build 31

doc/_index.html

@@ -98,11 +98,6 @@
       
             </li>
     
-            <li>
-      <span class='object_link'><a href="puppet_classes/confdroid_ntp_3A_3Amonitoring_3A_3Aloki.html" title="puppet_classes::confdroid_ntp::monitoring::loki (puppet_class)">confdroid_ntp::monitoring::loki</a></span>
-      
-            </li>
-    
             <li>
       <span class='object_link'><a href="puppet_classes/confdroid_ntp_3A_3Amonitoring_3A_3Atarget.html" title="puppet_classes::confdroid_ntp::monitoring::target (puppet_class)">confdroid_ntp::monitoring::target</a></span>
       

doc/puppet_class_list.html

@@ -78,21 +78,14 @@
     </li>
     
 
-    <li id="object_puppet_classes::confdroid_ntp::monitoring::loki" class="odd">
+    <li id="object_puppet_classes::confdroid_ntp::monitoring::target" class="odd">
-      <div class="item">
-        <span class='object_link'><a href="puppet_classes/confdroid_ntp_3A_3Amonitoring_3A_3Aloki.html" title="puppet_classes::confdroid_ntp::monitoring::loki (puppet_class)">confdroid_ntp::monitoring::loki</a></span>
-      </div>
-    </li>
-    
-
-    <li id="object_puppet_classes::confdroid_ntp::monitoring::target" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/confdroid_ntp_3A_3Amonitoring_3A_3Atarget.html" title="puppet_classes::confdroid_ntp::monitoring::target (puppet_class)">confdroid_ntp::monitoring::target</a></span>
       </div>
     </li>
     
 
-    <li id="object_puppet_classes::confdroid_ntp::params" class="odd">
+    <li id="object_puppet_classes::confdroid_ntp::params" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/confdroid_ntp_3A_3Aparams.html" title="puppet_classes::confdroid_ntp::params (puppet_class)">confdroid_ntp::params</a></span>
       </div>

doc/puppet_classes/confdroid_ntp_3A_3Amain_3A_3Aconfig.html

@@ -109,11 +109,7 @@
 11
 12
 13
-14
+14</pre>
-15
-16
-17
-18</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 6</span>
@@ -126,10 +122,6 @@ class confdroid_ntp::main::config (
   if $cy_manage_nagios == true {
     include confdroid_ntp::monitoring::target
   }
-
-  if $cy_manage_loki == true {
-    include confdroid_ntp::monitoring::loki
-  }
 }</pre>
       </td>
     </tr>

doc/puppet_classes/confdroid_ntp_3A_3Amonitoring_3A_3Aloki.html

@@ -1,138 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>
-  Puppet Class: confdroid_ntp::monitoring::loki
-  
-    &mdash; Documentation by YARD 0.9.36
-  
-</title>
-
-  <link rel="stylesheet" href="../css/style.css" type="text/css" />
-
-  <link rel="stylesheet" href="../css/common.css" type="text/css" />
-
-<script type="text/javascript">
-  pathId = "puppet_classes::confdroid_ntp::monitoring::loki";
-  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">confdroid_ntp::monitoring::loki</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: confdroid_ntp::monitoring::loki</h1>
-<div class="box_info">
-  
-  <dl>
-    <dt>Inherits:</dt>
-    <dd><span class='object_link'><a href="confdroid_ntp_3A_3Aparams.html" title="puppet_classes::confdroid_ntp::params (puppet_class)">confdroid_ntp::params</a></span></dd>
-  </dl>
-  
-  
-  <dl>
-    <dt>Defined in:</dt>
-    <dd>
-      manifests/monitoring/loki.pp
-    </dd>
-  </dl>
-</div>
-
-  <h2>Summary</h2>
-  Class manages loki monitoring for the confdroid_ntp services
-
-<h2>Overview</h2>
-<div class="docstring">
-  <div class="discussion">
-    
-<p>confdroid_ntp::monitoring::loki.pp Module name: confdroid_ntp Author: 12ww1160 (12ww1160@confdroid.com)</p>
-
-  </div>
-</div>
-
-
-
-<div class="tags">
-  
-
-
-</div><div class="method_details_list">
-  <table class="source_code">
-    <tr>
-      <td>
-        <pre class="lines">
-
-
-6
-7
-8
-9
-10
-11
-12
-13
-14</pre>
-      </td>
-      <td>
-        <pre class="code"><span class="info file"># File 'manifests/monitoring/loki.pp', line 6</span>
-
-class confdroid_ntp::monitoring::loki (
-
-) inherits confdroid_ntp::params {
-  if $cy_manage_loki == true {
-    confdroid_alloy::monitoring::log_targets { &quot;confdroid_ntp_${fqdn}&quot;:
-      targets =&gt; [&#39;/var/log/chrony&#39;],
-    }
-  }
-}</pre>
-      </td>
-    </tr>
-  </table>
-</div>
-</div>
-
-      <div id="footer">
-     Generated by <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>.
-</div>
-
-    </div>
-  </body>
-</html>

doc/puppet_classes/confdroid_ntp_3A_3Amonitoring_3A_3Atarget.html

@@ -128,7 +128,7 @@ class confdroid_ntp::monitoring::target (
 ) inherits confdroid_ntp::params {
   if $cy_manage_nagios == true {
     @@nagios_service { "check_chronyd_${fqdn}":
-      check_command       => "check_nrpe!check_chronyd!${cy_procs_allowed}!chronyd",
+      check_command       => "check_nrpe!check_chronyd!${cy_procs_allowed}!chrony",
       use                 => 'generic-service',
       host_name           => $fqdn,
       notification_period => '24x7',

doc/puppet_classes/confdroid_ntp_3A_3Aparams.html

@@ -77,8 +77,6 @@
       
       <span class='object_link'><a href="confdroid_ntp_3A_3Amain_3A_3Aservice.html" title="puppet_classes::confdroid_ntp::main::service (puppet_class)">confdroid_ntp::main::service</a></span><br/>
       
-      <span class='object_link'><a href="confdroid_ntp_3A_3Amonitoring_3A_3Aloki.html" title="puppet_classes::confdroid_ntp::monitoring::loki (puppet_class)">confdroid_ntp::monitoring::loki</a></span><br/>
-      
       <span class='object_link'><a href="confdroid_ntp_3A_3Amonitoring_3A_3Atarget.html" title="puppet_classes::confdroid_ntp::monitoring::target (puppet_class)">confdroid_ntp::monitoring::target</a></span><br/>
       
     </dd>
@@ -316,7 +314,7 @@
         <span class='type'>(<tt>String</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>&#39;1:&#39;</tt>)</em>
+        <em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
       
       
         &mdash;
@@ -352,30 +350,12 @@
         <span class='type'>(<tt>Array</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>[&#39;nagiosadmin&#39;]</tt>)</em>
+        <em class="default">(defaults to: <tt>[&#39;admin&#39;]</tt>)</em>
       
       
         &mdash;
         <div class='inline'>
-<p>List of Nagios contacts for notifications. must exist in Nagios contacts configuration!</p>
+<p>List of Nagios contacts for notifications.</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>cy_manage_loki</span>
-      
-      
-        <span class='type'>(<tt>Boolean</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>false</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>Whether to manage Loki logging for the module.</p>
 </div>
       
     </li>
@@ -391,6 +371,8 @@
         <pre class="lines">
 
 
+26
+27
 28
 29
 30
@@ -432,15 +414,10 @@
 66
 67
 68
-69
+69</pre>
-70
-71
-72
-73
-74</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 28</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 26</span>
 
 class confdroid_ntp::params (
 
@@ -460,12 +437,9 @@ class confdroid_ntp::params (
 
 # monitoring
   Boolean $cy_manage_nagios   = false,
-  String $cy_procs_allowed    = &#39;1:&#39;,
+  String $cy_procs_allowed    = &#39;1&#39;,
   String $cy_target_service   = &#39;/etc/nagios/conf.d/chronyd_service.cfg&#39;,
-  Array $cy_target_contacts   = [&#39;nagiosadmin&#39;],
+  Array $cy_target_contacts   = [&#39;admin&#39;],
-
-# loki
-  Boolean $cy_manage_loki     = false,
 
 ) {
 # facts

manifests/main/config.pp

@@ -11,8 +11,4 @@ class confdroid_ntp::main::config (
   if $cy_manage_nagios == true {
     include confdroid_ntp::monitoring::target
   }
-
-  if $cy_manage_loki == true {
-    include confdroid_ntp::monitoring::loki
-  }
 }

manifests/monitoring/loki.pp

@@ -1,14 +0,0 @@
-#### confdroid_ntp::monitoring::loki.pp
-# Module name: confdroid_ntp
-# Author: 12ww1160 (12ww1160@confdroid.com)
-# @summary Class manages loki monitoring for the confdroid_ntp services
-###############################################################################
-class confdroid_ntp::monitoring::loki (
-
-) inherits confdroid_ntp::params {
-  if $cy_manage_loki == true {
-    confdroid_alloy::monitoring::log_targets { "confdroid_ntp_${fqdn}":
-      targets => ['/var/log/chrony'],
-    }
-  }
-}

manifests/monitoring/target.pp

@@ -8,7 +8,7 @@ class confdroid_ntp::monitoring::target (
 ) inherits confdroid_ntp::params {
   if $cy_manage_nagios == true {
     @@nagios_service { "check_chronyd_${fqdn}":
-      check_command       => "check_nrpe!check_chronyd!${cy_procs_allowed}!chronyd",
+      check_command       => "check_nrpe!check_chronyd!${cy_procs_allowed}!chrony",
       use                 => 'generic-service',
       host_name           => $fqdn,
       notification_period => '24x7',

manifests/params.pp

@@ -22,8 +22,6 @@
 # @param [String] cy_procs_allowed Number of allowed processes for the Nagios check.
 # @param [String] cy_target_service Path to the Nagios service configuration file.
 # @param [Array] cy_target_contacts List of Nagios contacts for notifications.
-#   must exist in Nagios contacts configuration!
-# @param [Boolean] cy_manage_loki Whether to manage Loki logging for the module.
 ###############################################################################
 class confdroid_ntp::params (
 
@@ -43,12 +41,9 @@ class confdroid_ntp::params (
 
 # monitoring
   Boolean $cy_manage_nagios   = false,
-  String $cy_procs_allowed    = '1:',
+  String $cy_procs_allowed    = '1',
   String $cy_target_service   = '/etc/nagios/conf.d/chronyd_service.cfg',
-  Array $cy_target_contacts   = ['nagiosadmin'],
+  Array $cy_target_contacts   = ['admin'],
-
-# loki
-  Boolean $cy_manage_loki     = false,
 
 ) {
 # facts