Skip to content

Commit 1b62f05

Browse files
PMEds28PMEds28
authored
Merge pull request #290794 from MicrosoftDocs/main
Publish to Live Wednesday 4AM PST, 11/20
2 parents 9e7dfc7 + 6025466 commit 1b62f05

File tree

58 files changed

+140
-73
lines changed

Some content is hidden

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

58 files changed

+140
-73
lines changed

‎articles/app-service/app-service-undelete.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Restore-AzDeletedWebApp -TargetResourceGroupName <my_rg> -Name <my_app> -TargetA
8585

8686
>Restore used for scenarios where multiple apps with the same name have been deleted with `-DeletedSiteId`
8787
```powershell
88-
Restore-AzDeletedWebApp -ResourceGroupName <original_rg> -Name <original_app> -DeletedId /subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Web/locations/location/deletedSites/1234 -TargetAppServicePlanName <my_asp>
88+
Restore-AzDeletedWebApp -ResourceGroupName <original_rg> -Name <original_app> -DeletedId /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/providers/Microsoft.Web/locations/location/deletedSites/1234 -TargetAppServicePlanName <my_asp>
8989
9090
```
9191

@@ -129,5 +129,3 @@ Currently there's no support for Undelete (Restore-AzDeletedWebApp) Function app
129129
| **AzureWebJobsStorage** | Connection String for the storage account used by the deleted app. |
130130
| **WEBSITE_CONTENTAZUREFILECONNECTIONSTRING** | Connection String for the storage account used by the deleted app. |
131131
| **WEBSITE_CONTENTSHARE** | File share on storage account used by the deleted app. |
132-
133-

‎articles/app-service/configure-authentication-api-version.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ The following steps will allow you to manually migrate the application to the V2
7979

