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

Switch to structured firewall logs #3816

Merged
merged 4 commits into from
Dec 22, 2023
Merged

Switch to structured firewall logs #3816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c94824e
Switch to structured firewall logs
dusan-ilic-mhra Dec 21, 2023
81dcaba
removed notebooks.tf
dusan-ilic-mhra Dec 22, 2023
abc4adf
Updated CHANGELOG.md
dusan-ilic-mhra Dec 22, 2023
360ee61
updated version.txt
dusan-ilic-mhra Dec 22, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ FEATURES:

ENHANCEMENTS:
* Switch from OpenCensus to OpenTelemetry for logging ([#3762](https://github.com/microsoft/AzureTRE/pull/3762))
* Switch to Structured Firewall Logs ([#3816](https://github.com/microsoft/AzureTRE/pull/3816))

BUG FIXES:

Expand Down
17 changes: 0 additions & 17 deletions core/terraform/notebooks.tf
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion core/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.9.1"
__version__ = "0.9.2"
2 changes: 1 addition & 1 deletion templates/shared_services/firewall/porter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
schemaVersion: 1.0.0
name: tre-shared-service-firewall
version: 1.1.5
version: 1.1.6
description: "An Azure TRE Firewall shared service"
dockerfile: Dockerfile.tmpl
registry: azuretre
Expand Down
2 changes: 1 addition & 1 deletion templates/shared_services/firewall/terraform/firewall.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ resource "azurerm_monitor_diagnostic_setting" "firewall" {
name = "diagnostics-fw-${var.tre_id}"
target_resource_id = azurerm_firewall.fw.id
log_analytics_workspace_id = data.azurerm_log_analytics_workspace.tre.id
log_analytics_destination_type = "AzureDiagnostics"
log_analytics_destination_type = "Dedicated"

dynamic "enabled_log" {
for_each = setintersection(data.azurerm_monitor_diagnostic_categories.firewall.log_category_types, local.firewall_diagnostic_categories_enabled)
Expand Down
10 changes: 3 additions & 7 deletions templates/shared_services/firewall/terraform/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@ locals {
core_resource_group_name = "rg-${var.tre_id}"
firewall_name = "fw-${var.tre_id}"
firewall_diagnostic_categories_enabled = [
"AzureFirewallApplicationRule",
"AzureFirewallNetworkRule",
"AzureFirewallDnsProxy",
# These are for resource specific table settings that are still in preview
# "AZFWApplicationRule",
# "AZFWNetworkRule",
# "AZFWDnsProxy",
"AZFWApplicationRule",
"AZFWNetworkRule",
"AZFWDnsProxy",
]
tre_shared_service_tags = {
tre_id = var.tre_id
Expand Down
Loading