Merge branch 'main' of github.com:briancaffey/terraform-aws-django

briancaffey · Apr 22, 2024 · b73dea4 · b73dea4
2 parents bf6fc51 + 9d17e91
commit b73dea4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 
 
+## [0.23.2](https://github.com/briancaffey/terraform-aws-django/compare/v0.23.1...v0.23.2) (2023-01-24)
+
+
+### Bug Fixes
+
+* Give unique alarm_name to avoid collision when default and gunicorn both create the same alarm name. ([#61](https://github.com/briancaffey/terraform-aws-django/issues/61)) ([3a61b6a](https://github.com/briancaffey/terraform-aws-django/commit/3a61b6aa1a2e923d31550dd55c088e851e06b897))
+
 ## [0.23.1](https://github.com/briancaffey/terraform-aws-django/compare/v0.23.0...v0.23.1) (2023-01-24)
 
 

diff --git a/modules/internal/autoscaling/main.tf b/modules/internal/autoscaling/main.tf
@@ -50,7 +50,7 @@ resource "aws_appautoscaling_policy" "down" {
 
 # CloudWatch alarm that triggers the autoscaling up policy
 resource "aws_cloudwatch_metric_alarm" "service_cpu_high" {
-  alarm_name          = "${terraform.workspace}_cpu_utilization_high"
+  alarm_name          = "${var.service_name}_cpu_utilization_high"
   comparison_operator = "GreaterThanOrEqualToThreshold"
   evaluation_periods  = "2"
   metric_name         = "CPUUtilization"
@@ -69,7 +69,7 @@ resource "aws_cloudwatch_metric_alarm" "service_cpu_high" {
 
 # CloudWatch alarm that triggers the autoscaling down policy
 resource "aws_cloudwatch_metric_alarm" "service_cpu_low" {
-  alarm_name          = "${terraform.workspace}_cpu_utilization_low"
+  alarm_name          = "${var.service_name}_cpu_utilization_low"
   comparison_operator = "LessThanOrEqualToThreshold"
   evaluation_periods  = "2"
   metric_name         = "CPUUtilization"