From 5c0374245dc1e72f9b52117ce2e859d2c335663f Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sun, 30 Jul 2017 12:50:55 +0100 Subject: [PATCH 1/2] added test command --- README.md | 2 ++ manifests/commands/definition_rules.pp | 10 ++++++++++ templates/cmd_head.erb | 3 +-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ea45767..0585dd1 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,8 @@ 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. + ### SELINUX All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored. diff --git a/manifests/commands/definition_rules.pp b/manifests/commands/definition_rules.pp index 108462b..9c521e8 100644 --- a/manifests/commands/definition_rules.pp +++ b/manifests/commands/definition_rules.pp @@ -19,6 +19,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # @summary manage command definitions via define and Puppet rules. +# @example +# cd_nrpe::commands::definitions { 'check_users': +# ne_check_cmd => 'check_users', +# ne_cmd_argstring => '-w $ARG1$ -c $ARG2$', +# } ############################################################################### class cd_nrpe::commands::definition_rules ( @@ -51,6 +56,11 @@ class cd_nrpe::commands::definition_rules ( # basic example rules + cd_nrpe::commands::definitions { 'check_users': + ne_check_cmd => 'check_users', + ne_cmd_argstring => '-w $ARG1$ -c $ARG2$', + } + } } diff --git a/templates/cmd_head.erb b/templates/cmd_head.erb index 10d521f..8399eed 100644 --- a/templates/cmd_head.erb +++ b/templates/cmd_head.erb @@ -1,4 +1,3 @@ ################################################################################ -########## commandsmds.cfg managed by Puppet ########## -########## manual changes will be orverwritten ########## +### commands.cfg managed by Puppet | manual changes will be overwritten ### ################################################################################ From 7782b870bf31b9db2acfbbd8f1f5e80138bbf10d Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 30 Jul 2017 13:50:48 +0200 Subject: [PATCH 2/2] recommit for updates in build 42 --- CHANGELOG.md | 10 +++++ REPOSTRUCTURE.md | 3 +- doc/_index.html | 2 +- doc/file.README.html | 5 ++- doc/index.html | 5 ++- doc/puppet_classes/cd_nrpe.html | 2 +- ...e_3A_3Acommands_3A_3Adefinition_rules.html | 37 +++++++++++++++---- .../cd_nrpe_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Afiles.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Aservice.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Aparams.html | 2 +- ...d_nrpe_3A_3Acommands_3A_3Adefinitions.html | 2 +- doc/top-level-namespace.html | 2 +- 17 files changed, 61 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa666fc..aa89e0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+7a767e39dc3aa27 Arne Teuke 2017-07-30 11:42:09 +

+

fixed typo, added including clause to definitions

+ +

+501d59832c2f525 Jenkins Server 2017-07-30 11:42:02 +

+

recommit for updates in build 41

+ +

d9e6db5e0d5b277 Arne Teuke 2017-07-30 11:32:29

updated README, added defintions

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 6f3424b..75fc289 100644 --- 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 diff --git a/doc/_index.html b/doc/_index.html index eac3ae8..8b2c3de 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -171,7 +171,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index d40a22c..c1a0ae1 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -217,6 +217,9 @@ 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.

+

SELINUX

All files and directories are configured with correct selinux context. If @@ -277,7 +280,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index b88e6a3..f9b9fd5 100644 --- a/doc/index.html +++ b/doc/index.html @@ -217,6 +217,9 @@ 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.

+

SELINUX

All files and directories are configured with correct selinux context. If @@ -277,7 +280,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nrpe.html b/doc/puppet_classes/cd_nrpe.html index a7a3556..fd67b52 100644 --- a/doc/puppet_classes/cd_nrpe.html +++ b/doc/puppet_classes/cd_nrpe.html @@ -140,7 +140,7 @@ class cd_nrpe { diff --git a/doc/puppet_classes/cd_nrpe_3A_3Acommands_3A_3Adefinition_rules.html b/doc/puppet_classes/cd_nrpe_3A_3Acommands_3A_3Adefinition_rules.html index a26e510..62dc055 100644 --- 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/.

+
+

Examples:

+ + + 
cd_nrpe::commands::definitions { 'check_users':
+  ne_check_cmd      =>  'check_users',
+  ne_cmd_argstring  =>  '-w $ARG1$ -c $ARG2$',
+}
+ +
+
@@ -128,11 +139,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

 
 
-23
-24
-25
-26
-27
 28
 29
 30
@@ -161,10 +167,20 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

 53
 54
 55
-56
+56 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66
- 
# File 'manifests/commands/definition_rules.pp', line 23
+        
# File 'manifests/commands/definition_rules.pp', line 28
 
 class cd_nrpe::commands::definition_rules (
 
@@ -197,6 +213,11 @@ class cd_nrpe::commands::definition_rules (
 
     # basic example rules
 
+    cd_nrpe::commands::definitions { 'check_users':
+      ne_check_cmd      =>  'check_users',
+      ne_cmd_argstring  =>  '-w $ARG1$ -c $ARG2$',
+    }
+
 
   }
 }

@@ -207,7 +228,7 @@ class cd_nrpe::commands::definition_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html
index c5c3e0f..ad268f3 100644
--- 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 (
 
 
       
diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html
index b1eb0c0..f2a83ae 100644
--- 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 (
 
 
       
diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html
index 742c5e0..39749d6 100644
--- 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 (
 
 
       
diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html
index 28e6a2b..f342579 100644
--- 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 (
 
 
       
diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html
index 05205f0..06e24e3 100644
--- 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 (
 
 
       
diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html
index 9a58c18..af8dc41 100644
--- 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 (
 
 
       
diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html
index 61b4987..8f666a0 100644
--- 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 (
 
 
       
diff --git a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html
index cd82ecb..c89f9a1 100644
--- 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            = 'cd_nrpe/cmd_rule.erb'
 
 
       
diff --git a/doc/puppet_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html b/doc/puppet_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html
index 78443bd..dcb87fb 100644
--- 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
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index b8e97c8..718498b 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@