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.

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

ignore_chnages for log_analytics_destination_type #3217

Merged
merged 2 commits into from
Feb 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ BUG FIXES:
* Skip Certs shared service E2E on Friday & Saturday due to LetsEncrypt limits [#3203](https://github.com/microsoft/AzureTRE/pull/3203)
* Create Workspace AppInsights via AzAPI provider due to an issue with AzureRM [#3207](https://github.com/microsoft/AzureTRE/pull/3207)
* 'Workspace Owner' is now able to access Airlock request's SAS URL even if the request is not in review [#3208](https://github.com/microsoft/AzureTRE/pull/3208)
* Ignore changes in log_analytics_destination_type to prevent redundant updates [#3217](https://github.com/microsoft/AzureTRE/pull/3217)
COMPONENTS:
Expand Down
2 changes: 2 additions & 0 deletions core/terraform/airlock/airlock_processor.tf
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ resource "azurerm_monitor_diagnostic_setting" "airlock_function_app" {
days = 365
}
}

lifecycle { ignore_changes = [log_analytics_destination_type] }
}

resource "azurerm_private_endpoint" "function_storage" {
Expand Down
2 changes: 2 additions & 0 deletions core/terraform/api-webapp.tf
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,6 @@ resource "azurerm_monitor_diagnostic_setting" "webapp_api" {
days = 365
}
}

lifecycle { ignore_changes = [log_analytics_destination_type] }
}
3 changes: 2 additions & 1 deletion core/terraform/appgateway/appgateway.tf
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ resource "azurerm_monitor_diagnostic_setting" "agw" {
name = "diagnostics-agw-${var.tre_id}"
target_resource_id = azurerm_application_gateway.agw.id
log_analytics_workspace_id = var.log_analytics_workspace_id
# log_analytics_destination_type = "Dedicated"

dynamic "enabled_log" {
for_each = ["ApplicationGatewayAccessLog", "ApplicationGatewayPerformanceLog", "ApplicationGatewayFirewallLog"]
Expand All @@ -221,6 +220,8 @@ resource "azurerm_monitor_diagnostic_setting" "agw" {
days = 365
}
}

lifecycle { ignore_changes = [log_analytics_destination_type] }
}


9 changes: 5 additions & 4 deletions core/terraform/keyvault.tf
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,9 @@ resource "azurerm_key_vault_secret" "application_admin_client_secret" {
}

resource "azurerm_monitor_diagnostic_setting" "kv" {
name = "diagnostics-kv-${var.tre_id}"
target_resource_id = azurerm_key_vault.kv.id
log_analytics_workspace_id = module.azure_monitor.log_analytics_workspace_id
log_analytics_destination_type = "AzureDiagnostics"
name = "diagnostics-kv-${var.tre_id}"
target_resource_id = azurerm_key_vault.kv.id
log_analytics_workspace_id = module.azure_monitor.log_analytics_workspace_id

dynamic "enabled_log" {
for_each = ["AuditEvent", "AzurePolicyEvaluationDetails"]
Expand All @@ -139,4 +138,6 @@ resource "azurerm_monitor_diagnostic_setting" "kv" {
days = 365
}
}

lifecycle { ignore_changes = [log_analytics_destination_type] }
}
3 changes: 2 additions & 1 deletion core/terraform/servicebus.tf
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ resource "azurerm_monitor_diagnostic_setting" "sb" {
name = "diagnostics-sb-${var.tre_id}"
target_resource_id = azurerm_servicebus_namespace.sb.id
log_analytics_workspace_id = module.azure_monitor.log_analytics_workspace_id
# log_analytics_destination_type = "Dedicated"

dynamic "enabled_log" {
for_each = ["OperationalLogs", "VNetAndIPFilteringLogs", "RuntimeAuditLogs", "ApplicationMetricsLogs"]
Expand All @@ -119,4 +118,6 @@ resource "azurerm_monitor_diagnostic_setting" "sb" {
days = 365
}
}

lifecycle { ignore_changes = [log_analytics_destination_type] }
}
2 changes: 1 addition & 1 deletion core/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.7.4"
__version__ = "0.7.5"