Skip to content

Commit 1309ae4

Browse files
authored
Merge pull request #203626 from MicrosoftDocs/main
7/01 AM Publish
2 parents 334f47e + ab42e99 commit 1309ae4

File tree

53 files changed

+770
-162
lines changed

Some content is hidden

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

53 files changed

+770
-162
lines changed

articles/active-directory/app-provisioning/application-provisioning-quarantine-status.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ There are three ways to check whether an application is in quarantine:
4747

4848
## Why is my application in quarantine?
4949

50+
Below are the common reasons your application may go into quarantine
51+
5052
|Description|Recommended Action|
5153
|---|---|
5254
|**SCIM Compliance issue:** An HTTP/404 Not Found response was returned rather than the expected HTTP/200 OK response. In this case, the Azure AD provisioning service has made a request to the target application and received an unexpected response.|Check the admin credentials section. See if the application requires specifying the tenant URL and that the URL is correct. If you don't see an issue, contact the application developer to ensure that their service is SCIM-compliant. https://tools.ietf.org/html/rfc7644#section-3.4.2 |

articles/active-directory/roles/permissions-reference.md

Lines changed: 141 additions & 43 deletions
Large diffs are not rendered by default.

articles/aks/learn/quick-kubernetes-deploy-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ The following output example resembles successful creation of the resource group
8484
Create an AKS cluster using the [az aks create][az-aks-create] command with the *--enable-addons monitoring* parameter to enable [Container insights][azure-monitor-containers]. The following example creates a cluster named *myAKSCluster* with one node and enables a system-assigned managed identity:
8585

8686
```azurecli-interactive
87-
az aks create -g myResourceGroup -n myManagedCluster --enable-managed-identity --node-count 1 --enable-addons monitoring
87+
az aks create -g myResourceGroup -n myAKSCluster --enable-managed-identity --node-count 1 --enable-addons monitoring
8888
```
8989

9090
After a few minutes, the command completes and returns JSON-formatted information about the cluster.
@@ -321,4 +321,4 @@ This quickstart is for introductory purposes. For guidance on a creating full so
321321
[kubernetes-deployment]: ../concepts-clusters-workloads.md#deployments-and-yaml-manifests
322322
[kubernetes-service]: ../concepts-network.md#services
323323
[windows-container-cli]: ../windows-container-cli.md
324-
[aks-solution-guidance]: /azure/architecture/reference-architectures/containers/aks-start-here?WT.mc_id=AKSDOCSPAGE
324+
[aks-solution-guidance]: /azure/architecture/reference-architectures/containers/aks-start-here?WT.mc_id=AKSDOCSPAGE

articles/app-service/manage-backup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.custom: seodec18
1212

1313
In [Azure App Service](overview.md), you can easily restore app backups. You can also make on-demand custom backups or configure scheduled custom backups. You can restore a backup by overwriting an existing app by restoring to a new app or slot. This article shows you how to restore a backup and make custom backups.
1414

15-
Backup and restore**Standard**, **Premium**, **Isolated**. For more information about scaling your App Service plan to use a higher tier, see [Scale up an app in Azure](manage-scale-up.md).
15+
Back up and restore **Standard**, **Premium**, **Isolated**. For more information about scaling your App Service plan to use a higher tier, see [Scale up an app in Azure](manage-scale-up.md).
1616

1717
## Automatic vs custom backups
1818