8080
```json
8181
{
82-
"id": "/subscriptions/00d563f8-5b89-4c6a-bcec-c1b9f6d607e0/resourceGroups/myresourcegroup/providers/Microsoft.Web/sites/mywebapp/config/authsettings",
82+
"id": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/myresourcegroup/providers/Microsoft.Web/sites/mywebapp/config/authsettings",
8383
"name": "authsettings",
8484
"type": "Microsoft.Web/sites/config",
8585
"location": "Central US",

‎articles/app-service/configure-basic-auth-disable.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ To confirm that the logs are shipped to your selected service(s), try logging in
143143
<pre>
144144
{
145145
"time": "2023-10-16T17:42:32.9322528Z",
146-
"ResourceId": "/SUBSCRIPTIONS/EF90E930-9D7F-4A60-8A99-748E0EEA69DE/RESOURCEGROUPS/MYRESOURCEGROUP/PROVIDERS/MICROSOFT.WEB/SITES/MY-DEMO-APP",
146+
"ResourceId": "/SUBSCRIPTIONS/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/RESOURCEGROUPS/MYRESOURCEGROUP/PROVIDERS/MICROSOFT.WEB/SITES/MY-DEMO-APP",
147147
"Category": "AppServiceAuditLogs",
148148
"OperationName": "Authorization",
149149
"Properties": {
@@ -175,4 +175,4 @@ The following are corresponding policies for slots:
175175

176176
#### Why do I get a warning in Visual Studio saying that basic authentication is disabled?
177177

178-
Visual Studio requires basic authentication to deploy to Azure App Service. The warning reminds you that the configuration on your app changed and you can no longer deploy to it. Either you disabled basic authentication on the app yourself, or your organization policy enforces that basic authentication is disabled for App Service apps.
178+
Visual Studio requires basic authentication to deploy to Azure App Service. The warning reminds you that the configuration on your app changed and you can no longer deploy to it. Either you disabled basic authentication on the app yourself, or your organization policy enforces that basic authentication is disabled for App Service apps.

‎articles/app-service/environment/how-to-custom-domain-suffix.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,14 @@ You need to configure the managed identity and ensure it exists before assigning
110110
"identity": {
111111
"type": "UserAssigned",
112112
"userAssignedIdentities": {
113-
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/asev3-cdns-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ase-cdns-managed-identity"
113+
"/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourcegroups/asev3-cdns-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ase-cdns-managed-identity"
114114
}
115115
},
116116
"properties": {
117117
"customDnsSuffixConfiguration": {
118118
"dnsSuffix": "antares-test.net",
119119
"certificateUrl": "https://kv-sample-key-vault.vault.azure.net/secrets/wildcard-antares-test-net",
120-
"keyVaultReferenceIdentity": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/asev3-cdns-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ase-cdns-managed-identity"
120+
"keyVaultReferenceIdentity": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourcegroups/asev3-cdns-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ase-cdns-managed-identity"
121121
},
122122
"internalLoadBalancingMode": "Web, Publishing",
123123
etc...

‎articles/app-service/environment/how-to-migrate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ If you're using a user-assigned managed identity for your custom domain suffix c
169169
"customDnsSuffixConfiguration": {
170170
"dnsSuffix": "internal.contoso.com",
171171
"certificateUrl": "https://contoso.vault.azure.net/secrets/myCertificate",
172-
"keyVaultReferenceIdentity": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/asev3-migration/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ase-managed-identity"
172+
"keyVaultReferenceIdentity": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourcegroups/asev3-migration/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ase-managed-identity"
173173
}
174174
}
175175
}

‎articles/app-service/environment/how-to-side-by-side-migrate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ If you're using a user assigned managed identity for your custom domain suffix c
176176
"customDnsSuffixConfiguration": {
177177
"dnsSuffix": "internal.contoso.com",
178178
"certificateUrl": "https://contoso.vault.azure.net/secrets/myCertificate",
179-
"keyVaultReferenceIdentity": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/asev3-migration/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ase-managed-identity"
179+
"keyVaultReferenceIdentity": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourcegroups/asev3-migration/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ase-managed-identity"
180180
}
181181
}
182182
}

‎articles/app-service/environment/migrate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ If you're using a user-assigned managed identity for your custom domain suffix c
315315
"customDnsSuffixConfiguration": {
316316
"dnsSuffix": "internal.contoso.com",
317317
"certificateUrl": "https://contoso.vault.azure.net/secrets/myCertificate",
318-
"keyVaultReferenceIdentity": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/asev3-migration/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ase-managed-identity"
318+
"keyVaultReferenceIdentity": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourcegroups/asev3-migration/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ase-managed-identity"
319319
}
320320
}
321321
}

‎articles/app-service/environment/side-by-side-migrate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ If you're using a user assigned managed identity for your custom domain suffix c
372372
"customDnsSuffixConfiguration": {
373373
"dnsSuffix": "internal.contoso.com",
374374
"certificateUrl": "https://contoso.vault.azure.net/secrets/myCertificate",
375-
"keyVaultReferenceIdentity": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/asev3-migration/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ase-managed-identity"
375+
"keyVaultReferenceIdentity": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourcegroups/asev3-migration/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ase-managed-identity"
376376
}
377377
}
378378
}

‎articles/automation/change-tracking/manage-change-tracking-monitoring-agent.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: This article tells how to use change tracking and inventory to trac
44
services: automation
55
ms.subservice: change-inventory-management
66
ms.custom: linux-related-content
7-
ms.date: 09/19/2024
7+
ms.date: 11/19/2024
88
ms.topic: how-to
99
ms.service: azure-automation
1010
---
@@ -25,7 +25,10 @@ To manage tracking and inventory, ensure that you enable Change tracking with AM
2525

2626
1. In the [Azure portal](https://portal.azure.com), select the virtual machine.
2727
1. Select a specific VM for which you would like to configure the Change tracking settings.
28-
1. Under **Operations**, select **Change tracking**
28+
1. Under **Operations**, select **Change tracking**.
29+
30+
:::image type="content" source="media/manage-change-tracking-monitoring-agent/configure-file-settings.png" alt-text="Screenshot of selecting the change tracking to configure file settings." lightbox="media/manage-change-tracking-monitoring-agent/configure-file-settings.png":::
31+
2932
1. Select **Settings** to view the **Data Collection Rule Configuration** (DCR) page. Here, you can do the following actions:
3033
1. Configure changes on a VM at a granular level.
3134
1. Select the filter to configure the workspace.

‎articles/automation/change-tracking/media/manage-change-tracking-monitoring-agent/configure-file-settings.png

248 KB
Loading

0 commit comments

Comments
 (0)