From 7782b870bf31b9db2acfbbd8f1f5e80138bbf10d Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 30 Jul 2017 13:50:48 +0200 Subject: [PATCH 1/4] 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 @@ -228,7 +264,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 ad268f3..4f19ccf 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 f2a83ae..6af2ca9 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 39749d6..fc36c8e 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 f342579..9dda5ea 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 06e24e3..acc08e8 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 af8dc41..f659d1b 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 8f666a0..1f16080 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 c89f9a1..2eb2c37 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 dcb87fb..dfa3e06 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 718498b..0edab9c 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From e683f873a393b9a27b3a1d85376a4f2439515a4c Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 30 Jul 2017 16:03:58 +0200 Subject: [PATCH 3/4] recommit for updates in build 50 --- CHANGELOG.md | 15 ++++++++ REPOSTRUCTURE.md | 5 +-- doc/_index.html | 2 +- doc/file.README.html | 33 +++++++++++++++--- doc/index.html | 33 +++++++++++++++--- doc/puppet_classes/cd_nrpe.html | 2 +- ...e_3A_3Acommands_3A_3Adefinition_rules.html | 15 ++++---- .../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 | 34 +++++++++++++++++-- .../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 | 14 +++++--- ...d_nrpe_3A_3Acommands_3A_3Adefinitions.html | 31 ++++++++++++++--- doc/top-level-namespace.html | 2 +- 17 files changed, 160 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52d21b2..53fb27b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,21 @@ Changelog of Git Changelog.

No issue

+c0a5382d2c4cd88 Arne Teuke 2017-07-30 12:07:53 +

+

added basic command examples

+ +

+2e89f817d99fb64 Jenkins Server 2017-07-30 12:07:49 +

+

recommit for updates in build 43

+ +

+5f91d2a4715fe48 Arne Teuke 2017-07-30 12:06:19 +

+

added basic command examples

+ +

5c0374245dc1e72 Arne Teuke 2017-07-30 11:50:55

added test command

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 75fc289..2c32000 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -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 diff --git a/doc/_index.html b/doc/_index.html index 26d55f9..9457811 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 0ec7a80..ecfad14 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -132,9 +132,13 @@ structure (file system permissions, selinux context) through parameters manage configuration files through parameters: * nrpe.conf * nrpe.cfg - * -commands.cfg (optional) -* manage iptables (optionals )

+* +manage sudo role for nagios user on NRPE clients +* manage dynamic NRPE +check command definitions +* manage iptables (optional) +* manage selinux +rule exceptions (optional)

SERVICE * manage NRPE service

