Skip to content

Commit 9e49352

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into freshness_c65
2 parents e6ee968 + 5f3b0c5 commit 9e49352

File tree

68 files changed

+1763
-1139
lines changed

Some content is hidden

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

68 files changed

+1763
-1139
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-vnet-classic-cli",
3636
"redirect_document_id": false
3737
},
38-
3938
{
4039
"source_path": "articles/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file.md",
4140
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file",
@@ -20691,6 +20690,11 @@
2069120690
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
2069220691
"redirect_document_id": false
2069320692
},
20693+
{
20694+
"source_path": "articles/marketplace/partner-center-portal/billing-details.md",
20695+
"redirect_url": "https://docs.microsoft.com/azure/marketplace/marketplace-commercial-transaction-capabilities-and-considerations",
20696+
"redirect_document_id": false
20697+
},
2069420698
{
2069520699
"source_path": "articles/multi-factor-authentication/multi-factor-authentication-app-faq.md",
2069620700
"redirect_url": "./end-user/microsoft-authenticator-app-faq",
4.45 KB
Loading
2.85 KB
Loading

articles/active-directory/users-groups-roles/roles-delegate-by-task.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.workload: identity
1010
ms.subservice: users-groups-roles
1111
ms.topic: article
12-
ms.date: 03/03/2020
12+
ms.date: 05/04/2020
1313
ms.author: curtand
1414
ms.reviewer: vincesm
1515
ms.custom: it-pro
@@ -73,9 +73,9 @@ Configure company properties | Global Administrator |
7373

7474
Task | Least privileged role | Additional roles
7575
---- | --------------------- | ----------------
76-
Passthrough authentication | Global Administrator |
77-
Read all configuration | Global reader | Global Administrator |
78-
Seamless single sign-on | Global Administrator |
76+
Passthrough authentication | Hybrid Identity Administrator |
77+
Read all configuration | Global reader | Hybrid Identity Administrator |
78+
Seamless single sign-on | Hybrid Identity Administrator |
7979

8080
## Connect Health
8181

articles/aks/azure-ad-integration-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ serverApplicationId=$(az ad app create \
5353
--identifier-uris "https://${aksname}Server" \
5454
--query appId -o tsv)
5555
56-
# Update the application group memebership claims
56+
# Update the application group membership claims
5757
az ad app update --id $serverApplicationId --set groupMembershipClaims=All
5858
```
5959

articles/api-management/api-management-howto-protect-backend-with-aad.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Every client application that calls the API needs to be registered as an applica
7575
- In the **Name** section, enter a meaningful application name that will be displayed to users of the app, such as *client-app*.
7676
- In the **Supported account types** section, select **Accounts in any organizational directory (Any Azure AD directory - Multitenant)**.
7777

78-
1. In the **Redirect URI** section, select `Web` and enter the URL `https://contoso5.portal.azure-api.net/signin`.
78+
1. In the **Redirect URI** section, select `Web` and leave the URL field empty for now.
7979

8080
1. Select **Register** to create the application.
8181

@@ -145,9 +145,9 @@ In this example, the Developer Console is the client-app. The following steps de
145145

146146
1. Select **Create**.
147147

148-
1. Go back to your client-app and select **Authentication**.
148+
1. Go back to your client-app registration in Azure Active Directory and select **Authentication**.
149149

150-
1. Under **Redirect URIs**, select the type as **Web**, paste the **redirect_url** under **Redirect URI**, and then save.
150+
1. Under **Platform configurations** click on **Add a platform**, and select the type as **Web**, paste the **redirect_url** under **Redirect URI**, and then click on **Configure** button to save.
151151

152152
Now that you have configured an OAuth 2.0 authorization server, the Developer Console can obtain access tokens from Azure AD.
153153

articles/automation/automation-configure-windows-update.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Configure Windows Update settings to work with Azure Update Management
33
description: This article describes the Windows Update settings that you configure to work with Azure Update Management.
44
services: automation
55
ms.subservice: update-management
6-
ms.date: 03/02/2020
6+
ms.date: 05/04/2020
77
ms.topic: conceptual
88
---
99
# Configure Windows Update settings for Update Management
@@ -17,6 +17,8 @@ Azure Update Management relies on [Windows Update client](https://docs.microsoft
1717

1818
Update Management respects many of the settings specified to control the Windows Update client. If you use settings to enable non-Windows updates, Update Management will also manage those updates. If you want to enable downloading of updates before an update deployment occurs, update deployment can be faster, more efficient, and less likely to exceed the maintenance window.
1919

20+
For additional recommendations on setting up WSUS in your Azure subscription and securely keep your Windows virtual machines up to date, review [Plan your deployment for updating Windows virtual machines in Azure using WSUS](https://docs.microsoft.com/azure/architecture/example-scenario/wsus/).
21+
2022
## Pre-download updates
2123

2224
To configure automatic downloading of updates but don't automatically install them, you can use Group Policy to set the [Configure Automatic Updates setting](/windows-server/administration/windows-server-update-services/deploy/4-configure-group-policy-settings-for-automatic-updates##configure-automatic-updates) to **3**. This setting enables downloads of the required updates in the background, and notifies you that the updates are ready to install. In this way, Update Management remains in control of schedules, but updates can be downloaded outside the Update Management maintenance window. This behavior prevents **Maintenance window exceeded** errors in Update Management.

articles/automation/automation-update-management.md

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Update Management in Azure Automation
33
description: This article describes the Update Management feature that manages updates for your Windows and Linux machines.
44
services: automation
55
ms.subservice: update-management
6-
ms.date: 02/27/2020
6+
ms.date: 05/04/2020
77
ms.topic: conceptual
88
---
99
# Update Management in Azure Automation
@@ -20,11 +20,6 @@ You can enable Update Management for virtual machines (VMs) using the following
2020
> [!NOTE]
2121
> Update Management requires linking a Log Analytics workspace to your Automation account. For a definitive list of supported regions, see [Azure Workspace mappings](how-to/region-mappings.md). The region mappings don't affect the ability to manage VMs in a separate region from your Automation account.
2222
23-
> [!NOTE]
24-
> This article was recently updated to use the term Azure Monitor logs instead of Log Analytics. Log data is still stored in a Log Analytics workspace and is still collected and analyzed by the same Log Analytics service. We are updating the terminology to better reflect the role of [logs in Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/platform/data-platform-logs). See [Azure Monitor terminology changes](https://docs.microsoft.com/azure/azure-monitor/terminology) for details.
25-
26-
[!INCLUDE [azure-monitor-log-analytics-rebrand](../../includes/azure-monitor-log-analytics-rebrand.md)]
27-
2823
An [Azure Resource Manager template](automation-update-management-deploy-template.md) is available to help you deploy Update Management to a new or existing Automation account and Log Analytics workspace in your subscription.
2924

3025
## Update Management overview
@@ -57,9 +52,9 @@ Update Management reports how up to date the machine is based on what source you
5752
5853
You can deploy and install software updates on machines that require the updates by creating a scheduled deployment. Updates classified as optional aren't included in the deployment scope for Windows machines. Only required updates are included in the deployment scope.
5954

60-
The scheduled deployment defines which target machines receive the applicable updates. It does so either by explicitly specifying certain machines or by selecting a [computer group](https://docs.microsoft.com/azure/azure-monitor/platform/computer-groups) that's based on log searches of a specific set of machines (or on an [Azure query](automation-update-management-query-logs.md) that dynamically selects Azure VMs based on specified criteria). These groups differ from [scope configuration](https://docs.microsoft.com/azure/azure-monitor/insights/solution-targeting), which is used only to determine which machines get the management packs that enable Update Management.
55+
The scheduled deployment defines which target machines receive the applicable updates. It does so either by explicitly specifying certain machines or by selecting a [computer group](https://docs.microsoft.com/azure/azure-monitor/platform/computer-groups) that's based on log searches of a specific set of machines (or on an [Azure query](automation-update-management-query-logs.md) that dynamically selects Azure VMs based on specified criteria). These groups differ from [scope configuration](https://docs.microsoft.com/azure/azure-monitor/insights/solution-targeting), which is used to control the targeting of machines that receive the configuration to enable Update Management. This prevents them from performing and reporting update compliance, and install approved required updates.
6156

62-
You also specify a schedule to approve and set a time period during which updates can be installed. This period is called the maintenance window. A 20-minute span of the maintenance window is reserved for reboots, assuming one is needed and you selected the appropriate reboot option. If patching takes longer than expected and there's less than 20 minutes in the maintenance window, a reboot won't occur.
57+
While defining a deployment, you also specify a schedule to approve and set a time period during which updates can be installed. This period is called the maintenance window. A 20-minute span of the maintenance window is reserved for reboots, assuming one is needed and you selected the appropriate reboot option. If patching takes longer than expected and there's less than 20 minutes in the maintenance window, a reboot won't occur.
6358

6459
Updates are installed by runbooks in Azure Automation. You can't view these runbooks, and they don't require any configuration. When an update deployment is created, it creates a schedule that starts a master update runbook at the specified time for the included machines. The master runbook starts a child runbook on each agent to install the required updates.
6560

@@ -106,7 +101,7 @@ The following information describes operating system-specific client requirement
106101

107102
Windows agents must be configured to communicate with a WSUS server, or they require access to Microsoft Update. For information about how to install the Log Analytics agent for Windows, see [Connect Windows computers to Azure Monitor](../log-analytics/log-analytics-windows-agent.md).
108103

109-
You can use Update Management with Configuration Manager. To learn more about integration scenarios, see [Integrate Configuration Manager with Update Management](oms-solution-updatemgmt-sccmintegration.md#configuration). The [Log Analytics agent for Windows](../azure-monitor/platform/agent-windows.md) is required. The agent is installed automatically if you're onboarding an Azure VM.
104+
You can use Update Management with Microsoft Endpoint Configuration Manager. To learn more about integration scenarios, see [Integrate Configuration Manager with Update Management](updatemgmt-mecmintegration.md#configuration). The [Log Analytics agent for Windows](../azure-monitor/platform/agent-windows.md) is required for Windows servers managed by sites in your Configuration Manager environment.
110105

111106
By default, Windows VMs that are deployed from the Azure Marketplace are set to receive automatic updates from Windows Update Service. This behavior doesn't change when you add Windows VMs to your workspace. If you don't actively manage updates by using Update Management, the default behavior (to automatically apply updates) applies.
112107

@@ -130,7 +125,7 @@ To create and manage update deployments, you need specific permissions. To learn
130125

131126
## Update Management components
132127

133-
Update Management uses the resources described in this section. These resources are automatically added to your Automation account when you enable Update Management.
128+
Update Management uses the resources described in this section. These resources are automatically added to your Automation account when you enable Update Management.
134129

135130
### Hybrid Runbook Worker groups
136131

@@ -233,20 +228,21 @@ To classify updates on Red Hat Enterprise version 6, you need to install the yum
233228

234229
## Integrate Update Management with Configuration Manager
235230

236-
Customers who have invested in Microsoft Endpoint Configuration Manager for managing PCs, servers, and mobile devices also rely on the strength and maturity of Configuration Manager to help them manage software updates. Configuration Manager is part of their software update management (SUM) cycle. To learn how to integrate Update Management with Configuration Manager, see [Integrate Configuration Manager with Update Management](oms-solution-updatemgmt-sccmintegration.md).
231+
Customers who have invested in Microsoft Endpoint Configuration Manager for managing PCs, servers, and mobile devices also rely on the strength and maturity of Configuration Manager to help manage software updates. To learn how to integrate Update Management with Configuration Manager, see [Integrate Configuration Manager with Update Management](updatemgmt-mecmintegration.md).
237232

238233
## Third-party updates on Windows
239234

240235
Update Management relies on the locally configured update repository to update supported Windows systems, either WSUS or Windows Update. Tools such as [System Center Updates Publisher](https://docs.microsoft.com/configmgr/sum/tools/updates-publisher) allow you to import and publish custom updates with WSUS. This scenario allows Update Management to update machines that use Configuration Manager as their update repository with third-party software. To learn how to configure Updates Publisher, see [Install Updates Publisher](https://docs.microsoft.com/configmgr/sum/tools/install-updates-publisher).
241236

242237
## Enable Update Management
243238

244-
An Azure [Resource Manager template](automation-update-management-deploy-template.md) is available to help you deploy Update Management to a new or existing Automation account and Azure Monitor Log Analytics workspace in your subscription. Here are the ways that you can enable Update Management:
239+
An Azure [Resource Manager template](automation-update-management-deploy-template.md) is available to help you deploy Update Management to a new or existing Automation account and Azure Monitor Log Analytics workspace in your subscription. It does not configure the scope of machines that should be managed, this is performed as a separate step after using the template.
240+
241+
Here are the ways that you can enable Update Management and select machines to be managed:
245242

246243
* [From a virtual machine](automation-onboard-solutions-from-vm.md).
247244
* [From browsing multiple machines](automation-onboard-solutions-from-browse.md).
248-
* [With an Azure Automation runbook](automation-onboard-solutions.md).
249-
* [With the Azure Resource Manager template](automation-update-management-deploy-template.md).
245+
* [From an Azure Automation account](automation-onboard-solutions.md).
250246

251247
## Next steps
252248

0 commit comments

Comments
 (0)