Skip to content

Commit 8449879

Browse files
authored
Changes needed for new dogfood monitoring (#25147)
1 parent 91f4c64 commit 8449879

File tree

3 files changed

+102
-107
lines changed

3 files changed

+102
-107
lines changed

.github/workflows/dogfood-deploy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565

6666
- uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
6767
with:
68-
terraform_version: 1.6.3
68+
terraform_version: 1.10.2
6969
terraform_wrapper: false
7070
- name: Terraform Init
7171
id: init

infrastructure/dogfood/terraform/aws-tf-module/.terraform.lock.hcl

+94-101
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

infrastructure/dogfood/terraform/aws-tf-module/main.tf

+7-5
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,8 @@ module "osquery-carve" {
370370

371371
module "monitoring" {
372372
source = "github.com/fleetdm/fleet//terraform/addons/monitoring?ref=tf-mod-addon-monitoring-v1.5.0"
373-
customer_prefix = local.customer
373+
customer_prefix = local.customer
374+
fleet_ecs_service_name = module.main.byo-vpc.byo-db.byo-ecs.service.name
374375
albs = [
375376
{
376377
name = module.main.byo-vpc.byo-db.alb.lb_dns_name,
@@ -389,11 +390,11 @@ module "monitoring" {
389390
threshold = 0
390391
}
391392
}
392-
}
393+
}
393394
]
394395
sns_topic_arns_map = {
395-
alb_httpcode_5xx = [module.notify_slack.slack_topic_arn]
396-
cron_monitoring = [module.notify_slack.slack_topic_arn]
396+
alb_httpcode_5xx = [module.notify_slack.slack_topic_arn]
397+
cron_monitoring = [module.notify_slack.slack_topic_arn]
397398
cron_job_failure_monitoring = [module.notify_slack_p2.slack_topic_arn]
398399
}
399400
mysql_cluster_members = module.main.byo-vpc.rds.cluster_members
@@ -490,7 +491,8 @@ module "notify_slack_p2" {
490491
source = "terraform-aws-modules/notify-slack/aws"
491492
version = "5.5.0"
492493

493-
sns_topic_name = "fleet-dogfood-p2-alerts"
494+
lambda_function_name = "notify_slack_p2"
495+
sns_topic_name = "fleet-dogfood-p2-alerts"
494496

495497
slack_webhook_url = var.slack_p2_webhook
496498
slack_channel = "#help-p2"

0 commit comments

Comments
 (0)