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

Enhancement: Policy Refresh H2 FY24 and Changes for AMA #785

Merged
merged 55 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
df214b4
Added UMI resource
oZakari May 24, 2024
64ef976
Add data collection rule
oZakari May 24, 2024
5b03e34
Update vm insights dcr name
oZakari May 28, 2024
4f9e579
Add change tracking DCR
oZakari May 28, 2024
9e573a4
Add MDFC for SQL data collection rule
oZakari May 29, 2024
c9fab0a
Remove legacy solutions
oZakari May 29, 2024
58aed9c
Change DCR default names
oZakari May 29, 2024
d560bbf
Update Policy Library (automated)
actions-user Jun 3, 2024
09816fb
Update Policy Library (automated)
actions-user Jun 5, 2024
675a0d9
Update Policy Library (automated)
actions-user Jun 6, 2024
e0d27c9
Update Policy Library (automated)
actions-user Jun 11, 2024
25e7429
Merge branch 'main' of https://github.com/Azure/ALZ-Bicep into patch-…
oZakari Jun 15, 2024
8c5fb51
Update policy and policy set definition variables
oZakari Jun 15, 2024
255aad8
Update superseded definition for mdfcconfig
oZakari Jun 15, 2024
7fe4784
Add enforce_backup assignment and deployment
oZakari Jun 16, 2024
dda1cc5
Replace custom diag intiative with built-in
oZakari Jun 16, 2024
ab58efe
Added missing endpoint for using machine learning with private dns zones
oZakari Jun 16, 2024
8b20af3
Update policy assignments api version to 2024-04-01
oZakari Jun 16, 2024
eb20521
Add policy assignment for trusted launch initiative
oZakari Jun 17, 2024
e9daeac
Supersede Deploy-EncryptTransit with Deploy-EncryptTransit_20240509
oZakari Jun 17, 2024
595c2a4
Added MD Endpoints AMA initiative and assignment
oZakari Jun 17, 2024
979fb1b
Update Policy Library (automated)
actions-user Jun 17, 2024
9294e4e
Merge remote-tracking branch 'origin/ama-integration' into patch-poli…
oZakari Jun 18, 2024
97ef20b
Cleanup param files of old workspace solutions
oZakari Jun 18, 2024
d0ddbea
Generate Parameter Markdowns [oZakari/56e2292c]
github-actions[bot] Jun 18, 2024
f814dd8
Remove resource lock for umi
oZakari Jun 18, 2024
7c369d4
Merge branch 'patch-policy-library' of https://github.com/Azure/ALZ-B…
oZakari Jun 18, 2024
b61c969
Generate Parameter Markdowns [oZakari/56e2292c]
github-actions[bot] Jun 18, 2024
e82e997
Configure change tracking assignments
oZakari Jun 19, 2024
79945e0
Add VM insights policy assignments
oZakari Jun 19, 2024
f45cd36
Add AUM-CheckUpdates enforce policy assignment
oZakari Jun 19, 2024
58e1b0f
Add assignment for mdfc-sql-ama
oZakari Jun 19, 2024
903f832
Generate Parameter Markdowns [oZakari/56e2292c]
github-actions[bot] Jun 19, 2024
8a8e968
Update Policy Library (automated)
actions-user Jun 19, 2024
d5ea40a
Remove additional unneeded LAW solutions
oZakari Jun 19, 2024
d0ae2fd
Merge branches 'patch-policy-library' and 'patch-policy-library' of h…
oZakari Jun 19, 2024
9ea826b
Change UAMI API to GA version
oZakari Jun 19, 2024
960ca75
Generate Parameter Markdowns [oZakari/56e2292c]
github-actions[bot] Jun 19, 2024
20291d8
Update infra-as-code/bicep/modules/logging/logging.bicep
oZakari Jun 19, 2024
3795283
Update infra-as-code/bicep/modules/logging/logging.bicep
oZakari Jun 19, 2024
a0f7a90
Update infra-as-code/bicep/modules/logging/logging.bicep
oZakari Jun 19, 2024
94c7cf0
Merge branches 'patch-policy-library' and 'patch-policy-library' of h…
oZakari Jun 19, 2024
e659e87
Update VM, VMSS, and ArcVM monitoring assignments to align to enterpr…
oZakari Jun 19, 2024
a174cfc
Add new AMA related resource IDs to accelerator config
oZakari Jun 19, 2024
7a5a435
Add ama resource outputs and update documentation
oZakari Jun 19, 2024
12f4de6
Generate Parameter Markdowns [oZakari/56e2292c]
github-actions[bot] Jun 19, 2024
f2faabe
Update infra-as-code/bicep/modules/policy/assignments/alzDefaults/alz…
oZakari Jun 19, 2024
8bbba66
Match policy assignment api version to match the version referenced i…
oZakari Jun 20, 2024
8051f68
Added policy assignment to block deletion of UAMI
oZakari Jun 20, 2024
a8d42a8
Update Policy Library (automated)
actions-user Jun 20, 2024
37b01dd
update to align to .txt file output
jtracey93 Jun 20, 2024
bd7c8fa
output typo
jtracey93 Jun 20, 2024
fdc813a
add outputs for UAMI
jtracey93 Jun 20, 2024
10c7217
Generate Parameter Markdowns [jtracey93/56e2292c]
github-actions[bot] Jun 20, 2024
0bec879
align to txt file
jtracey93 Jun 20, 2024
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
2 changes: 2 additions & 0 deletions infra-as-code/bicep/modules/logging/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ New-AzResourceGroup `

New-AzResourceGroupDeployment @inputObject
```

