Skip to content

Commit 45a7744

Browse files
authored
Merge pull request #213056 from MicrosoftDocs/main
9/29 AM Publish
2 parents 6bd1db2 + 8b51b27 commit 45a7744

30 files changed

+154
-373
lines changed
282 Bytes
Loading

articles/active-directory/develop/apple-sso-plugin.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ Common settings:
9090
- `https://sts.windows.net`
9191
- `https://login.partner.microsoftonline.cn`
9292
- `https://login.chinacloudapi.cn`
93-
- `https://login.microsoftonline.de`
9493
- `https://login.microsoftonline.us`
9594
- `https://login.usgovcloudapi.net`
9695
- `https://login-us.microsoftonline.com`

articles/api-management/api-management-advanced-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ This policy can be used in the following policy [sections](./api-management-howt
858858

859859
## <a name="SetHttpProxy"></a> Set HTTP proxy
860860

861-
The `proxy` policy allows you to route requests forwarded to backends via an HTTP proxy. Only HTTP (not HTTPS) is supported between the gateway and the proxy. Basic and NTLM authentication only.
861+
The `proxy` policy allows you to route requests forwarded to backends via an HTTP proxy. Only HTTP (not HTTPS) is supported between the gateway and the proxy. Basic and NTLM authentication only. To route the send-request via HTTP proxy, you must place the set HTTP proxy policy inside the send-request policy block.
862862

863863
[!INCLUDE [api-management-policy-generic-alert](../../includes/api-management-policy-generic-alert.md)]
864864

articles/app-service/configure-connect-to-azure-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ This guide shows how to mount Azure Storage Files as a network share in a Window
3737
- Make static content like video and images readily available for your App Service app.
3838
- Write application log files or archive older application log to Azure File shares.
3939
- Share content across multiple apps or with other Azure services.
40-
- Mount Azure Storage in a Windows container in a Standard tier or higher plan, including Isolated ([App Service environment v3](environment/overview.md)).
40+
- Mount Azure Storage in a Windows container, including Isolated ([App Service environment v3](environment/overview.md)).
4141

4242
The following features are supported for Windows containers:
4343

articles/azure-arc/servers/network-requirements.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Connected Machine agent network requirements
33
description: Learn about the networking requirements for using the Connected Machine agent for Azure Arc-enabled servers.
4-
ms.date: 09/09/2022
4+
ms.date: 09/29/2022
55
ms.topic: conceptual
66
---
77

@@ -55,6 +55,7 @@ The table below lists the URLs that must be available in order to install and us
5555
|`guestnotificationservice.azure.com`, `*.guestnotificationservice.azure.com`|Notification service for extension and connectivity scenarios|Always| Public |
5656
|`azgn*.servicebus.windows.net`|Notification service for extension and connectivity scenarios|Always| Public |
5757
|`*.servicebus.windows.net`|For Windows Admin Center and SSH scenarios|If using SSH or Windows Admin Center from Azure|Public|
58+
|`*.waconazure.com`|For Windows Admin Center connectivity|If using Windows Admin Center|Public|
5859
|`*.blob.core.windows.net`|Download source for Azure Arc-enabled servers extensions|Always, except when using private endpoints| Not used when private link is configured |
5960
|`dc.services.visualstudio.com`|Agent telemetry|Optional| Public |
6061

articles/azure-functions/functions-identity-access-azure-sql-with-managed-identity.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ To enable system-assigned managed identity in the Azure portal:
7979
8080
For information on enabling system-assigned managed identity through Azure CLI or PowerShell, check out more information on [using managed identities with Azure Functions](../app-service/overview-managed-identity.md?tabs=dotnet&toc=%2fazure%2fazure-functions%2ftoc.json#add-a-system-assigned-identity).
8181
82+
> [!TIP]
83+
> For user-assigned managed identity, switch to the User Assigned tab. Click Add and select a Managed Identity. For more information on creating user-assigned managed identity, see the [Manage user-assigned managed identities](../active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities.md).
84+
8285
8386
## Grant SQL database access to the managed identity
8487
@@ -114,8 +117,11 @@ In the application settings of our Function App the SQL connection string settin
114117
115118
*testdb* is the name of the database we're connecting to and *demo.database.windows.net* is the name of the server we're connecting to.
116119
120+
>[!TIP]
121+
>For user-assigned managed identity, use `Server=demo.database.windows.net; Authentication=Active Directory Managed Identity; User Id=ClientIdOfManagedIdentity; Database=testdb`.
122+
117123
## Next steps
118124
119125
- [Read data from a database (Input binding)](./functions-bindings-azure-sql-input.md)
120126
- [Save data to a database (Output binding)](./functions-bindings-azure-sql-output.md)
121-
- [Review ToDo API sample with Azure SQL bindings](/samples/azure-samples/azure-sql-binding-func-dotnet-todo/todo-backend-dotnet-azure-sql-bindings-azure-functions/)
127+
- [Review ToDo API sample with Azure SQL bindings](/samples/azure-samples/azure-sql-binding-func-dotnet-todo/todo-backend-dotnet-azure-sql-bindings-azure-functions/)

articles/azure-monitor/app/app-insights-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ To use the SDK, you install a small instrumentation package in your app and then
6060

6161
### [.NET](#tab/net)
6262

63-
Integrated Auto-instrumentation is available for [Azure App Service .NET](azure-web-apps-net.md), [Azure App Service .NET Core](azure-web-apps-net-core.md), [Azure Functions](../../azure-functions/functions-monitoring.md#monitor-executions-in-azure-functions), and [Azure Virtual Machines](azure-vm-vmss-apps.md).
63+
Integrated Auto-instrumentation is available for [Azure App Service .NET](azure-web-apps-net.md), [Azure App Service .NET Core](azure-web-apps-net-core.md), [Azure Functions](../../azure-functions/functions-monitoring.md), and [Azure Virtual Machines](azure-vm-vmss-apps.md).
6464

6565
[Azure Monitor Application Insights Agent](status-monitor-v2-overview.md) is available for workloads running in on-premises virtual machines.
6666

@@ -72,9 +72,9 @@ A preview [Open Telemetry](opentelemetry-enable.md?tabs=net) offering is also av
7272

7373
### [Java](#tab/java)
7474

75-
Auto-instrumentation is available for any environment using [Azure Monitor OpenTelemetry-based auto-instrumentation for Java applications](java-in-process-agent.md).
75+
Integrated Auto-Instrumentation is available for Java Apps hosted on [Azure App Service](azure-web-apps-java.md) and [Azure Functions](monitor-functions.md).
7676

77-
Integrated Auto-Instrumentation is available for Java Apps hosted on [Azure App Service](azure-web-apps-java.md) and [Azure Functions](monitor-functions.md#distributed-tracing-for-java-applications-public-preview).
77+
Auto-instrumentation is available for any environment using [Azure Monitor OpenTelemetry-based auto-instrumentation for Java applications](java-in-process-agent.md).
7878

7979
### [Node.js](#tab/nodejs)
8080

articles/azure-monitor/containers/container-insights-cost.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ The following list is the eight metrics per container collected:
7979

8080
The following list is the cluster inventory data collected by default:
8181

82-
- KubePodInventory – 1 per minute per container
82+
- KubePodInventory – 1 per pod per minute
8383
- KubeNodeInventory – 1 per node per minute
8484
- KubeServices – 1 per service per minute
8585
- ContainerInventory – 1 per container per minute

articles/azure-video-indexer/index.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ landingContent:
2626
links:
2727
- text: "What is Azure Video Indexer?"
2828
url: video-indexer-overview.md
29-
- text: "Compare Media Services v3 presets and Azure Video Indexer"
30-
url: compare-video-indexer-with-media-services-presets.md
3129
- text: Frequently asked questions
3230
url: faq.yml
3331
- text: User voice

articles/backup/backup-azure-arm-vms-prepare.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
title: Back up Azure VMs in a Recovery Services vault
33
description: Describes how to back up Azure VMs in a Recovery Services vault using the Azure Backup
44
ms.topic: conceptual
5-
ms.date: 06/01/2021
5+
ms.date: 09/29/2022
6+
author: v-amallick
7+
ms.service: backup
8+
ms.author: v-amallick
69
---
710
# Back up Azure VMs in a Recovery Services vault
811

@@ -58,7 +61,7 @@ Modify the storage replication type as follows:
5861

5962
To apply a backup policy to your Azure VMs, follow these steps:
6063

61-
1. Navigate to Backup center and click **+Backup** from the **Overview** tab.
64+
1. Go to the Backup center and click **+Backup** from the **Overview** tab.
6265

6366
![Backup button](./media/backup-azure-arm-vms-prepare/backup-button.png)
6467

@@ -108,7 +111,7 @@ If you selected to create a new backup policy, fill in the policy settings.
108111
2. In **Backup schedule**, specify when backups should be taken. You can take daily or weekly backups for Azure VMs.
109112
3. In **Instant Restore**, specify how long you want to retain snapshots locally for instant restore.
110113
* When you restore, backed up VM disks are copied from storage, across the network to the recovery storage location. With instant restore, you can leverage locally stored snapshots taken during a backup job, without waiting for backup data to be transferred to the vault.
111-
* You can retain snapshots for instant restore for between one to five days. Two days is the default setting.
114+
* You can retain snapshots for instant restore for between one to five days. The default setting is *two days*.
112115
4. In **Retention range**, specify how long you want to keep your daily or weekly backup points.
113116
5. In **Retention of monthly backup point** and **Retention of yearly backup point**, specify whether you want to keep a monthly or yearly backup of your daily or weekly backups.
114117
6. Select **OK** to save the policy.
@@ -118,13 +121,14 @@ If you selected to create a new backup policy, fill in the policy settings.
118121
![New backup policy](./media/backup-azure-arm-vms-prepare/new-policy.png)
119122

120123
> [!NOTE]
121-
> Azure Backup doesn't support automatic clock adjustment for daylight-saving changes for Azure VM backups. As time changes occur, modify backup policies manually as required.
124+
>- Azure Backup doesn't support automatic clock adjustment for daylight-saving changes for Azure VM backups. As time changes occur, modify backup policies manually as required.
125+
>- If you want hourly backups, then you can configure *Enhanced backup policy*. For more information, see [Back up an Azure VM using Enhanced policy](backup-azure-vms-enhanced-policy.md#create-an-enhanced-policy-and-configure-vm-backup).
122126
123127
## Trigger the initial backup
124128

125129
The initial backup will run in accordance with the schedule, but you can run it immediately as follows:
126130

127-
1. Navigate to Backup center and select the **Backup Instances** menu item.
131+
1. Go to the Backup center and select the **Backup Instances** menu item.
128132
1. Select **Azure Virtual machines** as the **Datasource type**. Then search for the VM that you have configured for backup.
129133
1. Right-click the relevant row or select the more icon (…), and then click **Backup Now**.
130134
1. In **Backup Now**, use the calendar control to select the last day that the recovery point should be retained. Then select **OK**.

0 commit comments

Comments
 (0)