Page MenuHomePhabricator
Files F2842547

D13471.id44607.diff
No OneTemporary
Actions

D13471.id44607.diff
View Options

diff --git a/services/terraform/remote/aws_cloudwatch_alarms.tf b/services/terraform/remote/aws_cloudwatch_alarms.tf
--- a/services/terraform/remote/aws_cloudwatch_alarms.tf
+++ b/services/terraform/remote/aws_cloudwatch_alarms.tf
@@ -21,6 +21,18 @@
Other = { name = "Other", pattern = "Other Error" },
}
+ tunnelbroker_error_patterns = {
+ AMQP = { name = "AMQP", pattern = "AMQP Error" },
+ DDB = { name = "DDB", pattern = "DDB Error" },
+ FCM = { name = "FCM", pattern = "FCM Error" },
+ APNs = { name = "APNs", pattern = "APNs Error" },
+ WebPush = { name = "WebPush", pattern = "Web Push Error" },
+ WNS = { name = "WNS", pattern = "WNS Error" },
+ Identity = { name = "Identity", pattern = "Identity Error" },
+ Websocket = { name = "Websocket", pattern = "Websocket Error" },
+ Server = { name = "Server", pattern = "Server Error" },
+ }
+
service_log_groups = {
Backup = { name = "Backup", log_group_name = "/ecs/backup-service-task-def" },
Blob = { name = "Blob", log_group_name = "/ecs/blob-service-task-def" },
@@ -281,3 +293,43 @@
}
alarm_actions = [aws_sns_topic.blob_error_topic.arn]
}
+
+resource "aws_sns_topic" "tunnelbroker_error_topic" {
+ name = "tunnelbroker-error-topic"
+}
+
+resource "aws_sns_topic_subscription" "tunnelbroker_email_subscription" {
+ topic_arn = aws_sns_topic.tunnelbroker_error_topic.arn
+ protocol = "email"
+ endpoint = local.error_reports_subscribed_email
+}
+
+resource "aws_cloudwatch_log_metric_filter" "tunnelbroker_error_filters" {
+ for_each = local.tunnelbroker_error_patterns
+
+ name = "Tunnelbroker${each.value.name}ErrorCount"
+ pattern = "{ $.level = \"ERROR\" && $.fields.errorType = \"${each.value.pattern}\" }"
+ log_group_name = "/ecs/tunnelbroker-task-def"
+
+ metric_transformation {
+ name = "Tunnelbroker${each.value.name}ErrorCount"
+ namespace = "TunnelbrokerServiceMetricFilters"
+ value = "1"
+ }
+}
+
+resource "aws_cloudwatch_metric_alarm" "tunnelbroker_error_alarms" {
+ for_each = local.tunnelbroker_error_patterns
+
+ alarm_name = "Tunnelbroker${local.is_staging ? "Staging" : "Production"}${each.value.name}ErrorAlarm"
+ comparison_operator = "GreaterThanOrEqualToThreshold"
+ evaluation_periods = "1"
+ metric_name = "Tunnelbroker${each.value.name}ErrorCount"
+ namespace = "TunnelbrokerServiceMetricFilters"
+ period = "300"
+ statistic = "Sum"
+ threshold = 1
+ alarm_description = "Alarm when Tunnelbroker ${each.value.name} errors exceed threshold"
+ actions_enabled = true
+ alarm_actions = [aws_sns_topic.tunnelbroker_error_topic.arn]
+}

File Metadata

Mime Type
text/plain
Expires
Mon, Sep 30, 2:36 PM (22 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2205205
Default Alt Text
D13471.id44607.diff (2 KB)

Event Timeline