Recommit for updates in build 30

doc/puppet_classes/confdroid_ntp_3A_3Amain_3A_3Aconfig.html

@@ -119,9 +119,9 @@ class confdroid_ntp::main::config (
 ) inherits confdroid_ntp::params {
   include confdroid_ntp::main::service
 
-  if $cy_manage_nagios == true {
+#  if $ay_manage_nagios == true {
-    include confdroid_ntp::monitoring::target
+#    include confdroid_ntp::monitoring::target
-  }
+#  }
 }</pre>
       </td>
     </tr>

doc/puppet_classes/confdroid_ntp_3A_3Amonitoring_3A_3Atarget.html

@@ -104,21 +104,7 @@
 6
 7
 8
-9
+9</pre>
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/monitoring/target.pp', line 6</span>
@@ -126,20 +112,6 @@
 class confdroid_ntp::monitoring::target (
 
 ) inherits confdroid_ntp::params {
-  if $cy_manage_nagios == true {
-    @@nagios_service { &quot;check_chronyd_${fqdn}&quot;:
-      check_command       =&gt; &quot;check_nrpe!check_chronyd!${cy_procs_allowed}!chrony&quot;,
-      use                 =&gt; &#39;generic-service&#39;,
-      host_name           =&gt; $fqdn,
-      notification_period =&gt; &#39;24x7&#39;,
-      service_description =&gt; &quot;${fqdn}_check_chronyd&quot;,
-      target              =&gt; $cy_target_service,
-      owner               =&gt; &#39;nagios&#39;,
-      group               =&gt; &#39;nagios&#39;,
-      mode                =&gt; &#39;0640&#39;,
-      contacts            =&gt; $cy_target_contacts,
-    }
-  }
 }</pre>
       </td>
     </tr>

doc/puppet_classes/confdroid_ntp_3A_3Aparams.html

@@ -284,78 +284,6 @@
         —
         <div class='inline'>
 <p>Whether to use a local LAN server or external pool.</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>cy_manage_nagios</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 Nagios monitoring for the module.</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>cy_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>Number of allowed processes for the Nagios check.</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>cy_target_service</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;/etc/nagios/conf.d/chronyd_service.cfg&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>Path to the Nagios service configuration file.</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>cy_target_contacts</span>
-      
-      
-        <span class='type'>(<tt>Array</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>[&#39;admin&#39;]</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>List of Nagios contacts for notifications.</p>
 </div>
       
     </li>
@@ -371,6 +299,10 @@
         <pre class="lines">
 
 
+22
+23
+24
+25
 26
 27
 28
@@ -404,20 +336,10 @@
 56
 57
 58
-59
+59</pre>
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69</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 22</span>
 
 class confdroid_ntp::params (
 
@@ -435,12 +357,6 @@ class confdroid_ntp::params (
   String $cy_leapsectz        = &#39;right/UTC&#39;,
   String $cy_loginfo          = &#39;measurements statistics tracking&#39;,
 
-# monitoring
-  Boolean $cy_manage_nagios   = false,
-  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;admin&#39;],
-
 ) {
 # facts
   $fqdn                       = $facts[&#39;networking&#39;][&#39;fqdn&#39;]

manifests/main/config.pp

@@ -8,7 +8,7 @@ class confdroid_ntp::main::config (
 ) inherits confdroid_ntp::params {
   include confdroid_ntp::main::service
 
-  if $cy_manage_nagios == true {
+#  if $ay_manage_nagios == true {
-    include confdroid_ntp::monitoring::target
+#    include confdroid_ntp::monitoring::target
-  }
+#  }
 }

manifests/monitoring/target.pp

@@ -6,18 +6,4 @@
 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}!chrony",
-      use                 => 'generic-service',
-      host_name           => $fqdn,
-      notification_period => '24x7',
-      service_description => "${fqdn}_check_chronyd",
-      target              => $cy_target_service,
-      owner               => 'nagios',
-      group               => 'nagios',
-      mode                => '0640',
-      contacts            => $cy_target_contacts,
-    }
-  }
 }

manifests/params.pp

@@ -18,10 +18,6 @@
 # @param [String] cy_loginfo Log information to record. Valid values are
 #   'measurements', 'statistics', and 'tracking'.
 # @param [Boolean] cy_use_lan_server Whether to use a local LAN server or external pool.
-# @param [Boolean] cy_manage_nagios Whether to manage Nagios monitoring for the module.
-# @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.
 ###############################################################################
 class confdroid_ntp::params (
 
@@ -39,12 +35,6 @@ class confdroid_ntp::params (
   String $cy_leapsectz        = 'right/UTC',
   String $cy_loginfo          = 'measurements statistics tracking',
 
-# monitoring
-  Boolean $cy_manage_nagios   = false,
-  String $cy_procs_allowed    = '1',
-  String $cy_target_service   = '/etc/nagios/conf.d/chronyd_service.cfg',
-  Array $cy_target_contacts   = ['admin'],
-
 ) {
 # facts
   $fqdn                       = $facts['networking']['fqdn']