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

feat: removing DataDog #1015

Merged
merged 5 commits into from
Dec 13, 2022
Merged

feat: removing DataDog #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
294493a
feat: remove datadog logger
rem1niscence Dec 13, 2022
883a7b2
infra: remove datadog envs
rem1niscence Dec 13, 2022
dd2e6dc
infra: remove datadog container
rem1niscence Dec 13, 2022
ab5378f
feat: remove datadog packages
rem1niscence Dec 13, 2022
778b220
feat: remove dd from task defs, cleanup
crisog Dec 13, 2022
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
27 changes: 1 addition & 26 deletions .github/workflows/canary-ap-northeast-2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
envkey_REDIRECTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_REDIRECTS }}
envkey_LOCAL_REDIS_ENDPOINT: 172.17.0.1:6379
envkey_REDIS_PORT: 6379
envkey_POCKET_NETWORK_NODE_URL: ${{ secrets.POCKET_NETWORK_MAINNET_NODE_URL }}
envkey_POCKET_SESSION_BLOCK_FREQUENCY: 4
envkey_POCKET_BLOCK_TIME: 1038000
envkey_POCKET_RELAY_RETRIES: 0
Expand All @@ -55,8 +54,6 @@ jobs:
envkey_AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
envkey_COMMIT_HASH: ${{ github.sha }}
envkey_ARCHIVAL_CHAINS: 0022,0028,0010,000A,000B,000C
envkey_LOG_TO_DATADOG: true
envkey_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
envkey_LOG_TO_LOKI: ${{ secrets.LOG_TO_LOKI }}
envkey_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
envkey_LOKI_HOST: ${{ secrets.LOKI_HOST }}
Expand Down Expand Up @@ -93,33 +90,11 @@ jobs:
task-definition: pocket-gateway/tasks/canary/ecs-task-definition.json
container-name: gateway
image: ${{ steps.build-image.outputs.image }}
# Needs to be set at container level to be read by the dd agent
environment-variables: |
DD_RUNTIME_METRICS_ENABLED=true
DD_PROFILING_ENABLED=true
DD_SERVICE=/canary/ap-northeast-2/ecs/gateway
DD_VERSION=${{ github.sha }}
DD_ENV=canary
DD_AGENT_HOST=datadog-agent

- name: Fill in the new image ID / ap-northeast-2 - datadog-agent
id: task-def-ap-northeast-2-datadog-agent
uses: aws-actions/amazon-ecs-render-task-definition@master
with:
task-definition: ${{ steps.task-def-ap-northeast-2-gateway.outputs.task-definition }}
container-name: datadog-agent
image: gcr.io/datadoghq/agent:latest
environment-variables: |
DD_API_KEY=${{ secrets.DATADOG_API_KEY }}
DD_SITE=datadoghq.eu
DD_LOGS_ENABLED=false
DD_APM_ENABLED=false
DD_DOGSTATSD_NON_LOCAL_TRAFFIC=false