articles/automation/automation-hrw-run-runbooks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ By default, the Hybrid jobs run under the context of System account. However, to
203203
1. Select **Settings**.
204204
1. Change the value of **Hybrid Worker credentials** from **Default** to **Custom**.
205205
1. Select the credential and click **Save**.
206-
1. If the following permissions are not assigned for Custom users, jobs might get suspended.
206+
1. If the following permissions are not assigned for Custom users, jobs might get suspended. Add these permission to the Hybrid Runbook Worker account on the runbook worker machine, instead of adding the account to **Administrators** group because the `Filtered Token` feature of UAC would grant standard user rights to this account when logging-in. For more details, refer to - [Information about UAC on Windows Server](/troubleshoot/windows-server/windows-security/disable-user-account-control#more-information).
207207
Use your discretion in assigning the elevated permissions corresponding to the following registry keys/folders:
208208
209209
**Registry path**
@@ -484,4 +484,4 @@ To help troubleshoot issues with your runbooks running on a hybrid runbook worke
484484
* If your runbooks aren't completing successfully, review the troubleshooting guide for [runbook execution failures](troubleshoot/hybrid-runbook-worker.md#runbook-execution-fails).
485485
* For more information on PowerShell, including language reference and learning modules, see [PowerShell Docs](/powershell/scripting/overview).
486486
* Learn about [using Azure Policy to manage runbook execution](enforce-job-execution-hybrid-worker.md) with Hybrid Runbook Workers.
487-
* For a PowerShell cmdlet reference, see [Az.Automation](/powershell/module/az.automation).
487+
* For a PowerShell cmdlet reference, see [Az.Automation](/powershell/module/az.automation).

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ For more information, see [Virtual network service tags](../../virtual-network/s
3939

4040
The table below lists the URLs that must be available in order to install and use the Connected Machine agent.
4141

42+
# [Azure Cloud](#tab/azure-cloud)
43+
4244
| Agent resource | Description | When required| Endpoint used with private link |
4345
|---------|---------|--------|---------|
4446
|`aka.ms`|Used to resolve the download script during installation|At installation time, only| Public |
@@ -56,6 +58,21 @@ The table below lists the URLs that must be available in order to install and us
5658
|`*.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 |
5759
|`dc.services.visualstudio.com`|Agent telemetry|Optional| Public |
5860

61+
# [Azure Government](#tab/azure-government)
62+
63+
| Agent resource | Description | When required| Endpoint used with private link |
64+
|---------|---------|--------|---------|
65+
|`aka.ms`|Used to resolve the download script during installation|At installation time, only| Public |
66+
|`download.microsoft.com`|Used to download the Windows installation package|At installation time, only| Public |
67+
|`packages.microsoft.com`|Used to download the Linux installation package|At installation time, only| Public |
68+
|`login.microsoftonline.us`|Azure Active Directory|Always| Public |
69+
|`pasff.usgovcloudapi.net`|Azure Active Directory|Always| Public |
70+
|`management.usgovcloudapi.net`|Azure Resource Manager - to create or delete the Arc server resource|When connecting or disconnecting a server, only| Public, unless a [resource management private link](../../azure-resource-manager/management/create-private-link-access-portal.md) is also configured |
71+
|`*.his.arc.azure.us`|Metadata and hybrid identity services|Always| Private |
72+
|`*.guestconfiguration.azure.us`| Extension management and guest configuration services |Always| Private |
73+
|`*.blob.core.usgovcloudapi.net`|Download source for Azure Arc-enabled servers extensions|Always, except when using private endpoints| Not used when private link is configured |
74+
|`dc.applicationinsights.us`|Agent telemetry|Optional| Public |
75+
5976
## Transport Layer Security 1.2 protocol
6077

6178
To ensure the security of data in transit to Azure, we strongly encourage you to configure machine to use Transport Layer Security (TLS) 1.2. Older versions of TLS/Secure Sockets Layer (SSL) have been found to be vulnerable and while they still currently work to allow backwards compatibility, they are **not recommended**.

articles/azure-functions/consumption-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Azure Functions Consumption plan hosting
3-
description: Learn about how Azure Function Consumption plan hosting lets you run your code in an environment that scales dynamically, but you only pay for resources used during execution.
3+
description: Learn about how Azure Functions Consumption plan hosting lets you run your code in an environment that scales dynamically, but you only pay for resources used during execution.
44
ms.date: 8/31/2020
55
ms.topic: conceptual
66
# Customer intent: As a developer, I want to understand the benefits of using the Consumption plan so I can get the scalability benefits of Azure Functions without having to pay for resources I don't need.

articles/azure-monitor/essentials/activity-log.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: View the Azure Monitor activity log and send it to Azure Monitor Lo
44
author: bwren
55
services: azure-monitor
66
ms.topic: conceptual
7-
ms.date: 09/09/2021
7+
ms.date: 07/01/2022
88
ms.author: bwren
99
ms.reviewer: lualderm
1010
---
@@ -69,8 +69,8 @@ You can also access activity log events by using the following methods:
6969
- Use log queries to perform complex analysis and gain deep insights on activity log entries.
7070
- Use log alerts with Activity entries for more complex alerting logic.
7171
- Store activity log entries for longer than the activity log retention period.
72-
- Incur no data ingestion charges for activity log data stored in a Log Analytics workspace.
73-
- Incur no data retention charges for the first 90 days for activity log data stored in a Log Analytics workspace.
72+
- Incur no data ingestion or retention charges for activity log data stored in a Log Analytics workspace.
73+
- The default retention period in Log Analytics is 90 days
7474

7575
Select **Export Activity Logs** to send the activity log to a Log Analytics workspace.
7676

articles/azure-netapp-files/TOC.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,8 @@
203203
href: azure-netapp-files-create-volumes-smb.md
204204
- name: Enable Continuous Availability on existing SMB volumes
205205
href: enable-continuous-availability-existing-SMB.md
206+
- name: Use DFS-N and DFS Root Consolidation with Azure NetApp Files
207+
href: use-dfs-n-and-dfs-root-consolidation-with-azure-netapp-files.md
206208
- name: Manage dual-protocol volumes
207209
items:
208210
- name: Create a dual-protocol volume
@@ -352,4 +354,4 @@
352354
- name: Azure Files and Azure NetApp Files comparison
353355
href: ../storage/files/storage-files-netapp-comparison.md
354356
- name: Azure NetApp Files on Microsoft Q&A
355-
href: /answers/topics/25532/azure-netapp-files.html
357+
href: /answers/topics/25532/azure-netapp-files.html

0 commit comments

Comments
 (0)