@@ -213,6 +217,9 @@ through this modules. Defaults to true.

  • $ne_include_selinux : Whether to manage selinux exception rules. Defaults to true.

    +
  • +

    $ne_enable_ssl : Whether to allow SSL settings. See known problems for more details.

  • Managing Check Commands

    @@ -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.

    +

    The commands are created within /etc/nrpe.d/command.cfg , every set of +instructions creates a new line.

    +

    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.

    +defined as well, while nodes not running the service also do not contain +the command check.

    SELINUX

    @@ -248,6 +259,18 @@ defined as well.

    selinux is disabled, these contexts are ignored.

    Known Problems

    +
    • +

      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 +ssl_cert_file 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 $ne_enable_ssl boolean parameter, which is set to +false by default, hence disabling SSL/TLS options until this +has been fixed upstream, or a valid workaround has been found. Setting this +option to true will include all SSL / TLS settings.

      +

    Support

    • @@ -302,7 +325,7 @@ environments.

      diff --git a/doc/index.html b/doc/index.html index 0607b51..f4c585e 100644 --- a/doc/index.html +++ b/doc/index.html @@ -132,9 +132,13 @@ structure (file system permissions, selinux context) through parameters manage configuration files through parameters: * nrpe.conf * nrpe.cfg - * -commands.cfg (optional) -* manage iptables (optionals )

      +* +manage sudo role for nagios user on NRPE clients +* manage dynamic NRPE +check command definitions +* manage iptables (optional) +* manage selinux +rule exceptions (optional)

      SERVICE * manage NRPE service

      @@ -213,6 +217,9 @@ through this modules. Defaults to true.

    • $ne_include_selinux : Whether to manage selinux exception rules. Defaults to true.

      +
    • +

      $ne_enable_ssl : Whether to allow SSL settings. See known problems for more details.

    Managing Check Commands

    @@ -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.

    +

    The commands are created within /etc/nrpe.d/command.cfg , every set of +instructions creates a new line.

    +

    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.

    +defined as well, while nodes not running the service also do not contain +the command check.

    SELINUX

    @@ -248,6 +259,18 @@ defined as well.

    selinux is disabled, these contexts are ignored.

    Known Problems

    +
    • +

      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 +ssl_cert_file 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 $ne_enable_ssl boolean parameter, which is set to +false by default, hence disabling SSL/TLS options until this +has been fixed upstream, or a valid workaround has been found. Setting this +option to true will include all SSL / TLS settings.

      +

    Support

    • @@ -302,7 +325,7 @@ environments.

      diff --git a/doc/puppet_classes/cd_nrpe.html b/doc/puppet_classes/cd_nrpe.html index d312bff..9f436a5 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 1d950bf..fdda762 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 @@ -127,6 +127,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

      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',
       }
      @@ -139,7 +140,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

       
       
      -28
       29
       30
       31
      @@ -195,10 +195,12 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

      81 82 83 -84
      +84 +85 +86
    @@ -217,7 +247,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 acc08e8..4ba5626 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 f659d1b..e0c4901 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 1f16080..374e110 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 2eb2c37..1c356c4 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html @@ -494,7 +494,7 @@ changed in a later version of NRPE.

    path and name of the ssl certificate -authority ( ca) file / chain. must be +authority (ca) file / chain. must be full path.

    @@ -966,7 +966,10 @@ checks, to allow dynamic check 178 179 180 -181 +181 +182 +183 +184
    -
    # 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 @@ From 2e89f817d99fb64710e84b254f0512ee8d2f7841 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 30 Jul 2017 14:07:49 +0200 Subject: [PATCH 2/4] recommit for updates in build 43 --- CHANGELOG.md | 10 +++++ doc/_index.html | 2 +- doc/file.README.html | 26 +++++++++++- doc/index.html | 26 +++++++++++- doc/puppet_classes/cd_nrpe.html | 2 +- ...e_3A_3Acommands_3A_3Adefinition_rules.html | 40 ++++++++++++++++++- .../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 +- 16 files changed, 108 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa89e0b..52d21b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +5c0374245dc1e72 Arne Teuke 2017-07-30 11:50:55 +

    +

    added test command

    + +

    +7782b870bf31b9d Jenkins Server 2017-07-30 11:50:48 +

    +

    recommit for updates in build 42

    + +

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

    fixed typo, added including clause to definitions

    diff --git a/doc/_index.html b/doc/_index.html index 8b2c3de..26d55f9 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 c1a0ae1..0ec7a80 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -218,7 +218,29 @@ 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.

    +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: +<code> +`cd_nrpe::commands::definitions` { +'check_users': + `ne_check_cmd` => +'check_users', + `ne_cmd_argstring` => '-w $ARG1$ -c +$ARG2$', + } +</code> +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

    @@ -280,7 +302,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index f9b9fd5..0607b51 100644 --- a/doc/index.html +++ b/doc/index.html @@ -218,7 +218,29 @@ 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.

    +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: +<code> +`cd_nrpe::commands::definitions` { +'check_users': + `ne_check_cmd` => +'check_users', + `ne_cmd_argstring` => '-w $ARG1$ -c +$ARG2$', + } +</code> +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

    @@ -280,7 +302,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nrpe.html b/doc/puppet_classes/cd_nrpe.html index fd67b52..d312bff 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 62dc055..1d950bf 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 @@ -177,7 +177,25 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    63 64 65 -66
    +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84
    # File 'manifests/commands/definition_rules.pp', line 28
    @@ -218,7 +236,25 @@ 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$',
    +    }
       }
     }
    -
    # File 'manifests/commands/definition_rules.pp', line 28
    +        
    # File 'manifests/commands/definition_rules.pp', line 29
     
     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 (
     
     
           
    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 4f19ccf..ef7ccdd 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 6af2ca9..d47dc9f 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 fc36c8e..ef965c1 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 9dda5ea..31d03c5 100644
    --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html
    +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html
    @@ -166,7 +166,22 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    58 59 60 -61
    +61 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76
    # File 'manifests/main/files.pp', line 23
    @@ -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),
    +    }
    +  }
     }
    # File 'manifests/params.pp', line 101
    @@ -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'
     
     
           
    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 dfa3e06..b4ca191 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
    @@ -173,6 +173,25 @@ the custom location
     , i.e. -w $ARG1$ -c
     $ARG2$. See the arguments in th eman pages for the
     checks.

    + + + + +
  • + + ne_cmd_comment + + + (string) + + + (defaults to: undef) + + + — +
    +

    Specify an optional comment for your command +definition

  • @@ -187,8 +206,6 @@ checks.

     
     
    -31
    -32
     33
     34
     35
    @@ -206,16 +223,20 @@ checks.

    47 48 49 -50
    +50 +51 +52 +53
    -
    # File 'manifests/commands/definitions.pp', line 31
    +        
    # File 'manifests/commands/definitions.pp', line 33
     
     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
     
     
           
    diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
    index 0edab9c..15181d0 100644
    --- a/doc/top-level-namespace.html
    +++ b/doc/top-level-namespace.html
    @@ -90,7 +90,7 @@
     
     
           
    
    From 8583041eff9ce2686ed42b260ad5cae8f2eef7f3 Mon Sep 17 00:00:00 2001
    From: Jenkins Server 
    Date: Sun, 30 Jul 2017 16:13:19 +0200
    Subject: [PATCH 4/4] recommit for updates in build 51
    
    ---
     CHANGELOG.md                                  | 30 +++++++++++++++++++
     doc/_index.html                               |  2 +-
     doc/file.README.html                          |  2 +-
     doc/index.html                                |  2 +-
     doc/puppet_classes/cd_nrpe.html               |  2 +-
     ...e_3A_3Acommands_3A_3Adefinition_rules.html |  2 +-
     .../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 |  6 ++--
     doc/top-level-namespace.html                  |  2 +-
     16 files changed, 47 insertions(+), 17 deletions(-)
    
    diff --git a/CHANGELOG.md b/CHANGELOG.md
    index 53fb27b..13438a0 100644
    --- a/CHANGELOG.md
    +++ b/CHANGELOG.md
    @@ -8,6 +8,36 @@ Changelog of Git Changelog.
     

    No issue

    +e683f873a393b9a Jenkins Server 2017-07-30 14:03:58 +

    +

    recommit for updates in build 50

    + +

    +e82991f7ee64fae Arne Teuke 2017-07-30 14:03:50 +

    +

    edited README

    + +

    +5227b44c620f33a Arne Teuke 2017-07-30 14:01:52 +

    +

    fixed permissions on command.cfg file

    + +

    +6ae7e881a960237 Arne Teuke 2017-07-30 12:32:50 +

    +

    fixed permissions on command.cfg file

    + +

    +106e7b4e14b22f8 Arne Teuke 2017-07-30 12:25:04 +

    +

    edited README

    + +

    +ae65987869f779c Arne Teuke 2017-07-30 12:17:19 +

    +

    added comment option

    + +

    c0a5382d2c4cd88 Arne Teuke 2017-07-30 12:07:53

    added basic command examples

    diff --git a/doc/_index.html b/doc/_index.html index 9457811..4936548 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 ecfad14..3ef4a06 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -325,7 +325,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index f4c585e..53c3807 100644 --- a/doc/index.html +++ b/doc/index.html @@ -325,7 +325,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nrpe.html b/doc/puppet_classes/cd_nrpe.html index 9f436a5..909cade 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 fdda762..b0edd6a 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 @@ -267,7 +267,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 ef7ccdd..b99086f 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 d47dc9f..fcbf774 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 ef965c1..9a93b6a 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 31d03c5..be46b54 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html @@ -247,7 +247,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 4ba5626..aacadbd 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 e0c4901..07c78d0 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 374e110..beef777 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 1c356c4..d51b2ff 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html @@ -1065,7 +1065,7 @@ $ne_sudo_rule_erb = 'cd_nrpe/sudo_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 b4ca191..0ebd938 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 @@ -185,7 +185,7 @@ checks.

    (string) - (defaults to: undef) + (defaults to: '') — @@ -236,7 +236,7 @@ define cd_nrpe::commands::definitions ( $ne_check_cmd = undef, $ne_cmd_path = '/usr/lib64/nagios/plugins/', $ne_cmd_argstring = undef, -$ne_cmd_comment = undef, +$ne_cmd_comment = '', ) { @@ -259,7 +259,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 15181d0..aab4811 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@