- name: Deploy / ap-northeast-2
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
with:
task-definition: ${{ steps.task-def-ap-northeast-2-datadog-agent.outputs.task-definition }}
task-definition: ${{ steps.task-def-ap-northeast-2-gateway.outputs.task-definition }}
service: gateway-canary
cluster: gateway-canary
wait-for-service-stability: true
27 changes: 1 addition & 26 deletions .github/workflows/canary-ca-central-1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
envkey_REDIRECTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_REDIRECTS }}
envkey_LOCAL_REDIS_ENDPOINT: 172.17.0.1:6379
envkey_REDIS_PORT: 6379
envkey_POCKET_NETWORK_NODE_URL: ${{ secrets.POCKET_NETWORK_MAINNET_NODE_URL }}
envkey_POCKET_SESSION_BLOCK_FREQUENCY: 4
envkey_POCKET_BLOCK_TIME: 1038000
envkey_POCKET_RELAY_RETRIES: 0
Expand All @@ -55,8 +54,6 @@ jobs:
envkey_AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
envkey_COMMIT_HASH: ${{ github.sha }}
envkey_ARCHIVAL_CHAINS: 0022,0028,0010,000A,000B,000C
envkey_LOG_TO_DATADOG: true
envkey_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
envkey_LOG_TO_LOKI: ${{ secrets.LOG_TO_LOKI }}
envkey_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
envkey_LOKI_HOST: ${{ secrets.LOKI_HOST }}
Expand Down Expand Up @@ -93,33 +90,11 @@ jobs:
task-definition: pocket-gateway/tasks/canary/ecs-task-definition.json
container-name: gateway
image: ${{ steps.build-image.outputs.image }}
# Needs to be set at container level to be read by the dd agent
environment-variables: |
DD_RUNTIME_METRICS_ENABLED=true
DD_PROFILING_ENABLED=true
DD_SERVICE=/canary/ca-central-1/ecs/gateway
DD_VERSION=${{ github.sha }}
DD_ENV=canary
DD_AGENT_HOST=datadog-agent

- name: Fill in the new image ID / ca-central-1 - datadog-agent
id: task-def-ca-central-1-datadog-agent
uses: aws-actions/amazon-ecs-render-task-definition@master
with:
task-definition: ${{ steps.task-def-ca-central-1-gateway.outputs.task-definition }}
container-name: datadog-agent
image: gcr.io/datadoghq/agent:latest
environment-variables: |
DD_API_KEY=${{ secrets.DATADOG_API_KEY }}
DD_SITE=datadoghq.eu
DD_LOGS_ENABLED=false
DD_APM_ENABLED=false
DD_DOGSTATSD_NON_LOCAL_TRAFFIC=false

- name: Deploy / ca-central-1
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
with:
task-definition: ${{ steps.task-def-ca-central-1-datadog-agent.outputs.task-definition }}
task-definition: ${{ steps.task-def-ca-central-1-gateway.outputs.task-definition }}
service: gateway-canary
cluster: gateway-canary
wait-for-service-stability: true
27 changes: 1 addition & 26 deletions .github/workflows/canary-eu-central-1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
envkey_REDIRECTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_REDIRECTS }}
envkey_LOCAL_REDIS_ENDPOINT: 172.17.0.1:6379
envkey_REDIS_PORT: 6379
envkey_POCKET_NETWORK_NODE_URL: ${{ secrets.POCKET_NETWORK_MAINNET_NODE_URL }}
envkey_POCKET_SESSION_BLOCK_FREQUENCY: 4
envkey_POCKET_BLOCK_TIME: 1038000
envkey_POCKET_RELAY_RETRIES: 0
Expand All @@ -55,8 +54,6 @@ jobs:
envkey_AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
envkey_COMMIT_HASH: ${{ github.sha }}
envkey_ARCHIVAL_CHAINS: 0022,0028,0010,000A,000B,000C
envkey_LOG_TO_DATADOG: true
envkey_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
envkey_LOG_TO_LOKI: ${{ secrets.LOG_TO_LOKI }}
envkey_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
envkey_LOKI_HOST: ${{ secrets.LOKI_HOST }}
Expand Down Expand Up @@ -93,33 +90,11 @@ jobs:
task-definition: pocket-gateway/tasks/canary/ecs-task-definition.json
container-name: gateway
image: ${{ steps.build-image.outputs.image }}
# Needs to be set at container level to be read by the dd agent
environment-variables: |
DD_RUNTIME_METRICS_ENABLED=true
DD_PROFILING_ENABLED=true
DD_SERVICE=/canary/eu-central-1/ecs/gateway
DD_VERSION=${{ github.sha }}
DD_ENV=canary
DD_AGENT_HOST=datadog-agent

