forked from evolix/ansible-roles
redis: improve check_redis_instances
* a disabled instances is UNCHK (not CRITICAL) * output is copied directly from check_redis
This commit is contained in:
parent
a5378c783e
commit
429fc39b86
|
@ -35,19 +35,19 @@ check_server() {
|
||||||
if [ -n "${pass}" ]; then
|
if [ -n "${pass}" ]; then
|
||||||
cmd="${cmd} -x ${pass}"
|
cmd="${cmd} -x ${pass}"
|
||||||
fi
|
fi
|
||||||
$cmd >/dev/null 2>&1
|
result=$($cmd)
|
||||||
ret="${?}"
|
ret="${?}"
|
||||||
if [ "${ret}" -ge 2 ]; then
|
if [ "${ret}" -ge 2 ]; then
|
||||||
nb_crit=$((nb_crit + 1))
|
nb_crit=$((nb_crit + 1))
|
||||||
output="${output}CRITICAL - ${name} (${host}:${port})\n"
|
output="${output}${result}\n"
|
||||||
[ "${return}" -le 2 ] && return=2
|
[ "${return}" -le 2 ] && return=2
|
||||||
elif [ "${ret}" -ge 1 ]; then
|
elif [ "${ret}" -ge 1 ]; then
|
||||||
nb_warn=$((nb_warn + 1))
|
nb_warn=$((nb_warn + 1))
|
||||||
output="${output}WARNING - ${name} (${host}:${port})\n"
|
output="${output}${result}\n"
|
||||||
[ "${return}" -le 1 ] && return=1
|
[ "${return}" -le 1 ] && return=1
|
||||||
else
|
else
|
||||||
nb_ok=$((nb_ok + 1))
|
nb_ok=$((nb_ok + 1))
|
||||||
output="${output}OK - ${name} (${host}:${port})\n"
|
output="${output}${result}\n"
|
||||||
[ "${return}" -le 0 ] && return=0
|
[ "${return}" -le 0 ] && return=0
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -69,8 +69,8 @@ for conf_file in ${conf_files}; do
|
||||||
if systemctl is-enabled -q "redis-server@${name}.service"; then
|
if systemctl is-enabled -q "redis-server@${name}.service"; then
|
||||||
check_server $name $conf_file
|
check_server $name $conf_file
|
||||||
else
|
else
|
||||||
nb_crit=$((nb_crit + 1))
|
nb_unchk=$((nb_unchk + 1))
|
||||||
output="${output}CRITICAL - ${name}\n"
|
output="${output}UNCHK - ${name} (unit is disabled or missing)\n"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue