Skip to content

Commit 329cf36

Browse files
PMEds28PMEds28
authored
Merge pull request #289047 from MicrosoftDocs/main
Publish to Live Wednesday 4AM PST, 10/23
2 parents 38a3341 + 046a980 commit 329cf36

File tree

63 files changed

+586
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+586
-226
lines changed

‎articles/automation/add-user-assigned-identity.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ PATCH
120120
"identity": {
121121
"type": "SystemAssigned, UserAssigned",
122122
"userAssignedIdentities": {
123-
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/firstIdentity": {},
124-
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/secondIdentity": {}
123+
"/subscriptions/ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/firstIdentity": {},
124+
"/subscriptions/ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/secondIdentity": {}
125125
}
126126
}
127127
}
@@ -130,7 +130,7 @@ PATCH
130130
The syntax of the API is as follows:
131131

132132
```http
133-
https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
133+
https://management.azure.com/subscriptions/ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
134134
```
135135

136136
#### Example
@@ -176,16 +176,16 @@ Perform the following steps.
176176
```json
177177
{
178178
"type": "SystemAssigned, UserAssigned",
179-
"principalId": "00000000-0000-0000-0000-000000000000",
180-
"tenantId": "00000000-0000-0000-0000-000000000000",
179+
"principalId": "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
180+
"tenantId": "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
181181
"userAssignedIdentities": {
182182
"/subscriptions/ContosoID/resourcegroups/ContosoLab/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ContosoUAMI1": {
183-
"PrincipalId": "00000000-0000-0000-0000-000000000000",
184-
"ClientId": "00000000-0000-0000-0000-000000000000"
183+
"PrincipalId": "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
184+
"ClientId": "00001111-aaaa-2222-bbbb-3333cccc4444"
185185
},
186186
"/subscriptions/ContosoID/resourcegroups/ContosoLab/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ContosoUAMI2": {
187-
"PrincipalId": "00000000-0000-0000-0000-000000000000",
188-
"ClientId": "00000000-0000-0000-0000-000000000000"
187+
"PrincipalId": "ffffffff-eeee-dddd-cccc-bbbbbbbbbbb0",
188+
"ClientId": "00001111-aaaa-2222-bbbb-3333cccc4444"
189189
}
190190
}
191191
}

‎articles/automation/automation-role-based-access-control.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -389,14 +389,14 @@ Get-AzRoleAssignment -Scope '/subscriptions/<SubscriptionID>/resourcegroups/<Res
389389
The following is the example output:
390390

391391
```powershell
392-
RoleAssignmentId : /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Automation/automationAccounts/myAutomationAccount/provid
393-
ers/Microsoft.Authorization/roleAssignments/cc594d39-ac10-46c4-9505-f182a355c41f
394-
Scope : /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Automation/automationAccounts/myAutomationAccount
392+
RoleAssignmentId : /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/myResourceGroup/providers/Microsoft.Automation/automationAccounts/myAutomationAccount/provid
393+
ers/Microsoft.Authorization/roleAssignments/00000000-0000-0000-0000-000000000000
394+
Scope : /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/myResourceGroup/providers/Microsoft.Automation/automationAccounts/myAutomationAccount
395395
DisplayName : [email protected]
396396
SignInName : [email protected]
397397
RoleDefinitionName : Automation Operator
398398
RoleDefinitionId : d3881f73-407a-4167-8283-e981cbba0404
399-
ObjectId : 15f26a47-812d-489a-8197-3d4853558347
399+
ObjectId : aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb
400400
ObjectType : User
401401
```
402402

@@ -411,14 +411,14 @@ New-AzRoleAssignment -SignInName <sign-in Id of a user you wish to grant access>
411411
The following is the example output:
412412

413413
```azurepowershell
414-
RoleAssignmentId : /subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/Providers/Microsoft.Automation/automationAccounts/myAutomationAccount/provid
415-
ers/Microsoft.Authorization/roleAssignments/25377770-561e-4496-8b4f-7cba1d6fa346
416-
Scope : /subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/Providers/Microsoft.Automation/automationAccounts/myAutomationAccount
414+
RoleAssignmentId : /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourcegroups/myResourceGroup/Providers/Microsoft.Automation/automationAccounts/myAutomationAccount/provid
415+
ers/Microsoft.Authorization/roleAssignments/00000000-0000-0000-0000-000000000000
416+
Scope : /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourcegroups/myResourceGroup/Providers/Microsoft.Automation/automationAccounts/myAutomationAccount
417417
DisplayName : [email protected]
418418
SignInName : [email protected]
419419
RoleDefinitionName : Automation Operator
420420
RoleDefinitionId : d3881f73-407a-4167-8283-e981cbba0404
421-
ObjectId : f5ecbe87-1181-43d2-88d5-a8f5e9d8014e
421+
ObjectId : bbbbbbbb-1111-2222-3333-cccccccccccc
422422
ObjectType : User
423423
```
424424

‎articles/automation/automation-secure-asset-encryption.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ $principalID
9696
Configure a system-assigned managed identity to the Automation account using the following REST API call:
9797

9898
```http
99-
PATCH https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
99+
PATCH https://management.azure.com/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
100100
```
101101

102102
Request body:
@@ -115,7 +115,7 @@ System-assigned identity for the Automation account is returned in a response si
115115
```json
116116
{
117117
"name": "automation-account-name",
118-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name",
118+
"id": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name",
119119
..
120120
"identity": {
121121
"type": "SystemAssigned",
@@ -155,7 +155,7 @@ The output should look similar to the following:
155155
The access policy can be set using the following REST API call:
156156

157157
```http
158-
PUT https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.KeyVault/vaults/sample-vault/accessPolicies/add?api-version=2018-02-14
158+
PUT https://management.azure.com/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/sample-group/providers/Microsoft.KeyVault/vaults/sample-vault/accessPolicies/add?api-version=2018-02-14
159159
```
160160

161161
Request body:
@@ -226,7 +226,7 @@ The output should look similar to the following:
226226
Use the following REST API call:
227227

228228
```http
229-
PATCH https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
229+
PATCH https://management.azure.com/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
230230
```
231231

232232
Request body:
@@ -254,7 +254,7 @@ Sample response
254254
```json
255255
{
256256
"name": "automation-account-name",
257-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name",
257+
"id": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name",
258258
..
259259
"properties": {
260260
..

‎articles/automation/context-switching.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Context switching is when the context in one process changes the context in a di
2323
|Tenant | A dedicated and trusted instance of Microsoft Entra ID that represents a single organization.|
2424
|Credentials | The information used by Azure to verify your identity and confirm your authorization to access resources in Azure.|
2525

26-
When an account signs on that can access several subscriptions, any of those subscriptions may be added to the user's context. To guarantee the correct subscription, you must declare it when connecting. For example, use `Add-AzAccount -Credential $Cred -subscription 'cd4dxxxx-xxxx-xxxx-xxxx-xxxxxxxx9749'`. However, issues can arise when your runbooks managing one subscription runs in the same sandbox process as your other runbooks managing resources in another subscription from the same Automation account. Changes to the context made by one runbook can affect your other runbooks using the default context. As the context includes information, such as the credentials to use and the subscription to target, cmdlets could target the wrong subscription resulting in `not found` or permissions errors. This issue is known as **Context Switching**.
26+
When an account signs on that can access several subscriptions, any of those subscriptions may be added to the user's context. To guarantee the correct subscription, you must declare it when connecting. For example, use `Add-AzAccount -Credential $Cred -subscription 'aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e'`. However, issues can arise when your runbooks managing one subscription runs in the same sandbox process as your other runbooks managing resources in another subscription from the same Automation account. Changes to the context made by one runbook can affect your other runbooks using the default context. As the context includes information, such as the credentials to use and the subscription to target, cmdlets could target the wrong subscription resulting in `not found` or permissions errors. This issue is known as **Context Switching**.
2727

2828
## Manage Azure contexts
2929

‎articles/automation/disable-managed-identity-for-automation.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ If there are multiple user-assigned identities defined, to retain them and only
4848
"identity" : {
4949
"type": "UserAssigned",
5050
"userAssignedIdentities": {
51-
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/firstIdentity": {},
52-
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/secondIdentity": {}
51+
"/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/firstIdentity": {},
52+
"/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/secondIdentity": {}
5353
}
5454
}
5555
}
@@ -58,7 +58,7 @@ If there are multiple user-assigned identities defined, to retain them and only
5858
The following is the service's REST API request URI to send the PATCH request.
5959

6060
```http
61-
PATCH https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
61+
PATCH https://management.azure.com/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
6262
```
6363

6464
### Example
@@ -124,4 +124,4 @@ Perform the following steps.
124124
125125
- For more information about enabling managed identities in Azure Automation, see [Enable and use managed identity for Automation](enable-managed-identity-for-automation.md).
126126
127-
- For an overview of Automation account security, see [Automation account authentication overview](automation-security-overview.md).
127+
- For an overview of Automation account security, see [Automation account authentication overview](automation-security-overview.md).

‎articles/automation/enable-managed-identity-for-automation.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ If there are multiple user-assigned identities defined, to retain them and only
129129
"identity" : {
130130
"type": "SystemAssigned, UserAssigned",
131131
"userAssignedIdentities": {
132-
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cmkID": {},
133-
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cmkID2": {}
132+
"/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cmkID": {},
133+
"/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cmkID2": {}
134134
}
135135
}
136136
}
@@ -140,7 +140,7 @@ If there are multiple user-assigned identities defined, to retain them and only
140140
The syntax of the API is as follows:
141141

142142
```http
143-
PATCH https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
143+
PATCH https://management.azure.com/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
144144
```
145145

146146
#### Example

‎articles/automation/enforce-job-execution-hybrid-worker.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ When one of the Automation REST operations are executed without reference to a H
192192
"error": {
193193
"code": "RequestDisallowedByPolicy",
194194
"target": "Start_VMS",
195-
"message": "Resource 'Start_VMS' was disallowed by policy. Policy identifiers: '[{\"policyAssignment\":{\"name\":\"Enforce Jobs on Automation Hybrid Runbook Workers\",\"id\":\"/subscriptions/75475e1e-9643-4f3d-859e-055f4c31b458/resourceGroups/MAIC-RG/providers/Microsoft.Authorization/policyAssignments/fd5e2cb3842d4eefbc857917\"},\"policyDefinition\":{\"name\":\"Enforce Jobs on Automation Hybrid Runbook Workers\",\"id\":\"/subscriptions/75475e1e-9643-4f3d-859e-055f4c31b458/providers/Microsoft.Authorization/policyDefinitions/4fdffd35-fd9f-458e-9779-94fe33401bfc\"}}]'.",
195+
"message": "Resource 'Start_VMS' was disallowed by policy. Policy identifiers: '[{\"policyAssignment\":{\"name\":\"Enforce Jobs on Automation Hybrid Runbook Workers\",\"id\":\"/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/MAIC-RG/providers/Microsoft.Authorization/policyAssignments/fd5e2cb3842d4eefbc857917\"},\"policyDefinition\":{\"name\":\"Enforce Jobs on Automation Hybrid Runbook Workers\",\"id\":\"/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/providers/Microsoft.Authorization/policyDefinitions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f\"}}]'.",
196196
"additionalInfo": [
197197
{
198198
"type": "PolicyViolation",
@@ -219,13 +219,13 @@ When one of the Automation REST operations are executed without reference to a H
219219
}
220220
]
221221
},
222-
"policyDefinitionId": "/subscriptions/75475e1e-9643-4f3d-859e-055f4c31b458/providers/Microsoft.Authorization/policyDefinitions/4fdffd35-fd9f-458e-9779-94fe33401bfc",
223-
"policyDefinitionName": "4fdffd35-fd9f-458e-9779-94fe33401bfc",
222+
"policyDefinitionId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/providers/Microsoft.Authorization/policyDefinitions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f",
223+
"policyDefinitionName": "bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f",
224224
"policyDefinitionEffect": "Deny",
225-
"policyAssignmentId": "/subscriptions/75475e1e-9643-4f3d-859e-055f4c31b458/resourceGroups/MAIC-RG/providers/Microsoft.Authorization/policyAssignments/fd5e2cb3842d4eefbc857917",
225+
"policyAssignmentId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/MAIC-RG/providers/Microsoft.Authorization/policyAssignments/fd5e2cb3842d4eefbc857917",
226226
"policyAssignmentName": "fd5e2cb3842d4eefbc857917",
227227
"policyAssignmentDisplayName": "Enforce Jobs on Automation Hybrid Runbook Workers",
228-
"policyAssignmentScope": "/subscriptions/75475e1e-9643-4f3d-859e-055f4c31b458/resourceGroups/MAIC-RG",
228+
"policyAssignmentScope": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/MAIC-RG",
229229
"policyAssignmentParameters": {}
230230
}
231231
}

‎articles/automation/remove-user-assigned-identity.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Scenario: System-assigned managed identity is enabled or is to be enabled. One o
7878
"identity": {
7979
"type": "SystemAssigned, UserAssigned",
8080
"userAssignedIdentities": {
81-
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/firstIdentity": null
81+
"/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/firstIdentity": null
8282
}
8383
}
8484
}
@@ -101,7 +101,7 @@ Scenario: System-assigned managed identity is disabled or is to be disabled. One
101101
"identity": {
102102
"type": "UserAssigned",
103103
"userAssignedIdentities": {
104-
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/firstIdentity": null
104+
"/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/resource-group-name/providers/Microsoft.ManagedIdentity/userAssignedIdentities/firstIdentity": null
105105
}
106106
}
107107
}
@@ -121,7 +121,7 @@ Scenario: System-assigned managed identity is disabled or is to be disabled. All
121121
The following is the service's REST API request URI to send the PATCH request.
122122

123123
```http
124-
https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
124+
https://management.azure.com/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/resource-group-name/providers/Microsoft.Automation/automationAccounts/automation-account-name?api-version=2020-01-13-preview
125125
```
126126

127127
### Example

‎articles/automation/troubleshoot/update-agent-issues-linux.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ Debug: omsadmin.conf file contents:
260260
URL_TLD=opinsights.azure.com
261261
DSC_ENDPOINT=https://scus-agentservice-prod-1.azure-automation.net/Accou nts/00000000-0000-0000-0000-000000000000/Nodes\(AgentId='00000000-0000-0000-0000-000000000000'\)
262262
OMS_ENDPOINT=https://00000000-0000-0000-0000-000000000000.ods.opinsights .azure.com/OperationalData.svc/PostJsonDataItems
263-
AZURE_RESOURCE_ID=/subscriptions/00000000-0000-0000-0000-000000000000/re sourcegroups/myresourcegroup/providers/microsoft.compute/virtualmachines/linuxvm 2
263+
AZURE_RESOURCE_ID=/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/re sourcegroups/myresourcegroup/providers/microsoft.compute/virtualmachines/linuxvm 2
264264
OMSCLOUD_ID=0000-0000-0000-0000-0000-0000-00
265265
UUID=00000000-0000-0000-0000-000000000000
266266

0 commit comments

Comments
 (0)