Skip to content

Commit

Permalink
Remove datadog monitoring
Browse files Browse the repository at this point in the history
  • Loading branch information
hellais committed Mar 5, 2024
1 parent 79d5746 commit 758001d
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 14 deletions.
1 change: 0 additions & 1 deletion .github/workflows/check_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ jobs:
env:
TF_VAR_aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
TF_VAR_aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
TF_VAR_datadog_api_key: ${{ secrets.DATADOG_API_KEY }}
TF_VAR_ooni_pg_password: ${{ secrets.OONI_PG_PASSWORD }}

steps:
Expand Down
4 changes: 1 addition & 3 deletions tf/environments/prod/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ resource "aws_route_table_association" "a" {
#
# aws_vpc_id = aws_vpc.main.id
# aws_subnet_id = aws_subnet.main[0].id
# datadog_api_key = var.datadog_api_key
# aws_access_key_id = var.aws_access_key_id
# aws_secret_access_key = var.aws_secret_access_key
# key_name = var.key_name
Expand Down Expand Up @@ -205,8 +204,7 @@ resource "aws_launch_template" "app" {

user_data = base64encode(templatefile("${path.module}/templates/ecs-setup.sh", {
ecs_cluster_name = local.ecs_cluster_name,
ecs_cluster_tags = local.tags,
datadog_api_key = var.datadog_api_key,
ecs_cluster_tags = local.tags
}))

update_default_version = true
Expand Down
3 changes: 0 additions & 3 deletions tf/environments/prod/variables.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
variable "datadog_api_key" {
sensitive = true
}
variable "aws_access_key_id" {
sensitive = true
}
Expand Down
1 change: 0 additions & 1 deletion tf/modules/clickhouse/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ resource "aws_instance" "clickhouse_server_prod_tier1" {
}

user_data = templatefile("${path.module}/templates/clickhouse-setup.sh", {
datadog_api_key = var.datadog_api_key,
hostname = local.clickhouse_hostname,
device_name = local.clickhouse_device_name
})
Expand Down
3 changes: 0 additions & 3 deletions tf/modules/clickhouse/templates/clickhouse-setup.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
#!/bin/bash
sudo hostnamectl set-hostname --static ${hostname}

# Install datadog agent
DD_API_KEY=${datadog_api_key} DD_SITE="datadoghq.eu" bash -c "$(curl -L https://s3.amazonaws.com/dd-agent/scripts/install_script_agent7.sh)"

# This only needs to be run the first time to initialize the volume
# sudo mkfs.ext4 -q -F ${device_name}
sudo mkdir -p /var/lib/clickhouse
Expand Down
3 changes: 0 additions & 3 deletions tf/modules/clickhouse/variables.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
variable "datadog_api_key" {
sensitive = true
}
variable "aws_access_key_id" {
sensitive = true
}
Expand Down

0 comments on commit 758001d

Please sign in to comment.