- up to 3.2.1

[packages/nagios-nrpe.git] / nagios-nrpe-config.patch

diff --git a/nagios-nrpe-config.patch b/nagios-nrpe-config.patch
index ceab790b546461041b9a358a719be363e881052f..b2d4fe4aed9c67712946aeaa567fdfab837d602f 100644 (file)
--- a/nagios-nrpe-config.patch
+++ b/nagios-nrpe-config.patch
@@ -1,25 +1,9 @@
---- nrpe-2.12/sample-config/nrpe.cfg.in        2012-01-04 17:57:22.907296034 +0200
-+++ nrpe-2.15/sample-config/nrpe.cfg.in        2015-05-25 15:40:07.747598382 +0300
-@@ -23,7 +23,7 @@
- # number.  The file is only written if the NRPE daemon is started by the root
- # user and is running in standalone mode.
+--- nrpe-3.2.1/sample-config/nrpe.cfg.in~      2017-09-01 15:59:54.000000000 +0200
++++ nrpe-3.2.1/sample-config/nrpe.cfg.in       2018-09-20 14:02:57.989524019 +0200
+@@ -270,92 +270,10 @@ connection_timeout=300
  
--pid_file=/var/run/nrpe.pid
-+pid_file=/var/run/nrpe/nrpe.pid
+ # nasty_metachars="|`&><'\\[]{};\r\n"
  
- 
- 
-@@ -169,8 +169,7 @@
- # This directive allows you to include definitions from config files (with a
- # .cfg extension) in one or more directories (with recursion).
- 
--#include_dir=<somedirectory>
--#include_dir=<someotherdirectory>
-+include_dir=/etc/nagios/nrpe.d
- 
- 
- 
-@@ -195,41 +194,2 @@
 -
 -
 -# COMMAND DEFINITIONS
@@ -43,23 +27,70 @@
 -
 -
 -# The following examples use hardcoded command arguments...
+-# This is by far the most secure method of using NRPE
 -
--command[check_users]=@libexecdir@/check_users -w 5 -c 10
--command[check_load]=@libexecdir@/check_load -w 15,10,5 -c 30,25,20
--command[check_hda1]=@libexecdir@/check_disk -w 20% -c 10% -p /dev/hda1
--command[check_zombie_procs]=@libexecdir@/check_procs -w 5 -c 10 -s Z
--command[check_total_procs]=@libexecdir@/check_procs -w 150 -c 200 
+-command[check_users]=@pluginsdir@/check_users -w 5 -c 10
+-command[check_load]=@pluginsdir@/check_load -r -w .15,.10,.05 -c .30,.25,.20
+-command[check_hda1]=@pluginsdir@/check_disk -w 20% -c 10% -p /dev/hda1
+-command[check_zombie_procs]=@pluginsdir@/check_procs -w 5 -c 10 -s Z
+-command[check_total_procs]=@pluginsdir@/check_procs -w 150 -c 200
 -
 -
 -# The following examples allow user-supplied arguments and can
--# only be used if the NRPE daemon was compiled with support for 
+-# only be used if the NRPE daemon was compiled with support for
 -# command arguments *AND* the dont_blame_nrpe directive in this
 -# config file is set to '1'.  This poses a potential security risk, so
 -# make sure you read the SECURITY file before doing this.
 -
--#command[check_users]=@libexecdir@/check_users -w $ARG1$ -c $ARG2$
--#command[check_load]=@libexecdir@/check_load -w $ARG1$ -c $ARG2$
--#command[check_disk]=@libexecdir@/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
--#command[check_procs]=@libexecdir@/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
-+# NOTE:
-+# In PLD Linux, command definitions are in file /etc/nagios/nrpe.d/commands.cfg
+-### MISC SYSTEM METRICS ###
+-#command[check_users]=@pluginsdir@/check_users $ARG1$
+-#command[check_load]=@pluginsdir@/check_load $ARG1$
+-#command[check_disk]=@pluginsdir@/check_disk $ARG1$
+-#command[check_swap]=@pluginsdir@/check_swap $ARG1$
+-#command[check_cpu_stats]=@pluginsdir@/check_cpu_stats.sh $ARG1$
+-#command[check_mem]=@pluginsdir@/custom_check_mem -n $ARG1$
+-
+-### GENERIC SERVICES ###
+-#command[check_init_service]=sudo @pluginsdir@/check_init_service $ARG1$
+-#command[check_services]=@pluginsdir@/check_services -p $ARG1$
+-
+-### SYSTEM UPDATES ###
+-#command[check_yum]=@pluginsdir@/check_yum
+-#command[check_apt]=@pluginsdir@/check_apt
+-
+-### PROCESSES ###
+-#command[check_all_procs]=@pluginsdir@/custom_check_procs
+-#command[check_procs]=@pluginsdir@/check_procs $ARG1$
+-
+-### OPEN FILES ###
+-#command[check_open_files]=@pluginsdir@/check_open_files.pl $ARG1$
+-
+-### NETWORK CONNECTIONS ###
+-#command[check_netstat]=@pluginsdir@/check_netstat.pl -p $ARG1$ $ARG2$
+-
+-### ASTERISK ###
+-#command[check_asterisk]=@pluginsdir@/check_asterisk.pl $ARG1$
+-#command[check_sip]=@pluginsdir@/check_sip $ARG1$
+-#command[check_asterisk_sip_peers]=sudo @pluginsdir@/check_asterisk_sip_peers.sh $ARG1$
+-#command[check_asterisk_version]=@pluginsdir@/nagisk.pl -c version
+-#command[check_asterisk_peers]=@pluginsdir@/nagisk.pl -c peers
+-#command[check_asterisk_channels]=@pluginsdir@/nagisk.pl -c channels 
+-#command[check_asterisk_zaptel]=@pluginsdir@/nagisk.pl -c zaptel 
+-#command[check_asterisk_span]=@pluginsdir@/nagisk.pl -c span -s 1
+-
+-
+-
+-# INCLUDE CONFIG FILE
+-# This directive allows you to include definitions from an external config file.
+-
+-#include=<somefile.cfg>
+-
+-
+-
+ # INCLUDE CONFIG DIRECTORY
+ # This directive allows you to include definitions from config files (with a
+ # .cfg extension) in one or more directories (with recursion).
+ 
+ #include_dir=<somedirectory>
+ #include_dir=<someotherdirectory>
++include_dir=/etc/nagios/nrpe.d