diff --git a/director-cli.sh b/director-cli.sh index bc10d3d6c4f3eeb1057a253d2ef3326099aa7d87..e16885421211c144a17d71200b1364d876d9d0f1 100755 --- a/director-cli.sh +++ b/director-cli.sh @@ -21,10 +21,11 @@ # 2023-02-17 v0.6 ah remove invalid line in cleanup # 2023-02-17 v0.7 ah check inc_getconfig.sh exists and hostname -f has a value # 2023-10-25 v0.8 ah generate json with "jo"; optimze http requests on services; parallel service function call +# 2023-11-02 v0.9 ah fix json genration for multiple ports # ====================================================================== -_version="0.8" +_version="0.9" which curl >/dev/null || exit 1 which jo >/dev/null || exit 1 @@ -118,14 +119,14 @@ hostDefaultgroups="groups[]=iml groups[]=iml-server" # check if host is in a private network: if echo "$MY_IP" | grep -E "${regexPrivateNetworks}" >/dev/null then - JSONPARAMS+='imports[]="${hostImportPrivate}" ' + JSONPARAMS+='imports[]="'${hostImportPrivate}'" ' else - JSONPARAMS+='imports[]="${hostImportReachable}" ' + JSONPARAMS+='imports[]="'${hostImportReachable}'" ' fi # port checks initiated by icinga server to monitor client if [ -n "${host_vars_tcpport}" -a "${host_vars_tcpport}" != "[]" ]; then - JSONPARAMS+='vars.tcp_port=${host_vars_tcpport} ' + JSONPARAMS+='vars.tcp_port="'${host_vars_tcpport}'" ' fi # ----- host groups