Skip to content

[Modules] Fix Automation Account and Log Analytics Workspace #1530

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

Merged
eriqua merged 15 commits into from
Jun 16, 2022
Merged

[Modules] Fix Automation Account and Log Analytics Workspace #1530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2103c7b
readme update
eriqua Jun 14, 2022
975ec44
solution dep law
eriqua Jun 14, 2022
dcc2311
Merge branch 'main' into users/erikag/autoaccount-smallfix
eriqua Jun 15, 2022
8fe4795
disable link
eriqua Jun 15, 2022
8ecf812
readme
eriqua Jun 15, 2022
257ca61
disable sol
eriqua Jun 15, 2022
fad23b8
readme
eriqua Jun 15, 2022
aea5d75
resource name
eriqua Jun 15, 2022
cb1dbdf
readme
eriqua Jun 15, 2022
ca75758
change names
eriqua Jun 15, 2022
edabf4c
change linked name
eriqua Jun 15, 2022
2346064
aut name update
eriqua Jun 15, 2022
0bdb0e8
law name update solutions back
eriqua Jun 15, 2022
b487ba9
readme
eriqua Jun 15, 2022
1055fd2
cleanup
eriqua Jun 15, 2022
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: 1 addition & 1 deletion arm/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "<<namePrefix>>-wd-aut-encr-001"
"value": "<<namePrefix>>-az-aut-encr-001"
},
"encryptionKeySource": {
"value": "Microsoft.Keyvault"
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "<<namePrefix>>-wd-aut-min-001"
"value": "<<namePrefix>>-az-aut-min-001"
}
}
}
2 changes: 1 addition & 1 deletion arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "<<namePrefix>>-wd-aut-x-001"
"value": "<<namePrefix>>-az-aut-x-001"
},
"lock": {
"value": "CanNotDelete"
Expand Down
13 changes: 6 additions & 7 deletions arm/Microsoft.Automation/automationAccounts/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ userAssignedIdentities: {
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "<<namePrefix>>-wd-aut-encr-001"
"value": "<<namePrefix>>-az-aut-encr-001"
},
"encryptionKeySource": {
"value": "Microsoft.Keyvault"
Expand All @@ -374,7 +374,6 @@ userAssignedIdentities: {
"keyVersion": {
"value": "9917c14be51d4d93b37218de7d326f60"
},

"userAssignedIdentities": {
"value": {
"/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
Expand All @@ -395,7 +394,7 @@ userAssignedIdentities: {
module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bicep' = {
name: '${uniqueString(deployment().name)}-automationAccounts'
params: {
name: '<<namePrefix>>-wd-aut-encr-001'
name: '<<namePrefix>>-az-aut-encr-001'
encryptionKeySource: 'Microsoft.Keyvault'
encryptionUserAssignedIdentity: '/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001'
keyName: 'keyEncryptionKey'
Expand All @@ -422,7 +421,7 @@ module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bice
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "<<namePrefix>>-wd-aut-min-001"
"value": "<<namePrefix>>-az-aut-min-001"
}
}
}
Expand All @@ -439,7 +438,7 @@ module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bice
module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bicep' = {
name: '${uniqueString(deployment().name)}-automationAccounts'
params: {
name: '<<namePrefix>>-wd-aut-min-001'
name: '<<namePrefix>>-az-aut-min-001'
}
```

Expand All @@ -458,7 +457,7 @@ module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bice
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "<<namePrefix>>-wd-aut-x-001"
"value": "<<namePrefix>>-az-aut-x-001"
},
"lock": {
"value": "CanNotDelete"
Expand Down Expand Up @@ -665,7 +664,7 @@ module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bice
module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bicep' = {
name: '${uniqueString(deployment().name)}-automationAccounts'
params: {
name: '<<namePrefix>>-wd-aut-x-001'
name: '<<namePrefix>>-az-aut-x-001'
lock: 'CanNotDelete'
schedules: [
{
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "<<namePrefix>>-az-la-min-001"
"value": "<<namePrefix>>-az-law-min-001"
}
}
}
4 changes: 2 additions & 2 deletions arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "<<namePrefix>>-az-la-x-001"
"value": "<<namePrefix>>-az-law-x-001"
},
"lock": {
"value": "CanNotDelete"
Expand Down Expand Up @@ -34,7 +34,7 @@
"value": [
{
"name": "Automation",
"resourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<<namePrefix>>-wd-aut-x-001"
"resourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<<namePrefix>>-az-aut-x-001"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.OperationalInsights/workspaces/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ module logAnalyticsWorkspace_linkedServices 'linkedServices/deploy.bicep' = [for
params: {
logAnalyticsWorkspaceName: logAnalyticsWorkspace.name
name: linkedService.name
resourceId: linkedService.resourceId
resourceId: contains(linkedService, 'resourceId') ? linkedService.resourceId : ''
writeAccessResourceId: contains(linkedService, 'writeAccessResourceId') ? linkedService.writeAccessResourceId : ''
enableDefaultTelemetry: enableReferencedModulesTelemetry
}
Expand Down
12 changes: 6 additions & 6 deletions arm/Microsoft.OperationalInsights/workspaces/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ tags: {
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "<<namePrefix>>-az-la-min-001"
"value": "<<namePrefix>>-az-law-min-001"
}
}
}
Expand All @@ -469,7 +469,7 @@ tags: {
module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = {
name: '${uniqueString(deployment().name)}-workspaces'
params: {
name: '<<namePrefix>>-az-la-min-001'
name: '<<namePrefix>>-az-law-min-001'
}
```

Expand All @@ -488,7 +488,7 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = {
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "<<namePrefix>>-az-la-x-001"
"value": "<<namePrefix>>-az-law-x-001"
},
"lock": {
"value": "CanNotDelete"
Expand Down Expand Up @@ -519,7 +519,7 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = {
"value": [
{
"name": "Automation",
"resourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<<namePrefix>>-wd-aut-x-001"
"resourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<<namePrefix>>-az-aut-x-001"
}
]
},
Expand Down Expand Up @@ -667,7 +667,7 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = {
module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = {
name: '${uniqueString(deployment().name)}-workspaces'
params: {
name: '<<namePrefix>>-az-la-x-001'
name: '<<namePrefix>>-az-law-x-001'
lock: 'CanNotDelete'
publicNetworkAccessForIngestion: 'Disabled'
publicNetworkAccessForQuery: 'Disabled'
Expand All @@ -686,7 +686,7 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = {
linkedServices: [
{
name: 'Automation'
resourceId: '/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<<namePrefix>>-wd-aut-x-001'
resourceId: '/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<<namePrefix>>-az-aut-x-001'
}
]
savedSearches: [
Expand Down
2 changes: 1 addition & 1 deletion ...pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "adp-<<namePrefix>>-wd-aut-x-001"
"value": "adp-<<namePrefix>>-az-aut-x-001"
}
}
}