Skip to content

Commit 323c3f2

Browse files
authored
Merge pull request #103741 from MicrosoftDocs/master
Merge master to live Sunday 3:00 PM
2 parents 9add86f + b6fd817 commit 323c3f2

18 files changed

+95
-89
lines changed

articles/active-directory-b2c/identity-provider-azure-ad-multi-tenant-custom.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: conceptual
12-
ms.date: 02/06/2020
12+
ms.date: 02/10/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -46,6 +46,19 @@ To enable sign-in for users from a specific Azure AD organization, you need to r
4646
1. Select **Certificates & secrets**, and then select **New client secret**.
4747
1. Enter a **Description** for the secret, select an expiration, and then select **Add**. Record the **Value** of the secret for use in a later step.
4848
49+
## Configuring optional claims
50+
51+
If you want to get the `family_name` and `given_name` claims from Azure AD, you can configure optional claims for your application in the Azure portal UI or application manifest. For more information, see [How to provide optional claims to your Azure AD app](../active-directory/develop/active-directory-optional-claims.md).
52+
53+
1. Sign in to the [Azure portal](https://portal.azure.com). Search for and select **Azure Active Directory**.
54+
1. From the **Manage** section, select **App registrations**.
55+
1. Select the application you want to configure optional claims for in the list.
56+
1. From the **Manage** section, select **Token configuration (preview)**.
57+
1. Select **Add optional claim**.
58+
1. Select the token type you want to configure.
59+
1. Select the optional claims to add.
60+
1. Click **Add**.
61+
4962
## Create a policy key
5063
5164
You need to store the application key that you created in your Azure AD B2C tenant.
@@ -60,19 +73,6 @@ You need to store the application key that you created in your Azure AD B2C tena
6073
1. For **Key usage**, select `Signature`.
6174
1. Select **Create**.
6275
63-
## Configuring optional claims
64-
65-
If you want to get the `family_name` and `given_name` claims from Azure AD, you can configure optional claims for your application in the Azure portal UI or application manifest. For more information, see [How to provide optional claims to your Azure AD app](../active-directory/develop/active-directory-optional-claims.md).
66-
67-
1. Sign in to the [Azure portal](https://portal.azure.com). Search for and select **Azure Active Directory**.
68-
1. From the **Manage** section, select **App registrations**.
69-
1. Select the application you want to configure optional claims for in the list.
70-
1. From the **Manage** section, select **Token configuration (preview)**.
71-
1. Select **Add optional claim**.
72-
1. Select the token type you want to configure.
73-
1. Select the optional claims to add.
74-
1. Click **Add**.
75-
7676
## Add a claims provider
7777
7878
If you want users to sign in by using Azure AD, you need to define Azure AD as a claims provider that Azure AD B2C can communicate with through an endpoint. The endpoint provides a set of claims that are used by Azure AD B2C to verify that a specific user has authenticated.

articles/active-directory/manage-apps/application-proxy-integrate-with-power-bi.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,6 @@ Before the Power BI mobile app can connect and access Report Services, you must
135135

136136
## Step 5: Configure Intune policy for managed devices (optional)
137137

138-
> [!NOTE]
139-
> This functionality is currently only available on iOS.
140-
141138
You can use Microsoft Intune to manage the client apps that your company's workforce uses. Intune allows you to use capabilities such as data encryption and additional access requirements. To learn more about app management through Intune, see Intune App Management. To enable the Power BI mobile application to work with the Intune policy, use the following steps.
142139

143140
1. Go to **Azure Active Directory** and then **App Registrations**.

articles/aks/configure-azure-cni.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ The IP address plan for an AKS cluster consists of a virtual network, at least o
4848
| --------- | ------------- |
4949
| Virtual network | The Azure virtual network can be as large as /8, but is limited to 65,536 configured IP addresses. |
5050
| Subnet | Must be large enough to accommodate the nodes, pods, and all Kubernetes and Azure resources that might be provisioned in your cluster. For example, if you deploy an internal Azure Load Balancer, its front-end IPs are allocated from the cluster subnet, not public IPs. The subnet size should also take into account upgrade operations or future scaling needs.<p />To calculate the *minimum* subnet size including an additional node for upgrade operations: `(number of nodes + 1) + ((number of nodes + 1) * maximum pods per node that you configure)`<p/>Example for a 50 node cluster: `(51) + (51 * 30 (default)) = 1,581` (/21 or larger)<p/>Example for a 50 node cluster that also includes provision to scale up an additional 10 nodes: `(61) + (61 * 30 (default)) = 1,891` (/21 or larger)<p>If you don't specify a maximum number of pods per node when you create your cluster, the maximum number of pods per node is set to *30*. The minimum number of IP addresses required is based on that value. If you calculate your minimum IP address requirements on a different maximum value, see [how to configure the maximum number of pods per node](#configure-maximum---new-clusters) to set this value when you deploy your cluster. |
51-
| Kubernetes service address range | This range should not be used by any network element on or connected to this virtual network. Service address CIDR must be smaller than /12. |
51+
| Kubernetes service address range | This range should not be used by any network element on or connected to this virtual network. Service address CIDR must be smaller than /12. You can reuse this range across different AKS clusters. |
5252
| Kubernetes DNS service IP address | IP address within the Kubernetes service address range that will be used by cluster service discovery (kube-dns). Don't use the first IP address in your address range, such as .1. The first address in your subnet range is used for the *kubernetes.default.svc.cluster.local* address. |
53-
| Docker bridge address | The Docker bridge network address represents the default *docker0* bridge network address present in all Docker installations. While *docker0* bridge is not used by AKS clusters or the pods themselves, you must set this address to continue to support scenarios such as *docker build* within the AKS cluster. It is required to select a CIDR for the Docker bridge network address because otherwise Docker will pick a subnet automatically which could conflict with other CIDRs. You must pick an address space that does not collide with the rest of the CIDRs on your networks, including the cluster's service CIDR and pod CIDR. Default of 172.17.0.1/16. |
53+
| Docker bridge address | The Docker bridge network address represents the default *docker0* bridge network address present in all Docker installations. While *docker0* bridge is not used by AKS clusters or the pods themselves, you must set this address to continue to support scenarios such as *docker build* within the AKS cluster. It is required to select a CIDR for the Docker bridge network address because otherwise Docker will pick a subnet automatically which could conflict with other CIDRs. You must pick an address space that does not collide with the rest of the CIDRs on your networks, including the cluster's service CIDR and pod CIDR. Default of 172.17.0.1/16. You can reuse this range across different AKS clusters. |
5454

5555
## Maximum pods per node
5656

articles/automation/automation-dsc-diagnostics.md

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,9 @@ Set-AzDiagnosticSetting -ResourceId <AutomationResourceId> -WorkspaceId <Workspa
7171

7272
## View the State Configuration logs
7373

74-
After you set up integration with Azure Monitor logs for your Automation State Configuration data, a
75-
**Log search** button will appear on the **DSC Nodes** blade of your automation account. Click the
76-
**Log Search** button to view the logs for DSC node data.
74+
After you set up integration with Azure Monitor logs for your Automation State Configuration data, they can be viewed by selecting **Logs** in the **Monitoring** section in the left pane of the State Configuration (DSC) page.
7775

78-
![Log search button](media/automation-dsc-diagnostics/log-search-button.png)
76+
![Logs](media/automation-dsc-diagnostics/automation-dsc-logs-toc-item.png)
7977

8078
The **Log Search** blade opens, and you see a **DscNodeStatusData** operation for each State
8179
Configuration node, and a **DscResourceStatusData** operation for each [DSC
@@ -85,13 +83,14 @@ The **DscResourceStatusData** operation contains error information for any DSC r
8583

8684
Click each operation in the list to see the data for that operation.
8785

88-
You can also view the logs by searching in Azure Monitor logs.
89-
See [Find data using log searches](../log-analytics/log-analytics-log-searches.md).
90-
Type the following query to find your State Configuration logs:
91-
`Type=AzureDiagnostics ResourceProvider='MICROSOFT.AUTOMATION' Category='DscNodeStatus'`
86+
You can also view the logs by searching in Azure Monitor logs. See [Find data using log searches](https://docs.microsoft.com/azure/azure-monitor/log-query/log-query-overview). Type the following query to find your State Configuration logs.
9287

93-
You can also narrow the query by the operation name. For example:
94-
`Type=AzureDiagnostics ResourceProvider='MICROSOFT.AUTOMATION' Category='DscNodeStatus' OperationName='DscNodeStatusData'`
88+
```
89+
AzureDiagnostics
90+
| where Category == 'DscNodeStatus'
91+
| where OperationName contains 'DSCNodeStatusData'
92+
| where ResultType != 'Compliant'
93+
```
9594

9695
### Send an email when a State Configuration compliance check fails
9796

@@ -155,11 +154,11 @@ Diagnostics from Azure Automation creates two categories of records in Azure Mon
155154
| SourceSystem | How Azure Monitor logs collected the data. Always *Azure* for Azure diagnostics. |
156155
| ResourceId |Specifies the Azure Automation account. |
157156
| ResultDescription | The description for this operation. |
158-
| SubscriptionId | The Azure subscription Id (GUID) for the Automation account. |
157+
| SubscriptionId | The Azure subscription ID (GUID) for the Automation account. |
159158
| ResourceGroup | Name of the resource group for the Automation account. |
160159
| ResourceProvider | MICROSOFT.AUTOMATION |
161160
| ResourceType | AUTOMATIONACCOUNTS |
162-
| CorrelationId |GUID that is the Correlation Id of the compliance report. |
161+
| CorrelationId |GUID that is the Correlation ID of the compliance report. |
163162

164163
### DscResourceStatusData
165164

@@ -186,11 +185,11 @@ Diagnostics from Azure Automation creates two categories of records in Azure Mon
186185
| SourceSystem | How Azure Monitor logs collected the data. Always *Azure* for Azure diagnostics. |
187186
| ResourceId |Specifies the Azure Automation account. |
188187
| ResultDescription | The description for this operation. |
189-
| SubscriptionId | The Azure subscription Id (GUID) for the Automation account. |
188+
| SubscriptionId | The Azure subscription ID (GUID) for the Automation account. |
190189
| ResourceGroup | Name of the resource group for the Automation account. |
191190
| ResourceProvider | MICROSOFT.AUTOMATION |
192191
| ResourceType | AUTOMATIONACCOUNTS |
193-
| CorrelationId |GUID that is the Correlation Id of the compliance report. |
192+
| CorrelationId |GUID that is the Correlation ID of the compliance report. |
194193

195194
## Summary
196195

articles/automation/automation-windows-hrw-install.md

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ ms.topic: conceptual
1010

1111
You can use the Hybrid Runbook Worker feature of Azure Automation to run runbooks directly on the computer that's hosting the role and against resources in the environment to manage those local resources. Runbooks are stored and managed in Azure Automation and then delivered to one or more designated computers. This article describes how to install the Hybrid Runbook Worker on a Windows machine.
1212

13+
> [!NOTE]
14+
This article has been updated to use the new Azure PowerShell Az module. You can still use the AzureRM module, which will continue to receive bug fixes until at least December 2020. To learn more about the new Az module and AzureRM compatibility, see [Introducing the new Azure PowerShell Az module](https://docs.microsoft.com/powershell/azure/new-azureps-module-az?view=azps-3.3.0). For Az module installation instructions, see [Install the Azure PowerShell module](https://docs.microsoft.com/powershell/azure/install-az-ps?view=azps-3.4.0).
15+
1316
## Installing the Windows Hybrid Runbook Worker
1417

1518
To install and configure a Windows Hybrid Runbook Worker, you can use one of the three following methods:
@@ -25,12 +28,12 @@ To install and configure a Windows Hybrid Runbook Worker, you can use one of the
2528
2629
The minimum requirements for a Windows Hybrid Runbook Worker are:
2730

28-
* Windows Server 2012 or later.
29-
* Windows PowerShell 5.1 or later ([download WMF 5.1](https://www.microsoft.com/download/details.aspx?id=54616)).
30-
* .NET Framework 4.6.2 or later.
31-
* Two cores.
32-
* 4 GB of RAM.
33-
* Port 443 (outbound).
31+
* Windows Server 2012 or later
32+
* Windows PowerShell 5.1 or later ([download WMF 5.1](https://www.microsoft.com/download/details.aspx?id=54616))
33+
* .NET Framework 4.6.2 or later
34+
* Two cores
35+
* 4 GB of RAM
36+
* Port 443 (outbound)
3437

3538
To get more networking requirements for the Hybrid Runbook Worker, see [Configuring your network](automation-hybrid-runbook-worker.md#network-planning).
3639

@@ -45,17 +48,18 @@ After you successfully deploy a runbook worker, review [Run runbooks on a Hybrid
4548

4649
Perform the following steps to automate the installation and configuration of the Windows Hybrid Worker role:
4750

48-
1. Download the New-OnPremiseHybridWorker.ps1 script from the [PowerShell Gallery](https://www.powershellgallery.com/packages/New-OnPremiseHybridWorker) directly from the computer running the Hybrid Runbook Worker role or from another computer in your environment. Copy the script to the worker.
49-
50-
The New-OnPremiseHybridWorker.ps1 script requires the following parameters during execution:
51+
1. Download the New-OnPremiseHybridWorker.ps1 script from the
52+
[PowerShell Gallery](https://www.powershellgallery.com/packages/New-OnPremiseHybridWorker) directly from the computer running the Hybrid Runbook Worker role or from another computer in your environment. Copy the script to the worker. The New-OnPremiseHybridWorker.ps1 script requires the following parameters during execution:
5153

52-
* *AutomationAccountName* (mandatory): The name of your Automation account.
5354
* *AAResourceGroupName* (mandatory): The name of the resource group that's associated with your Automation account.
5455
* *OMSResourceGroupName* (optional): The name of the resource group for the Log Analytics workspace. If this resource group is not specified, *AAResourceGroupName* is used.
55-
* *HybridGroupName* (mandatory): The name of a Hybrid Runbook Worker group that you specify as a target for the runbooks that support this scenario.
56-
* *SubscriptionID* (mandatory): The Azure subscription ID that your Automation account is in.
56+
* *SubscriptionID* (mandatory): The Azure subscription ID that your Automation Account is in.
57+
* *TenantID* (optional): The identifier of the tenant organization associated with your Automation Account.
5758
* *WorkspaceName* (optional): The Log Analytics workspace name. If you don't have a Log Analytics workspace, the script creates and configures one.
58-
59+
* *AutomationAccountName* (mandatory): The name of your Automation Account.
60+
* *HybridGroupName* (mandatory): The name of a Hybrid Runbook Worker group that you specify as a target for the runbooks that support this scenario.
61+
* *Credential* (optional): The credentials to use when logging in to the Azure environment.
62+
5963
> [!NOTE]
6064
> When enabling solutions, only certain regions are supported for linking a Log Analytics workspace and an Automation Account.
6165
>
@@ -75,7 +79,7 @@ Perform the following steps to automate the installation and configuration of th
7579

7680
4. You're prompted to agree to install NuGet, and you're prompted to authenticate with your Azure credentials.
7781

78-
5. After the script is finished, the **Hybrid Worker Groups** page shows the new group and the number of members. If it's an existing group, the number of members is incremented. You can select the group from the list on the **Hybrid Worker Groups** page and select the **Hybrid Workers** tile. On the **Hybrid Workers** page, you see each member of the group listed.
82+
5. After the script is finished, the **Hybrid Worker Groups** page shows the new group and the number of members. If it's an existing group, the number of members is incremented. You can select the group from the list on the **Hybrid Worker Groups** page and select the **Hybrid Workers** tile. On the **Hybrid Workers** page, you see each member of the group listed.
7983

8084
### Manual deployment
8185

@@ -91,10 +95,10 @@ If you don't already have a Log Analytics workspace, first review the [Azure Mon
9195

9296
The Automation solution adds functionality for Azure Automation, including support for Hybrid Runbook Worker. When you add the solution to your Log Analytics workspace, it automatically pushes worker components to the agent computer that you will install in the next step.
9397

94-
To add the **Automation** solution to your workspace, run the following PowerShell.
98+
To add the **Automation** solution to your workspace, run the following PowerShell cmdlet.
9599

96100
```powershell-interactive
97-
Set-AzureRmOperationalInsightsIntelligencePack -ResourceGroupName <logAnalyticsResourceGroup> -WorkspaceName <LogAnalyticsWorkspaceName> -IntelligencePackName "AzureAutomation" -Enabled $true
101+
Set-AzOperationalInsightsIntelligencePack -ResourceGroupName <logAnalyticsResourceGroup> -WorkspaceName <LogAnalyticsWorkspaceName> -IntelligencePackName "AzureAutomation" -Enabled $true -DefaultProfile <IAzureContextContainer>
98102
```
99103

100104
#### 3. Install the Log Analytics agent for Windows
@@ -103,15 +107,15 @@ The Log Analytics agent for Windows connects computers to an Azure Monitor Log A
103107

104108
To install the agent on the computer, follow the instructions at [Connect Windows computers to Azure Monitor logs](../log-analytics/log-analytics-windows-agent.md). You can repeat this process for multiple computers to add multiple workers to your environment.
105109

106-
When the agent has successfully connected to your Log Analytics workspace, after a few minutes you can run the following query to verify it is sending heartbeat data to the workspace:
110+
When the agent has successfully connected to your Log Analytics workspace after a few minutes, you can run the following query to verify that it is sending heartbeat data to the workspace:
107111

108112
```kusto
109113
Heartbeat
110114
| where Category == "Direct Agent"
111115
| where TimeGenerated > ago(30m)
112116
```
113117

114-
In the search results returned, you should see heartbeat records for the computer indicating it is connected and reporting to the service. The heartbeat record is forwarded from every agent by default to its assigned workspace. You can verify that the agent has correctly downloaded the Automation solution when it has a folder called **AzureAutomationFiles** in C:\Program Files\Microsoft Monitoring Agent\Agent. To confirm the version of the Hybrid Runbook Worker, you can browse to C:\Program Files\Microsoft Monitoring Agent\Agent\AzureAutomation\ and note the \\*version* subfolder.
118+
In the search results returned, you should see heartbeat records for the computer indicating it is connected and reporting to the service. The heartbeat record is forwarded from every agent by default to its assigned workspace. You can verify that the agent has correctly downloaded the Automation solution when it has a folder called **AzureAutomationFiles** in C:\Program Files\Microsoft Monitoring Agent\Agent. To confirm the version of the Hybrid Runbook Worker, browse to C:\Program Files\Microsoft Monitoring Agent\Agent\AzureAutomation\ and note the \\*version* subfolder.
115119

116120
#### 4. Install the runbook environment and connect to Azure Automation
117121

@@ -146,7 +150,7 @@ Runbooks can use any of the activities and cmdlets defined in the modules that a
146150

147151
Because the primary purpose of the Hybrid Runbook Worker feature is to manage local resources, you most likely need to install the modules that support these resources. For information on installing Windows PowerShell modules, see [Installing Modules](/powershell/scripting/developer/windows-powershell).
148152

149-
Modules that are installed must be in a location referenced by the **PSModulePath** environment variable so that the hybrid worker can automatically import them. For more information, see [Modifying the PSModulePath Installation Path](/powershell/scripting/developer/windows-powershell).
153+
Modules that are installed must be in a location referenced by the **PSModulePath** environment variable so that the hybrid worker can automatically import them. For more information, see [Modifying the PSModulePath Installation Path](/powershell/scripting/developer/windows-powershell).
150154

151155
## Next steps
152156

128 KB
Loading

0 commit comments

Comments
 (0)