From: Elan Ruusamäe Date: Tue, 11 Jul 2017 09:22:57 +0000 (+0300) Subject: up to 3.2.0 (2017-06-27) X-Git-Tag: auto/th/nagios-nrpe-3.2.0-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fnagios-nrpe.git;a=commitdiff_plain;h=16af75f012528c3d1105ca0511482495b42da727;hp=9eb387ed42a7628133fc0acbc40affe0a09468df up to 3.2.0 (2017-06-27) --- diff --git a/commands.cfg b/commands.cfg index 4ff6c62..3aa8fb1 100644 --- a/commands.cfg +++ b/commands.cfg @@ -19,21 +19,52 @@ # The following examples use hardcoded command arguments... +# This is by far the most secure method of using NRPE #command[check_users]=/usr/lib/nagios/check_users -w 5 -c 10 -#command[check_load]=/usr/lib/nagios/check_load -w 15,10,5 -c 30,25,20 +#command[check_load]=/usr/lib/nagios/check_load -r -w .15,.10,.05 -c .30,.25,.20 #command[check_hda1]=/usr/lib/nagios/check_disk -w 20% -c 10% -p /dev/hda1 #command[check_zombie_procs]=/usr/lib/nagios/check_procs -w 5 -c 10 -s Z #command[check_total_procs]=/usr/lib/nagios/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 # 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]=/usr/lib/nagios/check_users -w $ARG1$ -c $ARG2$ -#command[check_load]=/usr/lib/nagios/check_load -w $ARG1$ -c $ARG2$ -#command[check_disk]=/usr/lib/nagios/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ -#command[check_procs]=/usr/lib/nagios/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$ +### MISC SYSTEM METRICS ### +#command[check_users]=/usr/lib/nagios/check_users $ARG1$ +#command[check_load]=/usr/lib/nagios/check_load $ARG1$ +#command[check_disk]=/usr/lib/nagios/check_disk $ARG1$ +#command[check_swap]=/usr/lib/nagios/check_swap $ARG1$ +#command[check_cpu_stats]=/usr/lib/nagios/check_cpu_stats.sh $ARG1$ +#command[check_mem]=/usr/lib/nagios/custom_check_mem -n $ARG1$ + +### GENERIC SERVICES ### +#command[check_init_service]=sudo /usr/lib/nagios/check_init_service $ARG1$ +#command[check_services]=/usr/lib/nagios/check_services -p $ARG1$ + +### SYSTEM UPDATES ### +#command[check_yum]=/usr/lib/nagios/check_yum +#command[check_apt]=/usr/lib/nagios/check_apt + +### PROCESSES ### +#command[check_all_procs]=/usr/lib/nagios/custom_check_procs +#command[check_procs]=/usr/lib/nagios/check_procs $ARG1$ + +### OPEN FILES ### +#command[check_open_files]=/usr/lib/nagios/check_open_files.pl $ARG1$ + +### NETWORK CONNECTIONS ### +#command[check_netstat]=/usr/lib/nagios/check_netstat.pl -p $ARG1$ $ARG2$ + +### ASTERISK ### +#command[check_asterisk]=/usr/lib/nagios/check_asterisk.pl $ARG1$ +#command[check_sip]=/usr/lib/nagios/check_sip $ARG1$ +#command[check_asterisk_sip_peers]=sudo /usr/lib/nagios/check_asterisk_sip_peers.sh $ARG1$ +#command[check_asterisk_version]=/usr/lib/nagios/nagisk.pl -c version +#command[check_asterisk_peers]=/usr/lib/nagios/nagisk.pl -c peers +#command[check_asterisk_channels]=/usr/lib/nagios/nagisk.pl -c channels +#command[check_asterisk_zaptel]=/usr/lib/nagios/nagisk.pl -c zaptel +#command[check_asterisk_span]=/usr/lib/nagios/nagisk.pl -c span -s 1 diff --git a/nagios-nrpe-config.patch b/nagios-nrpe-config.patch index 7cd8cd8..e94813e 100644 --- a/nagios-nrpe-config.patch +++ b/nagios-nrpe-config.patch @@ -1,14 +1,14 @@ ---- nrpe-3.0.orig/sample-config/nrpe.cfg.in 2016-07-12 23:24:40.000000000 +0300 -+++ nrpe-3.0/sample-config/nrpe.cfg.in 2016-09-07 15:46:35.913180521 +0300 -@@ -257,47 +257,8 @@ +--- nrpe-3.2.0/sample-config/nrpe.cfg.in~ 2017-06-28 00:13:20.000000000 +0300 ++++ nrpe-3.2.0/sample-config/nrpe.cfg.in 2017-07-11 12:15:01.541380203 +0300 +@@ -281,80 +281,4 @@ + # 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= -#include_dir= -+include_dir=/etc/nagios/nrpe.d - - +- +- - -# COMMAND DEFINITIONS -# Command definitions that this daemon will run. Definitions @@ -31,9 +31,10 @@ - - -# The following examples use hardcoded command arguments... +-# This is by far the most secure method of using NRPE - -command[check_users]=@pluginsdir@/check_users -w 5 -c 10 --command[check_load]=@pluginsdir@/check_load -w 15,10,5 -c 30,25,20 +-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 @@ -45,9 +46,39 @@ -# 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]=@pluginsdir@/check_users -w $ARG1$ -c $ARG2$ --#command[check_load]=@pluginsdir@/check_load -w $ARG1$ -c $ARG2$ --#command[check_disk]=@pluginsdir@/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ --#command[check_procs]=@pluginsdir@/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_dir=/etc/nagios/nrpe.d diff --git a/nagios-nrpe.spec b/nagios-nrpe.spec index 1cd6744..0b34add 100644 --- a/nagios-nrpe.spec +++ b/nagios-nrpe.spec @@ -1,12 +1,12 @@ Summary: Nagios remote plugin execution service/plugin Summary(pl.UTF-8): Demon i wtyczka zdalnego wywoływania wtyczek Nagios Name: nagios-nrpe -Version: 3.0.1 +Version: 3.2.0 Release: 1 License: GPL v2 Group: Networking Source0: http://downloads.sourceforge.net/nagios/nrpe-%{version}.tar.gz -# Source0-md5: 8c81f251d9ee0903e5ff0191e99f7981 +# Source0-md5: 5c81355bcd8b9929ca904879075e1ff5 Source1: nrpe.init Source2: nrpe-command.cfg Source3: %{name}.tmpfiles @@ -141,7 +141,7 @@ fi %files %defattr(644,root,root,755) -%doc Changelog LEGAL README* SECURITY.md update-cfg.pl +%doc CHANGELOG.md LEGAL README* SECURITY.md update-cfg.pl %attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nrpe.cfg %attr(750,root,nagios) %dir %{_sysconfdir}/nrpe.d %attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nrpe.d/commands.cfg