confdroid/confdroid_nrpe
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'jenkins' into 'master'

Browse Source 
Jenkins

See merge request !24
This commit is contained in:
12ww1160
2017-07-28 20:18:53 +02:00
parent 8d4d37c4b8 c2e28a2557
commit 955c000642
17 changed files with 59 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
<h2> No issue </h2>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/7efec6b6a39fc99">7efec6b6a39fc99</a> Arne Teuke <i>2017-07-28 17:57:30</i>
<p>
<h3>updated template</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/adde8bf90e044c4">adde8bf90e044c4</a> Jenkins Server <i>2017-07-28 17:57:26</i>
<p>
<h3>recommit for updates in build 35</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/84b5e09383fa0e2">84b5e09383fa0e2</a> Arne Teuke <i>2017-07-28 17:49:08</i>
<p>
<h3>updated template</h3>

2
doc/_index.html
View File

@@ -166,7 +166,7 @@
</div>
<div id="footer">
Generated on Fri Jul 28 19:57:21 2017 by
Generated on Fri Jul 28 20:26:16 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/file.README.html
View File

@@ -252,7 +252,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Fri Jul 28 19:57:22 2017 by
Generated on Fri Jul 28 20:26:17 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/index.html
View File

@@ -252,7 +252,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Fri Jul 28 19:57:22 2017 by
Generated on Fri Jul 28 20:26:16 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nrpe.html
View File

