Merge branch 'jenkins' into 'master'

Jenkins

See merge request !30
This commit is contained in:
12ww1160
2017-07-30 13:58:52 +02:00
19 changed files with 137 additions and 20 deletions

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/5c0374245dc1e72">5c0374245dc1e72</a> Arne Teuke <i>2017-07-30 11:50:55</i>
<p>
<h3>added test command</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/7782b870bf31b9d">7782b870bf31b9d</a> Jenkins Server <i>2017-07-30 11:50:48</i>
<p>
<h3>recommit for updates in build 42</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/7a767e39dc3aa27">7a767e39dc3aa27</a> Arne Teuke <i>2017-07-30 11:42:09</i>
<p>
<h3>fixed typo, added including clause to definitions</h3>

View File

@@ -87,7 +87,16 @@ There are currently no mandatory parameters, i.e. the module will function right
* `$ne_include_selinux` : Whether to manage selinux exception rules. Defaults to `true`.
### Managing Check Commands
In order to connect a Nagios monitoring server to clients through NRPE, you must define commands and the desired argument strings on the clients.
In order to connect a Nagios monitoring server to clients through NRPE, you must define commands and the desired argument strings on the clients. The default NRPE installation comes with a few examples of such commands, which are also included in this module. However, every environment is very different in their requirements and Nagios via Puppet is all about the 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.
Defining commands is as simple as that:
```
`cd_nrpe::commands::definitions` { 'check_users':
`ne_check_cmd` => 'check_users',
`ne_cmd_argstring` => '-w $ARG1$ -c $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.
### SELINUX

View File

@@ -171,7 +171,7 @@
</div>
<div id="footer">
Generated on Sun Jul 30 13:50:43 2017 by
Generated on Sun Jul 30 14:07:44 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>

View File

@@ -218,7 +218,29 @@ rules. Defaults to <code>true</code>.</p>
<h3 id="label-Managing+Check+Commands">Managing Check Commands</h3>
<p>In order to connect a Nagios monitoring server to clients through NRPE, you
must define commands and the desired argument strings on the clients.</p>
must define commands and the desired argument strings on the clients. The
default NRPE installation comes with a few examples of such commands, which
are also included in this module. However, every environment is very
different in their requirements and Nagios via Puppet is all about the
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>Defining commands is as simple as
that:
&lt;code&gt;
`cd_nrpe::commands::definitions` {
&#39;check_users&#39;:
`ne_check_cmd` =&gt;
&#39;check_users&#39;,
`ne_cmd_argstring` =&gt; &#39;-w $ARG1$ -c
$ARG2$&#39;,
}
&lt;/code&gt;
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>
<h3 id="label-SELINUX">SELINUX</h3>
@@ -280,7 +302,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Sun Jul 30 13:50:44 2017 by
Generated on Sun Jul 30 14:07:45 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>

View File

@@ -218,7 +218,29 @@ rules. Defaults to <code>true</code>.</p>
<h3 id="label-Managing+Check+Commands">Managing Check Commands</h3>
<p>In order to connect a Nagios monitoring server to clients through NRPE, you
must define commands and the desired argument strings on the clients.</p>
must define commands and the desired argument strings on the clients. The
default NRPE installation comes with a few examples of such commands, which
are also included in this module. However, every environment is very
different in their requirements and Nagios via Puppet is all about the
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>Defining commands is as simple as
that:
&lt;code&gt;
`cd_nrpe::commands::definitions` {
&#39;check_users&#39;:
`ne_check_cmd` =&gt;
&#39;check_users&#39;,
`ne_cmd_argstring` =&gt; &#39;-w $ARG1$ -c
$ARG2$&#39;,
}
&lt;/code&gt;
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>
<h3 id="label-SELINUX">SELINUX</h3>
@@ -280,7 +302,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Sun Jul 30 13:50:44 2017 by
Generated on Sun Jul 30 14:07:45 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>

View File

@@ -140,7 +140,7 @@ class cd_nrpe {
</div>
<div id="footer">
Generated on Sun Jul 30 13:50:44 2017 by
Generated on Sun Jul 30 14:07:45 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>

View File

@@ -177,7 +177,25 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
63
64
65
66</pre>
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/commands/definition_rules.pp', line 28</span>
@@ -218,7 +236,25 @@ class cd_nrpe::commands::definition_rules (
ne_cmd_argstring =&gt; &#39;-w $ARG1$ -c $ARG2$&#39;,
}
cd_nrpe::commands::definitions { &#39;check_load&#39;:
ne_check_cmd =&gt; &#39;check_load&#39;,
ne_cmd_argstring =&gt; &#39;-w $ARG1$ -c $ARG2$&#39;,
}
cd_nrpe::commands::definitions { &#39;check_disk&#39;:
ne_check_cmd =&gt; &#39;check_disk&#39;,
ne_cmd_argstring =&gt; &#39;-w $ARG1$ -c $ARG2$ -p $ARG3$&#39;,
}
cd_nrpe::commands::definitions { &#39;check_procs&#39;:
ne_check_cmd =&gt; &#39;check_procs&#39;,
ne_cmd_argstring =&gt; &#39;-w $ARG1$ -c $ARG2$ -s $ARG3$&#39;,
}
cd_nrpe::commands::definitions { &#39;check_swap&#39;:
ne_check_cmd =&gt; &#39;check_swap&#39;,
ne_cmd_argstring =&gt; &#39;-w $ARG1$ -c $ARG2$&#39;,
}
}
}</pre>
</td>
@@ -228,7 +264,7 @@ class cd_nrpe::commands::definition_rules (
</div>
<div id="footer">
Generated on Sun Jul 30 13:50:46 2017 by
Generated on Sun Jul 30 14:07:47 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>

View File

@@ -165,7 +165,7 @@ class cd_nrpe::firewall::iptables (
</div>
<div id="footer">
Generated on Sun Jul 30 13:50:45 2017 by
Generated on Sun Jul 30 14:07:47 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>

View File

@@ -154,7 +154,7 @@ class cd_nrpe::main::config (
</div>
<div id="footer">
Generated on Sun Jul 30 13:50:45 2017 by
Generated on Sun Jul 30 14:07:46 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>

View File

@@ -205,7 +205,7 @@ class cd_nrpe::main::dirs (
</div>
<div id="footer">
Generated on Sun Jul 30 13:50:45 2017 by
Generated on Sun Jul 30 14:07:46 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>

View File

@@ -217,7 +217,7 @@ class cd_nrpe::main::files (
</div>
<div id="footer">
Generated on Sun Jul 30 13:50:45 2017 by
Generated on Sun Jul 30 14:07:46 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>

View File

@@ -160,7 +160,7 @@ class cd_nrpe::main::install (
</div>
<div id="footer">
Generated on Sun Jul 30 13:50:45 2017 by
Generated on Sun Jul 30 14:07:46 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>

View File

@@ -183,7 +183,7 @@ class cd_nrpe::main::service (
</div>
<div id="footer">
Generated on Sun Jul 30 13:50:45 2017 by
Generated on Sun Jul 30 14:07:46 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>

View File

@@ -193,7 +193,7 @@ class cd_nrpe::main::user (
</div>
<div id="footer">
Generated on Sun Jul 30 13:50:45 2017 by
Generated on Sun Jul 30 14:07:46 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>

View File

@@ -1059,7 +1059,7 @@ $ne_cmd_rule_erb = &#39;cd_nrpe/cmd_rule.erb&#39;
</div>
<div id="footer">
Generated on Sun Jul 30 13:50:45 2017 by
Generated on Sun Jul 30 14:07:46 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>

View File

@@ -238,7 +238,7 @@ $ne_manage_cmds = $::cd_nrpe::params::ne_manage_cmds
</div>
<div id="footer">
Generated on Sun Jul 30 13:50:46 2017 by
Generated on Sun Jul 30 14:07:47 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>

View File

@@ -90,7 +90,7 @@
</div>
<div id="footer">
Generated on Sun Jul 30 13:50:44 2017 by
Generated on Sun Jul 30 14:07:45 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>

View File

@@ -61,6 +61,24 @@ class cd_nrpe::commands::definition_rules (
ne_cmd_argstring => '-w $ARG1$ -c $ARG2$',
}
cd_nrpe::commands::definitions { 'check_load':
ne_check_cmd => 'check_load',
ne_cmd_argstring => '-w $ARG1$ -c $ARG2$',
}
cd_nrpe::commands::definitions { 'check_disk':
ne_check_cmd => 'check_disk',
ne_cmd_argstring => '-w $ARG1$ -c $ARG2$ -p $ARG3$',
}
cd_nrpe::commands::definitions { 'check_procs':
ne_check_cmd => 'check_procs',
ne_cmd_argstring => '-w $ARG1$ -c $ARG2$ -s $ARG3$',
}
cd_nrpe::commands::definitions { 'check_swap':
ne_check_cmd => 'check_swap',
ne_cmd_argstring => '-w $ARG1$ -c $ARG2$',
}
}
}

View File

@@ -1,2 +1,2 @@
cmd[<%= @ne_check_cmd %>]= <%= @ne_cmd_path %><%= @ne_check_cmd %> <%= @ne_cmd_argstring %>
command[<%= @ne_check_cmd %>]=<%= @ne_cmd_path %><%= @ne_check_cmd %> <%= @ne_cmd_argstring %>