- name: Fill in the new image ID / eu-central-1 - datadog-agent
id: task-def-eu-central-1-datadog-agent
uses: aws-actions/amazon-ecs-render-task-definition@master
with:
task-definition: ${{ steps.task-def-eu-central-1-gateway.outputs.task-definition }}
container-name: datadog-agent
image: gcr.io/datadoghq/agent:latest
environment-variables: |
DD_API_KEY=${{ secrets.DATADOG_API_KEY }}
DD_SITE=datadoghq.eu
DD_LOGS_ENABLED=false
DD_APM_ENABLED=false
DD_DOGSTATSD_NON_LOCAL_TRAFFIC=false

- name: Deploy / eu-central-1
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
with:
task-definition: ${{ steps.task-def-eu-central-1-datadog-agent.outputs.task-definition }}
task-definition: ${{ steps.task-def-eu-central-1-gateway.outputs.task-definition }}
service: gateway-canary
cluster: gateway-canary
wait-for-service-stability: true
27 changes: 1 addition & 26 deletions .github/workflows/canary-us-west-2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
envkey_REDIRECTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_REDIRECTS }}
envkey_LOCAL_REDIS_ENDPOINT: 172.17.0.1:6379
envkey_REDIS_PORT: 6379
envkey_POCKET_NETWORK_NODE_URL: ${{ secrets.POCKET_NETWORK_MAINNET_NODE_URL }}
envkey_POCKET_SESSION_BLOCK_FREQUENCY: 4
envkey_POCKET_BLOCK_TIME: 1038000
envkey_POCKET_RELAY_RETRIES: 0
Expand All @@ -55,8 +54,6 @@ jobs:
envkey_AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
envkey_COMMIT_HASH: ${{ github.sha }}
envkey_ARCHIVAL_CHAINS: 0022,0028,0010,000A,000B,000C
envkey_LOG_TO_DATADOG: true
envkey_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
envkey_LOG_TO_LOKI: ${{ secrets.LOG_TO_LOKI }}
envkey_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
envkey_LOKI_HOST: ${{ secrets.LOKI_HOST }}
Expand Down Expand Up @@ -93,33 +90,11 @@ jobs:
task-definition: pocket-gateway/tasks/canary/ecs-task-definition.json
container-name: gateway
image: ${{ steps.build-image.outputs.image }}
# Needs to be set at container level to be read by the dd agent
environment-variables: |
DD_RUNTIME_METRICS_ENABLED=true
DD_PROFILING_ENABLED=true
DD_SERVICE=/canary/us-west-2/ecs/gateway
DD_VERSION=${{ github.sha }}
DD_ENV=canary
DD_AGENT_HOST=datadog-agent

- name: Fill in the new image ID / us-west-2 - datadog-agent
id: task-def-us-west-2-datadog-agent
uses: aws-actions/amazon-ecs-render-task-definition@master
with:
task-definition: ${{ steps.task-def-us-west-2-gateway.outputs.task-definition }}
container-name: datadog-agent
image: gcr.io/datadoghq/agent:latest
environment-variables: |
DD_API_KEY=${{ secrets.DATADOG_API_KEY }}
DD_SITE=datadoghq.eu
DD_LOGS_ENABLED=false
DD_APM_ENABLED=false
DD_DOGSTATSD_NON_LOCAL_TRAFFIC=false

