generated from NHSDigital/nhs-notify-repository-template
-
Notifications
You must be signed in to change notification settings - Fork 2
Feature/ccm 12860 #370
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.
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
Open
francisco-videira-nhs
wants to merge
10
commits into
main
Choose a base branch
from
feature/CCM-12860
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+747
−7
Open
Feature/ccm 12860 #370
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
f349462
Add alarms
francisco-videira-nhs bc7febe
Add alarms dir and fix anomaly metric
francisco-videira-nhs fb61f97
add alarms readme
francisco-videira-nhs f00f941
Merge remote-tracking branch 'origin/main' into feature/CCM-12860
francisco-videira-nhs e6cd9b5
fix return data
francisco-videira-nhs 7f45981
Fix some values and increase cert expiry from 14 to 30
francisco-videira-nhs 00a58df
Merge remote-tracking branch 'origin/main' into feature/CCM-12860
francisco-videira-nhs a5ffa22
Make sqs msg age alarms same period; some tf lint
francisco-videira-nhs c962260
Merge remote-tracking branch 'origin/main' into feature/CCM-12860
francisco-videira-nhs 9cae234
Fix expiry unit tests
francisco-videira-nhs File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| locals { | ||
| lambda_alarm_targets = { | ||
| authorizer_lambda = module.authorizer_lambda.function_name | ||
| get_letter = module.get_letter.function_name | ||
| get_letters = module.get_letters.function_name | ||
| get_letter_data = module.get_letter_data.function_name | ||
| get_status = module.get_status.function_name | ||
| patch_letter = module.patch_letter.function_name | ||
| post_letters = module.post_letters.function_name | ||
| post_mi = module.post_mi.function_name | ||
| upsert_letter = module.upsert_letter.function_name | ||
| letter_status_update = module.letter_status_update.function_name | ||
| letter_updates_transformer = module.letter_updates_transformer.function_name | ||
| mi_updates_transformer = module.mi_updates_transformer.function_name | ||
| } | ||
|
|
||
| sqs_queue_names = { | ||
| letter_updates = { | ||
| name = module.sqs_letter_updates.sqs_queue_name | ||
| age_period_seconds = 900 | ||
| } | ||
| letter_status_updates = { | ||
| name = module.letter_status_updates_queue.sqs_queue_name | ||
| age_period_seconds = 900 | ||
| } | ||
| } | ||
| } | ||
|
|
||
| module "lambda_alarms" { | ||
| for_each = local.lambda_alarm_targets | ||
| source = "../../modules/alarms/alarms-lambda" | ||
|
|
||
| alarm_prefix = local.csi | ||
| function_name = each.value | ||
| log_group_name = "/aws/lambda/${each.value}" | ||
| tags = local.default_tags | ||
| } | ||
|
|
||
| module "ddb_alarms_letters" { | ||
| source = "../../modules/alarms/alarms-ddb" | ||
| alarm_prefix = local.csi | ||
| table_name = aws_dynamodb_table.letters.name | ||
| tags = local.default_tags | ||
| } | ||
|
|
||
| module "ddb_alarms_mi" { | ||
| source = "../../modules/alarms/alarms-ddb" | ||
| alarm_prefix = local.csi | ||
| table_name = aws_dynamodb_table.mi.name | ||
| tags = local.default_tags | ||
| } | ||
|
|
||
| module "ddb_alarms_suppliers" { | ||
| source = "../../modules/alarms/alarms-ddb" | ||
| alarm_prefix = local.csi | ||
| table_name = aws_dynamodb_table.suppliers.name | ||
| tags = local.default_tags | ||
| } | ||
|
|
||
| module "sqs_alarms" { | ||
| for_each = local.sqs_queue_names | ||
| source = "../../modules/alarms/alarms-sqs" | ||
|
|
||
| alarm_prefix = local.csi | ||
| queue_name = each.value.name | ||
| dlq_queue_name = replace(each.value.name, "-queue", "-dlq") | ||
| age_period_seconds = each.value.age_period_seconds | ||
| tags = local.default_tags | ||
| } | ||
|
|
||
| module "apigw_alarms" { | ||
| source = "../../modules/alarms/alarms-apigw" | ||
| alarm_prefix = local.csi | ||
| api_name = aws_api_gateway_rest_api.main.name | ||
| stage_name = aws_api_gateway_stage.main.stage_name | ||
| tags = local.default_tags | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <!-- BEGIN_TF_DOCS --> | ||
| <!-- markdownlint-disable --> | ||
| <!-- vale off --> | ||
|
|
||
| ## Requirements | ||
|
|
||
| No requirements. | ||
| ## Inputs | ||
|
|
||
| No inputs. | ||
| ## Modules | ||
|
|
||
| No modules. | ||
| ## Outputs | ||
|
|
||
| No outputs. | ||
| <!-- vale on --> | ||
| <!-- markdownlint-enable --> | ||
| <!-- END_TF_DOCS --> |
34 changes: 34 additions & 0 deletions
34
infrastructure/terraform/modules/alarms/alarms-apigw/README.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| <!-- BEGIN_TF_DOCS --> | ||
| <!-- markdownlint-disable --> | ||
| <!-- vale off --> | ||
|
|
||
| ## Requirements | ||
|
|
||
| | Name | Version | | ||
| |------|---------| | ||
| | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 | | ||
| ## Inputs | ||
|
|
||
| | Name | Description | Type | Default | Required | | ||
| |------|-------------|------|---------|:--------:| | ||
| | <a name="input_alarm_prefix"></a> [alarm\_prefix](#input\_alarm\_prefix) | n/a | `string` | n/a | yes | | ||
| | <a name="input_api_name"></a> [api\_name](#input\_api\_name) | n/a | `string` | n/a | yes | | ||
| | <a name="input_error_5xx_evaluation_periods"></a> [error\_5xx\_evaluation\_periods](#input\_error\_5xx\_evaluation\_periods) | n/a | `number` | `1` | no | | ||
| | <a name="input_error_5xx_period_seconds"></a> [error\_5xx\_period\_seconds](#input\_error\_5xx\_period\_seconds) | n/a | `number` | `60` | no | | ||
| | <a name="input_error_5xx_threshold"></a> [error\_5xx\_threshold](#input\_error\_5xx\_threshold) | n/a | `number` | `0` | no | | ||
| | <a name="input_latency_anomaly_sensitivity"></a> [latency\_anomaly\_sensitivity](#input\_latency\_anomaly\_sensitivity) | n/a | `number` | `2` | no | | ||
| | <a name="input_latency_datapoints_to_alarm"></a> [latency\_datapoints\_to\_alarm](#input\_latency\_datapoints\_to\_alarm) | n/a | `number` | `3` | no | | ||
| | <a name="input_latency_evaluation_periods"></a> [latency\_evaluation\_periods](#input\_latency\_evaluation\_periods) | n/a | `number` | `5` | no | | ||
| | <a name="input_latency_period_seconds"></a> [latency\_period\_seconds](#input\_latency\_period\_seconds) | n/a | `number` | `60` | no | | ||
| | <a name="input_latency_threshold_ms"></a> [latency\_threshold\_ms](#input\_latency\_threshold\_ms) | n/a | `number` | `29000` | no | | ||
| | <a name="input_stage_name"></a> [stage\_name](#input\_stage\_name) | n/a | `string` | n/a | yes | | ||
| | <a name="input_tags"></a> [tags](#input\_tags) | n/a | `map(string)` | `{}` | no | | ||
| ## Modules | ||
|
|
||
| No modules. | ||
| ## Outputs | ||
|
|
||
| No outputs. | ||
| <!-- vale on --> | ||
| <!-- markdownlint-enable --> | ||
| <!-- END_TF_DOCS --> |
87 changes: 87 additions & 0 deletions
87
infrastructure/terraform/modules/alarms/alarms-apigw/main.tf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| locals { | ||
| api_dimensions = { | ||
| ApiName = var.api_name | ||
| Stage = var.stage_name | ||
| } | ||
| } | ||
|
|
||
| resource "aws_cloudwatch_metric_alarm" "five_xx" { | ||
| alarm_name = "${var.alarm_prefix}-apigw-5xx" | ||
| alarm_description = "RELIABILITY: API Gateway 5xx responses" | ||
|
|
||
| namespace = "AWS/ApiGateway" | ||
| metric_name = "5XXError" | ||
| statistic = "Sum" | ||
| period = var.error_5xx_period_seconds | ||
|
|
||
| evaluation_periods = var.error_5xx_evaluation_periods | ||
| threshold = var.error_5xx_threshold | ||
| comparison_operator = "GreaterThanThreshold" | ||
| treat_missing_data = "notBreaching" | ||
|
|
||
| dimensions = local.api_dimensions | ||
|
|
||
| actions_enabled = false | ||
| alarm_actions = [] | ||
| ok_actions = [] | ||
| insufficient_data_actions = [] | ||
| tags = var.tags | ||
| } | ||
|
|
||
| resource "aws_cloudwatch_metric_alarm" "latency_threshold" { | ||
| alarm_name = "${var.alarm_prefix}-apigw-latency-threshold" | ||
| alarm_description = "RELIABILITY: API Gateway latency above threshold" | ||
|
|
||
| namespace = "AWS/ApiGateway" | ||
| metric_name = "Latency" | ||
| statistic = "Average" | ||
| period = var.latency_period_seconds | ||
|
|
||
| evaluation_periods = var.latency_evaluation_periods | ||
| threshold = var.latency_threshold_ms | ||
| comparison_operator = "GreaterThanThreshold" | ||
| treat_missing_data = "notBreaching" | ||
|
|
||
| dimensions = local.api_dimensions | ||
|
|
||
| actions_enabled = false | ||
| alarm_actions = [] | ||
| ok_actions = [] | ||
| insufficient_data_actions = [] | ||
| tags = var.tags | ||
| } | ||
|
|
||
| resource "aws_cloudwatch_metric_alarm" "latency_anomaly" { | ||
| alarm_name = "${var.alarm_prefix}-apigw-latency-anomaly" | ||
| alarm_description = "RELIABILITY: API Gateway latency anomaly" | ||
| comparison_operator = "GreaterThanUpperThreshold" | ||
| evaluation_periods = var.latency_evaluation_periods | ||
| datapoints_to_alarm = var.latency_datapoints_to_alarm | ||
| threshold_metric_id = "ad1" | ||
| treat_missing_data = "notBreaching" | ||
|
|
||
| actions_enabled = false | ||
| alarm_actions = [] | ||
| ok_actions = [] | ||
| insufficient_data_actions = [] | ||
| tags = var.tags | ||
|
|
||
| metric_query { | ||
| id = "m1" | ||
| metric { | ||
| metric_name = "Latency" | ||
| namespace = "AWS/ApiGateway" | ||
| stat = "Average" | ||
| period = var.latency_period_seconds | ||
| dimensions = local.api_dimensions | ||
| } | ||
| return_data = true | ||
| } | ||
|
|
||
| metric_query { | ||
| id = "ad1" | ||
| expression = "ANOMALY_DETECTION_BAND(m1, ${var.latency_anomaly_sensitivity})" | ||
| label = "Latency (expected)" | ||
| return_data = true | ||
| } | ||
| } |
56 changes: 56 additions & 0 deletions
56
infrastructure/terraform/modules/alarms/alarms-apigw/variables.tf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| variable "alarm_prefix" { | ||
| type = string | ||
| } | ||
|
|
||
| variable "api_name" { | ||
| type = string | ||
| } | ||
|
|
||
| variable "stage_name" { | ||
| type = string | ||
| } | ||
|
|
||
| variable "tags" { | ||
| type = map(string) | ||
| default = {} | ||
| } | ||
|
|
||
| variable "error_5xx_threshold" { | ||
| type = number | ||
| default = 0 | ||
| } | ||
|
|
||
| variable "error_5xx_period_seconds" { | ||
| type = number | ||
| default = 60 | ||
| } | ||
|
|
||
| variable "error_5xx_evaluation_periods" { | ||
| type = number | ||
| default = 1 | ||
| } | ||
|
|
||
| variable "latency_threshold_ms" { | ||
| type = number | ||
| default = 29000 | ||
| } | ||
|
|
||
| variable "latency_period_seconds" { | ||
| type = number | ||
| default = 60 | ||
| } | ||
|
|
||
| variable "latency_evaluation_periods" { | ||
| type = number | ||
| default = 5 | ||
| } | ||
|
|
||
| variable "latency_datapoints_to_alarm" { | ||
| type = number | ||
| default = 3 | ||
| } | ||
|
|
||
| variable "latency_anomaly_sensitivity" { | ||
| type = number | ||
| default = 2 | ||
| } |
9 changes: 9 additions & 0 deletions
9
infrastructure/terraform/modules/alarms/alarms-apigw/versions.tf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
|
|
||
| terraform { | ||
| required_providers { | ||
| aws = { | ||
| source = "hashicorp/aws" | ||
| } | ||
| } | ||
| required_version = ">= 1.9.0" | ||
| } |
29 changes: 29 additions & 0 deletions
29
infrastructure/terraform/modules/alarms/alarms-ddb/README.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <!-- BEGIN_TF_DOCS --> | ||
| <!-- markdownlint-disable --> | ||
| <!-- vale off --> | ||
|
|
||
| ## Requirements | ||
|
|
||
| | Name | Version | | ||
| |------|---------| | ||
| | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 | | ||
| ## Inputs | ||
|
|
||
| | Name | Description | Type | Default | Required | | ||
| |------|-------------|------|---------|:--------:| | ||
| | <a name="input_alarm_prefix"></a> [alarm\_prefix](#input\_alarm\_prefix) | n/a | `string` | n/a | yes | | ||
| | <a name="input_evaluation_periods"></a> [evaluation\_periods](#input\_evaluation\_periods) | n/a | `number` | `1` | no | | ||
| | <a name="input_period_seconds"></a> [period\_seconds](#input\_period\_seconds) | n/a | `number` | `60` | no | | ||
| | <a name="input_read_throttle_threshold"></a> [read\_throttle\_threshold](#input\_read\_throttle\_threshold) | n/a | `number` | `0` | no | | ||
| | <a name="input_table_name"></a> [table\_name](#input\_table\_name) | n/a | `string` | n/a | yes | | ||
| | <a name="input_tags"></a> [tags](#input\_tags) | n/a | `map(string)` | `{}` | no | | ||
| | <a name="input_write_throttle_threshold"></a> [write\_throttle\_threshold](#input\_write\_throttle\_threshold) | n/a | `number` | `0` | no | | ||
| ## Modules | ||
|
|
||
| No modules. | ||
| ## Outputs | ||
|
|
||
| No outputs. | ||
| <!-- vale on --> | ||
| <!-- markdownlint-enable --> | ||
| <!-- END_TF_DOCS --> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can these be in their own files please, both module calls