Skip to content

Feature support Valkey #860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature support Valkey #860

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a18256
Detect valkey-server
mayrstefan Oct 12, 2025
c3835b9
Detect redis cli per instance
mayrstefan Oct 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions agents/plugins/mk_redis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ CMK_VERSION="2.5.0b1"
# sample output of pgrep command
# 1051 /usr/bin/redis-server 127.0.0.1:6380
# 1324 /usr/bin/redis-server 127.0.0.1:6379
# 1612 /usr/bin/valkey-server 127.0.0.1:6379

# example cfg file /etc/check_mk/mk_redis.cfg
#
Expand Down Expand Up @@ -55,13 +56,26 @@ redis_args() {
REDIS_ARGS=("-h" "${!HOST}" "-p" "${!PORT}")
fi

if [[ "${!PASSWORD}" ]] && [[ "${!PASSWORD}" != "None" ]]; then
REDIS_CLI_COMMAND="REDISCLI_AUTH='${!PASSWORD}' redis-cli"
else
REDIS_ARGS+=("info")

# detect usable redis-cli
if [[ "${!HOST}" == /omd/sites/* ]]; then
# use site redis-cli for redis instances in site
IFS="/" read -ra ADDR <<<"${!HOST}"
REDIS_CLI_COMMAND="/omd/sites/${ADDR[3]}/bin/redis-cli"
elif type redis-cli &>/dev/null; then
REDIS_CLI_COMMAND="redis-cli"
elif type valkey-cli &>/dev/null; then
REDIS_CLI_COMMAND="valkey-cli"
else
REDIS_CLI_COMMAND="echo 'error: no cli found'"
REDIS_ARGS=()
return
fi

REDIS_ARGS+=("info")
if [[ "${!PASSWORD}" ]] && [[ "${!PASSWORD}" != "None" ]]; then
REDIS_CLI_COMMAND="REDISCLI_AUTH='${!PASSWORD}' ${REDIS_CLI_COMMAND}"
fi
}

main() {
Expand All @@ -76,7 +90,7 @@ main() {
if [ ${#REDIS_INSTANCES[@]} -eq 0 ]; then
IS_DETECTED=true
# find instances and remove entries like "*:6879", possible with docker container
DETECTED=$(pgrep -xa "redis-server" 2>/dev/null | awk '/:[0-9]+/ && !/\*/ || /unixsocket:.*/ { print $3 }')
DETECTED=$(pgrep -xa "(redis|valkey)-server" 2>/dev/null | awk '/:[0-9]+/ && !/\*/ || /unixsocket:.*/ { print $3 }')

# add found redis instances
for REDIS_INSTANCE in $DETECTED; do
Expand Down Expand Up @@ -112,13 +126,7 @@ main() {
# print server section
echo "[[[$INSTANCE|${!HOST}|${!PORT}]]]"

if [[ "${!HOST}" == /omd/sites/* ]]; then
# use site redis-cli for redis instances in site
IFS="/" read -ra ADDR <<<"${!HOST}"
output=$(waitmax 3 bash -c "/omd/sites/${ADDR[3]}/bin/redis-cli ${REDIS_ARGS[*]}" 2>&1 || true)
else
output=$(waitmax 3 bash -c "${REDIS_CLI_COMMAND} ${REDIS_ARGS[*]}" 2>&1 || true)
fi
output=$(waitmax 3 bash -c "${REDIS_CLI_COMMAND} ${REDIS_ARGS[*]}" 2>&1 || true)

if [[ "$output" == *"Could not connect to Redis at ${!HOST}: Permission denied"* ]]; then
# mark error explicitly for easier parsing
Expand Down
Loading