recommit for updates in build 7

This commit is contained in:
2018-04-29 12:24:46 +02:00
parent 3ff4143007
commit 4dec14a699
13 changed files with 655 additions and 36 deletions

View File

@@ -97,6 +97,8 @@
<span class='object_link'><a href="cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html" title="puppet_classes::cd_nagios::nagios::objects::hostgroups (puppet_class)">cd_nagios::nagios::objects::hostgroups</a></span><br/>
<span class='object_link'><a href="cd_nagios_3A_3Anagios_3A_3Aresources_3A_3Aresource.html" title="puppet_classes::cd_nagios::nagios::resources::resource (puppet_class)">cd_nagios::nagios::resources::resource</a></span><br/>
<span class='object_link'><a href="cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html" title="puppet_classes::cd_nagios::nagios::objects::timeperiods (puppet_class)">cd_nagios::nagios::objects::timeperiods</a></span><br/>
<span class='object_link'><a href="cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html" title="puppet_classes::cd_nagios::nagios::objects::contactgroups (puppet_class)">cd_nagios::nagios::objects::contactgroups</a></span><br/>
@@ -4915,6 +4917,42 @@ the check declaration from there, so the
Nagios check is properly aligned
to the Puppet module controlling the
particular item.</p>
</div>
</li>
<li>
<span class='name'>ng_user_arg1</span>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/usr/lib64/nagios/plugins&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the user argument for $user1$</p>
</div>
</li>
<li>
<span class='name'>ng_user_arg2</span>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/usr/lib64/nagios/plugins/eventhandlers&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the user argument for $user2$</p>
</div>
</li>
@@ -4936,8 +4974,6 @@ particular item.</p>
<pre class="lines">
653
654
655
656
657
@@ -5295,10 +5331,16 @@ particular item.</p>
1009
1010
1011
1012</pre>
1012
1013
1014
1015
1016
1017
1018</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 653</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 655</span>
class cd_nagios::params (
@@ -5554,6 +5596,9 @@ $ng_loadctl_options = &#39;jobs_max=100;backoff_limit=10;rampup_change=5
# single nagios checks
$ng_enable_swap_check = true,
# resource.cfg
$ng_user_arg1 = &#39;/usr/lib64/nagios/plugins&#39;,
$ng_user_arg2 = &#39;/usr/lib64/nagios/plugins/eventhandlers&#39;,
) {
@@ -5614,6 +5659,7 @@ $ng_ssl_vhost_file = &#39;/etc/httpd/conf.d/nagios_ssl.conf&#39;
$ng_ssl_vhost_erb = &#39;cd_nagios/httpd/nagios_ssl_vhost.erb&#39;
$ng_nagios_cfg_file = &quot;${ng_main_dir}/nagios.cfg&quot;
$ng_nagios_cfg_erb = &#39;cd_nagios/nagios/nagios_cfg.erb&#39;
$ng_resource_erb = &#39;cd_nagios/nagios/resource_cfg.erb&#39;
# certbot
$ng_certbot_main_dir = &#39;/etc/letsencrypt&#39;