From 7782b870bf31b9db2acfbbd8f1f5e80138bbf10d Mon Sep 17 00:00:00 2001
From: Jenkins Server
+ No issue
+7a767e39dc3aa27 Arne Teuke 2017-07-30 11:42:09
+fixed typo, added including clause to definitions
+
+
+
true.
In order to connect a Nagios monitoring server to clients through NRPE, you +must define commands and the desired argument strings on the clients.
+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 totrue.
In order to connect a Nagios monitoring server to clients through NRPE, you +must define commands and the desired argument strings on the clients.
+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/.
- # File 'manifests/commands/definition_rules.pp', line 23 ++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$',
+ }
}
}
|
@@ -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
- # 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),
+ }
+ }
}
|
@@ -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.
—
# 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. + + + + +
+
Specify an optional comment for your command +definition -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 |