recommit for updates in build 50
This commit is contained in:
15
CHANGELOG.md
15
CHANGELOG.md
@@ -8,6 +8,21 @@ Changelog of Git Changelog.
|
||||
<h2> No issue </h2>
|
||||
|
||||
|
||||
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/c0a5382d2c4cd88">c0a5382d2c4cd88</a> Arne Teuke <i>2017-07-30 12:07:53</i>
|
||||
<p>
|
||||
<h3>added basic command examples</h3>
|
||||
|
||||
</p>
|
||||
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/2e89f817d99fb64">2e89f817d99fb64</a> Jenkins Server <i>2017-07-30 12:07:49</i>
|
||||
<p>
|
||||
<h3>recommit for updates in build 43</h3>
|
||||
|
||||
</p>
|
||||
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/5f91d2a4715fe48">5f91d2a4715fe48</a> Arne Teuke <i>2017-07-30 12:06:19</i>
|
||||
<p>
|
||||
<h3>added basic command examples</h3>
|
||||
|
||||
</p>
|
||||
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/5c0374245dc1e72">5c0374245dc1e72</a> Arne Teuke <i>2017-07-30 11:50:55</i>
|
||||
<p>
|
||||
<h3>added test command</h3>
|
||||
|
||||
@@ -50,7 +50,8 @@
|
||||
| |-- cmd_head.erb
|
||||
| |-- cmd_rule.erb
|
||||
| |-- nrpe_cfg.erb
|
||||
| `-- nrpe_conf.erb
|
||||
| |-- nrpe_conf.erb
|
||||
| `-- sudo_rule.erb
|
||||
|-- tests
|
||||
| `-- UTF_Files
|
||||
|-- CHANGELOG.md
|
||||
@@ -61,4 +62,4 @@
|
||||
|-- README.md
|
||||
`-- REPOSTRUCTURE.md
|
||||
|
||||
11 directories, 50 files
|
||||
11 directories, 51 files
|
||||
|
||||
@@ -171,7 +171,7 @@
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Sun Jul 30 14:07:44 2017 by
|
||||
Generated on Sun Jul 30 16:03:54 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>
|
||||
|
||||
@@ -133,8 +133,12 @@ manage configuration files through parameters:
|
||||
* nrpe.conf
|
||||
* nrpe.cfg
|
||||
*
|
||||
commands.cfg (optional)
|
||||
* manage iptables (optionals )</p>
|
||||
manage sudo role for nagios user on NRPE clients
|
||||
* manage dynamic NRPE
|
||||
check command definitions
|
||||
* manage iptables (optional)
|
||||
* manage selinux
|
||||
rule exceptions (optional)</p>
|
||||
|
||||
<p>SERVICE
|
||||
* manage NRPE service</p>
|
||||
@@ -213,6 +217,9 @@ through this modules. Defaults to <code>true</code>.</p>
|
||||
</li><li>
|
||||
<p><code>$ne_include_selinux</code> : Whether to manage selinux exception
|
||||
rules. Defaults to <code>true</code>.</p>
|
||||
</li><li>
|
||||
<p><code>$ne_enable_ssl</code> : Whether to allow SSL settings. See <a
|
||||
href="#konwn-problems">known problems</a> for more details.</p>
|
||||
</li></ul>
|
||||
|
||||
<h3 id="label-Managing+Check+Commands">Managing Check Commands</h3>
|
||||
@@ -226,6 +233,9 @@ ability to dynamicically set command arguments based on default variables /
|
||||
overrides. For that reason no hard-coded commands are included, but instead
|
||||
all commands are set via argument strings, where possible.</p>
|
||||
|
||||
<p>The commands are created within /etc/nrpe.d/command.cfg , every set of
|
||||
instructions creates a new line.</p>
|
||||
|
||||
<p>Defining commands is as simple as
|
||||
that:
|
||||
<code>
|
||||
@@ -240,7 +250,8 @@ $ARG2$',
|
||||
It is very recommendable to define such
|
||||
commands within Puppet modules controlling services, so any node running
|
||||
the particular service will automatically get the required check commands
|
||||
defined as well.</p>
|
||||
defined as well, while nodes not running the service also do not contain
|
||||
the command check.</p>
|
||||
|
||||
<h3 id="label-SELINUX">SELINUX</h3>
|
||||
|
||||
@@ -248,6 +259,18 @@ defined as well.</p>
|
||||
selinux is disabled, these contexts are ignored.</p>
|
||||
|
||||
<h3 id="label-Known+Problems">Known Problems</h3>
|
||||
<ul><li>
|
||||
<p>SSL/TLS support: Version 3 of NRPE supposedly has support for SSL/ TLs.
|
||||
However, at the time of writing this module, this seems to be buggy, as I
|
||||
was unable to start the NRPE service as soon as the
|
||||
<code>ssl_cert_file</code> line was uncommented in teh configuration file,
|
||||
despite having valid certs in the right position on the node. This happened
|
||||
when installing manually, not through this Puppet module. For that reason I
|
||||
included the <code>$ne_enable_ssl</code> boolean parameter, which is set to
|
||||
<code>false</code> by default, hence disabling SSL/TLS options until this
|
||||
has been fixed upstream, or a valid workaround has been found. Setting this
|
||||
option to <code>true</code> will include all SSL / TLS settings.</p>
|
||||
</li></ul>
|
||||
|
||||
<h3 id="label-Support">Support</h3>
|
||||
<ul><li>
|
||||
@@ -302,7 +325,7 @@ environments.</p>
|
||||
</div></div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Sun Jul 30 14:07:45 2017 by
|
||||
Generated on Sun Jul 30 16:03:55 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>
|
||||
|
||||
@@ -133,8 +133,12 @@ manage configuration files through parameters:
|
||||
* nrpe.conf
|
||||
* nrpe.cfg
|
||||
*
|
||||
commands.cfg (optional)
|
||||
* manage iptables (optionals )</p>
|
||||
manage sudo role for nagios user on NRPE clients
|
||||
* manage dynamic NRPE
|
||||
check command definitions
|
||||
* manage iptables (optional)
|
||||
* manage selinux
|
||||
rule exceptions (optional)</p>
|
||||
|
||||
<p>SERVICE
|
||||
* manage NRPE service</p>
|
||||
@@ -213,6 +217,9 @@ through this modules. Defaults to <code>true</code>.</p>
|
||||
</li><li>
|
||||
<p><code>$ne_include_selinux</code> : Whether to manage selinux exception
|
||||
rules. Defaults to <code>true</code>.</p>
|
||||
</li><li>
|
||||
<p><code>$ne_enable_ssl</code> : Whether to allow SSL settings. See <a
|
||||
href="#konwn-problems">known problems</a> for more details.</p>
|
||||
</li></ul>
|
||||
|
||||
<h3 id="label-Managing+Check+Commands">Managing Check Commands</h3>
|
||||
@@ -226,6 +233,9 @@ ability to dynamicically set command arguments based on default variables /
|
||||
overrides. For that reason no hard-coded commands are included, but instead
|
||||
all commands are set via argument strings, where possible.</p>
|
||||
|
||||
<p>The commands are created within /etc/nrpe.d/command.cfg , every set of
|
||||
instructions creates a new line.</p>
|
||||
|
||||
<p>Defining commands is as simple as
|
||||
that:
|
||||
<code>
|
||||
@@ -240,7 +250,8 @@ $ARG2$',
|
||||
It is very recommendable to define such
|
||||
commands within Puppet modules controlling services, so any node running
|
||||
the particular service will automatically get the required check commands
|
||||
defined as well.</p>
|
||||
defined as well, while nodes not running the service also do not contain
|
||||
the command check.</p>
|
||||
|
||||
<h3 id="label-SELINUX">SELINUX</h3>
|
||||
|
||||
@@ -248,6 +259,18 @@ defined as well.</p>
|
||||
selinux is disabled, these contexts are ignored.</p>
|
||||
|
||||
<h3 id="label-Known+Problems">Known Problems</h3>
|
||||
<ul><li>
|
||||
<p>SSL/TLS support: Version 3 of NRPE supposedly has support for SSL/ TLs.
|
||||
However, at the time of writing this module, this seems to be buggy, as I
|
||||
was unable to start the NRPE service as soon as the
|
||||
<code>ssl_cert_file</code> line was uncommented in teh configuration file,
|
||||
despite having valid certs in the right position on the node. This happened
|
||||
when installing manually, not through this Puppet module. For that reason I
|
||||
included the <code>$ne_enable_ssl</code> boolean parameter, which is set to
|
||||
<code>false</code> by default, hence disabling SSL/TLS options until this
|
||||
has been fixed upstream, or a valid workaround has been found. Setting this
|
||||
option to <code>true</code> will include all SSL / TLS settings.</p>
|
||||
</li></ul>
|
||||
|
||||
<h3 id="label-Support">Support</h3>
|
||||
<ul><li>
|
||||
@@ -302,7 +325,7 @@ environments.</p>
|
||||
</div></div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Sun Jul 30 14:07:45 2017 by
|
||||
Generated on Sun Jul 30 16:03:54 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>
|
||||
|
||||
@@ -140,7 +140,7 @@ class cd_nrpe {
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Sun Jul 30 14:07:45 2017 by
|
||||
Generated on Sun Jul 30 16:03:55 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>
|
||||
|
||||
@@ -127,6 +127,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
|
||||
<pre class="example code"><code>cd_nrpe::commands::definitions { 'check_users':
|
||||
ne_check_cmd => 'check_users',
|
||||
ne_cmd_argstring => '-w $ARG1$ -c $ARG2$',
|
||||
ne_cmd_comment => 'check the amount of user logged in locally',
|
||||
}</code></pre>
|
||||
|
||||
</div>
|
||||
@@ -139,7 +140,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
|
||||
<pre class="lines">
|
||||
|
||||
|
||||
28
|
||||
29
|
||||
30
|
||||
31
|
||||
@@ -195,10 +195,12 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
|
||||
81
|
||||
82
|
||||
83
|
||||
84</pre>
|
||||
84
|
||||
85
|
||||
86</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/commands/definition_rules.pp', line 28</span>
|
||||
<pre class="code"><span class="info file"># File 'manifests/commands/definition_rules.pp', line 29</span>
|
||||
|
||||
class cd_nrpe::commands::definition_rules (
|
||||
|
||||
@@ -211,8 +213,8 @@ class cd_nrpe::commands::definition_rules (
|
||||
concat { $ne_cmd_file:
|
||||
ensure => present,
|
||||
path => $ne_cmd_file,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
owner => $ne_user,
|
||||
group => $ne_user,
|
||||
mode => '0640',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
@@ -234,6 +236,7 @@ class cd_nrpe::commands::definition_rules (
|
||||
cd_nrpe::commands::definitions { 'check_users':
|
||||
ne_check_cmd => 'check_users',
|
||||
ne_cmd_argstring => '-w $ARG1$ -c $ARG2$',
|
||||
ne_cmd_comment => 'check the amount of user logged in locally',
|
||||
}
|
||||
|
||||
cd_nrpe::commands::definitions { 'check_load':
|
||||
@@ -264,7 +267,7 @@ class cd_nrpe::commands::definition_rules (
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Sun Jul 30 14:07:47 2017 by
|
||||
Generated on Sun Jul 30 16:03:57 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>
|
||||
|
||||
@@ -165,7 +165,7 @@ class cd_nrpe::firewall::iptables (
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Sun Jul 30 14:07:47 2017 by
|
||||
Generated on Sun Jul 30 16:03:57 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>
|
||||
|
||||
@@ -154,7 +154,7 @@ class cd_nrpe::main::config (
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Sun Jul 30 14:07:46 2017 by
|
||||
Generated on Sun Jul 30 16:03:56 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>
|
||||
|
||||
@@ -205,7 +205,7 @@ class cd_nrpe::main::dirs (
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Sun Jul 30 14:07:46 2017 by
|
||||
Generated on Sun Jul 30 16:03:56 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>
|
||||
|
||||
@@ -166,7 +166,22 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
|
||||
58
|
||||
59
|
||||
60
|
||||
61</pre>
|
||||
61
|
||||
62
|
||||
63
|
||||
64
|
||||
65
|
||||
66
|
||||
67
|
||||
68
|
||||
69
|
||||
70
|
||||
71
|
||||
72
|
||||
73
|
||||
74
|
||||
75
|
||||
76</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 23</span>
|
||||
@@ -209,6 +224,21 @@ class cd_nrpe::main::files (
|
||||
notify => Service[$ne_service],
|
||||
}
|
||||
|
||||
if $ne_allow_sudo == true {
|
||||
|
||||
file { $ne_sudo_file:
|
||||
ensure => file,
|
||||
path => $ne_sudo_file,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0440',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => etc_t,
|
||||
seluser => system_u,
|
||||
content => template($ne_sudo_rule_erb),
|
||||
}
|
||||
}
|
||||
}</pre>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -217,7 +247,7 @@ class cd_nrpe::main::files (
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Sun Jul 30 14:07:46 2017 by
|
||||
Generated on Sun Jul 30 16:03:56 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>
|
||||
|
||||
@@ -160,7 +160,7 @@ class cd_nrpe::main::install (
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Sun Jul 30 14:07:46 2017 by
|
||||
Generated on Sun Jul 30 16:03:56 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>
|
||||
|
||||
@@ -183,7 +183,7 @@ class cd_nrpe::main::service (
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Sun Jul 30 14:07:46 2017 by
|
||||
Generated on Sun Jul 30 16:03:56 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>
|
||||
|
||||
@@ -193,7 +193,7 @@ class cd_nrpe::main::user (
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Sun Jul 30 14:07:46 2017 by
|
||||
Generated on Sun Jul 30 16:03:56 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>
|
||||
|
||||
@@ -966,7 +966,10 @@ checks, to allow dynamic check
|
||||
178
|
||||
179
|
||||
180
|
||||
181</pre>
|
||||
181
|
||||
182
|
||||
183
|
||||
184</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 101</span>
|
||||
@@ -977,7 +980,7 @@ $pkg_ensure = 'latest',
|
||||
|
||||
$ne_manage_cmds = true,
|
||||
|
||||
# user settings
|
||||
# NRPE user settings
|
||||
$ne_user = 'nrpe',
|
||||
$ne_user_comment = 'NRPE service user',
|
||||
$ne_user_uid = '1005',
|
||||
@@ -985,6 +988,7 @@ $ne_user_home = '/var/run/nrpe',
|
||||
$ne_user_groups = undef,
|
||||
$ne_user_shell = '/sbin/nologin',
|
||||
|
||||
|
||||
# nrpe.cfg
|
||||
$ne_log_facility = 'daemon',
|
||||
$ne_log_file = '',
|
||||
@@ -1046,6 +1050,8 @@ $ne_nrpe_conf_erb = 'cd_nrpe/nrpe_conf.erb'
|
||||
$ne_cmd_file = "${ne_main_conf_d_dir}/commands.cfg"
|
||||
$ne_cmd_head_erb = 'cd_nrpe/cmd_head.erb'
|
||||
$ne_cmd_rule_erb = 'cd_nrpe/cmd_rule.erb'
|
||||
$ne_sudo_file = '/etc/sudoers.d/nagios_sudo'
|
||||
$ne_sudo_rule_erb = 'cd_nrpe/sudo_rule.erb'
|
||||
|
||||
# includes must be last
|
||||
|
||||
@@ -1059,7 +1065,7 @@ $ne_cmd_rule_erb = 'cd_nrpe/cmd_rule.erb'
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Sun Jul 30 14:07:46 2017 by
|
||||
Generated on Sun Jul 30 16:03:56 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>
|
||||
|
||||
@@ -173,6 +173,25 @@ the custom location
|
||||
, i.e. -w $ARG1$ -c
|
||||
$ARG2$. See the arguments in th eman pages for the
|
||||
checks.</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>ne_cmd_comment</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>string</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>undef</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>Specify an optional comment for your command
|
||||
definition</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
@@ -187,8 +206,6 @@ checks.</p>
|
||||
<pre class="lines">
|
||||
|
||||
|
||||
31
|
||||
32
|
||||
33
|
||||
34
|
||||
35
|
||||
@@ -206,16 +223,20 @@ checks.</p>
|
||||
47
|
||||
48
|
||||
49
|
||||
50</pre>
|
||||
50
|
||||
51
|
||||
52
|
||||
53</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/commands/definitions.pp', line 31</span>
|
||||
<pre class="code"><span class="info file"># File 'manifests/commands/definitions.pp', line 33</span>
|
||||
|
||||
define cd_nrpe::commands::definitions (
|
||||
|
||||
$ne_check_cmd = undef,
|
||||
$ne_cmd_path = '/usr/lib64/nagios/plugins/',
|
||||
$ne_cmd_argstring = undef,
|
||||
$ne_cmd_comment = undef,
|
||||
|
||||
) {
|
||||
|
||||
@@ -238,7 +259,7 @@ $ne_manage_cmds = $::cd_nrpe::params::ne_manage_cmds
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Sun Jul 30 14:07:47 2017 by
|
||||
Generated on Sun Jul 30 16:03:57 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>
|
||||
|
||||
@@ -90,7 +90,7 @@
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Sun Jul 30 14:07:45 2017 by
|
||||
Generated on Sun Jul 30 16:03:55 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>
|
||||
|
||||
Reference in New Issue
Block a user