Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Update vm insights dcr name
  • Loading branch information
oZakari committed May 28, 2024
commit 5b03e347cfa5171b4c33d63f98c5d17cd3abfde4
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ parLogAnalyticsWorkspaceLogRetentionInDays | No | Number of days of log re
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.
parDataCollectionRuleName | No | Name of the Data Collection Rule for Azure Monitoring Agent integration.
parDataCollectionRuleLock | No | Resource Lock Configuration for Data Collection Rule. - `kind` - The lock settings of the service which can be CanNotDelete, ReadOnly, or None. - `notes` - Notes about this lock.
parDataCollectionRuleVMInsightsName | No | Name of the Data Collection Rule for Azure Monitoring Agent integration.
parDataCollectionRuleVMInsightsLock | No | Resource Lock Configuration for Data Collection Rule. - `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.
parUserAssignedManagedIdentityLock | No | Resource Lock Configuration for User Assigned Managed Identity. - `kind` - The lock settings of the service which can be CanNotDelete, ReadOnly, or None. - `notes` - Notes about this lock.
parLogAnalyticsWorkspaceLinkAutomationAccount | No | Log Analytics Workspace should be linked with the automation account.
Expand Down
20 changes: 10 additions & 10 deletions infra-as-code/bicep/modules/logging/logging.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ param parLogAnalyticsWorkspaceName string = 'alz-log-analytics'
param parLogAnalyticsWorkspaceLocation string = resourceGroup().location

@sys.description('Data Collection Rule name for AMA integration.')
param parDataCollectionRuleName string = 'ama-vmi-default-perfAndda-dcr'
param parDataCollectionRuleVMInsightsName string = 'ama-vmi-default-perfAndda-dcr'

@sys.description('''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.

''')
param parDataCollectionRuleLock lockType = {
param parDataCollectionRuleVMInsightsLock lockType = {
kind: 'None'
notes: 'This lock was created by the ALZ Bicep Logging Module.'
}
Expand Down Expand Up @@ -246,8 +246,8 @@ resource resLogAnalyticsWorkspaceLock 'Microsoft.Authorization/locks@2020-05-01'
}
}

resource resDataCollectionRule 'Microsoft.Insights/dataCollectionRules@2023-03-11' = {
name: parDataCollectionRuleName
resource resDataCollectionRuleVMInsights 'Microsoft.Insights/dataCollectionRules@2023-03-11' = {
name: parDataCollectionRuleVMInsightsName
location: parLogAnalyticsWorkspaceLocation
properties: {
description: 'Data collection rule for VM Insights'
Expand Down Expand Up @@ -304,13 +304,13 @@ resource resDataCollectionRule 'Microsoft.Insights/dataCollectionRules@2023-03-1
}
}

// Create a resource lock for the Data Collection Rule if parGlobalResourceLock.kind != 'None' or if parDataCollectionRuleLock.kind != 'None'
resource resDataCollectionRuleLock 'Microsoft.Authorization/locks@2020-05-01' = if (parDataCollectionRuleLock.kind != 'None' || parGlobalResourceLock.kind != 'None') {
scope: resDataCollectionRule
name: parDataCollectionRuleLock.?name ?? '${resDataCollectionRule.name}-lock'
// Create a resource lock for the Data Collection Rule if parGlobalResourceLock.kind != 'None' or if parDataCollectionRuleVMInsightsLock.kind != 'None'
resource resDataCollectionRuleVMInsightsLock 'Microsoft.Authorization/locks@2020-05-01' = if (parDataCollectionRuleVMInsightsLock.kind != 'None' || parGlobalResourceLock.kind != 'None') {
scope: resDataCollectionRuleVMInsights
name: parDataCollectionRuleVMInsightsLock.?name ?? '${resDataCollectionRuleVMInsights.name}-lock'
properties: {
level: (parGlobalResourceLock.kind != 'None') ? parGlobalResourceLock.kind : parDataCollectionRuleLock.kind
notes: (parGlobalResourceLock.kind != 'None') ? parGlobalResourceLock.?notes : parDataCollectionRuleLock.?notes
level: (parGlobalResourceLock.kind != 'None') ? parGlobalResourceLock.kind : parDataCollectionRuleVMInsightsLock.kind
notes: (parGlobalResourceLock.kind != 'None') ? parGlobalResourceLock.?notes : parDataCollectionRuleVMInsightsLock.?notes
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"VMInsights"
]
},
"parDataCollectionRuleName": {
"parDataCollectionRuleVMInsightsName": {
"value": "ama-vmi-default-perfAndda-dcr"
},
"parUserAssignedManagedIdentityName": {
Expand Down Expand Up @@ -96,7 +96,7 @@
"notes": "This lock was created by the ALZ Bicep Logging Module."
}
},
"parDataCollectionRuleLock": {
"parDataCollectionRuleVMInsightsLock": {
"value": {
"kind": "None",
"notes": "This lock was created by the ALZ Bicep Logging Module."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"VMInsights"
]
},
"parDataCollectionRuleName": {
"parDataCollectionRuleVMInsightsName": {
"value": "ama-vmi-default-perfAndda-dcr"
},
"parUserAssignedManagedIdentityName": {
Expand Down Expand Up @@ -90,7 +90,7 @@
"notes": "This lock was created by the ALZ Bicep Logging Module."
}
},
"parDataCollectionRuleLock": {
"parDataCollectionRuleVMInsightsLock": {
"value": {
"kind": "None",
"notes": "This lock was created by the ALZ Bicep Logging Module."
Expand Down