diff --git a/aws/pinpoint_to_sqs_sms_callbacks/dashboards.tf b/aws/pinpoint_to_sqs_sms_callbacks/dashboards.tf index 8fdaa6f3f..e6d03b531 100644 --- a/aws/pinpoint_to_sqs_sms_callbacks/dashboards.tf +++ b/aws/pinpoint_to_sqs_sms_callbacks/dashboards.tf @@ -70,7 +70,7 @@ resource "aws_cloudwatch_dashboard" "pinpoint" { "type": "metric", "properties": { "metrics": [ - [ "AWS/SQS", "ApproximateAgeOfOldestMessage", "QueueName", "eks-notification-canada-cadelivery-receipts" ] + [ "AWS/SQS", "ApproximateAgeOfOldestMessage", "QueueName", "${var.celery_queue_prefix}delivery-receipts" ] ], "view": "timeSeries", "stacked": false, @@ -104,7 +104,7 @@ resource "aws_cloudwatch_dashboard" "pinpoint" { "type": "metric", "properties": { "metrics": [ - [ "AWS/SQS", "ApproximateNumberOfMessagesVisible", "QueueName", "eks-notification-canada-cadelivery-receipts" ] + [ "AWS/SQS", "ApproximateNumberOfMessagesVisible", "QueueName", "${var.celery_queue_prefix}delivery-receipts" ] ], "view": "timeSeries", "stacked": false, @@ -334,12 +334,12 @@ resource "aws_cloudwatch_dashboard" "pinpoint" { "type": "metric", "properties": { "metrics": [ - [ "AWS/SQS", "ApproximateAgeOfOldestMessage", "QueueName", "eks-notification-canada-casend-sms-high", { "region": "${var.region}" } ] + [ "AWS/SQS", "ApproximateAgeOfOldestMessage", "QueueName", "${var.celery_queue_prefix}${var.sqs_send_sms_high_queue_name}", { "region": "${var.region}" } ] ], "view": "timeSeries", "stacked": false, "region": "${var.region}", - "title": "Approximate age of oldest message in send-sms-high", + "title": "Approximate age of oldest message in ${var.sqs_send_sms_high_queue_name}", "stat": "Average", "period": 60, "annotations": { @@ -373,12 +373,12 @@ resource "aws_cloudwatch_dashboard" "pinpoint" { "type": "metric", "properties": { "metrics": [ - [ "AWS/SQS", "ApproximateAgeOfOldestMessage", "QueueName", "eks-notification-canada-casend-sms-medium", { "region": "${var.region}" } ] + [ "AWS/SQS", "ApproximateAgeOfOldestMessage", "QueueName", "${var.celery_queue_prefix}${var.sqs_send_sms_medium_queue_name}", { "region": "${var.region}" } ] ], "view": "timeSeries", "stacked": false, "region": "${var.region}", - "title": "Approximate age of oldest message in send-sms-medium", + "title": "Approximate age of oldest message in ${var.sqs_send_sms_medium_queue_name}", "stat": "Average", "period": 60, "annotations": { @@ -407,12 +407,12 @@ resource "aws_cloudwatch_dashboard" "pinpoint" { "type": "metric", "properties": { "metrics": [ - [ "AWS/SQS", "ApproximateAgeOfOldestMessage", "QueueName", "eks-notification-canada-casend-sms-low", { "region": "${var.region}" } ] + [ "AWS/SQS", "ApproximateAgeOfOldestMessage", "QueueName", "${var.celery_queue_prefix}${var.sqs_send_sms_low_queue_name}", { "region": "${var.region}" } ] ], "view": "timeSeries", "stacked": false, "region": "${var.region}", - "title": "Approximate age of oldest message in send-sms-low", + "title": "Approximate age of oldest message in ${var.sqs_send_sms_low_queue_name}", "stat": "Average", "period": 60, "annotations": { @@ -451,14 +451,14 @@ resource "aws_cloudwatch_dashboard" "pinpoint" { "type": "metric", "properties": { "metrics": [ - [ "AWS/SQS", "ApproximateNumberOfMessagesVisible", "QueueName", "eks-notification-canada-casend-sms-high", { "region": "${var.region}" } ] + [ "AWS/SQS", "ApproximateNumberOfMessagesVisible", "QueueName", "${var.celery_queue_prefix}${var.sqs_send_sms_high_queue_name}", { "region": "${var.region}" } ] ], "view": "timeSeries", "stacked": false, "region": "${var.region}", "stat": "Average", "period": 60, - "title": "Number of messages visible in send-sms-high" + "title": "Number of messages visible in ${var.sqs_send_sms_high_queue_name}" } }, { @@ -469,14 +469,14 @@ resource "aws_cloudwatch_dashboard" "pinpoint" { "type": "metric", "properties": { "metrics": [ - [ "AWS/SQS", "ApproximateNumberOfMessagesVisible", "QueueName", "eks-notification-canada-casend-sms-low", { "region": "${var.region}" } ] + [ "AWS/SQS", "ApproximateNumberOfMessagesVisible", "QueueName", "${var.celery_queue_prefix}${var.sqs_send_sms_low_queue_name}", { "region": "${var.region}" } ] ], "view": "timeSeries", "stacked": false, "region": "${var.region}", "stat": "Average", "period": 60, - "title": "Number of messages visible in send-sms-low" + "title": "Number of messages visible in ${var.sqs_send_sms_low_queue_name}" } }, { @@ -487,14 +487,14 @@ resource "aws_cloudwatch_dashboard" "pinpoint" { "type": "metric", "properties": { "metrics": [ - [ "AWS/SQS", "ApproximateNumberOfMessagesVisible", "QueueName", "eks-notification-canada-casend-sms-medium", { "region": "${var.region}" } ] + [ "AWS/SQS", "ApproximateNumberOfMessagesVisible", "QueueName", "${var.celery_queue_prefix}${var.sqs_send_sms_medium_queue_name}", { "region": "${var.region}" } ] ], "view": "timeSeries", "stacked": false, "region": "${var.region}", "stat": "Average", "period": 60, - "title": "Number of messages visible in send-sms-medium" + "title": "Number of messages visible in ${var.sqs_send_sms_medium_queue_name}" } } ] @@ -502,3 +502,130 @@ resource "aws_cloudwatch_dashboard" "pinpoint" { EOF } +resource "aws_cloudwatch_dashboard" "sms-send-rate" { + count = var.cloudwatch_enabled ? 1 : 0 + dashboard_name = "Specialized-sms-send-rate" + dashboard_body = <