Skip to content

Commit 9b17fe1

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into asc-melvyn-containerwork
2 parents 8e1bce1 + 80d0707 commit 9b17fe1

30 files changed

+985
-1036
lines changed

.openpublishing.redirection.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7556,6 +7556,46 @@
75567556
"redirect_url": "/azure/azure-monitor/app/java-get-started",
75577557
"redirect_document_id": false
75587558
},
7559+
{
7560+
"source_path": "articles/azure-monitor/app/status-monitor-v2-api-disable-instrumentation-engine.md",
7561+
"redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
7562+
"redirect_document_id": false
7563+
},
7564+
{
7565+
"source_path": "articles/azure-monitor/app/status-monitor-v2-api-disable-monitoring.md",
7566+
"redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
7567+
"redirect_document_id": false
7568+
},
7569+
{
7570+
"source_path": "articles/azure-monitor/app/status-monitor-v2-api-enable-instrumentation-engine.md",
7571+
"redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
7572+
"redirect_document_id": false
7573+
},
7574+
{
7575+
"source_path": "articles/azure-monitor/app/status-monitor-v2-api-enable-monitoring.md",
7576+
"redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
7577+
"redirect_document_id": false
7578+
},
7579+
{
7580+
"source_path": "articles/azure-monitor/app/status-monitor-v2-api-get-config.md",
7581+
"redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
7582+
"redirect_document_id": false
7583+
},
7584+
{
7585+
"source_path": "articles/azure-monitor/app/status-monitor-v2-api-get-status.md",
7586+
"redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
7587+
"redirect_document_id": false
7588+
},
7589+
{
7590+
"source_path": "articles/azure-monitor/app/status-monitor-v2-api-set-config.md",
7591+
"redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
7592+
"redirect_document_id": false
7593+
},
7594+
{
7595+
"source_path": "articles/azure-monitor/app/status-monitor-v2-api-start-trace.md",
7596+
"redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
7597+
"redirect_document_id": false
7598+
},
75597599
{
75607600
"source_path": "articles/application-insights/app-insights-mobile-hockeyapp.md",
75617601
"redirect_url": "/azure/azure-monitor/app/hockeyapp-bridge-app",

articles/active-directory-b2c/stringcollection-transformations.md

Lines changed: 35 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: 02/27/2020
12+
ms.date: 04/21/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -155,4 +155,38 @@ Following example checks whether the `roles` stringCollection claim type contain
155155
- Output claims:
156156
- **outputClaim**: "true"
157157

158+
## StringCollectionContainsClaim
158159

160+
Checks if a StringCollection claim type contains a claim value.
161+
162+
| Item | TransformationClaimType | Data Type | Notes |
163+
| ---- | ----------------------- | --------- | ----- |
164+
| InputClaim | collection | stringCollection | The claim type which is to be searched. |
165+
| InputClaim | item|string| The claim type that contains the value to search.|
166+
|InputParameter|ignoreCase|string|Specifies whether this comparison should ignore the case of the strings being compared.|
167+
| OutputClaim | outputClaim | boolean | The ClaimType that is produced after this ClaimsTransformation has been invoked. A boolean indicator if the collection contains such a string |
168+
169+
Following example checks whether the `roles` stringCollection claim type contains the value of the `role` claim type.
170+
171+
```XML
172+
<ClaimsTransformation Id="HasRequiredRole" TransformationMethod="StringCollectionContainsClaim">
173+
<InputClaims>
174+
<InputClaim ClaimTypeReferenceId="roles" TransformationClaimType="collection" />
175+
<InputClaim ClaimTypeReferenceId="role" TransformationClaimType="item" />
176+
</InputClaims>
177+
<InputParameters>
178+
<InputParameter Id="ignoreCase" DataType="string" Value="true" />
179+
</InputParameters>
180+
<OutputClaims>
181+
<OutputClaim ClaimTypeReferenceId="hasAccess" TransformationClaimType="outputClaim" />
182+
</OutputClaims>
183+
</ClaimsTransformation>
184+
```
185+
186+
- Input claims:
187+
- **collection**: ["reader", "author", "admin"]
188+
- **item**: "Admin"
189+
- Input parameters:
190+
- **ignoreCase**: "true"
191+
- Output claims:
192+
- **outputClaim**: "true"

articles/app-service/webjobs-sdk-get-started.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ In this section, you set up console logging that uses the [ASP.NET Core logging
131131
* Disables [dashboard logging](https://github.com/Azure/azure-webjobs-sdk/wiki/Queues#logs). The dashboard is a legacy monitoring tool, and dashboard logging is not recommended for high-throughput production scenarios.
132132
* Adds the console provider with default [filtering](webjobs-sdk-how-to.md#log-filtering).
133133

134-
Now, you can add a function that is triggered by messages arriving in an [Azure Storage queue](../azure-functions/functions-bindings-storage-queue.md).
134+
Now, you can add a function that is triggered by messages arriving in an Azure Storage queue.
135135

136136
## Install the Storage binding extension
137137

@@ -181,7 +181,7 @@ Starting with version 3.x, you must explicitly install the Storage binding exten
181181

182182
The `QueueTrigger` attribute tells the runtime to call this function when a new message is written on an Azure Storage queue called `queue`. The contents of the queue message are provided to the method code in the `message` parameter. The body of the method is where you process the trigger data. In this example, the code just logs the message.
183183

184-
The `message` parameter doesn't have to be a string. You can also bind to a JSON object, a byte array, or a [CloudQueueMessage](https://docs.microsoft.com/dotnet/api/microsoft.azure.storage.queue.cloudqueuemessage) object. [See Queue trigger usage](../azure-functions/functions-bindings-storage-queue-trigger.md#usage). Each binding type (such as queues, blobs, or tables) has a different set of parameter types that you can bind to.
184+
The `message` parameter doesn't have to be a string. You can also bind to a JSON object, a byte array, or a [CloudQueueMessage](https://docs.microsoft.com/dotnet/api/microsoft.azure.storage.queue.cloudqueuemessage) object. [See Queue trigger usage](/azure/azure-functions/functions-bindings-storage-queue-trigger?tabs=csharp#usage). Each binding type (such as queues, blobs, or tables) has a different set of parameter types that you can bind to.
185185

186186
## Create a storage account
187187

@@ -277,7 +277,7 @@ In this section, you build and run the project locally and trigger the function
277277

278278
Because you used the `QueueTrigger` attribute in the `ProcessQueueMessage` function, the WeJobs SDK runtime listens for queue messages when it starts up. It finds a new queue message in the queue named *queue* and calls the function.
279279

280-
Due to [queue polling exponential backoff](../azure-functions/functions-bindings-storage-queue-trigger.md#polling-algorithm), it might take as long as 2 minutes for the runtime to find the message and invoke the function. This wait time can be reduced by running in [development mode](webjobs-sdk-how-to.md#host-development-settings).
280+
Due to [queue polling exponential backoff](/azure/azure-functions/functions-bindings-storage-queue-trigger?tabs=csharp#polling-algorithm), it might take as long as 2 minutes for the runtime to find the message and invoke the function. This wait time can be reduced by running in [development mode](webjobs-sdk-how-to.md#host-development-settings).
281281

282282
The console output looks like this:
283283

@@ -441,7 +441,7 @@ During deployment, you create an app service instance in which to run your funct
441441
1. Refresh the **Queue** page, and the new message disappears because it has been processed by the function running in Azure.
442442

443443
> [!TIP]
444-
> When you're testing in Azure, use [development mode](webjobs-sdk-how-to.md#host-development-settings) to ensure that a queue trigger function is invoked right away and avoid delays due to [queue polling exponential backoff](../azure-functions/functions-bindings-storage-queue-trigger.md#polling-algorithm).
444+
> When you're testing in Azure, use [development mode](webjobs-sdk-how-to.md#host-development-settings) to ensure that a queue trigger function is invoked right away and avoid delays due to [queue polling exponential backoff](/azure/azure-functions/functions-bindings-storage-queue-trigger?tabs=csharp#polling-algorithm).
445445

446446
### View logs in Application Insights
447447

articles/automation/TOC.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,35 +44,35 @@
4444
items:
4545
- name: Automation Account
4646
items:
47-
- name: Create using Azure portal
47+
- name: Create Automation account using Azure portal
4848
href: automation-create-standalone-account.md
49-
- name: Create with Resource Manager template
49+
- name: Create Automation account with Resource Manager template
5050
href: automation-create-account-template.md
5151
- name: Manage an Automation Run As account
5252
href: manage-runas-account.md
53-
- name: Role permissions and security
53+
- name: Manage role permissions and security
5454
href: automation-role-based-access-control.md
55-
- name: Move Automation Account to another subscription
55+
- name: Move Automation account to another subscription
5656
href: how-to/move-account.md
5757
- name: Migrate from System Center Orchestrator
5858
href: automation-orchestrator-migration.md
59-
- name: Manage shared resources
59+
- name: Shared resources
6060
items:
61-
- name: Certificates
61+
- name: Manage certificates
6262
href: shared-resources/certificates.md
63-
- name: Connections
63+
- name: Manage connections
6464
href: automation-connections.md
65-
- name: Credentials
65+
- name: Manage credentials
6666
href: shared-resources/credentials.md
67-
- name: PowerShell modules
67+
- name: Manage PowerShell modules
6868
items:
6969
- name: Manage modules in Azure Automation
7070
href: shared-resources/modules.md
7171
- name: Update Azure PowerShell modules
7272
href: automation-update-azure-modules.md
73-
- name: Schedules
73+
- name: Manage schedules
7474
href: shared-resources/schedules.md
75-
- name: Variables
75+
- name: Manage variables
7676
href: shared-resources/variables.md
7777
- name: Manage Python 2 packages
7878
href: python-packages.md
@@ -104,13 +104,13 @@
104104
href: automation-webhooks.md
105105
- name: Track updated files with watcher task
106106
href: automation-watchers-tutorial.md
107-
- name: Working with the Graphical runbook SDK
107+
- name: Work with the Graphical runbook SDK
108108
href: graphical-runbook-sdk.md
109109
- name: Monitor runbooks
110110
items:
111-
- name: Runbook output
111+
- name: Monitor runbook output
112112
href: automation-runbook-output-and-messages.md
113-
- name: Handle errors in Graphical runbooks
113+
- name: Handle errors in graphical runbooks
114114
href: automation-runbook-graphical-error-handling.md
115115
- name: Forward job data to Azure Monitor Logs
116116
href: automation-manage-send-joblogs-log-analytics.md
@@ -120,7 +120,7 @@
120120
href: troubleshoot/runbooks.md
121121
- name: Data to collect before opening support case
122122
href: troubleshoot/collect-data-microsoft-azure-automation-case.md
123-
- name: Hybrid Runbook Worker
123+
- name: Work with a Hybrid Runbook Worker
124124
items:
125125
- name: Deploy Windows Hybrid Runbook Worker
126126
href: automation-windows-hrw-install.md
@@ -130,15 +130,15 @@
130130
href: automation-hrw-run-runbooks.md
131131
- name: Troubleshoot Hybrid Runbook Worker
132132
href: troubleshoot/hybrid-runbook-worker.md
133-
- name: Source control integration
133+
- name: Use source control integration
134134
href: source-control-integration.md
135135
- name: Configuration Management
136136
items:
137-
- name: State Configuration (DSC)
137+
- name: Manage State Configuration (DSC)
138138
items:
139139
- name: Overview
140140
href: automation-dsc-overview.md
141-
- name: Get started using DSC
141+
- name: Get started using State Configuration
142142
href: automation-dsc-getting-started.md
143143
- name: Onboard machines for management
144144
href: automation-dsc-onboarding.md
@@ -156,13 +156,13 @@
156156
href: automation-dsc-diagnostics.md
157157
- name: Troubleshoot issues with DSC
158158
href: troubleshoot/desired-state-configuration.md
159-
- name: Change Tracking and Inventory
159+
- name: Manage Change Tracking and Inventory
160160
items:
161161
- name: Overview
162162
href: change-tracking.md
163163
- name: Supported regions for linked Log Analytics workspace
164164
href: how-to/region-mappings.md
165-
- name: Enable
165+
- name: Enable Change Tracking and Inventory
166166
items:
167167
- name: Use Azure portal
168168
href: automation-onboard-solutions-from-browse.md

articles/automation/automation-connections.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
title: Connection assets in Azure Automation
2+
title: Manage connections in Azure Automation
33
description: Connection assets in Azure Automation contain the information required to connect to an external service or application from a runbook or DSC configuration. This article explains the details of connections and how to work with them in both textual and graphical authoring.
44
services: automation
55
ms.subservice: shared-capabilities
66
ms.date: 01/13/2020
77
ms.topic: conceptual
88
---
99

10-
# Connection assets in Azure Automation
10+
# Manage connections in Azure Automation
1111

1212
An Automation connection asset contains the information required to connect to an external service or application from a runbook or DSC configuration. This may include information required for authentication such as a username and password in addition to connection information such as a URL or a port. The value of a connection is keeping all of the properties for connecting to a particular application in one asset as opposed to creating multiple variables. The user can edit the values for a connection in one place, and you can pass the name of a connection to a runbook or DSC configuration in a single parameter. The properties for a connection can be accessed in the runbook or DSC configuration with the `Get-AutomationConnection` activity.
1313

articles/automation/automation-update-azure-modules.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
title: Update Azure modules in Azure Automation
2+
title: Update Azure PowerShell modules in Azure Automation
33
description: This article describes how you can now update common Azure PowerShell modules provided by default in Azure Automation.
44
services: automation
55
ms.subservice: process-automation
66
ms.date: 06/14/2019
77
ms.topic: conceptual
88
---
99

10-
# How to update Azure PowerShell modules in Azure Automation
10+
# Update Azure PowerShell modules in Azure Automation
1111

1212
To update the Azure modules in your Automation account you need to use the [Update Azure modules runbook](https://github.com/Microsoft/AzureAutomation-Account-Modules-Update), which is available as open source. To start using the **Update-AutomationAzureModulesForAccount** runbook to update your Azure modules, download it from the [Update Azure modules runbook repository](https://github.com/Microsoft/AzureAutomation-Account-Modules-Update) on GitHub. You can then import it into your Automation account or run it as a script. To learn how to import a runbook in your Automation account, see [Import a runbook](manage-runbooks.md#importing-a-runbook).
1313

articles/automation/shared-resources/certificates.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Certificate assets in Azure Automation
2+
title: Manage certificate in Azure Automation
33
description: Certificates are securely stored in Azure Automation so that runbooks or DSC configurations can access them to authenticate against Azure and third-party resources. This article explains the details of certificates and how to work with them in both textual and graphical authoring.
44
services: automation
55
ms.service: automation
@@ -11,7 +11,7 @@ ms.topic: conceptual
1111
manager: carmonm
1212
---
1313

14-
# Certificate assets in Azure Automation
14+
# Manage certificates in Azure Automation
1515

1616
Certificates are stored securely in Azure Automation so they can be accessed by runbooks or DSC configurations using the [Get-AzAutomationCertificate](https://docs.microsoft.com/powershell/module/Az.Automation/Get-AzAutomationCertificate?view=azps-3.7.0) activity for Azure Resource Manager resources. Secure certificate storage allows you to create runbooks and DSC configurations that use certificates for authentication or add them to Azure or third-party resources.
1717

articles/automation/shared-resources/credentials.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Manage credential assets in Azure Automation
2+
title: Manage credentials in Azure Automation
33
description: Credential assets in Azure Automation contain security credentials that can be used to authenticate to resources accessed by the runbook or DSC configuration. This article describes how to create credential assets and use them in a runbook or DSC configuration.
44
services: automation
55
ms.service: automation
@@ -11,7 +11,7 @@ ms.topic: conceptual
1111
manager: carmonm
1212
---
1313

14-
# Manage credential assets in Azure Automation
14+
# Manage credentials in Azure Automation
1515

1616
An Automation credential asset holds an object that contains security credentials, such as a user name and a password. Runbooks and DSC configurations use cmdlets that accept a [PSCredential](https://docs.microsoft.com/dotnet/api/system.management.automation.pscredential?view=pscore-6.2.0) object for authentication. Alternatively, they can extract the user name and password of the `PSCredential` object to provide to some application or service requiring authentication.
1717

articles/automation/shared-resources/schedules.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Schedules in Azure Automation
2+
title: Manage schedules in Azure Automation
33
description: Automation schedules are used to schedule runbooks in Azure Automation to start automatically. Describes how to create and manage a schedule in so that you can automatically start a runbook at a particular time or on a recurring schedule.
44
services: automation
55
ms.service: automation
@@ -10,7 +10,7 @@ ms.date: 04/04/2019
1010
ms.topic: conceptual
1111
manager: carmonm
1212
---
13-
# Scheduling a runbook in Azure Automation
13+
# Manage schedules in Azure Automation
1414

1515
To schedule a runbook in Azure Automation to start at a specified time, you link it to one or more schedules. A schedule can be configured to either run once or on a reoccurring hourly or daily schedule for runbooks in the Azure portal. You can also schedule them for weekly, monthly, specific days of the week or days of the month, or a particular day of the month. A runbook can be linked to multiple schedules, and a schedule can have multiple runbooks linked to it.
1616

articles/automation/shared-resources/variables.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Variable assets in Azure Automation
2+
title: Manage variables in Azure Automation
33
description: Variable assets are values that are available to all runbooks and DSC configurations in Azure Automation. This article explains the details of variables and how to work with them in both textual and graphical authoring.
44
services: automation
55
ms.service: automation
@@ -10,7 +10,7 @@ ms.date: 05/14/2019
1010
ms.topic: conceptual
1111
manager: carmonm
1212
---
13-
# Variable assets in Azure Automation
13+
# Manage variables in Azure Automation
1414

1515
Variable assets are values that are available to all runbooks and DSC configurations in your Automation account. You can manage them from the Azure portal, from PowerShell, within a runbook, or in a DSC configuration.
1616

0 commit comments

Comments
 (0)