OR

```powershell
# For Azure China regions
# Set Platform management subscripion ID as the the current subscription
Expand Down
132 changes: 123 additions & 9 deletions infra-as-code/bicep/modules/logging/generateddocs/logging.bicep.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,20 @@ Parameter name | Required | Description
parGlobalResourceLock | No | Global Resource Lock Configuration used for all resources deployed in this module. - `kind` - The lock settings of the service which can be CanNotDelete, ReadOnly, or None. - `notes` - Notes about this lock.
parLogAnalyticsWorkspaceName | No | Log Analytics Workspace name.
parLogAnalyticsWorkspaceLocation | No | Log Analytics region name - Ensure the regions selected is a supported mapping as per: https://docs.microsoft.com/azure/automation/how-to/region-mappings.
parDataCollectionRuleVMInsightsName | No | VM Insights Data Collection Rule name for AMA integration.
parDataCollectionRuleVMInsightsLock | No | Resource Lock Configuration for VM Insights Data Collection Rule. - `kind` - The lock settings of the service which can be CanNotDelete, ReadOnly, or None. - `notes` - Notes about this lock.
parDataCollectionRuleChangeTrackingName | No | Change Tracking Data Collection Rule name for AMA integration.
parDataCollectionRuleChangeTrackingLock | No | Resource Lock Configuration for Change Tracking Data Collection Rule. - `kind` - The lock settings of the service which can be CanNotDelete, ReadOnly, or None. - `notes` - Notes about this lock.
parDataCollectionRuleMDFCSQLName | No | MDFC for SQL Data Collection Rule name for AMA integration.
parDataCollectionRuleMDFCSQLLock | No | Resource Lock Configuration for MDFC Defender for SQL Data Collection Rule. - `kind` - The lock settings of the service which can be CanNotDelete, ReadOnly, or None. - `notes` - Notes about this lock.
parLogAnalyticsWorkspaceSkuName | No | Log Analytics Workspace sku name.
parLogAnalyticsWorkspaceCapacityReservationLevel | No | Log Analytics Workspace Capacity Reservation Level. Only used if parLogAnalyticsWorkspaceSkuName is set to CapacityReservation.
parLogAnalyticsWorkspaceLogRetentionInDays | No | Number of days of log retention for Log Analytics Workspace.
parLogAnalyticsWorkspaceLock | No | Resource Lock Configuration for Log Analytics Workspace. - `kind` - The lock settings of the service which can be CanNotDelete, ReadOnly, or None. - `notes` - Notes about this lock.
parLogAnalyticsWorkspaceSolutions | No | Solutions that will be added to the Log Analytics Workspace.
parLogAnalyticsWorkspaceSolutionsLock | No | Resource Lock Configuration for Log Analytics Workspace Solutions. - `kind` - The lock settings of the service which can be CanNotDelete, ReadOnly, or None. - `notes` - Notes about this lock.
parUserAssignedManagedIdentityName | No | Name of the User Assigned Managed Identity required for authenticating Azure Monitoring Agent to Azure.
parUserAssignedManagedIdentityLocation | No | User Assigned Managed Identity location.
parLogAnalyticsWorkspaceLinkAutomationAccount | No | Log Analytics Workspace should be linked with the automation account.
parAutomationAccountName | No | Automation account name.
parAutomationAccountLocation | No | Automation Account region name. - Ensure the regions selected is a supported mapping as per: https://docs.microsoft.com/azure/automation/how-to/region-mappings.
Expand Down Expand Up @@ -57,6 +65,69 @@ Log Analytics region name - Ensure the regions selected is a supported mapping a

- Default value: `[resourceGroup().location]`

### parDataCollectionRuleVMInsightsName

![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)

VM Insights Data Collection Rule name for AMA integration.

- Default value: `alz-ama-vmi-dcr`
oZakari marked this conversation as resolved.
Show resolved Hide resolved

### parDataCollectionRuleVMInsightsLock

![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)

Resource Lock Configuration for VM Insights Data Collection Rule.

- `kind` - The lock settings of the service which can be CanNotDelete, ReadOnly, or None.
- `notes` - Notes about this lock.



- Default value: `@{kind=None; notes=This lock was created by the ALZ Bicep Logging Module.}`

### parDataCollectionRuleChangeTrackingName

![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)

Change Tracking Data Collection Rule name for AMA integration.

- Default value: `alz-ama-ct-dcr`

### parDataCollectionRuleChangeTrackingLock

![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)

Resource Lock Configuration for Change Tracking Data Collection Rule.

- `kind` - The lock settings of the service which can be CanNotDelete, ReadOnly, or None.
- `notes` - Notes about this lock.



- Default value: `@{kind=None; notes=This lock was created by the ALZ Bicep Logging Module.}`

### parDataCollectionRuleMDFCSQLName

![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)

MDFC for SQL Data Collection Rule name for AMA integration.

- Default value: `alz-ama-mdfcsql-dcr`

### parDataCollectionRuleMDFCSQLLock

![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)

Resource Lock Configuration for MDFC Defender for SQL Data Collection Rule.

- `kind` - The lock settings of the service which can be CanNotDelete, ReadOnly, or None.
- `notes` - Notes about this lock.



- Default value: `@{kind=None; notes=This lock was created by the ALZ Bicep Logging Module.}`

### parLogAnalyticsWorkspaceSkuName

![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
Expand Down Expand Up @@ -104,9 +175,9 @@ Resource Lock Configuration for Log Analytics Workspace.

Solutions that will be added to the Log Analytics Workspace.

- Default value: `AgentHealthAssessment AntiMalware ChangeTracking Security SecurityInsights SQLAdvancedThreatProtection SQLVulnerabilityAssessment SQLAssessment Updates VMInsights`
- Default value: `AntiMalware Security SecurityInsights ServiceMap`
oZakari marked this conversation as resolved.
Show resolved Hide resolved

- Allowed values: `AgentHealthAssessment`, `AntiMalware`, `ChangeTracking`, `Security`, `SecurityInsights`, `ServiceMap`, `SQLAdvancedThreatProtection`, `SQLVulnerabilityAssessment`, `SQLAssessment`, `Updates`, `VMInsights`
- Allowed values: `AntiMalware`, `Security`, `SecurityInsights`, `ServiceMap`

### parLogAnalyticsWorkspaceSolutionsLock

Expand All @@ -121,6 +192,22 @@ Resource Lock Configuration for Log Analytics Workspace Solutions.

- Default value: `@{kind=None; notes=This lock was created by the ALZ Bicep Logging Module.}`

### parUserAssignedManagedIdentityName

![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)

Name of the User Assigned Managed Identity required for authenticating Azure Monitoring Agent to Azure.

- Default value: `alz-logging-mi`
oZakari marked this conversation as resolved.
Show resolved Hide resolved

### parUserAssignedManagedIdentityLocation

![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)

User Assigned Managed Identity location.

- Default value: `[resourceGroup().location]`

### parLogAnalyticsWorkspaceLinkAutomationAccount

![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
Expand Down Expand Up @@ -255,6 +342,33 @@ outAutomationAccountId | string |
"parLogAnalyticsWorkspaceLocation": {
"value": "[resourceGroup().location]"
},
"parDataCollectionRuleVMInsightsName": {
"value": "alz-ama-vmi-dcr"
},
"parDataCollectionRuleVMInsightsLock": {
"value": {
"kind": "None",
"notes": "This lock was created by the ALZ Bicep Logging Module."
}
},
"parDataCollectionRuleChangeTrackingName": {
"value": "alz-ama-ct-dcr"
},
"parDataCollectionRuleChangeTrackingLock": {
"value": {
"kind": "None",
"notes": "This lock was created by the ALZ Bicep Logging Module."
}
},
"parDataCollectionRuleMDFCSQLName": {
"value": "alz-ama-mdfcsql-dcr"
},
"parDataCollectionRuleMDFCSQLLock": {
"value": {
"kind": "None",
"notes": "This lock was created by the ALZ Bicep Logging Module."
}
},
"parLogAnalyticsWorkspaceSkuName": {
"value": "PerGB2018"
},
Expand All @@ -272,16 +386,10 @@ outAutomationAccountId | string |
},
"parLogAnalyticsWorkspaceSolutions": {
"value": [
"AgentHealthAssessment",
"AntiMalware",
"ChangeTracking",
"Security",
"SecurityInsights",
"SQLAdvancedThreatProtection",
"SQLVulnerabilityAssessment",
"SQLAssessment",
"Updates",
"VMInsights"
"ServiceMap"
]
},
"parLogAnalyticsWorkspaceSolutionsLock": {
Expand All @@ -290,6 +398,12 @@ outAutomationAccountId | string |
"notes": "This lock was created by the ALZ Bicep Logging Module."
}
},
"parUserAssignedManagedIdentityName": {
"value": "alz-logging-mi"
},
"parUserAssignedManagedIdentityLocation": {
"value": "[resourceGroup().location]"
},
"parLogAnalyticsWorkspaceLinkAutomationAccount": {
"value": true
},
Expand Down
Loading