Skip to content
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

Jump to bottom

Add remaining variables for RDS alarms and enable some by default #213

Merged
merged 4 commits into from
Jul 18, 2023
Merged

Add remaining variables for RDS alarms and enable some by default #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07580fb
Add alarm resources instead of utilizing module
dkatzz Jul 17, 2023
7429705
Update alarms.tf
dkatzz Jul 17, 2023
296cbca
Update variables.tf
dkatzz Jul 17, 2023
0dbb2d4
Updates from comments
dkatzz Jul 18, 2023
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
121 changes: 121 additions & 0 deletions cloud/aws/templates/aws_oidc/alarms.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
// CPU Utilization
resource "aws_cloudwatch_metric_alarm" "cpu_utilization_too_high" {
count = var.rds_create_high_cpu_alarm ? 1 : 0
alarm_name = "rds-${data.aws_db_instance.civiform.id}-highCPUUtilization"
comparison_operator = "GreaterThanThreshold"
evaluation_periods = var.rds_alarm_evaluation_period
metric_name = "CPUUtilization"
namespace = "AWS/RDS"
period = var.rds_alarm_statistic_period
statistic = "Average"
threshold = var.rds_max_cpu_utilization_threshold
alarm_description = "Average database CPU utilization is too high."

dimensions = {
DBInstanceIdentifier = data.aws_db_instance.civiform.id
}
}

resource "aws_cloudwatch_metric_alarm" "cpu_credit_balance_too_low" {
count = var.rds_create_low_cpu_credit_alarm ? length(regexall("(t2|t3|t4)", var.postgres_instance_class)) > 0 ? 1 : 0 : 0
alarm_name = "rds-${data.aws_db_instance.civiform.id}-lowCPUCreditBalance"
comparison_operator = "LessThanThreshold"
evaluation_periods = var.rds_alarm_evaluation_period
metric_name = "CPUCreditBalance"
namespace = "AWS/RDS"
period = var.rds_alarm_statistic_period
statistic = "Average"
threshold = var.rds_low_cpu_credit_balance_threshold
alarm_description = "Average database CPU credit balance is too low, a negative performance impact is imminent. When this alarm triggers, the database [instance class](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.DBInstanceClass.html) should be increased."

dimensions = {
DBInstanceIdentifier = data.aws_db_instance.civiform.id
}
}

// Disk Utilization
resource "aws_cloudwatch_metric_alarm" "disk_queue_depth_too_high" {
count = var.rds_create_high_queue_depth_alarm ? 1 : 0
alarm_name = "rds-${data.aws_db_instance.civiform.id}-highDiskQueueDepth"
comparison_operator = "GreaterThanThreshold"
evaluation_periods = var.rds_alarm_evaluation_period
metric_name = "DiskQueueDepth"
namespace = "AWS/RDS"
period = var.rds_alarm_statistic_period
statistic = "Average"
threshold = var.rds_disk_queue_depth_high_threshold
alarm_description = "Average database disk queue depth is too high, performance may be negatively impacted."

dimensions = {
DBInstanceIdentifier = data.aws_db_instance.civiform.id
}
}

resource "aws_cloudwatch_metric_alarm" "disk_free_storage_space_too_low" {
count = var.rds_create_low_disk_space_alarm ? 1 : 0
alarm_name = "rds-${data.aws_db_instance.civiform.id}-lowFreeStorageSpace"
comparison_operator = "LessThanThreshold"
evaluation_periods = var.rds_alarm_evaluation_period
metric_name = "FreeStorageSpace"
namespace = "AWS/RDS"
period = var.rds_alarm_statistic_period
statistic = "Average"
threshold = var.rds_disk_free_storage_low_threshold
alarm_description = "Average database free storage space is too low and may fill up soon."

dimensions = {
DBInstanceIdentifier = data.aws_db_instance.civiform.id
}
}

resource "aws_cloudwatch_metric_alarm" "disk_burst_balance_too_low" {
count = var.rds_create_low_disk_burst_alarm ? 1 : 0
alarm_name = "rds-${data.aws_db_instance.civiform.id}-lowEBSBurstBalance"
comparison_operator = "LessThanThreshold"
evaluation_periods = var.rds_alarm_evaluation_period
metric_name = "BurstBalance"
namespace = "AWS/RDS"
period = var.rds_alarm_statistic_period
statistic = "Average"
threshold = var.rds_disk_burst_balance_low_threshold
alarm_description = "Average database storage burst balance is too low, a negative performance impact is imminent."

dimensions = {
DBInstanceIdentifier = data.aws_db_instance.civiform.id
}
}

