Add 'performance_insights_retention_period' (#20)

* Add performance insights retention period * chore: update changelog and hooks
umotif-public · Jan 10, 2024 · 4f4efac · 4f4efac
1 parent b66a14f
commit 4f4efac
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 12 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -18,7 +18,7 @@ repos:
     args: ['--allow-missing-credentials']
   - id: trailing-whitespace
 - repo: https://github.com/antonbabenko/pre-commit-terraform
-  rev: v1.85.0
+  rev: v1.86.0
   hooks:
   - id: terraform_fmt
   - id: terraform_docs

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,10 +5,13 @@ All notable changes to this project will be documented in this file.
 <a name="unreleased"></a>
 ## [Unreleased]
 
-- Increase minimum provider version
-- Multiple changes - rds cluster role association, cert, adding serverlessv2 scaling, secrets manager management
-- chore: update hook
-- Adapt examples to use serverless v2
+- Add performance insights retention period
+
+
+<a name="3.4.0"></a>
+## [3.4.0] - 2023-12-18
+
+- Adding Serverless v2 functionality ([#19](https://github.com/umotif-public/terraform-aws-rds-aurora/issues/19))
 
 
 <a name="3.3.1"></a>
@@ -124,7 +127,8 @@ All notable changes to this project will be documented in this file.
 - Initial commit
 
 
-[Unreleased]: https://github.com/umotif-public/terraform-aws-rds-aurora/compare/3.3.1...HEAD
+[Unreleased]: https://github.com/umotif-public/terraform-aws-rds-aurora/compare/3.4.0...HEAD
+[3.4.0]: https://github.com/umotif-public/terraform-aws-rds-aurora/compare/3.3.1...3.4.0
 [3.3.1]: https://github.com/umotif-public/terraform-aws-rds-aurora/compare/3.3.0...3.3.1
 [3.3.0]: https://github.com/umotif-public/terraform-aws-rds-aurora/compare/3.2.1...3.3.0
 [3.2.1]: https://github.com/umotif-public/terraform-aws-rds-aurora/compare/3.2.0...3.2.1

diff --git a/README.md b/README.md
@@ -179,6 +179,7 @@ No modules.
 | <a name="input_parameters"></a> [parameters](#input\_parameters) | A list of parameter objects | <pre>list(object({<br>    name  = string<br>    value = string<br>  }))</pre> | `[]` | no |
 | <a name="input_performance_insights_enabled"></a> [performance\_insights\_enabled](#input\_performance\_insights\_enabled) | Specifies whether Performance Insights is enabled or not. | `bool` | `false` | no |
 | <a name="input_performance_insights_kms_key_id"></a> [performance\_insights\_kms\_key\_id](#input\_performance\_insights\_kms\_key\_id) | The ARN for the KMS key to encrypt Performance Insights data. | `string` | `null` | no |
+| <a name="input_performance_insights_retention_period"></a> [performance\_insights\_retention\_period](#input\_performance\_insights\_retention\_period) | Amount of time in days to retain Performance Insights data. Valid values are 7, 731 (2 years) or a multiple of 31. When specifying performance\_insights\_retention\_period, performance\_insights\_enabled needs to be set to true. | `number` | `7` | no |
 | <a name="input_permissions_boundary"></a> [permissions\_boundary](#input\_permissions\_boundary) | The ARN of the policy that is used to set the permissions boundary for the role. | `string` | `null` | no |
 | <a name="input_port"></a> [port](#input\_port) | The port on which to accept connections | `string` | `""` | no |
 | <a name="input_predefined_metric_type"></a> [predefined\_metric\_type](#input\_predefined\_metric\_type) | The metric type to scale on. Valid values are RDSReaderAverageCPUUtilization and RDSReaderAverageDatabaseConnections. | `string` | `"RDSReaderAverageCPUUtilization"` | no |

diff --git a/main.tf b/main.tf
@@ -325,12 +325,13 @@ resource "aws_rds_cluster_instance" "main" {
   preferred_maintenance_window = var.preferred_instance_maintenance_window
   apply_immediately            = var.apply_immediately
 
-  monitoring_role_arn             = var.create_monitoring_role && var.monitoring_interval > 0 ? aws_iam_role.rds_enhanced_monitoring[0].arn : var.monitoring_role_arn
-  monitoring_interval             = var.monitoring_interval
-  auto_minor_version_upgrade      = var.auto_minor_version_upgrade
-  performance_insights_enabled    = var.performance_insights_enabled
-  performance_insights_kms_key_id = var.performance_insights_kms_key_id
-  ca_cert_identifier              = var.ca_cert_identifier
+  monitoring_role_arn                   = var.create_monitoring_role && var.monitoring_interval > 0 ? aws_iam_role.rds_enhanced_monitoring[0].arn : var.monitoring_role_arn
+  monitoring_interval                   = var.monitoring_interval
+  auto_minor_version_upgrade            = var.auto_minor_version_upgrade
+  performance_insights_enabled          = var.performance_insights_enabled
+  performance_insights_kms_key_id       = var.performance_insights_kms_key_id
+  performance_insights_retention_period = try(var.performance_insights_retention_period, 7)
+  ca_cert_identifier                    = var.ca_cert_identifier
 
   tags = merge(
     var.tags,

diff --git a/variables.tf b/variables.tf
@@ -253,6 +253,12 @@ variable "performance_insights_kms_key_id" {
   default     = null
 }
 
+variable "performance_insights_retention_period" {
+  description = "Amount of time in days to retain Performance Insights data. Valid values are 7, 731 (2 years) or a multiple of 31. When specifying performance_insights_retention_period, performance_insights_enabled needs to be set to true."
+  type        = number
+  default     = 7
+}
+
 variable "iam_database_authentication_enabled" {
   description = "Specifies whether IAM Database authentication should be enabled or not. Not all versions and instances are supported. Refer to the AWS documentation to see which versions are supported."
   type        = bool