evolix/ansible-roles
22
2
Fork 2
Code Issues 61 Pull requests 16 Releases 34 Wiki Activity

nagios-nrpe: fix bug in monitoringctl check when an empty string is present in the NRPE command
All checks were successful
Ansible Lint |Total|New|Outstanding|Fixed|Trend |:-:|:-:|:-:|:-:|:-: |3118|0|3118|0|:zzz:
Details
gitea/ansible-roles/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
William Hirigoyen 2024-06-26 12:02:38 +02:00
parent 21b2fcb16c
commit ce35527c32
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
nagios-nrpe/files/alerts_wrapper
View file

@ -58,7 +58,7 @@ function main() {
timeout_command="timeout 8" timeout_command="timeout 8"
fi fi
check_stdout="$(${timeout_command} ${check_command})" check_stdout="$(eval "${timeout_command} ${check_command}")"
check_rc=$? check_rc=$?
if [ "${is_disabled}" = "True" ] && [ "${check_rc}" -eq 124 ] && [ -z "${check_stdout}" ]; then if [ "${is_disabled}" = "True" ] && [ "${check_rc}" -eq 124 ] && [ -z "${check_stdout}" ]; then
@ -141,16 +141,23 @@ if [[ "${1}" =~ -.* ]]; then
shift shift
done done
# The rest is the command
check_command="$*"
else else
# no option is passed (backward compatibility with previous version) # no option is passed (backward compatibility with previous version)
# treat the first argument as wrapper_name and the rest as the command # treat the first argument as wrapper_name and the rest as the command
wrapper_name="${1}" wrapper_name="${1}"
shift shift
check_command="$*"
fi fi
# The rest is the command
while [ "$#" -ne 0 ]; do
if [ -n "${1}" ]; then
check_command="${check_command} ${1}"
else
check_command="${check_command} ''"
fi
shift
done
if [ -z "${wrapper_name}" ]; then if [ -z "${wrapper_name}" ]; then
printf 'ERROR: You must specify a wrapper name, with --names.\n' >&2 printf 'ERROR: You must specify a wrapper name, with --names.\n' >&2
exit 2 exit 2