@@ -140,7 +140,7 @@ class cd_nrpe {
</div>
<div id="footer">
Generated on Fri Jul 28 19:57:22 2017 by
Generated on Fri Jul 28 20:26:17 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html
View File

@@ -165,7 +165,7 @@ class cd_nrpe::firewall::iptables (
</div>
<div id="footer">
Generated on Fri Jul 28 19:57:24 2017 by
Generated on Fri Jul 28 20:26:18 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html
View File

@@ -154,7 +154,7 @@ class cd_nrpe::main::config (
</div>
<div id="footer">
Generated on Fri Jul 28 19:57:23 2017 by
Generated on Fri Jul 28 20:26:18 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html
View File

@@ -205,7 +205,7 @@ class cd_nrpe::main::dirs (
</div>
<div id="footer">
Generated on Fri Jul 28 19:57:23 2017 by
Generated on Fri Jul 28 20:26:18 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html
View File

@@ -217,7 +217,7 @@ class cd_nrpe::main::files (
</div>
<div id="footer">
Generated on Fri Jul 28 19:57:23 2017 by
Generated on Fri Jul 28 20:26:18 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html
View File

@@ -160,7 +160,7 @@ class cd_nrpe::main::install (
</div>
<div id="footer">
Generated on Fri Jul 28 19:57:23 2017 by
Generated on Fri Jul 28 20:26:18 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html
View File

@@ -175,7 +175,7 @@ class cd_nrpe::main::service (
</div>
<div id="footer">
Generated on Fri Jul 28 19:57:23 2017 by
Generated on Fri Jul 28 20:26:18 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html
View File

@@ -193,7 +193,7 @@ class cd_nrpe::main::user (
</div>
<div id="footer">
Generated on Fri Jul 28 19:57:23 2017 by
Generated on Fri Jul 28 20:26:18 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

32
doc/puppet_classes/cd_nrpe_3A_3Aparams.html
View File

@@ -423,7 +423,7 @@ to be established before exiting.</p>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;TLSv1.1+&#39;</tt>)</em>
<em class="default">(defaults to: <tt>&#39;TLSv2+&#39;</tt>)</em>
&mdash;
@@ -825,6 +825,24 @@ needed.</p>
&mdash;
<div class='inline'>
<p>Whether to manage selinux</p>
</div>
</li>
<li>
<span class='name'>ne_enable_ssl</span>
<span class='type'>(<tt>boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
<p>Whether to enable SSL certificates.</p>
</div>
</li>
@@ -846,7 +864,6 @@ needed.</p>
<pre class="lines">
98
99
100
101
@@ -920,10 +937,12 @@ needed.</p>
169
170
171
172</pre>
172
173
174</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 98</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 99</span>
class cd_nrpe::params (
@@ -952,7 +971,8 @@ $ne_command_prefix = &#39;/usr/bin/sudo&#39;,
$ne_command_timeout = &#39;60&#39;,
$ne_connection_timeout = &#39;300&#39;,
$ne_allow_weak_rnd_seed = &#39;1&#39;,
$ne_ssl_version = &#39;TLSv1.1+&#39;,
$ne_enable_ssl = false,
$ne_ssl_version = &#39;TLSv2+&#39;,
$ne_ssl_use_adh = &#39;1&#39;,
$ne_ssl_cipher_list = &#39;ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!RC4:!MD5:@STRENGTH&#39;,
$ne_ssl_cacert_file = &#39;/etc/pki/tls/certs/ca-chain.crt.pem&#39;,
@@ -1007,7 +1027,7 @@ $ne_nrpe_conf_erb = &#39;cd_nrpe/nrpe_conf.erb&#39;
</div>
<div id="footer">
Generated on Fri Jul 28 19:57:23 2017 by
Generated on Fri Jul 28 20:26:18 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html
View File

@@ -148,7 +148,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
</div>
<div id="footer">
Generated on Fri Jul 28 19:57:24 2017 by
Generated on Fri Jul 28 20:26:18 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/top-level-namespace.html
View File

@@ -90,7 +90,7 @@
</div>
<div id="footer">
Generated on Fri Jul 28 19:57:22 2017 by
Generated on Fri Jul 28 20:26:17 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

4
manifests/params.pp
View File

@@ -94,6 +94,7 @@
# @param [string] ne_server_address the network interfaces to listen on
# @param [string] ne_allow_weak_rnd_seed Whether to allow weak random seeds
# @param [string] ne_include_selinux Whether to manage selinux
# @param [boolean] ne_enable_ssl Whether to enable SSL certificates.
###############################################################################
class cd_nrpe::params (
@@ -122,7 +123,8 @@ $ne_command_prefix = '/usr/bin/sudo',
$ne_command_timeout = '60',
$ne_connection_timeout = '300',
$ne_allow_weak_rnd_seed = '1',
$ne_ssl_version = 'TLSv1.1+',
$ne_enable_ssl = false,
$ne_ssl_version = 'TLSv2+',
$ne_ssl_use_adh = '1',
$ne_ssl_cipher_list = 'ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!RC4:!MD5:@STRENGTH',
$ne_ssl_cacert_file = '/etc/pki/tls/certs/ca-chain.crt.pem',

96
templates/nrpe_cfg.erb
View File

@@ -41,103 +41,21 @@ ssl_version=<%= @ne_ssl_version %>
ssl_use_adh=<%= @ne_ssl_use_adh %>
ssl_cipher_list=<%= @ne_ssl_cipher_list %>
<% if $ne_enable_ssl == true -%>
ssl_cacert_file=<%= @ne_ssl_cacert_file %>
ssl_cert_file=<%= @ne_ssl_cert_file %>
ssl_privatekey_file=<%= @ne_ssl_privatekey_file %>
ssl_client_certs=<%= @ne_ssl_client_certs %>
ssl_logging=<%= @ne_ssl_logging %>
<% end -%>
nasty_metachars=<%= @ne_nasty_metachars %>
<% unless @ne_include_file.empty? -%>
include=<%= @ne_include_file %>
<% end -%>
# NASTY METACHARACTERS
# This option allows you to override the list of characters that cannot
# be passed to the NRPE daemon.
# nasty_metachars="|`&><'\\[]{};\r\n"
# INCLUDE CONFIG FILE
# This directive allows you to include definitions from an external config file.
#include=<somefile.cfg>
# INCLUDE CONFIG DIRECTORY
# This directive allows you to include definitions from config files (with a
# .cfg extension) in one or more directories (with recursion).
include_dir=/etc/nrpe.d/
# COMMAND DEFINITIONS
# Command definitions that this daemon will run. Definitions
# are in the following format:
#
# command[<command_name>]=<command_line>
#
# When the daemon receives a request to return the results of <command_name>
# it will execute the command specified by the <command_line> argument.
#
# Unlike Nagios, the command line cannot contain macros - it must be
# typed exactly as it should be executed.
#
# Note: Any plugins that are used in the command lines must reside
# on the machine that this daemon is running on! The examples below
# assume that you have plugins installed in a /usr/local/nagios/libexec
# directory. Also note that you will have to modify the definitions below
# to match the argument format the plugins expect. Remember, these are
# examples only!
# The following examples use hardcoded command arguments...
command[check_users]=/usr/lib64/nagios/plugins/check_users -w 5 -c 10
command[check_load]=/usr/lib64/nagios/plugins/check_load -r -w .15,.10,.05 -c .30,.25,.20
command[check_hda1]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /dev/hda1
command[check_zombie_procs]=/usr/lib64/nagios/plugins/check_procs -w 5 -c 10 -s Z
command[check_total_procs]=/usr/lib64/nagios/plugins/check_procs -w 150 -c 200
# The following examples allow user-supplied arguments and can
# only be used if the NRPE daemon was compiled with support for
# command arguments *AND* the dont_blame_nrpe directive in this
# config file is set to '1'. This poses a potential security risk, so
# make sure you read the SECURITY file before doing this.
#command[check_users]=/usr/lib64/nagios/plugins/check_users -w $ARG1$ -c $ARG2$
#command[check_load]=/usr/lib64/nagios/plugins/check_load -w $ARG1$ -c $ARG2$
#command[check_disk]=/usr/lib64/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
#command[check_procs]=/usr/lib64/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
#####################################
#ssl_version=<%= @ne_ssl_version %>
#ssl_use_adh=<%= @ne_ssl_use_adh %>
#ssl_cipher_list=<%= @ne_ssl_cipher_list %>
#ssl_cacert_file=<%= @ne_ssl_cacert_file %>
#ssl_cert_file=<%= @ne_ssl_cert_file %>
#ssl_privatekey_file=<%= @ne_ssl_privatekey_file %>
#ssl_client_certs=<%= @ne_ssl_client_certs %>
#ssl_logging=<%= @ne_ssl_logging %>
#nasty_metachars=<%= @ne_nasty_metachars %>
#<% unless @ne_include_file.empty? -%>
#include=<%= @ne_include_file %>
#<% end -%>
#include_dir=<%= @ne_main_conf_d_dir %>
include_dir=<%= @ne_main_conf_d_dir %>
### command definitions have been moved to include_dir for easier external
# management