Merge pull request #112129 from MicrosoftDocs/master

Merge Master to Live, 4 AM

Author: PMEds28

.openpublishing.redirection.json

@@ -7556,6 +7556,46 @@
       "redirect_url": "/azure/azure-monitor/app/java-get-started",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/azure-monitor/app/status-monitor-v2-api-disable-instrumentation-engine.md",
+      "redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/app/status-monitor-v2-api-disable-monitoring.md",
+      "redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/app/status-monitor-v2-api-enable-instrumentation-engine.md",
+      "redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/app/status-monitor-v2-api-enable-monitoring.md",
+      "redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/app/status-monitor-v2-api-get-config.md",
+      "redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/app/status-monitor-v2-api-get-status.md",
+      "redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/app/status-monitor-v2-api-set-config.md",
+      "redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-monitor/app/status-monitor-v2-api-start-trace.md",
+      "redirect_url": "/azure/azure-monitor/app/status-monitor-v2-api-reference.md",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/application-insights/app-insights-mobile-hockeyapp.md",
       "redirect_url": "/azure/azure-monitor/app/hockeyapp-bridge-app",

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

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 02/27/2020
+ms.date: 04/21/2020
 ms.author: mimart
 ms.subservice: B2C
 ---
@@ -155,4 +155,38 @@ Following example checks whether the `roles` stringCollection claim type contain
 - Output claims:
     - **outputClaim**: "true"
 
+## StringCollectionContainsClaim
 
+Checks if a StringCollection claim type contains a claim value.
+
+| Item | TransformationClaimType | Data Type | Notes |
+| ---- | ----------------------- | --------- | ----- |
+| InputClaim | collection | stringCollection | The claim type which is to be searched. |
+| InputClaim | item|string| The claim type that contains the value to search.|
+|InputParameter|ignoreCase|string|Specifies whether this comparison should ignore the case of the strings being compared.|
+| OutputClaim | outputClaim | boolean | The ClaimType that is produced after this ClaimsTransformation has been invoked. A boolean indicator if the collection contains such a string |
+
+Following example checks whether the `roles` stringCollection claim type contains the value of the `role` claim type.
+
+```XML
+<ClaimsTransformation Id="HasRequiredRole" TransformationMethod="StringCollectionContainsClaim">
+  <InputClaims>
+    <InputClaim ClaimTypeReferenceId="roles" TransformationClaimType="collection" />
+    <InputClaim ClaimTypeReferenceId="role" TransformationClaimType="item" />
+  </InputClaims>
+  <InputParameters>
+    <InputParameter Id="ignoreCase" DataType="string" Value="true" />
+  </InputParameters>
+  <OutputClaims>
+    <OutputClaim ClaimTypeReferenceId="hasAccess" TransformationClaimType="outputClaim" />
+  </OutputClaims>
+</ClaimsTransformation> 
+```
+
+- Input claims:
+    - **collection**: ["reader", "author", "admin"]
+    - **item**: "Admin"
+- Input parameters:
+    - **ignoreCase**: "true"
+- Output claims:
+    - **outputClaim**: "true"

articles/active-directory/hybrid/how-to-connect-migrate-groups.md

@@ -105,7 +105,7 @@ if ($group -eq $null)
 }
 
 $csvFile = Import-Csv -Path $inputCsv -ErrorAction Stop
-$msDSConsistencyGuid = [GUID] $csvFile.'mS-DS-ConsistencyGuid'
+$msDSConsistencyGuid = $csvFile.'mS-DS-ConsistencyGuid'
 $objectGuid = [GUID] $csvFile.'objectGUID'
 $targetGuid = $msDSConsistencyGuid
 

articles/active-directory/manage-apps/manage-self-service-access.md

@@ -12,7 +12,7 @@ ms.workload: identity
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 10/23/2018
+ms.date: 04/20/2020
 ms.author: mimart
 
 ms.collection: M365-identity-device-management
@@ -38,6 +38,9 @@ Using this feature, you can:
 
 -   Optionally automatically assign self-service assigned users to an application role directly.
 
