Skip to content

Commit b31dfa3

Browse files
craigshoemakercraigshoemaker
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into crs-functions-http-restructure
2 parents fb1137c + 5507582 commit b31dfa3

22 files changed

+1382
-1251
lines changed

‎articles/active-directory-b2c/claim-resolver-overview.md

Lines changed: 23 additions & 1 deletion
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: reference
12-
ms.date: 01/25/2019
12+
ms.date: 02/13/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -100,6 +100,28 @@ Any parameter name included as part of an OIDC or OAuth2 request can be mapped t
100100
| ----- | ----------------------- | --------|
101101
| {oauth2:access_token} | The access token. | N/A |
102102

103+
## Using claim resolvers
104+
105+
You can use claims resolvers with following elements:
106+
107+
| Item | Element | Settings |
108+
| ----- | ----------------------- | --------|
109+
|Application Insights technical profile |`InputClaim` | |
110+
|[Azure Active Directory](active-directory-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
111+
|[OAuth2](oauth2-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
112+
|[OpenID Connect](openid-connect-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
113+
|[Claims transformation](claims-transformation-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
114+
|[RESTful provider](restful-technical-profile.md) technical profile| `InputClaim`| 1, 2|
115+
|[SAML2](saml-technical-profile.md) technical profile| `OutputClaim`| 1, 2|
116+
|[Self-Asserted](self-asserted-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
117+
|[ContentDefinition](contentdefinitions.md)| `LoadUri`| |
118+
|[ContentDefinitionParameters](relyingparty.md#contentdefinitionparameters)| `Parameter` | |
119+
|[RelyingParty](relyingparty.md#technicalprofile) technical profile| `OutputClaim`| 2 |
120+
121+
Settings:
122+
1. The `IncludeClaimResolvingInClaimsHandling` metadata must set to `true`
123+
1. The input or output claims attribute `AlwaysUseDefaultValue` must set to `true`
124+
103125
## How to use claim resolvers
104126

105127
### RESTful technical profile

‎articles/automation/automation-dsc-diagnostics.md

Lines changed: 48 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -31,118 +31,115 @@ With Azure Monitor logs you can:
3131
To start sending your Automation State Configuration reports to Azure Monitor logs, you need:
3232

3333
- The November 2016 or later release of [Azure PowerShell](/powershell/azure/overview) (v2.3.0).
34-
- An Azure Automation account. For more information, see [Getting Started with Azure Automation](automation-offering-get-started.md)
35-
- A Log Analytics workspace with an **Automation & Control** service offering. For more information, see [Get started with Azure Monitor logs](../log-analytics/log-analytics-get-started.md).
36-
- At least one Azure Automation State Configuration node. For more information, see [Onboarding machines for management by Azure Automation State Configuration](automation-dsc-onboarding.md)
37-
- The [xDscDiagnostics](https://www.powershellgallery.com/packages/xDscDiagnostics/2.7.0.0) module, version 2.7.0.0 or greater. For installation steps, see [View DSC logs on your Node](./troubleshoot/desired-state-configuration.md#steps-to-troubleshoot-desired-state-configuration-dsc).
34+
- An Azure Automation account. For more information, see [An introduction to Azure Automation](automation-intro.md).
35+
- A Log Analytics workspace with an Automation & Control service offering. For more information, see [Get started with Log Analytics in Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/log-query/get-started-portal).
36+
- At least one Azure Automation State Configuration node. For more information, see [Onboarding machines for management by Azure Automation State Configuration](automation-dsc-onboarding.md).
37+
- The [xDscDiagnostics](https://www.powershellgallery.com/packages/xDscDiagnostics/2.7.0.0) module, version 2.7.0.0 or greater. For installation steps, see [Troubleshoot Azure Automation Desired State Configuration](./troubleshoot/desired-state-configuration.md#steps-to-troubleshoot-desired-state-configuration-dsc).
3838

3939
## Set up integration with Azure Monitor logs
4040

4141
To begin importing data from Azure Automation DSC into Azure Monitor logs, complete the following steps:
4242

43-
1. Log in to your Azure account in PowerShell. See [Log in with Azure PowerShell](https://docs.microsoft.com/powershell/azure/authenticate-azureps)
44-
1. Get the _ResourceId_ of your automation account by running the following PowerShell command:
45-
(if you have more than one automation account, choose the _ResourceID_ for the account you want to configure).
43+
1. Log in to your Azure account in PowerShell. See [Sign in with Azure PowerShell](https://docs.microsoft.com/powershell/azure/authenticate-azureps).
44+
1. Get the resource ID of your Automation account by running the following PowerShell cmdlet. If you have more than one automation account, choose the resource ID for the account that you want to configure.
4645

4746
```powershell
48-
# Find the ResourceId for the Automation Account
47+
# Find the ResourceId for the Automation account
4948
Get-AzResource -ResourceType 'Microsoft.Automation/automationAccounts'
5049
```
5150

52-
1. Get the _ResourceId_ of your Log Analytics workspace by running the following PowerShell command:
53-
(if you have more than one workspace, choose the _ResourceID_ for the workspace you want to configure).
51+
1. Get the resource ID of your Log Analytics workspace by running the following PowerShell cmdlet. If you have more than one workspace, choose the resource ID for the workspace that you want to configure.
5452

5553
```powershell
5654
# Find the ResourceId for the Log Analytics workspace
5755
Get-AzResource -ResourceType 'Microsoft.OperationalInsights/workspaces'
5856
```
5957

60-
1. Run the following PowerShell command, replacing `<AutomationResourceId>` and `<WorkspaceResourceId>` with the _ResourceId_ values from each of the previous steps:
58+
1. Run the following PowerShell cmdlet, replacing `<AutomationResourceId>` and `<WorkspaceResourceId>` with the *ResourceId* values from each of the previous steps.
6159

6260
```powershell
6361
Set-AzDiagnosticSetting -ResourceId <AutomationResourceId> -WorkspaceId <WorkspaceResourceId> -Enabled $true -Category 'DscNodeStatus'
6462
```
6563

66-
If you want to stop importing data from Azure Automation State Configuration into Azure Monitor logs, run the following PowerShell command:
64+
1. If you want to stop importing data from Azure Automation State Configuration into Azure Monitor logs, run the following PowerShell cmdlet.
6765

68-
```powershell
69-
Set-AzDiagnosticSetting -ResourceId <AutomationResourceId> -WorkspaceId <WorkspaceResourceId> -Enabled $false -Category 'DscNodeStatus'
70-
```
66+
```powershell
67+
Set-AzDiagnosticSetting -ResourceId <AutomationResourceId> -WorkspaceId <WorkspaceResourceId> -Enabled $false -Category 'DscNodeStatus'
68+
```
7169

7270
## View the State Configuration logs
7371

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.
72+
After you set up integration with Azure Monitor logs for your Automation State Configuration data, you can view them by selecting **Logs** in the **Monitoring** section in the left pane of the State configuration (DSC) page.
7573

7674
![Logs](media/automation-dsc-diagnostics/automation-dsc-logs-toc-item.png)
7775

78-
The **Log Search** blade opens, and you see a **DscNodeStatusData** operation for each State
79-
Configuration node, and a **DscResourceStatusData** operation for each [DSC
80-
resource](/powershell/scripting/dsc/resources/resources) called in the Node configuration applied to that node.
81-
82-
The **DscResourceStatusData** operation contains error information for any DSC resources that failed.
76+
The **Log Search** pane opens with a query region scoped to your Automation account resource. You can search the State Configuration logs for DSC operations by searching in Azure Monitor logs. The records for DSC operations are stored in the AzureDiagnostics table. For example, to find nodes that are not compliant, type the following query.
8377

84-
Click each operation in the list to see the data for that operation.
85-
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.
87-
88-
```
89-
AzureDiagnostics
78+
```AzureDiagnostics
9079
| where Category == 'DscNodeStatus'
9180
| where OperationName contains 'DSCNodeStatusData'
9281
| where ResultType != 'Compliant'
9382
```
83+
Filtering details:
84+
85+
* Filter on *DscNodeStatusData* to return operations for each State Configuration node.
86+
* Filter on *DscResourceStatusData* to return operations for each DSC resource called in the node configuration applied to that resource.
87+
* Filter on *DscResourceStatusData* to return error information for any DSC resources that fail.
88+
89+
To learn more about constructing log queries to find data, see [Overview of log queries in Azure Monitor](https://docs.microsoft.com/azure/azure-monitor/log-query/log-query-overview).
9490

9591
### Send an email when a State Configuration compliance check fails
9692

97-
One of our top customer requests is for the ability to send an email or a text when something goes
98-
wrong with a DSC configuration.
93+
One of our top customer requests is for the ability to send an email or a text when something goes wrong with a DSC configuration.
9994

100-
To create an alert rule, you start by creating a log search for the State Configuration report
101-
records that should invoke the alert. Click the **+ New Alert Rule** button to create and configure
95+
To create an alert rule, start by creating a log search for the State Configuration report records that should invoke the alert. Click the **+ New Alert Rule** button to create and configure
10296
the alert rule.
10397

10498
1. From the Log Analytics workspace Overview page, click **Logs**.
10599
1. Create a log search query for your alert by typing the following search into the query field: `Type=AzureDiagnostics Category='DscNodeStatus' NodeName_s='DSCTEST1' OperationName='DscNodeStatusData' ResultType='Failed'`
106100

107-
If you have set up logs from more than one Automation account or subscription to your workspace, you can group your alerts by subscription and Automation account.
108-
Automation account name can be derived from the Resource field in the search of DscNodeStatusData.
109-
1. To open the **Create rule** screen, click **+ New Alert Rule** at the top of the page. For more information on the options to configure the alert, see [Create an alert rule](../monitoring-and-diagnostics/monitor-alerts-unified-usage.md).
101+
If you have set up logs from more than one Automation account or subscription to your workspace, you can group your alerts by subscription and Automation account. Derive the Automation account name from the Resource field in the search of DscNodeStatusData.
102+
1. To open the **Create rule** screen, click **+ New Alert Rule** at the top of the page.
103+
104+
For more information on the options to configure the alert, see [Create an alert rule](../monitoring-and-diagnostics/monitor-alerts-unified-usage.md).
110105

111106
### Find failed DSC resources across all nodes
112107

113108
One advantage of using Azure Monitor logs is that you can search for failed checks across nodes.
114-
To find all instances of DSC resources that failed.
109+
To find all instances of DSC resources that have failed:
115110

116-
1. From the Log Analytics workspace Overview page, click **Logs**.
111+
1. On the Log Analytics workspace Overview page, click **Logs**.
117112
1. Create a log search query for your alert by typing the following search into the query field: `Type=AzureDiagnostics Category='DscNodeStatus' OperationName='DscResourceStatusData' ResultType='Failed'`
118113

119114
### View historical DSC node status
120115

121-
Finally, you may want to visualize your DSC node status history over time.
122-
You can use this query to search for the status of your DSC node status over time.
116+
To visualize your DSC node status history over time, you can use this query:
123117

124118
`Type=AzureDiagnostics ResourceProvider="MICROSOFT.AUTOMATION" Category=DscNodeStatus NOT(ResultType="started") | measure Count() by ResultType interval 1hour`
125119

126-
This will display a chart of the node status over time.
120+
This query displays a chart of the node status over time.
127121

128122
## Azure Monitor logs records
129123

130-
Diagnostics from Azure Automation creates two categories of records in Azure Monitor logs.
124+
Azure Automation diagnostics create two categories of records in Azure Monitor logs:
125+
126+
* Node status data (DscNodeStatusData)
127+
* Resource status data (DscResourceStatusData)
131128

132129
### DscNodeStatusData
133130

134131
| Property | Description |
135132
| --- | --- |
136133
| TimeGenerated |Date and time when the compliance check ran. |
137-
| OperationName |DscNodeStatusData |
134+
| OperationName |DscNodeStatusData. |
138135
| ResultType |Whether the node is compliant. |
139136
| NodeName_s |The name of the managed node. |
140137
| NodeComplianceStatus_s |Whether the node is compliant. |
141138
| DscReportStatus |Whether the compliance check ran successfully. |
142-
| ConfigurationMode | How the configuration is applied to the node. Possible values are __"ApplyOnly"__,__"ApplyandMonitior"__, and __"ApplyandAutoCorrect"__. <ul><li>__ApplyOnly__: DSC applies the configuration and does nothing further unless a new configuration is pushed to the target node or when a new configuration is pulled from a server. After initial application of a new configuration, DSC does not check for drift from a previously configured state. DSC attempts to apply the configuration until it is successful before __ApplyOnly__ takes effect. </li><li> __ApplyAndMonitor__: This is the default value. The LCM applies any new configurations. After initial application of a new configuration, if the target node drifts from the desired state, DSC reports the discrepancy in logs. DSC attempts to apply the configuration until it is successful before __ApplyAndMonitor__ takes effect.</li><li>__ApplyAndAutoCorrect__: DSC applies any new configurations. After initial application of a new configuration, if the target node drifts from the desired state, DSC reports the discrepancy in logs, and then reapplies the current configuration.</li></ul> |
139+
| ConfigurationMode | How the configuration is applied to the node. Possible values are: <ul><li>*ApplyOnly*: DSC applies the configuration and does nothing further unless a new configuration is pushed to the target node or when a new configuration is pulled from a server. After initial application of a new configuration, DSC does not check for drift from a previously configured state. DSC attempts to apply the configuration until it is successful before the *ApplyOnly* value takes effect. </li><li>*ApplyAndMonitor*: This is the default value. The LCM applies any new configurations. After initial application of a new configuration, if the target node drifts from the desired state, DSC reports the discrepancy in logs. DSC attempts to apply the configuration until it is successful before the *ApplyAndMonitor* value takes effect.</li><li>*ApplyAndAutoCorrect*: DSC applies any new configurations. After initial application of a new configuration, if the target node drifts from the desired state, DSC reports the discrepancy in logs, and then reapplies the current configuration.</li></ul> |
143140
| HostName_s | The name of the managed node. |
144141
| IPAddress | The IPv4 address of the managed node. |
145-
| Category | DscNodeStatus |
142+
| Category | DscNodeStatus. |
146143
| Resource | The name of the Azure Automation account. |
147144
| Tenant_g | GUID that identifies the tenant for the Caller. |
148145
| NodeId_g |GUID that identifies the managed node. |
@@ -151,14 +148,14 @@ Diagnostics from Azure Automation creates two categories of records in Azure Mon
151148
| ReportStartTime_t |Date and time when the report was started. |
152149
| ReportEndTime_t |Date and time when the report completed. |
153150
| NumberOfResources_d |The number of DSC resources called in the configuration applied to the node. |
154-
| SourceSystem | How Azure Monitor logs collected the data. Always *Azure* for Azure diagnostics. |
155-
| ResourceId |Specifies the Azure Automation account. |
151+
| SourceSystem | How Azure Monitor logs collected the data. Always "Azure" for Azure diagnostics. |
152+
| ResourceId |Identifier of the Azure Automation account. |
156153
| ResultDescription | The description for this operation. |
157154
| SubscriptionId | The Azure subscription ID (GUID) for the Automation account. |
158155
| ResourceGroup | Name of the resource group for the Automation account. |
159-
| ResourceProvider | MICROSOFT.AUTOMATION |
160-
| ResourceType | AUTOMATIONACCOUNTS |
161-
| CorrelationId |GUID that is the Correlation ID of the compliance report. |
156+
| ResourceProvider | MICROSOFT.AUTOMATION. |
157+
| ResourceType | AUTOMATIONACCOUNTS. |
158+
| CorrelationId |GUID that is the correlation identifier of the compliance report. |
162159

163160
### DscResourceStatusData
164161

@@ -168,7 +165,7 @@ Diagnostics from Azure Automation creates two categories of records in Azure Mon
168165
| OperationName |DscResourceStatusData|
169166
| ResultType |Whether the resource is compliant. |
170167
| NodeName_s |The name of the managed node. |
171-
| Category | DscNodeStatus |
168+
| Category | DscNodeStatus. |
172169
| Resource | The name of the Azure Automation account. |
173170
| Tenant_g | GUID that identifies the tenant for the Caller. |
174171
| NodeId_g |GUID that identifies the managed node. |
@@ -187,8 +184,8 @@ Diagnostics from Azure Automation creates two categories of records in Azure Mon
187184
| ResultDescription | The description for this operation. |
188185
| SubscriptionId | The Azure subscription ID (GUID) for the Automation account. |
189186
| ResourceGroup | Name of the resource group for the Automation account. |
190-
| ResourceProvider | MICROSOFT.AUTOMATION |
191-
| ResourceType | AUTOMATIONACCOUNTS |
187+
| ResourceProvider | MICROSOFT.AUTOMATION. |
188+
| ResourceType | AUTOMATIONACCOUNTS. |
192189
| CorrelationId |GUID that is the Correlation ID of the compliance report. |
193190

194191
## Summary

0 commit comments

Comments
 (0)