Skip to content

Commit 6a0b5f8

Browse files
halkazwinihalkazwini
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nw-open-sfi
2 parents 1d3a37c + d9d78fd commit 6a0b5f8

File tree

331 files changed

+2081
-922
lines changed

Some content is hidden

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

331 files changed

+2081
-922
lines changed

‎articles/active-directory-b2c/media/phone-based-mfa/details-tab-1.png

74 Bytes
Loading

‎articles/active-directory-b2c/media/phone-based-mfa/details-tab-2.png

-2.18 KB
Loading

‎articles/active-directory-b2c/media/phone-based-mfa/details-tab-3.png

-3.44 KB
Loading

‎articles/active-directory-b2c/media/phone-based-mfa/overview-tab.png

-2.88 KB
Loading

‎articles/active-directory-b2c/phone-based-mfa.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: kengaderdus
77
manager: CelesteDG
88
ms.service: azure-active-directory
99
ms.topic: how-to
10-
ms.date: 09/11/2024
10+
ms.date: 10/23/2024
1111
ms.author: kengaderdus
1212
ms.subservice: b2c
1313

@@ -114,4 +114,4 @@ Take the following actions to help mitigate fraudulent sign-ups.
114114

115115
- Learn about [Identity Protection and Conditional Access for Azure AD B2C](conditional-access-identity-protection-overview.md)
116116

117-
- Apply [Conditional Access to user flows in Azure Active Directory B2C](conditional-access-user-flow.md)
117+
- Apply [Conditional Access to user flows in Azure Active Directory B2C](conditional-access-user-flow.md)

‎articles/automation/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@
274274
items:
275275
- name: Migration from Log Analytics to Azure Monitoring Agent version
276276
href: change-tracking/guidance-migration-log-analytics-monitoring-agent.md
277-
- name: Use Log Analytics
277+
- name: Use Log Analytics (Retired)
278278
items:
279279
- name: Overview
280280
href: change-tracking/overview.md
@@ -312,7 +312,7 @@
312312
href: troubleshoot/onboarding.md
313313
- name: Troubleshoot Change Tracking and Inventory issues
314314
href: troubleshoot/change-tracking.md
315-
- name: Update Management
315+
- name: Update Management (Retired)
316316
items:
317317
- name: Overview
318318
href: update-management/overview.md

‎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/change-tracking/overview-monitoring-agent.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure Automation Change Tracking and Inventory overview using Azure Monit
33
description: This article describes the Change Tracking and Inventory feature using Azure monitoring agent, which helps you identify software and Microsoft service changes in your environment.
44
services: automation
55
ms.subservice: change-inventory-management
6-
ms.date: 09/27/2024
6+
ms.date: 10/23/2024
77
ms.topic: overview
88
ms.service: azure-automation
99
---
@@ -13,7 +13,7 @@ ms.service: azure-automation
1313
**Applies to:** :heavy_check_mark: Windows VMs :heavy_check_mark: Linux VMs :heavy_check_mark: Windows Registry :heavy_check_mark: Windows Files :heavy_check_mark: Linux Files :heavy_check_mark: Windows Software :heavy_check_mark: Windows Services & Linux Daemons
1414

1515
> [!Important]
16-
> - Change Tracking and Inventory using Log Analytics agent has retired on **31 August 2024**. Follow the guidelines for [migration from Change Tracking and inventory using Log Analytics to Change Tracking and inventory using Azure Monitoring Agent version](guidance-migration-log-analytics-monitoring-agent.md)
16+
> - Change Tracking and Inventory using Log Analytics agent has retired on **31 August 2024** and will work on limited support till **01 February 2025**. Follow the guidelines for [migration from Change Tracking and inventory using Log Analytics to Change Tracking and inventory using Azure Monitoring Agent version](guidance-migration-log-analytics-monitoring-agent.md)
1717
> - We recommend that you use Change Tracking with Azure Monitoring Agent with the Change tracking extension version 2.20.0.0 (or above) to access the GA version of this service.
1818
1919
This article explains on the latest version of change tracking support using Azure Monitoring Agent as a singular agent for data collection.
@@ -78,7 +78,7 @@ You can enable Change Tracking and Inventory in the following ways:
7878

7979
- For a single Azure VM from the [Virtual machine page](enable-from-vm.md) in the Azure portal. This scenario is available for Linux and Windows VMs.
8080

81-
- For [multiple Azure VMs](enable-from-portal.md) by selecting them from the Virtual machines page in the Azure portal.
81+
- For [multiple Azure VMs](enable-vms-monitoring-agent.md) by selecting them from the Virtual machines page in the Azure portal.
8282

8383
## Tracking file changes
8484

0 commit comments

Comments
 (0)