Skip to content
This repository was archived by the owner on Jul 26, 2024. It is now read-only.

Commit 3cdf551

Browse files
arnaudlharnaudlh
authored
Merge pull request #502 from Azure/AL-2309
September 2023 Updates
2 parents 56d6bad + 3d53e3a commit 3cdf551

File tree

15 files changed

+159
-161
lines changed

15 files changed

+159
-161
lines changed

‎.devcontainer/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
version: '3.7'
77
services:
88
rover:
9-
image: aztfmod/rover:1.5.4-2307.2804
9+
image: aztfmod/rover:1.5.6-2309.0507
1010
user: vscode
1111

1212
labels:

‎.github/workflows/landingzones-tf100.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
random_length: ['5']
4040

4141
container:
42-
image: aztfmod/rover:1.5.4-2307.2804
42+
image: aztfmod/rover:1.5.6-2309.0507
4343
options: --user 0
4444

4545
steps:
@@ -96,7 +96,7 @@ jobs:
9696
]
9797

9898
container:
99-
image: aztfmod/rover:1.5.4-2307.2804
99+
image: aztfmod/rover:1.5.6-2309.0507
100100
options: --user 0
101101

102102
steps:
@@ -143,7 +143,7 @@ jobs:
143143
random_length: ['5']
144144

145145
container:
146-
image: aztfmod/rover:1.5.4-2307.2804
146+
image: aztfmod/rover:1.5.6-2309.0507
147147
options: --user 0
148148

149149
steps:
@@ -198,7 +198,7 @@ jobs:
198198
]
199199

200200
container:
201-
image: aztfmod/rover:1.5.4-2307.2804
201+
image: aztfmod/rover:1.5.6-2309.0507
202202
options: --user 0
203203

204204
steps:
@@ -244,7 +244,7 @@ jobs:
244244
random_length: ['5']
245245

246246
container:
247-
image: aztfmod/rover:1.5.4-2307.2804
247+
image: aztfmod/rover:1.5.6-2309.0507
248248
options: --user 0
249249

250250
steps:

‎README.md‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@
22

