Skip to content

Commit 5cd2645

Browse files
committed
Removing invalid lock
1 parent 7617f02 commit 5cd2645

File tree

3 files changed

+9
-39
lines changed

3 files changed

+9
-39
lines changed

infra-as-code/bicep/modules/logging/logging.bicep

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -130,17 +130,6 @@ param parLogAnalyticsWorkspaceSolutions array = [
130130
'ChangeTracking'
131131
]
132132

133-
@sys.description('''Resource Lock Configuration for Security Insights solution.
134-
135-
- `kind` - The lock settings of the service which can be CanNotDelete, ReadOnly, or None.
136-
- `notes` - Notes about this lock.
137-
138-
''')
139-
param parSecurityInsightsOnboardingLock lockType = {
140-
kind: 'None'
141-
notes: 'This lock was created by the ALZ Bicep Logging Module.'
142-
}
143-
144133
@sys.description('''Resource Lock Configuration for Change Tracking solution.
145134
- `kind` - The lock settings of the service which can be CanNotDelete, ReadOnly, or None.
146135
- `notes` - Notes about this lock.
@@ -211,7 +200,7 @@ resource resUserAssignedManagedIdentity 'Microsoft.ManagedIdentity/userAssignedI
211200
tags: parTags
212201
}
213202

214-
resource resAutomationAccount 'Microsoft.Automation/automationAccounts@2023-11-01' = if (parAutomationAccountEnabled) {
203+
resource resAutomationAccount 'Microsoft.Automation/automationAccounts@2024-10-23' = if (parAutomationAccountEnabled) {
215204
name: parAutomationAccountName
216205
location: parAutomationAccountLocation
217206
tags: parAutomationAccountTags
@@ -239,7 +228,7 @@ resource resAutomationAccountLock 'Microsoft.Authorization/locks@2020-05-01' = i
239228
}
240229
}
241230

242-
resource resLogAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' = {
231+
resource resLogAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2025-07-01' = {
243232
name: parLogAnalyticsWorkspaceName
244233
location: parLogAnalyticsWorkspaceLocation
245234
tags: parLogAnalyticsWorkspaceTags
@@ -262,6 +251,7 @@ resource resLogAnalyticsWorkspaceLock 'Microsoft.Authorization/locks@2020-05-01'
262251
}
263252
}
264253

254+
#disable-next-line use-recent-api-versions
265255
resource resDataCollectionRuleVMInsightsPerfAndMap 'Microsoft.Insights/dataCollectionRules@2021-04-01' = if (parDataCollectionRuleVMInsightsExperience == 'PerfAndMap') {
266256
name: parDataCollectionRuleVMInsightsName
267257
location: parLogAnalyticsWorkspaceLocation
@@ -321,6 +311,7 @@ resource resDataCollectionRuleVMInsightsPerfAndMap 'Microsoft.Insights/dataColle
321311
}
322312
}
323313

314+
#disable-next-line use-recent-api-versions
324315
resource resDataCollectionRuleVMInsightsPerfOnly 'Microsoft.Insights/dataCollectionRules@2021-04-01' = if (parDataCollectionRuleVMInsightsExperience == 'PerfOnly') {
325316
name: parDataCollectionRuleVMInsightsName
326317
location: parLogAnalyticsWorkspaceLocation
@@ -382,6 +373,7 @@ resource resDataCollectionRuleVMInsightsPerfOnlyLock 'Microsoft.Authorization/lo
382373
}
383374
}
384375

376+
#disable-next-line use-recent-api-versions
385377
resource resDataCollectionRuleChangeTracking 'Microsoft.Insights/dataCollectionRules@2021-04-01' = {
386378
name: parDataCollectionRuleChangeTrackingName
387379
location: parLogAnalyticsWorkspaceLocation
@@ -654,6 +646,7 @@ resource resDataCollectionRuleChangeTrackingLock 'Microsoft.Authorization/locks@
654646
}
655647
}
656648

649+
#disable-next-line use-recent-api-versions
657650
resource resDataCollectionRuleMDFCSQL'Microsoft.Insights/dataCollectionRules@2021-04-01' = {
658651
name: parDataCollectionRuleMDFCSQLName
659652
location: parLogAnalyticsWorkspaceLocation
@@ -716,7 +709,7 @@ resource resDataCollectionRuleMDFCSQLLock 'Microsoft.Authorization/locks@2020-05
716709
}
717710

718711
// Onboard the Log Analytics Workspace to Sentinel if SecurityInsights is in parLogAnalyticsWorkspaceSolutions
719-
resource resSentinelOnboarding 'Microsoft.SecurityInsights/onboardingStates@2024-03-01' = if (contains(parLogAnalyticsWorkspaceSolutions, 'SecurityInsights')) {
712+
resource resSentinelOnboarding 'Microsoft.SecurityInsights/onboardingStates@2025-09-01' = if (contains(parLogAnalyticsWorkspaceSolutions, 'SecurityInsights')) {
720713
name: 'default'
721714
scope: resLogAnalyticsWorkspace
722715
properties: {}
@@ -736,19 +729,8 @@ resource resChangeTrackingSolution 'Microsoft.OperationsManagement/solutions@201
736729
}
737730
}
738731

739-
740-
// Add resource lock for SecurityInsights solution
741-
resource resSecurityInsightsSolutionLock 'Microsoft.Authorization/locks@2020-05-01' = if (parSecurityInsightsOnboardingLock.kind != 'None' || parGlobalResourceLock.kind != 'None') {
742-
scope: resSentinelOnboarding
743-
name: parSecurityInsightsOnboardingLock.?name ?? '${resSentinelOnboarding.name}-lock'
744-
properties: {
745-
level: (parGlobalResourceLock.kind != 'None') ? parGlobalResourceLock.kind : parSecurityInsightsOnboardingLock.kind
746-
notes: (parGlobalResourceLock.kind != 'None') ? parGlobalResourceLock.?notes : parSecurityInsightsOnboardingLock.?notes
747-
}
748-
}
749-
750732
// Add resource lock for ChangeTracking solution
751-
resource resChangeTrackingSolutionLock 'Microsoft.Authorization/locks@2020-05-01' = if (parChangeTrackingSolutionLock.kind != 'None' || parGlobalResourceLock.kind != 'None') {
733+
resource resChangeTrackingSolutionLock 'Microsoft.Authorization/locks@2020-05-01' = if (contains(parLogAnalyticsWorkspaceSolutions, 'ChangeTracking') && (parChangeTrackingSolutionLock.kind != 'None' || parGlobalResourceLock.kind != 'None')) {
752734
scope: resChangeTrackingSolution
753735
name: parChangeTrackingSolutionLock.?name ?? '${resChangeTrackingSolution.name}-lock'
754736
properties: {
@@ -757,7 +739,7 @@ resource resChangeTrackingSolutionLock 'Microsoft.Authorization/locks@2020-05-01
757739
}
758740
}
759741

760-
resource resLogAnalyticsLinkedServiceForAutomationAccount 'Microsoft.OperationalInsights/workspaces/linkedServices@2023-09-01' = if (parLogAnalyticsWorkspaceLinkAutomationAccount) {
742+
resource resLogAnalyticsLinkedServiceForAutomationAccount 'Microsoft.OperationalInsights/workspaces/linkedServices@2025-07-01' = if (parLogAnalyticsWorkspaceLinkAutomationAccount) {
761743
parent: resLogAnalyticsWorkspace
762744
name: parLogAnalyticsLinkedServiceAutomationAccountName
763745
properties: {

infra-as-code/bicep/modules/logging/parameters/logging.parameters.all.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,6 @@
116116
"notes": "This lock was created by the ALZ Bicep Logging Module."
117117
}
118118
},
119-
"parSecurityInsightsOnboardingLock": {
120-
"value": {
121-
"kind": "None",
122-
"notes": "This lock was created by the ALZ Bicep Logging Module."
123-
}
124-
},
125119
"parChangeTrackingSolutionLock": {
126120
"value": {
127121
"kind": "None",

infra-as-code/bicep/modules/logging/parameters/mc-logging.parameters.all.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,6 @@
107107
"notes": "This lock was created by the ALZ Bicep Logging Module."
108108
}
109109
},
110-
"parSecurityInsightsOnboardingLock": {
111-
"value": {
112-
"kind": "None",
113-
"notes": "This lock was created by the ALZ Bicep Logging Module."
114-
}
115-
},
116110
"parChangeTrackingSolutionLock": {
117111
"value": {
118112
"kind": "None",

0 commit comments

Comments
 (0)