From b7240242ce42c9f0a98d0b803b783765abaa6a04 Mon Sep 17 00:00:00 2001 From: zbud-msft Date: Fri, 17 Mar 2023 18:26:24 +0000 Subject: [PATCH 1/2] Fix telemetry.sh passing in null as log level value --- dockers/docker-sonic-telemetry/telemetry.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dockers/docker-sonic-telemetry/telemetry.sh b/dockers/docker-sonic-telemetry/telemetry.sh index 1f92657e3b8f..15d111d66b2b 100755 --- a/dockers/docker-sonic-telemetry/telemetry.sh +++ b/dockers/docker-sonic-telemetry/telemetry.sh @@ -63,10 +63,10 @@ if [ -z $CLIENT_AUTH ] || [ $CLIENT_AUTH == "false" ]; then fi LOG_LEVEL=$(echo $GNMI | jq -r '.log_level') -if [ ! -z $LOG_LEVEL ]; then - TELEMETRY_ARGS+=" -v=$LOG_LEVEL" -else +if [ -z $LOG_LEVEL ] || [ $LOG_LEVEL == "null" ]; then TELEMETRY_ARGS+=" -v=2" +else + TELEMETRY_ARGS+=" -v=$LOG_LEVEL" fi exec /usr/sbin/telemetry ${TELEMETRY_ARGS} From 876415f7a955de507328fc1a4fc8cad70c2f9960 Mon Sep 17 00:00:00 2001 From: zbud-msft Date: Mon, 20 Mar 2023 17:04:40 +0000 Subject: [PATCH 2/2] Check if integer instead --- dockers/docker-sonic-telemetry/telemetry.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dockers/docker-sonic-telemetry/telemetry.sh b/dockers/docker-sonic-telemetry/telemetry.sh index 15d111d66b2b..8f116134df05 100755 --- a/dockers/docker-sonic-telemetry/telemetry.sh +++ b/dockers/docker-sonic-telemetry/telemetry.sh @@ -63,10 +63,10 @@ if [ -z $CLIENT_AUTH ] || [ $CLIENT_AUTH == "false" ]; then fi LOG_LEVEL=$(echo $GNMI | jq -r '.log_level') -if [ -z $LOG_LEVEL ] || [ $LOG_LEVEL == "null" ]; then - TELEMETRY_ARGS+=" -v=2" -else +if [[ $LOG_LEVEL =~ ^[0-9]+$ ]]; then TELEMETRY_ARGS+=" -v=$LOG_LEVEL" +else + TELEMETRY_ARGS+=" -v=2" fi exec /usr/sbin/telemetry ${TELEMETRY_ARGS}