- name: Deploy / us-west-2
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
with:
task-definition: ${{ steps.task-def-us-west-2-datadog-agent.outputs.task-definition }}
task-definition: ${{ steps.task-def-us-west-2-gateway.outputs.task-definition }}
service: gateway-canary
cluster: gateway-canary
wait-for-service-stability: true
27 changes: 1 addition & 26 deletions .github/workflows/production-ap-east-1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
envkey_REDIRECTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_REDIRECTS }}
envkey_LOCAL_REDIS_ENDPOINT: 172.17.0.1:6379
envkey_REDIS_PORT: 6379
envkey_POCKET_NETWORK_NODE_URL: ${{ secrets.POCKET_NETWORK_MAINNET_NODE_URL }}
envkey_POCKET_SESSION_BLOCK_FREQUENCY: 4
envkey_POCKET_BLOCK_TIME: 1038000
envkey_POCKET_RELAY_RETRIES: 0
Expand All @@ -55,8 +54,6 @@ jobs:
envkey_AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
envkey_COMMIT_HASH: ${{ github.sha }}
envkey_ARCHIVAL_CHAINS: 0022,0028,0010,000A,000B,000C
envkey_LOG_TO_DATADOG: true
envkey_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
envkey_LOG_TO_LOKI: ${{ secrets.LOG_TO_LOKI }}
envkey_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
envkey_LOKI_HOST: ${{ secrets.LOKI_HOST }}
Expand Down Expand Up @@ -93,33 +90,11 @@ jobs:
task-definition: pocket-gateway/tasks/production/ecs-task-definition.json
container-name: gateway
image: ${{ steps.build-image.outputs.image }}
# Needs to be set at container level to be read by the dd agent
environment-variables: |
DD_RUNTIME_METRICS_ENABLED=true
DD_PROFILING_ENABLED=true
DD_SERVICE=/ap-east-1/ecs/gateway
DD_VERSION=${{ github.sha }}
DD_ENV=production
DD_AGENT_HOST=datadog-agent

- name: Fill in the new image ID / ap-east-1 - datadog-agent
id: task-def-ap-east-1-datadog-agent
uses: aws-actions/amazon-ecs-render-task-definition@master
with:
task-definition: ${{ steps.task-def-ap-east-1-gateway.outputs.task-definition }}
container-name: datadog-agent
image: gcr.io/datadoghq/agent:latest
environment-variables: |
DD_API_KEY=${{ secrets.DATADOG_API_KEY }}
DD_SITE=datadoghq.eu
DD_LOGS_ENABLED=false
DD_APM_ENABLED=true
DD_DOGSTATSD_NON_LOCAL_TRAFFIC=true

- name: Deploy / ap-east-1
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
with:
task-definition: ${{ steps.task-def-ap-east-1-datadog-agent.outputs.task-definition }}
task-definition: ${{ steps.task-def-ap-east-1-gateway.outputs.task-definition }}
service: gateway-prod
cluster: gateway-prod
wait-for-service-stability: true
27 changes: 1 addition & 26 deletions .github/workflows/production-ap-northeast-1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
envkey_REDIRECTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_REDIRECTS }}
envkey_LOCAL_REDIS_ENDPOINT: 172.17.0.1:6379
envkey_REDIS_PORT: 6379
envkey_POCKET_NETWORK_NODE_URL: ${{ secrets.POCKET_NETWORK_MAINNET_NODE_URL }}
envkey_POCKET_SESSION_BLOCK_FREQUENCY: 4
envkey_POCKET_BLOCK_TIME: 1038000
envkey_POCKET_RELAY_RETRIES: 0
Expand All @@ -55,8 +54,6 @@ jobs:
envkey_AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
envkey_COMMIT_HASH: ${{ github.sha }}
envkey_ARCHIVAL_CHAINS: 0022,0028,0010,000A,000B,000C
envkey_LOG_TO_DATADOG: true
envkey_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
envkey_LOG_TO_LOKI: ${{ secrets.LOG_TO_LOKI }}
envkey_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
envkey_LOKI_HOST: ${{ secrets.LOKI_HOST }}
Expand Down Expand Up @@ -93,33 +90,11 @@ jobs:
task-definition: pocket-gateway/tasks/production/ecs-task-definition.json
container-name: gateway
image: ${{ steps.build-image.outputs.image }}
# Needs to be set at container level to be read by the dd agent
environment-variables: |
DD_RUNTIME_METRICS_ENABLED=true
DD_PROFILING_ENABLED=true
DD_SERVICE=/ap-northeast-1/ecs/gateway
DD_VERSION=${{ github.sha }}
DD_ENV=production
DD_AGENT_HOST=datadog-agent