+> [!NOTE]
+> An Azure Active Directory Premium (P1 or P2) license is required for users to request to join a self-service app and for owners to approve or deny requests. Without an Azure Active Directory Premium license, users cannot add self-service apps.
+
 ## Enable self-service application access to allow users to find their own applications
 
 Self-service application access is a great way to allow users to self-discover applications, and optionally allow the business group to approve access to those applications. For password single-sign on applications, you can also allow the business group to manage the credentials assigned to those users from their own My Apps access panels.

articles/app-service/app-service-web-get-started-java.md

@@ -119,10 +119,10 @@ Once deployment has completed, browse to the deployed application using the foll
 > [Connect to Azure SQL database with Java](/azure/sql-database/sql-database-connect-query-java?toc=%2Fazure%2Fjava%2Ftoc.json)
 
 > [!div class="nextstepaction"]
-> [Connect to Azure DB for MySQL with Java](/azure/mysql/connect-java?toc=/azure/java/toc.json)
+> [Connect to Azure DB for MySQL with Java](/azure/mysql/connect-java)
 
 > [!div class="nextstepaction"]
-> [Connect to Azure DB for PostgreSQL with Java](/azure/postgresql/connect-java?toc=/azure/java/toc.json)
+> [Connect to Azure DB for PostgreSQL with Java](/azure/postgresql/connect-java)
 
 > [!div class="nextstepaction"]
 > [Azure for Java Developers Resources](/java/azure/)

articles/app-service/configure-language-java.md

@@ -314,7 +314,7 @@ Azure's supported Java Development Kit (JDK) is [Zulu](https://www.azul.com/down
 
 Major version updates will be provided through new runtime options in Azure App Service for Windows. Customers update to these newer versions of Java by configuring their App Service deployment and are responsible for testing and ensuring the major update meets their needs.
 
-Supported JDKs are automatically patched on a quarterly basis in January, April, July, and October of each year. For more information on Java on Azure, please see [this support document](https://docs.microsoft.com/azure/java/jdk/).
+Supported JDKs are automatically patched on a quarterly basis in January, April, July, and October of each year. For more information on Java on Azure, please see [this support document](https://docs.microsoft.com/azure/developer/java/fundamentals/java-jdk-long-term-support).
 
 ### Security updates
 

articles/app-service/containers/quickstart-java.md

@@ -137,10 +137,10 @@ This command may take a minute to run.
 > [Connect to Azure SQL database with Java](/azure/sql-database/sql-database-connect-query-java?toc=%2Fazure%2Fjava%2Ftoc.json)
 
 > [!div class="nextstepaction"]
-> [Connect to Azure DB for MySQL with Java](/azure/mysql/connect-java?toc=/azure/java/toc.json)
+> [Connect to Azure DB for MySQL with Java](/azure/mysql/connect-java)
 
 > [!div class="nextstepaction"]
-> [Connect to Azure DB for PostgreSQL with Java](/azure/postgresql/connect-java?toc=/azure/java/toc.json)
+> [Connect to Azure DB for PostgreSQL with Java](/azure/postgresql/connect-java)
 
 > [!div class="nextstepaction"]
 > [Configure Java app](configure-custom-container.md)

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

@@ -131,7 +131,7 @@ In this section, you set up console logging that uses the [ASP.NET Core logging
     * 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.
     * Adds the console provider with default [filtering](webjobs-sdk-how-to.md#log-filtering).
 
-Now, you can add a function that is triggered by messages arriving in an [Azure Storage queue](../azure-functions/functions-bindings-storage-queue.md).
+Now, you can add a function that is triggered by messages arriving in an Azure Storage queue.
 
 ## Install the Storage binding extension
 
@@ -181,7 +181,7 @@ Starting with version 3.x, you must explicitly install the Storage binding exten
 
    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.
 
-   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.
+   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.
 
 ## Create a storage account
 
@@ -277,7 +277,7 @@ In this section, you build and run the project locally and trigger the function
 
    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.
 
-   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).
+   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).
 
    The console output looks like this:
 
@@ -441,7 +441,7 @@ During deployment, you create an app service instance in which to run your funct
 1. Refresh the **Queue** page, and the new message disappears because it has been processed by the function running in Azure.
 
    > [!TIP]
-   > 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).
+   > 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).
 
 ### View logs in Application Insights
 

articles/automation/TOC.yml

@@ -44,35 +44,35 @@
   items:
     - name: Automation Account
       items:
