Skip to content

Fix regional validation errors in London CloudWatch alarms #3910

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

Closed
davidgisbey wants to merge 1 commit into from
Closed

Fix regional validation errors in London CloudWatch alarms #3910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions terraform/deployments/chat/aws_chatbot.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,12 @@ resource "aws_chatbot_slack_channel_configuration" "chat" {
}

resource "aws_sns_topic" "chat_alerts_dublin" {
region = "eu-west-1"
name = "chat-alerts-${var.govuk_environment}-dublin"
display_name = "Chat Alerts (${var.govuk_environment} Dublin)"
}

resource "aws_sns_topic" "chat_alerts_london" {
region = "eu-west-2"
provider = aws.london
name = "chat-alerts-${var.govuk_environment}-london"
display_name = "Chat Alerts London (${var.govuk_environment} London)"
}
4 changes: 2 additions & 2 deletions terraform/deployments/chat/cloudwatch_alarms.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ resource "aws_cloudwatch_metric_alarm" "bedrock_token_threshold_100_percent_tita
}

resource "aws_cloudwatch_metric_alarm" "bedrock_token_threshold_50_percent_titan_embed_london" {
region = "eu-west-2"
provider = aws.london
alarm_name = "govuk-chat-${var.govuk_environment}-bedrock-token-threshold-50-titan-embed-london"
alarm_description = <<-EOF
WARNING - The current ${var.govuk_environment} Bedrock token usage > 50% for Titan Embed in eu-west-2 (Document indexing)
Expand Down Expand Up @@ -438,7 +438,7 @@ resource "aws_cloudwatch_metric_alarm" "bedrock_token_threshold_50_percent_titan
}

resource "aws_cloudwatch_metric_alarm" "bedrock_token_threshold_100_percent_titan_embed_london" {
region = "eu-west-2"
provider = aws.london
alarm_name = "govuk-chat-${var.govuk_environment}-bedrock-token-threshold-100-titan-embed-london"
alarm_description = <<-EOF
CRITICAL - The current ${var.govuk_environment} Bedrock token usage > 100% for Titan Embed in eu-west-2 (Document indexing)
Expand Down
16 changes: 16 additions & 0 deletions terraform/deployments/chat/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,22 @@ provider "aws" {
}
}

provider "aws" {
alias = "london"
region = "eu-west-2"
default_tags {
tags = {
product = "govuk"
system = "govuk-chat"
environment = var.govuk_environment
owner = "govuk-platform-engineering@digital.cabinet-office.gov.uk"
repository = "govuk-infrastructure"
terraform-deployment = basename(abspath(path.root))
Service = "govuk-chat"
}
}
}

provider "aws" {
alias = "global"
region = "us-east-1"
Expand Down
Loading