- name: Fill in the new image ID / ap-northeast-1 - datadog-agent
id: task-def-ap-northeast-1-datadog-agent
uses: aws-actions/amazon-ecs-render-task-definition@master
with:
task-definition: ${{ steps.task-def-ap-northeast-1-gateway.outputs.task-definition }}
container-name: datadog-agent
image: gcr.io/datadoghq/agent:latest
environment-variables: |
DD_API_KEY=${{ secrets.DATADOG_API_KEY }}
DD_SITE=datadoghq.eu
DD_LOGS_ENABLED=false
DD_APM_ENABLED=true
DD_DOGSTATSD_NON_LOCAL_TRAFFIC=true

- name: Deploy / ap-northeast-1
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
with:
task-definition: ${{ steps.task-def-ap-northeast-1-datadog-agent.outputs.task-definition }}
task-definition: ${{ steps.task-def-ap-northeast-1-gateway.outputs.task-definition }}
service: gateway-prod
cluster: gateway-prod
wait-for-service-stability: true
27 changes: 1 addition & 26 deletions .github/workflows/production-ap-northeast-2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
envkey_REDIRECTS: ${{ secrets.POCKET_NETWORK_PRODUCTION_REDIRECTS }}
envkey_LOCAL_REDIS_ENDPOINT: 172.17.0.1:6379
envkey_REDIS_PORT: 6379
envkey_POCKET_NETWORK_NODE_URL: ${{ secrets.POCKET_NETWORK_MAINNET_NODE_URL }}
envkey_POCKET_SESSION_BLOCK_FREQUENCY: 4
envkey_POCKET_BLOCK_TIME: 1038000
envkey_POCKET_RELAY_RETRIES: 0
Expand All @@ -55,8 +54,6 @@ jobs:
envkey_AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
envkey_COMMIT_HASH: ${{ github.sha }}
envkey_ARCHIVAL_CHAINS: 0022,0028,0010,000A,000B,000C
envkey_LOG_TO_DATADOG: true
envkey_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
envkey_LOG_TO_LOKI: ${{ secrets.LOG_TO_LOKI }}
envkey_LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
envkey_LOKI_HOST: ${{ secrets.LOKI_HOST }}
Expand Down Expand Up @@ -93,33 +90,11 @@ jobs:
task-definition: pocket-gateway/tasks/production/ecs-task-definition.json
container-name: gateway
image: ${{ steps.build-image.outputs.image }}
# Needs to be set at container level to be read by the dd agent
environment-variables: |
DD_RUNTIME_METRICS_ENABLED=true
DD_PROFILING_ENABLED=true
DD_SERVICE=/ap-northeast-2/ecs/gateway
DD_VERSION=${{ github.sha }}
DD_ENV=production
DD_AGENT_HOST=datadog-agent

- name: Fill in the new image ID / ap-northeast-2 - datadog-agent
id: task-def-ap-northeast-2-datadog-agent
uses: aws-actions/amazon-ecs-render-task-definition@master
with:
task-definition: ${{ steps.task-def-ap-northeast-2-gateway.outputs.task-definition }}
container-name: datadog-agent
image: gcr.io/datadoghq/agent:latest
environment-variables: |
DD_API_KEY=${{ secrets.DATADOG_API_KEY }}
DD_SITE=datadoghq.eu
DD_LOGS_ENABLED=false
DD_APM_ENABLED=true
DD_DOGSTATSD_NON_LOCAL_TRAFFIC=true

- name: Deploy / ap-northeast-2
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
with:
task-definition: ${{ steps.task-def-ap-northeast-2-datadog-agent.outputs.task-definition }}
task-definition: ${{ steps.task-def-ap-northeast-2-gateway.outputs.task-definition }}
service: gateway-prod
cluster: gateway-prod
wait-for-service-stability: true
Loading