chore(remove-dd): removed references to datadog in cloud-auto

uc-cdis · Nov 25, 2024 · 67e452e · 67e452e
1 parent 69e15ba
commit 67e452e
Show file tree

Hide file tree

Showing 37 changed files with 15 additions and 1,651 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
diff --git a/Docker/jenkins/Jenkins-CI-Worker/Dockerfile b/Docker/jenkins/Jenkins-CI-Worker/Dockerfile
@@ -97,7 +97,7 @@ RUN sed -i 's/python3/python3.9/' /usr/bin/lsb_release && \
     sed -i 's/python3/python3.9/' /usr/bin/add-apt-repository
 
 # install aws cli, poetry, pytest, etc.
-RUN set -xe && python3.9 -m pip install --upgrade pip setuptools && python3.9 -m pip install awscli --upgrade && python3.9 -m pip install pytest --upgrade && python3.9 -m pip install poetry && python3.9 -m pip install PyYAML --upgrade && python3.9 -m pip install lxml --upgrade && python3.9 -m pip install yq --upgrade && python3.9 -m pip install datadog --upgrade
+RUN set -xe && python3.9 -m pip install --upgrade pip setuptools && python3.9 -m pip install awscli --upgrade && python3.9 -m pip install pytest --upgrade && python3.9 -m pip install poetry && python3.9 -m pip install PyYAML --upgrade && python3.9 -m pip install lxml --upgrade && python3.9 -m pip install yq --upgrade 
 
 # install terraform
 RUN curl -o /tmp/terraform.zip https://releases.hashicorp.com/terraform/0.11.15/terraform_0.11.15_linux_amd64.zip \

diff --git a/Docker/python-nginx/python3.10-buster/dockerrun.sh b/Docker/python-nginx/python3.10-buster/dockerrun.sh
@@ -86,16 +86,9 @@ if [ -f ./wsgi.py ] && [ "$GEN3_DEBUG" = "True" ]; then
   printf "\napplication.debug=True\n\n" >> ./wsgi.py
 fi
 
-if [ -z $DD_ENABLED ]; then
 (
   run uwsgi --ini /etc/uwsgi/uwsgi.ini
 ) &
-else
-echo "import=ddtrace.bootstrap.sitecustomize" >> /etc/uwsgi/uwsgi.ini
-(
-  ddtrace-run uwsgi --enable-threads --ini /etc/uwsgi/uwsgi.ini
-) &
-fi
 
 run nginx -g 'daemon off;'
 wait
diff --git a/Docker/python-nginx/python3.6-alpine3.7/dockerrun.sh b/Docker/python-nginx/python3.6-alpine3.7/dockerrun.sh
@@ -86,16 +86,9 @@ if [ -f ./wsgi.py ] && [ "$GEN3_DEBUG" = "True" ]; then
   echo -e "\napplication.debug=True\n" >> ./wsgi.py
 fi
 
-if [[ -z $DD_ENABLED ]]; then
 (
   run uwsgi --ini /etc/uwsgi/uwsgi.ini
 ) &
-else
-echo "import=ddtrace.bootstrap.sitecustomize" >> /etc/uwsgi/uwsgi.ini
-(
-  ddtrace-run uwsgi --enable-threads --ini /etc/uwsgi/uwsgi.ini
-) &
-fi
 
 run nginx -g 'daemon off;'
 wait
diff --git a/Docker/python-nginx/python3.6-buster/dockerrun.sh b/Docker/python-nginx/python3.6-buster/dockerrun.sh
@@ -86,16 +86,9 @@ if [ -f ./wsgi.py ] && [ "$GEN3_DEBUG" = "True" ]; then
   printf "\napplication.debug=True\n\n" >> ./wsgi.py
 fi
 
-if [ -z $DD_ENABLED ]; then
 (
   run uwsgi --ini /etc/uwsgi/uwsgi.ini
 ) &
-else
-echo "import=ddtrace.bootstrap.sitecustomize" >> /etc/uwsgi/uwsgi.ini
-(
-  ddtrace-run uwsgi --enable-threads --ini /etc/uwsgi/uwsgi.ini
-) &
-fi
 
 run nginx -g 'daemon off;'
 wait
diff --git a/Docker/python-nginx/python3.9-buster/dockerrun.sh b/Docker/python-nginx/python3.9-buster/dockerrun.sh
@@ -86,16 +86,9 @@ if [ -f ./wsgi.py ] && [ "$GEN3_DEBUG" = "True" ]; then
   printf "\napplication.debug=True\n\n" >> ./wsgi.py
 fi
 
-if [ -z $DD_ENABLED ]; then
 (
   run uwsgi --ini /etc/uwsgi/uwsgi.ini
 ) &
-else
-echo "import=ddtrace.bootstrap.sitecustomize" >> /etc/uwsgi/uwsgi.ini
-(
-  ddtrace-run uwsgi --enable-threads --ini /etc/uwsgi/uwsgi.ini
-) &
-fi
 
 run nginx -g 'daemon off;'
 wait
diff --git a/gen3/bin/kube-setup-aurora-monitoring.sh b/gen3/bin/kube-setup-aurora-monitoring.sh
diff --git a/gen3/bin/kube-setup-aws-es-proxy.sh b/gen3/bin/kube-setup-aws-es-proxy.sh
@@ -8,7 +8,6 @@
 source "${GEN3_HOME}/gen3/lib/utils.sh"
 gen3_load "gen3/lib/kube-setup-init"
 
-# Deploy Datadog with argocd if flag is set in the manifest path
 manifestPath=$(g3k_manifest_path)
 es7="$(jq -r ".[\"global\"][\"es7\"]" < "$manifestPath" | tr '[:upper:]' '[:lower:]')"
 esDomain="$(jq -r ".[\"global\"][\"esDomain\"]" < "$manifestPath" | tr '[:upper:]' '[:lower:]')"
@@ -140,4 +139,4 @@ POLICY
       gen3 kube-setup-networkpolicy service aws-es-proxy
       g3kubectl patch deployment "aws-es-proxy-deployment" -p  '{"spec":{"template":{"metadata":{"labels":{"netvpc":"yes"}}}}}' || true
     fi
-  fi
+  fi
diff --git a/gen3/bin/kube-setup-datadog.sh b/gen3/bin/kube-setup-datadog.sh
diff --git a/gen3/lib/g3k_manifest.sh b/gen3/lib/g3k_manifest.sh
@@ -250,13 +250,13 @@ g3k_manifest_filter() {
     kvList+=("$kvKey" "image: $value")
     kvLabelKey=$(echo "GEN3_${key}_VERSION" | tr '[:lower:]' '[:upper:]')
     version=$(echo $value | rev | cut -d ':' -f 1 | rev)
-    kvList+=("$kvLabelKey" "tags.datadoghq.com/version: '$version'")
+    kvList+=("$kvLabelKey" "version: '$version'")
   done
   environment="$(g3k_config_lookup ".global.environment" "$manifestPath")"
   hostname="$(g3k_config_lookup ".global.hostname" "$manifestPath")"
   kvEnvKey=$(echo "GEN3_ENV_LABEL" | tr '[:lower:]' '[:upper:]')
   kvHostKey=$(echo "GEN3_HOSTNAME_LABEL" | tr '[:lower:]' '[:upper:]')
-  kvList+=("$kvEnvKey" "tags.datadoghq.com/env: $environment")
+  kvList+=("$kvEnvKey" "env: $environment")
   kvList+=("$kvHostKey" "hostname: $hostname")
   for key in $(g3k_config_lookup '. | keys[]' "$manifestPath"); do
     gen3_log_debug "harvesting key $key"