// Memory Utilization
resource "aws_cloudwatch_metric_alarm" "memory_freeable_too_low" {
count = var.rds_create_low_memory_alarm ? 1 : 0
alarm_name = "rds-${data.aws_db_instance.civiform.id}-lowFreeableMemory"
comparison_operator = "LessThanThreshold"
evaluation_periods = var.rds_alarm_evaluation_period
metric_name = "FreeableMemory"
namespace = "AWS/RDS"
period = var.rds_alarm_statistic_period
statistic = "Average"
threshold = var.rds_low_memory_threshold
alarm_description = "Average database freeable memory is too low, performance may be negatively impacted."

dimensions = {
DBInstanceIdentifier = data.aws_db_instance.civiform.id
}
}

resource "aws_cloudwatch_metric_alarm" "memory_swap_usage_too_high" {
count = var.rds_create_swap_alarm ? 1 : 0
alarm_name = "rds-${data.aws_db_instance.civiform.id}-highSwapUsage"
comparison_operator = "GreaterThanThreshold"
evaluation_periods = var.rds_alarm_evaluation_period
metric_name = "SwapUsage"
namespace = "AWS/RDS"
period = var.rds_alarm_statistic_period
statistic = "Average"
threshold = var.rds_high_swap_usage_threshold
alarm_description = "Average database swap usage is too high, performance may be negatively impacted."

dimensions = {
DBInstanceIdentifier = data.aws_db_instance.civiform.id
}
}
25 changes: 0 additions & 25 deletions cloud/aws/templates/aws_oidc/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,31 +63,6 @@ data "aws_db_instance" "civiform" {
]
}

module "aws-rds-alarms" {
source = "lorenzoaiello/rds-alarms/aws"
version = "2.2.0"
db_instance_id = data.aws_db_instance.civiform.id
db_instance_class = var.postgres_instance_class
evaluation_period = var.rds_alarm_evaluation_period
statistic_period = var.rds_alarm_statistic_period
create_high_cpu_alarm = var.rds_create_high_cpu_alarm
cpu_utilization_too_high_threshold = var.rds_max_cpu_utilization_threshold
create_high_queue_depth_alarm = var.rds_create_high_queue_depth_alarm
disk_queue_depth_too_high_threshold = var.rds_disk_queue_depth_high_threshold
create_low_disk_space_alarm = var.rds_create_low_disk_space_alarm
disk_free_storage_space_too_low_threshold = var.rds_disk_free_storage_low_threshold
create_low_memory_alarm = var.rds_create_low_memory_alarm
memory_freeable_too_low_threshold = var.rds_low_memory_threshold
create_low_cpu_credit_alarm = var.rds_create_low_cpu_credit_alarm
cpu_credit_balance_too_low_threshold = var.rds_low_cpu_credit_balance_threshold
create_low_disk_burst_alarm = var.rds_create_low_disk_burst_alarm
disk_burst_balance_too_low_threshold = var.rds_disk_burst_balance_low_threshold
create_swap_alarm = var.rds_create_swap_alarm
memory_swap_usage_too_high_threshold = var.rds_high_swap_usage_threshold
create_anomaly_alarm = var.rds_create_anomaly_alarm
maximum_used_transaction_ids_too_high_threshold = var.rds_max_used_transaction_ids_high_threshold
}

module "email_service" {
for_each = toset([
var.sender_email_address,
Expand Down
10 changes: 5 additions & 5 deletions cloud/aws/templates/aws_oidc/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ variable "rds_alarm_statistic_period" {
variable "rds_create_high_cpu_alarm" {
type = bool
description = "Whether or not to create a high CPU alarm for RDS."
default = false
default = true
}

variable "rds_max_cpu_utilization_threshold" {
Expand All @@ -163,7 +163,7 @@ variable "rds_max_cpu_utilization_threshold" {
variable "rds_create_high_queue_depth_alarm" {
type = bool
description = "Whether or not to create a high queue depth alarm for RDS."
default = false
default = true
}

variable "rds_disk_queue_depth_high_threshold" {
Expand All @@ -175,7 +175,7 @@ variable "rds_disk_queue_depth_high_threshold" {
variable "rds_create_low_disk_space_alarm" {
type = bool
description = "Whether or not to create a low disk space alarm for RDS."
default = false
default = true
}

variable "rds_disk_free_storage_low_threshold" {
Expand All @@ -187,7 +187,7 @@ variable "rds_disk_free_storage_low_threshold" {
variable "rds_create_low_memory_alarm" {
type = bool
description = "Whether or not to create a low memory free alarm for RDS."
default = false
default = true
}

variable "rds_low_memory_threshold" {
Expand All @@ -198,7 +198,7 @@ variable "rds_low_memory_threshold" {

variable "rds_create_low_cpu_credit_alarm" {
type = bool
description = "Whether or not to create a low CPU credit alarm for RDS."
description = "Whether or not to create a low CPU credit alarm for RDS. This alarm type only applies for T-type database instances."
default = false
}

Expand Down