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

Fix for issue when MonitoringRoleARN is required #143

Merged
merged 11 commits into from
Jan 7, 2020
Merged

Fix for issue when MonitoringRoleARN is required #143

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
25678e6
Fix issue invalidParCombi between mon_role_arn and mon_interval
flmmartins Jul 3, 2019
1670537
Support for max_allocated_storage (#146)
schulh Jul 17, 2019
9a2bda5
Update documentation a bit after merge
antonbabenko Jul 17, 2019
99a7284
Updated CHANGELOG
antonbabenko Jul 17, 2019
df8306f
Add support for performance insights retention period (#147)
Jul 17, 2019
0e8c939
Update documentation a bit after merge
antonbabenko Jul 17, 2019
a98b79b
Updated CHANGELOG
antonbabenko Jul 17, 2019
386c12a
Disable perf insights ret period when disabled (#153)
Jul 21, 2019
af228ba
Updated CHANGELOG
antonbabenko Jul 21, 2019
bd95144
Fix monitoring_arn using join as review
flmmartins Dec 19, 2019
aa16096
Merge remote-tracking branch 'upstream/master'
flmmartins Dec 19, 2019
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
4 changes: 2 additions & 2 deletions modules/db_instance/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ resource "aws_db_instance" "this" {
iops = var.iops
publicly_accessible = var.publicly_accessible
monitoring_interval = var.monitoring_interval
monitoring_role_arn = coalesce(var.monitoring_role_arn, aws_iam_role.enhanced_monitoring.*.arn, null)
monitoring_role_arn = var.monitoring_interval > 0 ? coalesce(var.monitoring_role_arn, join(", ", aws_iam_role.enhanced_monitoring.*.arn), null) : null

allow_major_version_upgrade = var.allow_major_version_upgrade
auto_minor_version_upgrade = var.auto_minor_version_upgrade
Expand Down Expand Up @@ -141,7 +141,7 @@ resource "aws_db_instance" "this_mssql" {
iops = var.iops
publicly_accessible = var.publicly_accessible
monitoring_interval = var.monitoring_interval
monitoring_role_arn = coalesce(var.monitoring_role_arn, aws_iam_role.enhanced_monitoring.*.arn, null)
monitoring_role_arn = var.monitoring_interval > 0 ? coalesce(var.monitoring_role_arn, aws_iam_role.enhanced_monitoring.*.arn, null) : null

allow_major_version_upgrade = var.allow_major_version_upgrade
auto_minor_version_upgrade = var.auto_minor_version_upgrade
Expand Down