Skip to content
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

Remove references to deprecated python environment vars #178

Merged
merged 1 commit into from
Jul 28, 2023
Merged

Remove references to deprecated python environment vars #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions jobs/dd-agent/templates/bin/process_agent_ctl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ source /var/vcap/jobs/dd-agent/packages/dd-agent/helpers/setup.sh "dd-agent" "pr
# Load function lib (alway before setup, there are some global variables needed)
source /var/vcap/jobs/dd-agent/packages/dd-agent/helpers/lib.sh

export DD_AGENT_PY_ENV="PYTHONPATH=$PYTHONPATH,LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
export DD_AGENT_PY="$DD_AGENT_PYTHON"
DD_PROCESS_AGENT="$JOB_DIR/packages/dd-agent/embedded/bin/process-agent"
PROCESS_AGENT_CMD="$DD_PROCESS_AGENT --config=$JOB_DIR/config/datadog.yaml --pid=$PIDFILE"

Expand Down
2 changes: 0 additions & 2 deletions jobs/dd-agent/templates/bin/system_probe_ctl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ source /var/vcap/jobs/dd-agent/packages/dd-agent/helpers/setup.sh "dd-agent" "sy
# Load function lib (alway before setup, there are some global variables needed)
source /var/vcap/jobs/dd-agent/packages/dd-agent/helpers/lib.sh

export DD_AGENT_PY_ENV="PYTHONPATH=$PYTHONPATH,LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
export DD_AGENT_PY="$DD_AGENT_PYTHON"
DD_SYSTEM_PROBE="$JOB_DIR/packages/dd-agent/embedded/bin/system-probe"
SYSTEM_PROBE_CMD="$DD_SYSTEM_PROBE --config=$JOB_DIR/config/system-probe.yaml --pid=$PIDFILE"

Expand Down
2 changes: 0 additions & 2 deletions jobs/dd-agent/templates/bin/trace_agent_ctl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ source /var/vcap/jobs/dd-agent/packages/dd-agent/helpers/setup.sh "dd-agent" "tr
# Load function lib (alway before setup, there are some global variables needed)
source /var/vcap/jobs/dd-agent/packages/dd-agent/helpers/lib.sh

export DD_AGENT_PY_ENV="PYTHONPATH=$PYTHONPATH,LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
export DD_AGENT_PY="$DD_AGENT_PYTHON"
DD_TRACE_AGENT="$JOB_DIR/packages/dd-agent/embedded/bin/trace-agent"
TRACE_AGENT_CMD="$DD_TRACE_AGENT --config=$JOB_DIR/config/datadog.yaml --pid=$PIDFILE"

Expand Down
2 changes: 0 additions & 2 deletions src/helpers/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ export CONFD_DIR="$JOB_DIR/config/conf.d"

export LANG=POSIX

export DD_AGENT_PYTHON="$PACKAGES/$NAME/embedded/bin/python3"

KNOWN_DISTRIBUTION="(Debian|Ubuntu|RedHat|CentOS|openSUSE|Amazon|Arista|SUSE)"
DISTRIBUTION=$(lsb_release -d 2>/dev/null | grep -Eo $KNOWN_DISTRIBUTION || grep -Eo $KNOWN_DISTRIBUTION /etc/issue 2>/dev/null || grep -Eo $KNOWN_DISTRIBUTION /etc/Eos-release 2>/dev/null || uname -s)

Expand Down