From 30eabb0c1fb31829ac0eec914a3b610ad9b4b4ac Mon Sep 17 00:00:00 2001 From: Sarah Date: Thu, 1 Dec 2022 15:02:15 -0500 Subject: [PATCH 1/6] Fix spaces parsing --- lib/scripts/create_logs_config.py | 22 +++++++++++++--------- lib/scripts/get_tags.py | 5 ++++- lib/scripts/update_agent_config_restart.sh | 7 ++++--- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/lib/scripts/create_logs_config.py b/lib/scripts/create_logs_config.py index 129a228..9362269 100644 --- a/lib/scripts/create_logs_config.py +++ b/lib/scripts/create_logs_config.py @@ -11,18 +11,20 @@ LOGS_CONFIG = os.environ.get('LOGS_CONFIG') DD_TAGS = os.environ.get('DD_TAGS') - config = {} -if not LOGS_CONFIG_DIR: +if LOGS_CONFIG_DIR is None: print("ERROR: `LOGS_CONFIG_DIR` must be set in order to collect logs. For more info, see: https://github.com/DataDog/datadog-cloudfoundry-buildpack#log-collection") exit(1) -if LOGS_CONFIG: +if LOGS_CONFIG is not None: config["logs"] = json.loads(LOGS_CONFIG) - if DD_TAGS: + if DD_TAGS is not None: config["logs"][0]["tags"] = DD_TAGS + else: + print("Could not find DD_TAGS env var") + else: print("ERROR: `LOGS_CONFIG` must be set in order to collect logs. For more info, see: https://github.com/DataDog/datadog-cloudfoundry-buildpack#log-collection") exit(1) @@ -30,8 +32,10 @@ config = json.dumps(config) path = LOGS_CONFIG_DIR + "/logs.yaml" - -with open(path, 'w') as f: - print("writing {} to {}".format(config, path)) - f.write(config) - f.write("\n") +try: + with open(path, 'w') as f: + print("writing {} to {}".format(config, path)) + f.write(config) + f.write("\n") +except Exception as e: + print("Could not write to log file: {}".format(str(e))) \ No newline at end of file diff --git a/lib/scripts/get_tags.py b/lib/scripts/get_tags.py index 0e6d206..fbbd83b 100644 --- a/lib/scripts/get_tags.py +++ b/lib/scripts/get_tags.py @@ -27,6 +27,7 @@ if node_agent_tags is not None: # we do this to separate commas inside json values from tags separator commas node_agent_tags = node_agent_tags.replace(",\"", ";\"") + node_agent_tags = node_agent_tags.replace(" ", "_") all_node_agent_tags = node_agent_tags.split(",") tags = tags + [tag for tag in all_node_agent_tags if ";" not in tag] @@ -34,6 +35,7 @@ for vcap_var_name in vcap_variables: vcap_var = vcap_application.get(vcap_var_name) if vcap_var is not None: + vcap_var = vcap_var.replace(" ", "_") key = vcap_var_name if vcap_var_name == 'name': key = 'application_name' @@ -48,6 +50,7 @@ if user_tags: try: user_tags = user_tags.split(',') + user_tags = user_tags.replace(" ", "_") for tag in user_tags: tags.append(tag) except Exception as e: @@ -56,6 +59,7 @@ user_tags = os.environ.get('DD_TAGS', None) if user_tags: try: + user_tags = user_tags.replace(" ", "_") user_tags = user_tags.split(',') for tag in user_tags: tags.append(tag) @@ -63,7 +67,6 @@ print("there was an issue parsing the tags in DD_TAGS: {}".format(e)) tags = list(dict.fromkeys(tags)) - legacy_tags = os.environ.get('LEGACY_TAGS_FORMAT', False) if legacy_tags: print(','.join(tags)) diff --git a/lib/scripts/update_agent_config_restart.sh b/lib/scripts/update_agent_config_restart.sh index 263c9fb..1a52274 100644 --- a/lib/scripts/update_agent_config_restart.sh +++ b/lib/scripts/update_agent_config_restart.sh @@ -10,16 +10,17 @@ DATADOG_DIR="${DATADOG_DIR:-/home/vcap/app/.datadog}" -SUPPRESS_DD_AGENT_OUTPUT="${SUPPRESS_DD_AGENT_OUTPUT:-true}" # correct way to export / source the .datadog_env file so that every variable is parsed -export $(grep -v '^#' $DATADOG_DIR/.datadog_env | xargs) +export $(grep -v '^#' $DATADOG_DIR/.datadog_env | xargs -0) + export DD_TAGS=$(LEGACY_TAGS_FORMAT=true python $DATADOG_DIR/scripts/get_tags.py node-agent-tags) +SUPPRESS_DD_AGENT_OUTPUT="${SUPPRESS_DD_AGENT_OUTPUT:-true}" + # the agent cloud_foundry_container workloadmeta collector reads from this file # See: https://github.com/DataDog/datadog-agent/blob/main/pkg/workloadmeta/collectors/internal/cloudfoundry/cf_container/cloudfoundry_container.go#L24 echo "$DD_TAGS" | awk '{ printf "%s", $0 }' > "$DATADOG_DIR/node_agent_tags.txt" - # for debugging purposes printenv > /home/vcap/app/.datadog/.sourced_datadog_env From b5e53178f5b883817819c12bec8ea3c0a9c015c7 Mon Sep 17 00:00:00 2001 From: Sarah Date: Thu, 1 Dec 2022 17:09:25 -0500 Subject: [PATCH 2/6] Add python script for parsing --- bin/compile | 1 + bin/supply | 1 + lib/scripts/parse_env_vars.py | 17 +++++++++++++++++ lib/scripts/update_agent_config_restart.sh | 5 ++--- 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 lib/scripts/parse_env_vars.py diff --git a/bin/compile b/bin/compile index 2f8fe98..dbdc3f8 100755 --- a/bin/compile +++ b/bin/compile @@ -13,6 +13,7 @@ mkdir -p $BUILD_DIR/.datadog/scripts cp $ROOT_DIR/lib/scripts/update_agent_config.sh $BUILD_DIR/.datadog/scripts/update_agent_config.sh chmod +x $BUILD_DIR/.datadog/scripts/update_agent_config.sh cp $ROOT_DIR/lib/scripts/get_tags.py $BUILD_DIR/.datadog/scripts/get_tags.py +cp $ROOT_DIR/lib/scripts/parse_env_vars.py $BUILD_DIR/.datadog/scripts/parse_env_vars.py echo "Installing Datadog IOT Agent, Dogstatsd and Trace Agent" diff --git a/bin/supply b/bin/supply index 441d384..e647609 100755 --- a/bin/supply +++ b/bin/supply @@ -13,6 +13,7 @@ mkdir -p $1/.datadog/scripts cp $ROOT_DIR/lib/scripts/update_agent_config.sh $1/.datadog/scripts/update_agent_config.sh chmod +x $1/.datadog/scripts/update_agent_config.sh cp $ROOT_DIR/lib/scripts/get_tags.py $BUILD_DIR/.datadog/scripts/get_tags.py +cp $ROOT_DIR/lib/scripts/parse_env_vars.py $BUILD_DIR/.datadog/scripts/parse_env_vars.py echo "Installing Datadog IOT Agent, Dogstatsd and Trace Agent" diff --git a/lib/scripts/parse_env_vars.py b/lib/scripts/parse_env_vars.py new file mode 100644 index 0000000..2194782 --- /dev/null +++ b/lib/scripts/parse_env_vars.py @@ -0,0 +1,17 @@ +# Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2.0 License. +# This product includes software developed at Datadog (https://www.datadoghq.com/). +# Copyright 2022-Present Datadog, Inc. + +import sys + + +if len(sys.argv) > 1: + env_file_name = sys.argv[1] + with open(env_file_name, 'r') as env_file: + env_vars = env_file.readlines() + + for env_var in env_vars: + if env_var.startswith("#"): + continue + env_var = env_var.replace(" ", "_") + print(env_var) diff --git a/lib/scripts/update_agent_config_restart.sh b/lib/scripts/update_agent_config_restart.sh index 1a52274..653028f 100644 --- a/lib/scripts/update_agent_config_restart.sh +++ b/lib/scripts/update_agent_config_restart.sh @@ -10,14 +10,13 @@ DATADOG_DIR="${DATADOG_DIR:-/home/vcap/app/.datadog}" +SUPPRESS_DD_AGENT_OUTPUT="${SUPPRESS_DD_AGENT_OUTPUT:-true}" # correct way to export / source the .datadog_env file so that every variable is parsed -export $(grep -v '^#' $DATADOG_DIR/.datadog_env | xargs -0) +export $(python parse_env_vars.py $DATADOG_DIR/.datadog_env) export DD_TAGS=$(LEGACY_TAGS_FORMAT=true python $DATADOG_DIR/scripts/get_tags.py node-agent-tags) -SUPPRESS_DD_AGENT_OUTPUT="${SUPPRESS_DD_AGENT_OUTPUT:-true}" - # the agent cloud_foundry_container workloadmeta collector reads from this file # See: https://github.com/DataDog/datadog-agent/blob/main/pkg/workloadmeta/collectors/internal/cloudfoundry/cf_container/cloudfoundry_container.go#L24 echo "$DD_TAGS" | awk '{ printf "%s", $0 }' > "$DATADOG_DIR/node_agent_tags.txt" From 74c332e4974c8a52ea38eea3634890aab15c4b88 Mon Sep 17 00:00:00 2001 From: Sarah Date: Fri, 2 Dec 2022 11:20:45 -0500 Subject: [PATCH 3/6] create new file for environment --- lib/scripts/get_tags.py | 1 + lib/scripts/parse_env_vars.py | 21 +++++++++++++++++---- lib/scripts/update_agent_config_restart.sh | 9 +++++++-- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/lib/scripts/get_tags.py b/lib/scripts/get_tags.py index fbbd83b..07a2787 100644 --- a/lib/scripts/get_tags.py +++ b/lib/scripts/get_tags.py @@ -66,6 +66,7 @@ except Exception as e: print("there was an issue parsing the tags in DD_TAGS: {}".format(e)) +tags = [ tag.replace(" ", "_") for tag in tags ] tags = list(dict.fromkeys(tags)) legacy_tags = os.environ.get('LEGACY_TAGS_FORMAT', False) if legacy_tags: diff --git a/lib/scripts/parse_env_vars.py b/lib/scripts/parse_env_vars.py index 2194782..38ac15d 100644 --- a/lib/scripts/parse_env_vars.py +++ b/lib/scripts/parse_env_vars.py @@ -10,8 +10,21 @@ with open(env_file_name, 'r') as env_file: env_vars = env_file.readlines() + new_env_vars = [] for env_var in env_vars: - if env_var.startswith("#"): - continue - env_var = env_var.replace(" ", "_") - print(env_var) + if not("VCAP_APPLICATION" in env_var or "TAGS" in env_var): + new_env_vars.insert(0, env_var) + else: + new_env_vars.append(env_var) + + if len(sys.argv) > 2: + new_env_file_name = sys.argv[2] + with open(new_env_file_name, 'w') as new_env_file: + for env_var in new_env_vars: + env_var = env_var.strip() + if env_var.startswith("#"): + continue + if env_var.endswith("=\'\'"): + continue + env_var = env_var.replace(" ", "_") + new_env_file.write("export {}\n".format(env_var)) \ No newline at end of file diff --git a/lib/scripts/update_agent_config_restart.sh b/lib/scripts/update_agent_config_restart.sh index 653028f..5150201 100644 --- a/lib/scripts/update_agent_config_restart.sh +++ b/lib/scripts/update_agent_config_restart.sh @@ -13,14 +13,19 @@ DATADOG_DIR="${DATADOG_DIR:-/home/vcap/app/.datadog}" SUPPRESS_DD_AGENT_OUTPUT="${SUPPRESS_DD_AGENT_OUTPUT:-true}" # correct way to export / source the .datadog_env file so that every variable is parsed -export $(python parse_env_vars.py $DATADOG_DIR/.datadog_env) +#export $(python parse_env_vars.py $DATADOG_DIR/.datadog_env | xargs -0) -export DD_TAGS=$(LEGACY_TAGS_FORMAT=true python $DATADOG_DIR/scripts/get_tags.py node-agent-tags) +touch "$DATADOG_DIR/.new_datadog_env" +python parse_env_vars.py "$DATADOG_DIR/.datadog_env" "$DATADOG_DIR/.new_datadog_env" +source "$DATADOG_DIR/.new_datadog_env" +printenv > /home/vcap/app/.datadog/.sourced_datadog_envs +export DD_TAGS=$(LEGACY_TAGS_FORMAT=true $DATADOG_DIR/scripts/get_tags.py node-agent-tags) # the agent cloud_foundry_container workloadmeta collector reads from this file # See: https://github.com/DataDog/datadog-agent/blob/main/pkg/workloadmeta/collectors/internal/cloudfoundry/cf_container/cloudfoundry_container.go#L24 echo "$DD_TAGS" | awk '{ printf "%s", $0 }' > "$DATADOG_DIR/node_agent_tags.txt" # for debugging purposes + printenv > /home/vcap/app/.datadog/.sourced_datadog_env # import helper functions From 0b491e71f1e31b9c2cb75087d50c1ab2b35ca190 Mon Sep 17 00:00:00 2001 From: Sarah Date: Fri, 2 Dec 2022 15:46:24 -0500 Subject: [PATCH 4/6] Properly apply tags --- bin/compile | 2 +- bin/supply | 3 ++- lib/scripts/create_logs_config.py | 4 +++- lib/scripts/parse_env_vars.py | 18 ++++++------------ lib/scripts/update_agent_config_restart.sh | 13 ++++++------- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/bin/compile b/bin/compile index dbdc3f8..0f9062a 100755 --- a/bin/compile +++ b/bin/compile @@ -13,7 +13,6 @@ mkdir -p $BUILD_DIR/.datadog/scripts cp $ROOT_DIR/lib/scripts/update_agent_config.sh $BUILD_DIR/.datadog/scripts/update_agent_config.sh chmod +x $BUILD_DIR/.datadog/scripts/update_agent_config.sh cp $ROOT_DIR/lib/scripts/get_tags.py $BUILD_DIR/.datadog/scripts/get_tags.py -cp $ROOT_DIR/lib/scripts/parse_env_vars.py $BUILD_DIR/.datadog/scripts/parse_env_vars.py echo "Installing Datadog IOT Agent, Dogstatsd and Trace Agent" @@ -31,6 +30,7 @@ fi cp $ROOT_DIR/lib/trace-agent $BUILD_DIR/.datadog/trace-agent cp $ROOT_DIR/lib/scripts/create_logs_config.py $BUILD_DIR/.datadog/scripts/create_logs_config.py +cp $ROOT_DIR/lib/scripts/parse_env_vars.py $BUILD_DIR/.datadog/scripts/parse_env_vars.py cp $ROOT_DIR/lib/scripts/nc.py $BUILD_DIR/.datadog/scripts/nc.py cp $ROOT_DIR/lib/scripts/utils.sh $BUILD_DIR/.datadog/scripts/utils.sh diff --git a/bin/supply b/bin/supply index e647609..bf1d8ee 100755 --- a/bin/supply +++ b/bin/supply @@ -13,7 +13,6 @@ mkdir -p $1/.datadog/scripts cp $ROOT_DIR/lib/scripts/update_agent_config.sh $1/.datadog/scripts/update_agent_config.sh chmod +x $1/.datadog/scripts/update_agent_config.sh cp $ROOT_DIR/lib/scripts/get_tags.py $BUILD_DIR/.datadog/scripts/get_tags.py -cp $ROOT_DIR/lib/scripts/parse_env_vars.py $BUILD_DIR/.datadog/scripts/parse_env_vars.py echo "Installing Datadog IOT Agent, Dogstatsd and Trace Agent" @@ -31,7 +30,9 @@ fi cp $ROOT_DIR/lib/trace-agent $BUILD_DIR/.datadog/trace-agent cp $ROOT_DIR/lib/scripts/create_logs_config.py $BUILD_DIR/.datadog/scripts/create_logs_config.py +cp $ROOT_DIR/lib/scripts/parse_env_vars.py $BUILD_DIR/.datadog/scripts/parse_env_vars.py cp $ROOT_DIR/lib/scripts/nc.py $BUILD_DIR/.datadog/scripts/nc.py + cp $ROOT_DIR/lib/scripts/utils.sh $BUILD_DIR/.datadog/scripts/utils.sh cp $ROOT_DIR/lib/scripts/update_agent_config_restart.sh $BUILD_DIR/.datadog/scripts/update_agent_config_restart.sh diff --git a/lib/scripts/create_logs_config.py b/lib/scripts/create_logs_config.py index 9362269..71dc479 100644 --- a/lib/scripts/create_logs_config.py +++ b/lib/scripts/create_logs_config.py @@ -33,7 +33,9 @@ path = LOGS_CONFIG_DIR + "/logs.yaml" try: - with open(path, 'w') as f: + if not os.path.exists(LOGS_CONFIG_DIR): + os.makedirs(LOGS_CONFIG_DIR) + with open(path, 'w+') as f: print("writing {} to {}".format(config, path)) f.write(config) f.write("\n") diff --git a/lib/scripts/parse_env_vars.py b/lib/scripts/parse_env_vars.py index 38ac15d..a36699d 100644 --- a/lib/scripts/parse_env_vars.py +++ b/lib/scripts/parse_env_vars.py @@ -4,27 +4,21 @@ import sys - if len(sys.argv) > 1: env_file_name = sys.argv[1] with open(env_file_name, 'r') as env_file: env_vars = env_file.readlines() - new_env_vars = [] - for env_var in env_vars: - if not("VCAP_APPLICATION" in env_var or "TAGS" in env_var): - new_env_vars.insert(0, env_var) - else: - new_env_vars.append(env_var) - if len(sys.argv) > 2: new_env_file_name = sys.argv[2] with open(new_env_file_name, 'w') as new_env_file: - for env_var in new_env_vars: + for env_var in env_vars: env_var = env_var.strip() if env_var.startswith("#"): continue - if env_var.endswith("=\'\'"): - continue env_var = env_var.replace(" ", "_") - new_env_file.write("export {}\n".format(env_var)) \ No newline at end of file + new_env_file.write("export {}\n".format(env_var)) + else: + print("Destination file not specified") +else: + print("Source file not specified") \ No newline at end of file diff --git a/lib/scripts/update_agent_config_restart.sh b/lib/scripts/update_agent_config_restart.sh index 5150201..b2a35a8 100644 --- a/lib/scripts/update_agent_config_restart.sh +++ b/lib/scripts/update_agent_config_restart.sh @@ -13,20 +13,18 @@ DATADOG_DIR="${DATADOG_DIR:-/home/vcap/app/.datadog}" SUPPRESS_DD_AGENT_OUTPUT="${SUPPRESS_DD_AGENT_OUTPUT:-true}" # correct way to export / source the .datadog_env file so that every variable is parsed -#export $(python parse_env_vars.py $DATADOG_DIR/.datadog_env | xargs -0) - touch "$DATADOG_DIR/.new_datadog_env" -python parse_env_vars.py "$DATADOG_DIR/.datadog_env" "$DATADOG_DIR/.new_datadog_env" +python "$DATADOG_DIR/scripts/parse_env_vars.py" "$DATADOG_DIR/.datadog_env" "$DATADOG_DIR/.new_datadog_env" source "$DATADOG_DIR/.new_datadog_env" -printenv > /home/vcap/app/.datadog/.sourced_datadog_envs -export DD_TAGS=$(LEGACY_TAGS_FORMAT=true $DATADOG_DIR/scripts/get_tags.py node-agent-tags) +export DD_TAGS=$(LEGACY_TAGS_FORMAT=true python $DATADOG_DIR/scripts/get_tags.py node-agent-tags) + # the agent cloud_foundry_container workloadmeta collector reads from this file # See: https://github.com/DataDog/datadog-agent/blob/main/pkg/workloadmeta/collectors/internal/cloudfoundry/cf_container/cloudfoundry_container.go#L24 echo "$DD_TAGS" | awk '{ printf "%s", $0 }' > "$DATADOG_DIR/node_agent_tags.txt" -# for debugging purposes -printenv > /home/vcap/app/.datadog/.sourced_datadog_env +# for debugging purposes +printenv > "$DATADOG_DIR/.sourced_datadog_env" # import helper functions source "$DATADOG_DIR/scripts/utils.sh" @@ -76,6 +74,7 @@ start_datadog() { export DD_LOG_FILE=$DATADOG_DIR/agent.log export DD_IOT_HOST=false + echo "Starting Datadog agent" python $DATADOG_DIR/scripts/create_logs_config.py if [ "$SUPPRESS_DD_AGENT_OUTPUT" = "true" ]; then From 6d72a4d51bce361e79eb7ba3aaeee79c4b6f1bd4 Mon Sep 17 00:00:00 2001 From: Sarah Date: Sat, 3 Dec 2022 16:51:58 -0500 Subject: [PATCH 5/6] Address PR review --- lib/scripts/get_tags.py | 4 ---- lib/scripts/parse_env_vars.py | 3 +-- lib/scripts/update_agent_config_restart.sh | 5 ++--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/scripts/get_tags.py b/lib/scripts/get_tags.py index 07a2787..ca39c0e 100644 --- a/lib/scripts/get_tags.py +++ b/lib/scripts/get_tags.py @@ -27,7 +27,6 @@ if node_agent_tags is not None: # we do this to separate commas inside json values from tags separator commas node_agent_tags = node_agent_tags.replace(",\"", ";\"") - node_agent_tags = node_agent_tags.replace(" ", "_") all_node_agent_tags = node_agent_tags.split(",") tags = tags + [tag for tag in all_node_agent_tags if ";" not in tag] @@ -35,7 +34,6 @@ for vcap_var_name in vcap_variables: vcap_var = vcap_application.get(vcap_var_name) if vcap_var is not None: - vcap_var = vcap_var.replace(" ", "_") key = vcap_var_name if vcap_var_name == 'name': key = 'application_name' @@ -50,7 +48,6 @@ if user_tags: try: user_tags = user_tags.split(',') - user_tags = user_tags.replace(" ", "_") for tag in user_tags: tags.append(tag) except Exception as e: @@ -59,7 +56,6 @@ user_tags = os.environ.get('DD_TAGS', None) if user_tags: try: - user_tags = user_tags.replace(" ", "_") user_tags = user_tags.split(',') for tag in user_tags: tags.append(tag) diff --git a/lib/scripts/parse_env_vars.py b/lib/scripts/parse_env_vars.py index a36699d..03161a5 100644 --- a/lib/scripts/parse_env_vars.py +++ b/lib/scripts/parse_env_vars.py @@ -11,12 +11,11 @@ if len(sys.argv) > 2: new_env_file_name = sys.argv[2] - with open(new_env_file_name, 'w') as new_env_file: + with open(new_env_file_name, 'w+') as new_env_file: for env_var in env_vars: env_var = env_var.strip() if env_var.startswith("#"): continue - env_var = env_var.replace(" ", "_") new_env_file.write("export {}\n".format(env_var)) else: print("Destination file not specified") diff --git a/lib/scripts/update_agent_config_restart.sh b/lib/scripts/update_agent_config_restart.sh index b2a35a8..faabda2 100644 --- a/lib/scripts/update_agent_config_restart.sh +++ b/lib/scripts/update_agent_config_restart.sh @@ -13,7 +13,6 @@ DATADOG_DIR="${DATADOG_DIR:-/home/vcap/app/.datadog}" SUPPRESS_DD_AGENT_OUTPUT="${SUPPRESS_DD_AGENT_OUTPUT:-true}" # correct way to export / source the .datadog_env file so that every variable is parsed -touch "$DATADOG_DIR/.new_datadog_env" python "$DATADOG_DIR/scripts/parse_env_vars.py" "$DATADOG_DIR/.datadog_env" "$DATADOG_DIR/.new_datadog_env" source "$DATADOG_DIR/.new_datadog_env" @@ -34,8 +33,8 @@ stop_datadog() { # first try to stop the agent so we don't lose data and then force it if ! [ "$(find_pid ./agent)" = "" ]; then echo "Stopping agent process, pid: $(cat $DATADOG_DIR/run/agent.pid)" - ($DATADOG_DIR/agent stop --cfgpath $DATADOG_DIR/dist/) || true - find_pid_kill_and_wait $DATADOG_DIR/agent || true + ("$DATADOG_DIR/agent" stop --cfgpath "$DATADOG_DIR/dist/") || true + find_pid_kill_and_wait "$DATADOG_DIR/agent" || true kill_and_wait "$DATADOG_DIR/run/agent.pid" 5 rm -f "$DATADOG_DIR/run/agent.pid" fi From b5d9c1abfefdea725276730123a7e305b358b8c6 Mon Sep 17 00:00:00 2001 From: Sarah Date: Mon, 5 Dec 2022 09:31:25 -0500 Subject: [PATCH 6/6] Add back space removal --- lib/scripts/parse_env_vars.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/scripts/parse_env_vars.py b/lib/scripts/parse_env_vars.py index 03161a5..fb2a7b7 100644 --- a/lib/scripts/parse_env_vars.py +++ b/lib/scripts/parse_env_vars.py @@ -16,6 +16,7 @@ env_var = env_var.strip() if env_var.startswith("#"): continue + env_var = env_var.replace(" ", "_") new_env_file.write("export {}\n".format(env_var)) else: print("Destination file not specified")