From 5bcc4d5410b84625b2378ad0ac037ebf304fd3fa Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 13 Nov 2023 09:53:20 +0100 Subject: [PATCH] net-mgmt/os-nrpe (#3668) --- net-mgmt/nrpe/Makefile | 3 +-- net-mgmt/nrpe/pkg-descr | 7 +++++++ net-mgmt/nrpe/src/etc/inc/plugins.inc.d/nrpe.inc | 2 +- net-mgmt/nrpe/src/opnsense/scripts/OPNsense/Nrpe/setup.sh | 4 ++-- .../src/opnsense/service/conf/actions.d/actions_nrpe.conf | 8 ++++---- .../src/opnsense/service/templates/OPNsense/Nrpe/+TARGETS | 2 +- .../src/opnsense/service/templates/OPNsense/Nrpe/nrpe | 6 +++--- .../src/opnsense/service/templates/OPNsense/Nrpe/nrpe.cfg | 2 +- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/net-mgmt/nrpe/Makefile b/net-mgmt/nrpe/Makefile index 864ade0cf..abb4f51bd 100644 --- a/net-mgmt/nrpe/Makefile +++ b/net-mgmt/nrpe/Makefile @@ -1,6 +1,5 @@ PLUGIN_NAME= nrpe -PLUGIN_VERSION= 1.0 -PLUGIN_REVISION= 3 +PLUGIN_VERSION= 1.1 PLUGIN_COMMENT= Execute nagios plugins PLUGIN_DEPENDS= nrpe PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/net-mgmt/nrpe/pkg-descr b/net-mgmt/nrpe/pkg-descr index 483177b58..787e80023 100644 --- a/net-mgmt/nrpe/pkg-descr +++ b/net-mgmt/nrpe/pkg-descr @@ -7,3 +7,10 @@ the plugin requests to the remote host. Requires that nrpe be running on the remote host (either as a standalone daemon or as a service under inetd). WWW: http://www.nagios.org/ + +Plugin Changelog: +----------------- + +1.1 + +* Make plugin compatbile with nrpe (v4) diff --git a/net-mgmt/nrpe/src/etc/inc/plugins.inc.d/nrpe.inc b/net-mgmt/nrpe/src/etc/inc/plugins.inc.d/nrpe.inc index 59a70977d..e5d1eaed6 100644 --- a/net-mgmt/nrpe/src/etc/inc/plugins.inc.d/nrpe.inc +++ b/net-mgmt/nrpe/src/etc/inc/plugins.inc.d/nrpe.inc @@ -47,7 +47,7 @@ function nrpe_services() 'start' => array('nrpe start'), 'stop' => array('nrpe stop'), ), - 'name' => 'nrpe3', + 'name' => 'nrpe', 'pid' => '/var/run/nrpe.pid' ); diff --git a/net-mgmt/nrpe/src/opnsense/scripts/OPNsense/Nrpe/setup.sh b/net-mgmt/nrpe/src/opnsense/scripts/OPNsense/Nrpe/setup.sh index 667c70099..48665e140 100755 --- a/net-mgmt/nrpe/src/opnsense/scripts/OPNsense/Nrpe/setup.sh +++ b/net-mgmt/nrpe/src/opnsense/scripts/OPNsense/Nrpe/setup.sh @@ -1,4 +1,4 @@ #!/bin/sh -mkdir -p /var/run/nrpe3 -chown -R nagios:nagios /var/run/nrpe3 +mkdir -p /var/run/nrpe +chown -R nagios:nagios /var/run/nrpe diff --git a/net-mgmt/nrpe/src/opnsense/service/conf/actions.d/actions_nrpe.conf b/net-mgmt/nrpe/src/opnsense/service/conf/actions.d/actions_nrpe.conf index 89b66602a..d089ece29 100644 --- a/net-mgmt/nrpe/src/opnsense/service/conf/actions.d/actions_nrpe.conf +++ b/net-mgmt/nrpe/src/opnsense/service/conf/actions.d/actions_nrpe.conf @@ -1,23 +1,23 @@ [start] -command:/usr/local/etc/rc.d/nrpe3 start +command:/usr/local/etc/rc.d/nrpe start parameters: type:script message:starting nrpe [stop] -command:/usr/local/etc/rc.d/nrpe3 stop +command:/usr/local/etc/rc.d/nrpe stop parameters: type:script message:stopping nrpe [restart] -command:/usr/local/etc/rc.d/nrpe3 restart +command:/usr/local/etc/rc.d/nrpe restart parameters: type:script message:restarting nrpe [status] -command:/usr/local/etc/rc.d/nrpe3 status; exit 0 +command:/usr/local/etc/rc.d/nrpe status; exit 0 parameters: type:script_output message:request nrpe status diff --git a/net-mgmt/nrpe/src/opnsense/service/templates/OPNsense/Nrpe/+TARGETS b/net-mgmt/nrpe/src/opnsense/service/templates/OPNsense/Nrpe/+TARGETS index f0f104196..d3154ecdd 100644 --- a/net-mgmt/nrpe/src/opnsense/service/templates/OPNsense/Nrpe/+TARGETS +++ b/net-mgmt/nrpe/src/opnsense/service/templates/OPNsense/Nrpe/+TARGETS @@ -1,3 +1,3 @@ -nrpe:/etc/rc.conf.d/nrpe3 +nrpe:/etc/rc.conf.d/nrpe nrpe.cfg:/usr/local/etc/nrpe.cfg nrpe_commands.cfg:/usr/local/etc/nrpe_commands.cfg diff --git a/net-mgmt/nrpe/src/opnsense/service/templates/OPNsense/Nrpe/nrpe b/net-mgmt/nrpe/src/opnsense/service/templates/OPNsense/Nrpe/nrpe index dc85ed6ac..25419b71f 100644 --- a/net-mgmt/nrpe/src/opnsense/service/templates/OPNsense/Nrpe/nrpe +++ b/net-mgmt/nrpe/src/opnsense/service/templates/OPNsense/Nrpe/nrpe @@ -1,6 +1,6 @@ {% if helpers.exists('OPNsense.nrpe.general.enabled') and OPNsense.nrpe.general.enabled == '1' %} -nrpe3_setup="/usr/local/opnsense/scripts/OPNsense/Nrpe/setup.sh" -nrpe3_enable="YES" +nrpe_setup="/usr/local/opnsense/scripts/OPNsense/Nrpe/setup.sh" +nrpe_enable="YES" {% else %} -nrpe3_enable="NO" +nrpe_enable="NO" {% endif %} diff --git a/net-mgmt/nrpe/src/opnsense/service/templates/OPNsense/Nrpe/nrpe.cfg b/net-mgmt/nrpe/src/opnsense/service/templates/OPNsense/Nrpe/nrpe.cfg index 3a439d537..68c437209 100644 --- a/net-mgmt/nrpe/src/opnsense/service/templates/OPNsense/Nrpe/nrpe.cfg +++ b/net-mgmt/nrpe/src/opnsense/service/templates/OPNsense/Nrpe/nrpe.cfg @@ -3,7 +3,7 @@ log_facility=daemon log_file=/var/log/nrpe.log debug=0 -pid_file=/var/run/nrpe3/nrpe.pid +pid_file=/var/run/nrpe/nrpe.pid nrpe_user=nagios nrpe_group=nagios