Skip to content

Commit b547151

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents d2e27df + e8c3435 commit b547151

File tree

216 files changed

+3090
-2774
lines changed

Some content is hidden

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

216 files changed

+3090
-2774
lines changed

.openpublishing.redirection.data-factory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"source_path_from_root": "/articles/data-factory/turorial-push-lineage-to-purview.md",
1010
"redirect_url": "/azure/data-factory/tutorial-push-lineage-to-purview",
1111
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/data-factory/continuous-integration-deployment.md",
15+
"redirect_url": "/azure/data-factory/continuous-integration-delivery",
16+
"redirect_document_id": false
1217
}
1318
]
1419
}

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15733,6 +15733,11 @@
1573315733
"redirect_url": "/azure/cognitive-services/QnAMaker/",
1573415734
"redirect_document_id": false
1573515735
},
15736+
{
15737+
"source_path_from_root": "/articles/cognitive-services/QnAMaker/concepts/active-learning-suggestions.md",
15738+
"redirect_url": "/azure/cognitive-services/QnAMaker/",
15739+
"redirect_document_id": false
15740+
},
1573615741
{
1573715742
"source_path_from_root": "/articles/cognitive-services/QnAMaker/reference-document-type-url.md",
1573815743
"redirect_url": "/azure/cognitive-services/QnAMaker/",

.openpublishing.redirection.synapse-analytics.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
"redirect_url": "/azure/synapse-analytics/sql/data-loading-best-practices",
4141
"redirect_document_id": false
4242
},
43+
{
44+
"source_path_from_root": "/articles/synapse-analytics/cicd/continuous-integration-deployment.md",
45+
"redirect_url": "/azure/synapse-analytics/cicd/continuous-integration-delivery",
46+
"redirect_document_id": false
47+
},
4348
{
4449
"source_path_from_root": "/articles/synapse-analytics/sql/develop-best-practices.md",
4550
"redirect_url": "/azure/synapse-analytics/sql/best-practices-dedicated-sql-pool",

articles/active-directory/manage-apps/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
- name: Create collections on My Apps
108108
href: access-panel-collections.md
109109
- name: Enable self-service app access
110-
href: access-panel-manage-self-service-access.md
110+
href: manage-self-service-access.md
111111
- name: Hide an app
112112
href: hide-application-from-user-portal.md
113113
- name: Disable user sign-on
@@ -180,7 +180,7 @@
180180
href: application-types.md
181181
- name: Reasons users are assigned to an app
182182
href: ways-users-get-assigned-to-applications.md
183-
- name: Remove user access
183+
- name: Methods of removing user access to an app
184184
href: methods-for-removing-user-access.md
185185
- name: Resources
186186
items:

articles/application-gateway/key-vault-certs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Define access policies to use the user-assigned managed identity with your key v
6666

6767
If you're using the permission model **Azure role-based access control**: Add a role assignment for the user-assigned managed identity to the Azure key vault for the role **Key Vault Secrets User**.
6868

69-
As of March 15, 2021, Key Vault recognizes Application Gateway as a trusted service, so you can build a secure network boundary in Azure. You can deny access to traffic from all networks (including internet traffic) to Key Vault but still make Key Vault accessible for an Application Gateway resource under your subscription.
69+
As of March 15, 2021, Key Vault recognizes Application Gateway as a trusted service by leveraging User Managed Identities for authentication to Azure Key Vault. With the use of service endpoints and enabling the trusted services option for key vault's firewall, you can build a secure network boundary in Azure. You can deny access to traffic from all networks (including internet traffic) to Key Vault but still make Key Vault accessible for an Application Gateway resource under your subscription.
7070

7171
When you're using a restricted key vault, use the following steps to configure Application Gateway to use firewalls and virtual networks:
7272

articles/automation/quickstarts/create-account-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ An Azure account with an active subscription. [Create an account for free](https
2323

2424
1. From the top menu, select **+ Create a resource**.
2525

26-
1. Under Categories**, select **IT & Management Tools**, and then select **Automation**.
26+
1. Under **Categories**, select **IT & Management Tools**, and then select **Automation**.
2727

2828
:::image type="content" source="./media/create-account-portal/automation-account-portal.png" alt-text="Locating Automation accounts in portal.":::
2929

@@ -34,7 +34,7 @@ An Azure account with an active subscription. [Create an account for free](https
3434
|Name| Enter a name unique for it's location and resource group. Names for Automation accounts that have been deleted might not be immediately available. You can't change the account name once it has been entered in the user interface. |
3535
|Subscription| From the drop-down list, select the Azure subscription for the account.|
3636
|Resource group|From the drop-down list, select your existing resource group, or select **Create new**.|
37-
|Location| From the drop-down list, select a location for the account. For an updated list of locations that you can deploy an Automation account to, see [Products available by region](https://azure.microsoft.com/global-infrastructure/services/?products=automation&regions=all)|
37+
|Location| From the drop-down list, select a location for the account. For an updated list of locations that you can deploy an Automation account to, see [Products available by region](https://azure.microsoft.com/global-infrastructure/services/?products=automation&regions=all).|
3838
|Create Azure Run As account| Select **No**. An Azure Run As account in the Automation account is useful for authenticating with Azure; however, managed identities in Automation is now available. [Managed identities](../../active-directory/managed-identities-azure-resources/overview.md) provide an identity for applications to use when connecting to resources that support Azure Active Directory (Azure AD) authentication. |
3939

4040
:::image type="content" source="./media/create-account-portal/add-automation-account-portal.png" alt-text="Required fields for adding the Automation account":::

articles/availability-zones/az-region.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,15 @@ To achieve comprehensive business continuity on Azure, build your application ar
4444

4545
| Americas | Europe | Africa | Asia Pacific |
4646
|--------------------|----------------------|---------------------|----------------|
47-
| | | | |
4847
| Brazil South | France Central | South Africa North* | Australia East |
4948
| Canada Central | Germany West Central | | Central India* |
5049
| Central US | North Europe | | Japan East |
5150
| East US | Norway East | | Korea Central* |
5251
| East US 2 | UK South | | Southeast Asia |
53-
| South Central US | West Europe | | |
52+
| South Central US | West Europe | | |
5453
| US Gov Virginia | | | |
55-
| West US 2 | | | |
56-
| West US 3 | | | |
54+
| West US 2 | | | |
55+
| West US 3 | | | |
5756

5857
\* To learn more about Availability Zones and available services support in these regions, contact your Microsoft sales or customer representative. For the upcoming regions that will support Availability Zones, see [Azure geographies](https://azure.microsoft.com/global-infrastructure/geographies/).
5958

articles/azure-arc/kubernetes/quickstart-connect-cluster.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ In this quickstart, you'll learn the benefits of Azure Arc-enabled Kubernetes an
9393
| `https://login.microsoftonline.com`, `login.windows.net` (for Azure Cloud), `https://login.microsoftonline.us` (for Azure US Government) | Required to fetch and update Azure Resource Manager tokens. |
9494
| `https://mcr.microsoft.com`, `https://*.data.mcr.microsoft.com` | Required to pull container images for Azure Arc agents. |
9595
| `https://gbl.his.arc.azure.com` | Required to get the regional endpoint for pulling system-assigned Managed Service Identity (MSI) certificates. |
96-
| `https://*.his.arc.azure.com` (for Azure Cloud), `https://usgv.his.arc.azure.us` (for Azure US Government) | Required to pull system-assigned Managed Service Identity (MSI) certificates. |
96+
| `https://*.his.arc.azure.com` (for Azure Cloud), `https://usgv.his.arc.azure.us` and `https://gbl.his.arc.azure.us` (for Azure US Government) | Required to pull system-assigned Managed Identity certificates. |
9797
|`*.servicebus.windows.net`, `guestnotificationservice.azure.com`, `*.guestnotificationservice.azure.com`, `sts.windows.net` | For [Cluster Connect](cluster-connect.md) and for [Custom Location](custom-locations.md) based scenarios. |
9898

9999
## 1. Register providers for Azure Arc-enabled Kubernetes

articles/azure-functions/monitor-metrics.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ ms.date: 07/4/2021
1010

1111
Azure Functions integrates with Azure Monitor Metrics to let you analyze the metrics generated by your function app during execution. To learn more, see the [Azure Monitor Metrics overview](../azure-monitor/essentials/data-platform-metrics.md). These metrics indicate how your function app is running on the App Service platform. You can review resource consumption data used to estimate consumption plan costs. To investigate detailed telemetry from your function executions, including log data, you should also use [Application Insights](functions-monitoring.md) in Azure Monitor.
1212

13-
> [!NOTE]
14-
> Azure Monitor Metrics is not currently supported when your function app runs on Linux in a Consumption plan.
15-
1613
## Available metrics
1714

1815
Azure Monitor collects numeric data from a set of monitored resources, which are entered into a time series database. Azure Monitor collects metrics specific to both Functions and the underlying App Service resources.

articles/azure-monitor/agents/agents-overview.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ The following tables list the operating systems that are supported by the Azure
154154
| Windows 10 Enterprise<br>(including multi-session) and Pro<br>(Server scenarios only<sup>1</sup>) | X | X | X | X |
155155
| Windows 8 Enterprise and Pro<br>(Server scenarios only<sup>1</sup>) | | X | X | |
156156
| Windows 7 SP1<br>(Server scenarios only<sup>1</sup>) | | X | X | |
157+
| Azure Stack HCI | | X | | |
157158

158159
<sup>1</sup> Running the OS on server hardware, i.e. machines that are always connected, always turned on, and not running other workloads (PC, office, browser, etc.)
159160

@@ -162,6 +163,7 @@ The following tables list the operating systems that are supported by the Azure
162163
| Operating system | Azure Monitor agent <sup>1</sup> | Log Analytics agent <sup>1</sup> | Dependency agent | Diagnostics extension <sup>2</sup>|
163164
|:---|:---:|:---:|:---:|:---:
164165
| Amazon Linux 2017.09 | | X | | |
166+
| Amazon Linux 2 | | X | | |
165167
| CentOS Linux 8 | X <sup>3</sup> | X | X | |
166168
| CentOS Linux 7 | X | X | X | X |
167169
| CentOS Linux 6 | | X | | |
@@ -186,7 +188,7 @@ The following tables list the operating systems that are supported by the Azure
186188
| SUSE Linux Enterprise Server 15 | X | X | X | |
187189
| SUSE Linux Enterprise Server 12 SP5 | X | X | X | X |
188190
| SUSE Linux Enterprise Server 12 | X | X | X | X |
189-
| Ubuntu 20.04 LTS | X | X | X | |
191+
| Ubuntu 20.04 LTS | X | X | X | X |
190192
| Ubuntu 18.04 LTS | X | X | X | X |
191193
| Ubuntu 16.04 LTS | X | X | X | X |
192194
| Ubuntu 14.04 LTS | | X | | X |

0 commit comments

Comments
 (0)