Merge branch 'master' of gitlab.puppetsoft.com:12ww1160/cd_nrpe into HEAD

2017-07-30 16:03:31 +02:00
parent e82991f7ee 8519ffa0b7
commit 8a82eddd93
17 changed files with 151 additions and 23 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,26 @@ 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>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/501d59832c2f525">501d59832c2f525</a> Jenkins Server <i>2017-07-30 11:42:02</i>
+<p>
+<h3>recommit for updates in build 41</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/d9e6db5e0d5b277">d9e6db5e0d5b277</a> Arne Teuke <i>2017-07-30 11:32:29</i>
 <p>
 <h3>updated README, added defintions</h3>
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -9,6 +9,7 @@
 |   |   |-- full_list.js
 |   |   `-- jquery.js
 |   |-- puppet_classes
+|   |   |-- cd_nrpe_3A_3Acommands_3A_3Adefinition_rules.html
 |   |   |-- cd_nrpe_3A_3Acommands_3A_3Adefinitions.html
 |   |   |-- cd_nrpe_3A_3Afirewall_3A_3Aiptables.html
 |   |   |-- cd_nrpe_3A_3Amain_3A_3Aconfig.html
@@ -60,4 +61,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md

-11 directories, 49 files
+11 directories, 50 files
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -171,7 +171,7 @@
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 13:41:58 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>
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -217,6 +217,31 @@ 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. 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>

 <p>All files and directories are configured with correct selinux context. If
@@ -277,7 +302,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Sun Jul 30 13:41:59 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>
--- a/doc/index.html
+++ b/doc/index.html
@@ -217,6 +217,31 @@ 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. 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>

 <p>All files and directories are configured with correct selinux context. If
@@ -277,7 +302,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Sun Jul 30 13:41:58 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>
--- a/doc/puppet_classes/cd_nrpe.html
+++ b/doc/puppet_classes/cd_nrpe.html
@@ -140,7 +140,7 @@ class cd_nrpe {
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 13:41:59 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>
--- a/doc/puppet_classes/cd_nrpe_3A_3Acommands_3A_3Adefinition_rules.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Acommands_3A_3Adefinition_rules.html
@@ -120,6 +120,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 </div>
 <div class="tags">
  
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+    
+      
+      <pre class="example code"><code>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;,
+}</code></pre>
+    
+  </div>
+

 </div><div class="method_details_list">
  <table class="source_code">
@@ -128,11 +139,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
        <pre class="lines">


-23
-24
-25
-26
-27
 28
 29
 30
@@ -161,10 +167,38 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 53
 54
 55
-56</pre>
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+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 23</span>
+        <pre class="code"><span class="info file"># File 'manifests/commands/definition_rules.pp', line 28</span>

 class cd_nrpe::commands::definition_rules (

@@ -197,7 +231,30 @@ class cd_nrpe::commands::definition_rules (

    # basic example rules

+    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;,
+    }

+    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>
@@ -207,7 +264,7 @@ class cd_nrpe::commands::definition_rules (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 13:42:00 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>
--- a/doc/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html
@@ -165,7 +165,7 @@ class cd_nrpe::firewall::iptables (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 13:42:00 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>
--- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html
@@ -154,7 +154,7 @@ class cd_nrpe::main::config (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 13:42:00 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>
--- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html
@@ -205,7 +205,7 @@ class cd_nrpe::main::dirs (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 13:42:00 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>
--- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html
@@ -217,7 +217,7 @@ class cd_nrpe::main::files (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 13:42:00 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>
--- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html
@@ -160,7 +160,7 @@ class cd_nrpe::main::install (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 13:42:00 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>
--- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html
@@ -183,7 +183,7 @@ class cd_nrpe::main::service (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 13:42:00 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>
--- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html
@@ -193,7 +193,7 @@ class cd_nrpe::main::user (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 13:42:00 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>
--- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html
@@ -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:42:00 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>
--- a/doc/puppet_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html
+++ b/doc/puppet_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html
@@ -238,7 +238,7 @@ $ne_manage_cmds   = $::cd_nrpe::params::ne_manage_cmds
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 13:42:00 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>
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 13:41:59 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>