-        - name: Create using Azure portal
+        - name: Create Automation account using Azure portal
           href: automation-create-standalone-account.md
-        - name: Create with Resource Manager template
+        - name: Create Automation account with Resource Manager template
           href: automation-create-account-template.md
         - name: Manage an Automation Run As account
           href: manage-runas-account.md
-        - name: Role permissions and security
+        - name: Manage role permissions and security
           href: automation-role-based-access-control.md
-        - name: Move Automation Account to another subscription
+        - name: Move Automation account to another subscription
           href: how-to/move-account.md
         - name: Migrate from System Center Orchestrator
           href: automation-orchestrator-migration.md
-    - name: Manage shared resources
+    - name: Shared resources
       items:
-        - name: Certificates
+        - name: Manage certificates
           href: shared-resources/certificates.md
-        - name: Connections
+        - name: Manage connections
           href: automation-connections.md
-        - name: Credentials
+        - name: Manage credentials
           href: shared-resources/credentials.md
-        - name: PowerShell modules
+        - name: Manage PowerShell modules
           items:
             - name: Manage modules in Azure Automation
               href: shared-resources/modules.md
             - name: Update Azure PowerShell modules
               href: automation-update-azure-modules.md
-        - name: Schedules
+        - name: Manage schedules
           href: shared-resources/schedules.md
-        - name: Variables
+        - name: Manage variables
           href: shared-resources/variables.md
         - name: Manage Python 2 packages
           href: python-packages.md
@@ -104,13 +104,13 @@
               href: automation-webhooks.md
             - name: Track updated files with watcher task
               href: automation-watchers-tutorial.md
-            - name: Working with the Graphical runbook SDK
+            - name: Work with the Graphical runbook SDK
               href: graphical-runbook-sdk.md
         - name: Monitor runbooks
           items:
-            - name: Runbook output
+            - name: Monitor runbook output
               href: automation-runbook-output-and-messages.md
-            - name: Handle errors in Graphical runbooks
+            - name: Handle errors in graphical runbooks
               href: automation-runbook-graphical-error-handling.md
             - name: Forward job data to Azure Monitor Logs
               href: automation-manage-send-joblogs-log-analytics.md
@@ -120,7 +120,7 @@
               href: troubleshoot/runbooks.md
             - name: Data to collect before opening support case
               href: troubleshoot/collect-data-microsoft-azure-automation-case.md
-        - name: Hybrid Runbook Worker
+        - name: Work with a Hybrid Runbook Worker
           items: 
             - name: Deploy Windows Hybrid Runbook Worker
               href: automation-windows-hrw-install.md
@@ -130,15 +130,15 @@
               href: automation-hrw-run-runbooks.md
             - name: Troubleshoot Hybrid Runbook Worker
               href: troubleshoot/hybrid-runbook-worker.md
-        - name: Source control integration
+        - name: Use source control integration
           href: source-control-integration.md
     - name: Configuration Management
       items:
-        - name: State Configuration (DSC)
+        - name: Manage State Configuration (DSC)
           items:
             - name: Overview
               href: automation-dsc-overview.md
-            - name: Get started using DSC
+            - name: Get started using State Configuration
               href: automation-dsc-getting-started.md
             - name: Onboard machines for management
               href: automation-dsc-onboarding.md
@@ -156,13 +156,13 @@
               href: automation-dsc-diagnostics.md
             - name: Troubleshoot issues with DSC
               href: troubleshoot/desired-state-configuration.md
-        - name: Change Tracking and Inventory
+        - name: Manage Change Tracking and Inventory
           items:
             - name: Overview
               href: change-tracking.md
             - name: Supported regions for linked Log Analytics workspace
               href: how-to/region-mappings.md
-            - name: Enable
+            - name: Enable Change Tracking and Inventory
               items:
                 - name: Use Azure portal
                   href: automation-onboard-solutions-from-browse.md

articles/automation/automation-connections.md

@@ -1,13 +1,13 @@
 ---
-title: Connection assets in Azure Automation
+title: Manage connections in Azure Automation
 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.
 services: automation
 ms.subservice: shared-capabilities
 ms.date: 01/13/2020
 ms.topic: conceptual
 ---
 
-# Connection assets in Azure Automation
+# Manage connections in Azure Automation
 
 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.