33
[![Gitter](https://badges.gitter.im/aztfmod/community.svg)](https://gitter.im/aztfmod/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
44

5-
# Cloud Adoption Framework for Azure Terraform landing zones
5+
# Azure Terraform SRE
66

7-
Microsoft [Cloud Adoption Framework for Azure](https://docs.microsoft.com/azure/cloud-adoption-framework/overview) provides you with guidance and best practices to adopt Azure.
87

9-
CAF Terraform landing zones team mission statement is to:
8+
Azure Terraform SRE (formely CAF Terraform) ambitions:
109

1110
* Equip the Site Reliability Engineering teams for Terraform on Azure.
1211
* Democratize an IaC: Infrastructure-as-Configuration.
1312
* Commoditize state management and enterprise-wide composition.
14-
* Standardize deployments using Azure enterprise-scale landing zones.
15-
* Implement Azure enterprise-scale design and approach with native Terraform and DevOps.
13+
* Standardize deployments leveraging official Azure landing zones components.
1614
* Propose a prescriptive guidance on how to enable DevOps for infrastructure as code on Microsoft Azure.
1715
* Foster a community of Azure *Terraformers* using a common set of practices and sharing best practices.
1816

1917

20-
You can review the different components parts of the Cloud Adoption Framework for Azure Terraform landing zones and look at the quick intro video below:
18+
You can review the different components parts of the Azure Terraform SRE and look at the quick intro video below:
2119

2220
[![caf_elements](./_pictures/caf_elements.png)](https://www.youtube.com/watch?v=FlQ17u4NNts "CAF Introduction")
2321

@@ -26,7 +24,7 @@ You can review the different components parts of the Cloud Adoption Framework fo
2624

2725
When starting an enterprise deployment, we recommend you start creating a configuration repository where you craft the configuration files for your environments.
2826

29-
The best way to start is to clone the [platform starter repository](https://github.com/Azure/caf-terraform-landingzones-platform-starter) and getting started with the configuration files.
27+
The best way to start is to clone the [platform starter repository](https://github.com/Azure/caf-terraform-landingzones-platform-starter) and getting started with the configuration files.
3028

3129
If you are reading this, you are probably interested also in reading the doc as below:
3230
:books: Read our [centralized documentation page](https://aka.ms/caf/terraform)

‎caf_launchpad/dynamic_secrets.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
module "dynamic_keyvault_secrets" {
33
source = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
4-
version = "5.7.3"
4+
version = "5.7.4"
55

66
for_each = try(var.dynamic_keyvault_secrets, {})
77

‎caf_launchpad/landingzone.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "launchpad" {
22
source = "aztfmod/caf/azurerm"
3-
version = "5.7.3"
3+
version = "5.7.4"
44
# source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git?ref=main"
55

66
providers = {

‎caf_launchpad/scenario/200/diagnostics_definition.tfvars‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ diagnostics_definition = {
99
categories = {
1010
log = [
1111
# ["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
12-
["Audit", true, false, 7],
12+
["Audit", true, false, 0],
1313
]
1414
metric = [
1515
#["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
16-
["AllMetrics", true, false, 7],
16+
["AllMetrics", true, false, 0],
1717
]
1818
}
1919

@@ -24,11 +24,11 @@ diagnostics_definition = {
2424
categories = {
2525
log = [
2626
# ["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
27-
["AuditEvent", true, false, 7],
27+
["AuditEvent", true, false, 0],
2828
]
2929
metric = [
3030
#["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
31-
["AllMetrics", true, false, 7],
31+
["AllMetrics", true, false, 0],
3232
]
3333
}
3434

@@ -39,7 +39,7 @@ diagnostics_definition = {
3939
categories = {
4040
log = [
4141
# ["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
42-
["BastionAuditLogs", true, false, 7],
42+
["BastionAuditLogs", true, false, 0],
4343
]
4444
}
4545

@@ -50,11 +50,11 @@ diagnostics_definition = {
5050
categories = {
5151
log = [
5252
# ["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
53-
["VMProtectionAlerts", true, false, 7],
53+
["VMProtectionAlerts", true, false, 0],
5454
]
5555
metric = [
5656
#["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
57-
["AllMetrics", true, false, 7],
57+
["AllMetrics", true, false, 0],
5858
]
5959
}
6060

@@ -65,13 +65,13 @@ diagnostics_definition = {
6565
categories = {
6666
log = [
6767
# ["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
68-
["DDoSProtectionNotifications", true, false, 7],
69-
["DDoSMitigationFlowLogs", true, false, 7],
70-
["DDoSMitigationReports", true, false, 7],
68+
["DDoSProtectionNotifications", true, false, 0],
69+
["DDoSMitigationFlowLogs", true, false, 0],
70+
["DDoSMitigationReports", true, false, 0],
7171
]
7272
metric = [
7373
#["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
74-
["AllMetrics", true, false, 7],
74+
["AllMetrics", true, false, 0],
7575
]
7676
}
7777

@@ -82,8 +82,8 @@ diagnostics_definition = {
8282
categories = {
8383
log = [
8484
# ["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
85-
["NetworkSecurityGroupEvent", true, false, 7],
86-
["NetworkSecurityGroupRuleCounter", true, false, 7],
85+
["NetworkSecurityGroupEvent", true, false, 0],
86+
["NetworkSecurityGroupRuleCounter", true, false, 0],
8787
]
8888
}
8989

@@ -94,11 +94,11 @@ diagnostics_definition = {
9494
categories = {
9595
# log = [
9696
# # ["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
97-
# ["AuditEvent", true, false, 7],
97+
# ["AuditEvent", true, false, 0],
9898
# ]
9999
metric = [
100100
#["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
101-
["AllMetrics", true, false, 7],
101+
["AllMetrics", true, false, 0],
102102
]
103103
}
104104

@@ -109,12 +109,12 @@ diagnostics_definition = {
109109
categories = {
110110
log = [
111111
# ["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
112-
["ContainerRegistryRepositoryEvents", true, false, 7],
113-
["ContainerRegistryLoginEvents", true, false, 7],
112+
["ContainerRegistryRepositoryEvents", true, false, 0],
113+
["ContainerRegistryLoginEvents", true, false, 0],
114114
]
115115
metric = [
116116
#["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
117-
["AllMetrics", true, false, 7],
117+
["AllMetrics", true, false, 0],
118118
]
119119
}
120120
}
@@ -124,17 +124,17 @@ diagnostics_definition = {
124124
categories = {
125125
log = [
126126
# ["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
127-
["kube-apiserver", true, false, 7],
128-
["kube-audit", true, false, 7],
129-
["kube-audit-admin", true, false, 7],
130-
["kube-controller-manager", true, false, 7],
131-
["kube-scheduler", true, false, 7],
132-
["cluster-autoscaler", true, false, 7],
133-
["guard", true, false, 7],
127+
["kube-apiserver", true, false, 0],
128+
["kube-audit", true, false, 0],
129+
["kube-audit-admin", true, false, 0],
130+
["kube-controller-manager", true, false, 0],
131+
["kube-scheduler", true, false, 0],
132+
["cluster-autoscaler", true, false, 0],
133+
["guard", true, false, 0],
134134
]
135135
metric = [
136136
#["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
137-
["AllMetrics", true, false, 7],
137+
["AllMetrics", true, false, 0],
138138
]
139139
}
140140
}
@@ -145,20 +145,20 @@ diagnostics_definition = {
145145
categories = {
146146
log = [
147147
# ["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
148-
["AzureBackupReport", true, true, 7],
149-
["CoreAzureBackup", true, true, 7],
150-
["AddonAzureBackupAlerts", true, true, 7],
151-
["AddonAzureBackupJobs", true, true, 7],
152-
["AddonAzureBackupPolicy", true, true, 7],
153-
["AddonAzureBackupProtectedInstance", true, true, 7],
154-
["AddonAzureBackupStorage", true, true, 7],
155-
["AzureSiteRecoveryJobs", true, true, 7],
156-
["AzureSiteRecoveryEvents", true, true, 7],
157-
["AzureSiteRecoveryReplicatedItems", true, true, 7],
158-
["AzureSiteRecoveryReplicationStats", true, true, 7],
159-
["AzureSiteRecoveryRecoveryPoints", true, true, 7],
160-
["AzureSiteRecoveryReplicationDataUploadRate", true, true, 7],
161-
["AzureSiteRecoveryProtectedDiskDataChurn", true, true, 30],
148+
["AzureBackupReport", true, true, 0],
149+
["CoreAzureBackup", true, true, 0],
150+
["AddonAzureBackupAlerts", true, true, 0],
151+
["AddonAzureBackupJobs", true, true, 0],
152+
["AddonAzureBackupPolicy", true, true, 0],
153+
["AddonAzureBackupProtectedInstance", true, true, 0],
154+
["AddonAzureBackupStorage", true, true, 0],
155+
["AzureSiteRecoveryJobs", true, true, 0],
156+
["AzureSiteRecoveryEvents", true, true, 0],
157+
["AzureSiteRecoveryReplicatedItems", true, true, 0],
158+
["AzureSiteRecoveryReplicationStats", true, true, 0],
159+
["AzureSiteRecoveryRecoveryPoints", true, true, 0],
160+
["AzureSiteRecoveryReplicationDataUploadRate", true, true, 0],
161+
["AzureSiteRecoveryProtectedDiskDataChurn", true, true, 0],
162162
]
163163
metric = [
164164
#["AllMetrics", 60, True],
@@ -172,13 +172,13 @@ diagnostics_definition = {
172172
categories = {
173173
log = [
174174
# ["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
175-
["JobLogs", true, true, 30],
176-
["JobStreams", true, true, 30],
177-
["DscNodeStatus", true, true, 30],
175+
["JobLogs", true, true, 0],
176+
["JobStreams", true, true, 0],
177+
["DscNodeStatus", true, true, 0],
178178
]
179179
metric = [
180180
# ["Category name", "Metric Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
181-
["AllMetrics", true, true, 30],
181+
["AllMetrics", true, true, 0],
182182
]
183183
}
184184

@@ -189,17 +189,17 @@ diagnostics_definition = {
189189
categories = {
190190
log = [
191191
# ["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
192-
["ArchiveLogs", true, false, 7],
193-
["OperationalLogs", true, false, 7],
194-
["AutoScaleLogs", true, false, 7],
195-
["KafkaCoordinatorLogs", true, false, 7],
196-
["KafkaUserErrorLogs", true, false, 7],
197-
["EventHubVNetConnectionEvent", true, false, 7],
198-
["CustomerManagedKeyUserLogs", true, false, 7],
192+
["ArchiveLogs", true, false, 0],
193+
["OperationalLogs", true, false, 0],
194+
["AutoScaleLogs", true, false, 0],
195+
["KafkaCoordinatorLogs", true, false, 0],
196+
["KafkaUserErrorLogs", true, false, 0],
197+
["EventHubVNetConnectionEvent", true, false, 0],
198+
["CustomerManagedKeyUserLogs", true, false, 0],
199199
]
200200
metric = [
201201
#["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
202-
["AllMetrics", true, false, 7],
202+
["AllMetrics", true, false, 0],
203203
]
204204
}
205205

@@ -210,11 +210,11 @@ diagnostics_definition = {
210210
categories = {
211211
log = [
212212
# ["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
213-
["AuditEvent", true, true, 365],
213+
["AuditEvent", true, true, 0],
214214
]
215215
metric = [
216216
#["Category name", "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
217-
["AllMetrics", false, false, 7],
217+
["AllMetrics", false, false, 0],
218218
]
219219
}
220220

‎caf_solution/dynamic_secrets.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "dynamic_keyvault_secrets" {
22
source = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
3-
version = "5.7.3"
3+
version = "5.7.4"
44

55
for_each = {
66
for keyvault_key, secrets in try(var.dynamic_keyvault_secrets, {}) : keyvault_key => {

‎caf_solution/landingzone.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "solution" {
22
source = "aztfmod/caf/azurerm"
3-
version = "5.7.3"
3+
version = "5.7.4"
44
# source = "git::https://github.com/aztfmod/terraform-azurerm-caf.git?ref=main"
55

66
providers = {

‎caf_solution/local.maps.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ locals {
22
maps = merge(
33
var.maps,
44
{
5-
maps_accounts = var.maps_accounts
5+
maps_accounts = var.maps_accounts
66
}
77
)
88
}

0 commit comments

Comments
 (0)