@@ -44,7 +44,7 @@ resource "random_string" "str" {
44
44
}
45
45
46
46
resource "azurerm_storage_account" "storeacc" {
47
- count = var. enable_sql_server_extended_auditing_policy || var. enable_database_extended_auditing_policy || var. enable_vulnerability_assessment || var. enable_audit_log_monitoring == true ? 1 : 0
47
+ count = var. enable_sql_server_extended_auditing_policy || var. enable_database_extended_auditing_policy || var. enable_vulnerability_assessment || var. enable_log_monitoring == true ? 1 : 0
48
48
name = var. storage_account_name == null ? " stsqlauditlogs${ element (concat (random_string. str . * . result , [" " ]), 0 )} " : substr (var. storage_account_name , 0 , 24 )
49
49
resource_group_name = local. resource_group_name
50
50
location = local. location
@@ -103,7 +103,7 @@ resource "azurerm_mssql_server_extended_auditing_policy" "primary" {
103
103
storage_account_access_key = azurerm_storage_account. storeacc . 0 . primary_access_key
104
104
storage_account_access_key_is_secondary = false
105
105
retention_in_days = var. log_retention_days
106
- log_monitoring_enabled = var. enable_audit_log_monitoring == true && var. log_analytics_workspace_name != null ? true : false
106
+ log_monitoring_enabled = var. enable_log_monitoring == true && var. log_analytics_workspace_name != null ? true : false
107
107
}
108
108
109
109
resource "azurerm_sql_server" "secondary" {
@@ -131,7 +131,7 @@ resource "azurerm_mssql_server_extended_auditing_policy" "secondary" {
131
131
storage_account_access_key = azurerm_storage_account. storeacc . 0 . primary_access_key
132
132
storage_account_access_key_is_secondary = false
133
133
retention_in_days = var. log_retention_days
134
- log_monitoring_enabled = var. enable_audit_log_monitoring == true && var. log_analytics_workspace_name != null ? true : null
134
+ log_monitoring_enabled = var. enable_log_monitoring == true && var. log_analytics_workspace_name != null ? true : null
135
135
}
136
136
137
137
@@ -167,7 +167,7 @@ resource "azurerm_mssql_database_extended_auditing_policy" "primary" {
167
167
storage_account_access_key = azurerm_storage_account. storeacc . 0 . primary_access_key
168
168
storage_account_access_key_is_secondary = false
169
169
retention_in_days = var. log_retention_days
170
- log_monitoring_enabled = var. enable_audit_log_monitoring == true && var. log_analytics_workspace_name != null ? true : null
170
+ log_monitoring_enabled = var. enable_log_monitoring == true && var. log_analytics_workspace_name != null ? true : null
171
171
}
172
172
173
173
# -----------------------------------------------------------------------------------------------
@@ -414,18 +414,20 @@ resource "azurerm_private_dns_a_record" "arecord2" {
414
414
# azurerm monitoring diagnostics - Default is "false"
415
415
# ------------------------------------------------------------------
416
416
resource "azurerm_monitor_diagnostic_setting" "extaudit" {
417
- count = var. enable_audit_log_monitoring == true && var. log_analytics_workspace_name != null ? 1 : 0
417
+ count = var. enable_log_monitoring == true && var. log_analytics_workspace_name != null ? 1 : 0
418
418
name = lower (" extaudit-${ var . database_name } -diag" )
419
419
target_resource_id = azurerm_sql_database. db . id
420
420
log_analytics_workspace_id = data. azurerm_log_analytics_workspace . logws . 0 . id
421
421
storage_account_id = azurerm_storage_account. storeacc . 0 . id
422
422
423
- log {
424
- category = " SQLSecurityAuditEvents"
425
- enabled = true
426
-
427
- retention_policy {
428
- enabled = false
423
+ dynamic "log" {
424
+ for_each = var. extaudit_diag_logs
425
+ content {
426
+ category = log. value
427
+ enabled = true
428
+ retention_policy {
429
+ enabled = false
430
+ }
429
431
}
430
432
}
431
433
@@ -440,4 +442,4 @@ resource "azurerm_monitor_diagnostic_setting" "extaudit" {
440
442
lifecycle {
441
443
ignore_changes = [log , metric ]
442
444
}
443
- }
445
+ }
0 commit comments