Merge pull request #109482 from MicrosoftDocs/master

Merge master to live, 4 AM

Author: ShannonLeavitt

.openpublishing.redirection.json

@@ -20244,6 +20244,11 @@
       "redirect_url": "/azure/service-fabric/service-fabric-tutorial-deploy-app-to-party-cluster",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/migrate/deploy-appliance.md",
+      "redirect_url": "migrate-appliance-architecture",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/migrate/troubleshooting-general.md",
       "redirect_url": "troubleshoot-general",

articles/active-directory/saas-apps/profitco-saml-app-tutorial.md

@@ -0,0 +1,145 @@
+---
+title: 'Tutorial: Azure Active Directory single sign-on (SSO) integration with Profit.co SAML App | Microsoft Docs'
+description: Learn how to configure single sign-on between Azure Active Directory and Profit.co SAML App.
+services: active-directory
+documentationCenter: na
+author: jeevansd
+manager: mtillman
+ms.reviewer: barbkess
+
+ms.assetid: 27f42934-c636-43dd-9c20-a3c6316f2763
+ms.service: active-directory
+ms.subservice: saas-app-tutorial
+ms.workload: identity
+ms.tgt_pltfrm: na
+ms.topic: tutorial
+ms.date: 03/27/2020
+ms.author: jeedes
+
+ms.collection: M365-identity-device-management
+---
+
+# Tutorial: Azure Active Directory single sign-on (SSO) integration with Profit.co SAML App
+
+In this tutorial, you'll learn how to integrate Profit.co SAML App with Azure Active Directory (Azure AD). When you integrate Profit.co SAML App with Azure AD, you can:
+
+* Control in Azure AD who has access to Profit.co SAML App.
+* Enable your users to be automatically signed-in to Profit.co SAML App with their Azure AD accounts.
+* Manage your accounts in one central location - the Azure portal.
+
+To learn more about SaaS app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/manage-apps/what-is-single-sign-on).
+
+## Prerequisites
+
+To get started, you need the following items:
+
+* An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
+* Profit.co SAML App single sign-on (SSO) enabled subscription.
+
+## Scenario description
+
+In this tutorial, you configure and test Azure AD SSO in a test environment.
+
+* Profit.co SAML App supports **IDP** initiated SSO
+
+* Once you configure Profit.co SAML App you can enforce session control, which protect exfiltration and infiltration of your organization’s sensitive data in real-time. Session control extend from Conditional Access. [Learn how to enforce session control with Microsoft Cloud App Security](https://docs.microsoft.com/cloud-app-security/proxy-deployment-any-app).
+
+## Adding Profit.co SAML App from the gallery
+
+To configure the integration of Profit.co SAML App into Azure AD, you need to add Profit.co SAML App from the gallery to your list of managed SaaS apps.
+
+1. Sign in to the [Azure portal](https://portal.azure.com) using either a work or school account, or a personal Microsoft account.
+1. On the left navigation pane, select the **Azure Active Directory** service.
+1. Navigate to **Enterprise Applications** and then select **All Applications**.
+1. To add new application, select **New application**.
+1. In the **Add from the gallery** section, type **Profit.co SAML App** in the search box.
+1. Select **Profit.co SAML App** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
+
+
+## Configure and test Azure AD single sign-on for Profit.co SAML App
+
+Configure and test Azure AD SSO with Profit.co SAML App using a test user called **B.Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in Profit.co SAML App.
+
+To configure and test Azure AD SSO with Profit.co SAML App, complete the following building blocks:
+
+1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** - to enable your users to use this feature.
+    1. **[Create an Azure AD test user](#create-an-azure-ad-test-user)** - to test Azure AD single sign-on with B.Simon.
+    1. **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** - to enable B.Simon to use Azure AD single sign-on.
+1. **[Configure Profit.co SAML App SSO](#configure-profitco-saml-app-sso)** - to configure the single sign-on settings on application side.
+    1. **[Create Profit.co SAML App test user](#create-profitco-saml-app-test-user)** - to have a counterpart of B.Simon in Profit.co SAML App that is linked to the Azure AD representation of user.
+1. **[Test SSO](#test-sso)** - to verify whether the configuration works.
+
+## Configure Azure AD SSO
+
+Follow these steps to enable Azure AD SSO in the Azure portal.
+
+1. In the [Azure portal](https://portal.azure.com/), on the **Profit.co SAML App** application integration page, find the **Manage** section and select **single sign-on**.
+1. On the **Select a single sign-on method** page, select **SAML**.
+1. On the **Set up single sign-on with SAML** page, click the edit/pen icon for **Basic SAML Configuration** to edit the settings.
+
+   ![Edit Basic SAML Configuration](common/edit-urls.png)
+
+1. On the **Basic SAML Configuration** section, the application is pre-configured and the necessary URLs are already pre-populated with Azure. The user needs to save the configuration by clicking the **Save** button.
+
+1. On the **Set up single sign-on with SAML** page, In the **SAML Signing Certificate** section, click copy button to copy **App Federation Metadata Url** and save it on your computer.
+
+	![The Certificate download link](common/copy-metadataurl.png)
+
+### Create an Azure AD test user
+
+In this section, you'll create a test user in the Azure portal called B.Simon.
+
+1. From the left pane in the Azure portal, select **Azure Active Directory**, select **Users**, and then select **All users**.
+1. Select **New user** at the top of the screen.
+1. In the **User** properties, follow these steps:
+   1. In the **Name** field, enter `B.Simon`.  
+   1. In the **User name** field, enter the [email protected]. For example, `[email protected]`.
+   1. Select the **Show password** check box, and then write down the value that's displayed in the **Password** box.
+   1. Click **Create**.
+
+### Assign the Azure AD test user
+
+In this section, you'll enable B.Simon to use Azure single sign-on by granting access to Profit.co SAML App.
+
+1. In the Azure portal, select **Enterprise Applications**, and then select **All applications**.
+1. In the applications list, select **Profit.co SAML App**.
+1. In the app's overview page, find the **Manage** section and select **Users and groups**.
+
+   ![The "Users and groups" link](common/users-groups-blade.png)
+
+1. Select **Add user**, then select **Users and groups** in the **Add Assignment** dialog.
+
+	![The Add User link](common/add-assign-user.png)
+
+1. In the **Users and groups** dialog, select **B.Simon** from the Users list, then click the **Select** button at the bottom of the screen.
+1. If you're expecting any role value in the SAML assertion, in the **Select Role** dialog, select the appropriate role for the user from the list and then click the **Select** button at the bottom of the screen.
+1. In the **Add Assignment** dialog, click the **Assign** button.
+
+## Configure Profit.co SAML App SSO
+
+To configure single sign-on on **Profit.co SAML App** side, you need to send the **App Federation Metadata Url** to [Profit.co SAML App support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
+
+### Create Profit.co SAML App test user
+
+In this section, you create a user called Britta Simon in Profit.co SAML App. Work with [Profit.co SAML App support team](mailto:[email protected]) to add the users in the Profit.co SAML App platform. Users must be created and activated before you use single sign-on.
+
+## Test SSO 
+
+In this section, you test your Azure AD single sign-on configuration using the Access Panel.
+
+When you click the Profit.co SAML App tile in the Access Panel, you should be automatically signed in to the Profit.co SAML App for which you set up SSO. For more information about the Access Panel, see [Introduction to the Access Panel](https://docs.microsoft.com/azure/active-directory/active-directory-saas-access-panel-introduction).
+
+## Additional resources
+
+- [ List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory ](https://docs.microsoft.com/azure/active-directory/active-directory-saas-tutorial-list)
+
+- [What is application access and single sign-on with Azure Active Directory? ](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis)
+
+- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
+
+- [Try Profit.co SAML App with Azure AD](https://aad.portal.azure.com/)
+
+- [What is session control in Microsoft Cloud App Security?](https://docs.microsoft.com/cloud-app-security/proxy-intro-aad)
+
+- [How to protect Profit.co SAML App with advanced visibility and controls](https://docs.microsoft.com/cloud-app-security/proxy-intro-aad)
+

articles/active-directory/saas-apps/toc.yml

@@ -1154,6 +1154,8 @@
         href: procoresso-tutorial.md
       - name: productboard
         href: productboard-tutorial.md
+      - name: Profit.co SAML App
+        href: profitco-saml-app-tutorial.md
       - name: Projectplace
         href: projectplace-tutorial.md
       - name: ProMaster (by Inlogik)

articles/aks/azure-ad-v2.md

@@ -46,7 +46,7 @@ az extension list
 
 To install kubectl, use the following
 ```azurecli
-curl -LO "https://storage.googleapis.com/kubernetes-release/release/v1.18.0-beta.2/bin/darwin/amd64/kubectl"
+curl -LO "https://storage.googleapis.com/kubernetes-release/release/v1.18.0-beta.2/bin/linux/amd64/kubectl"
 chmod +x ./kubectl
 sudo mv ./kubectl /usr/local/bin/kubectl
 kubectl version --client
@@ -149,4 +149,4 @@ The user above gets an error because the user is not a part of a group that has
 Learn about [Azure AD Role Based Access Control][azure-ad-rbac].
 
 <!-- LINKS - Internal -->
-[azure-ad-rbac]: azure-ad-rbac.md
+[azure-ad-rbac]: azure-ad-rbac.md

articles/backup/backup-support-matrix-iaas.md

@@ -110,7 +110,6 @@ Recovery points on DPM/MABS disk | 64 for file servers, and 448 for app servers.
 **Restore** | **Supported**
 --- | ---
 Restoring files across operating systems | You can restore files on any machine that has the same (or compatible) OS as the backed-up VM. See the [Compatible OS table](backup-azure-restore-files-from-vm.md#system-requirements).
-Restoring files on classic VMs | Not supported.
 Restoring files from encrypted VMs | Not supported.
 Restoring files from network-restricted storage accounts | Not supported.
 Restoring files on VMs using Windows Storage Spaces | Restore not supported on same VM.<br/><br/> Instead, restore the files on a compatible VM.

articles/data-explorer/python-ingest-data.md

@@ -133,7 +133,7 @@ Queue a message to pull data from blob storage and ingest that data into Azure D
 INGESTION_CLIENT = KustoIngestClient(KCSB_INGEST)
 
 # All ingestion properties are documented here: https://docs.microsoft.com/azure/kusto/management/data-ingest#ingestion-properties
-INGESTION_PROPERTIES = IngestionProperties(database=KUSTO_DATABASE, table=DESTINATION_TABLE, dataFormat=DataFormat.csv,
+INGESTION_PROPERTIES = IngestionProperties(database=KUSTO_DATABASE, table=DESTINATION_TABLE, dataFormat=DataFormat.CSV,
                                            mappingReference=DESTINATION_TABLE_COLUMN_MAPPING, additionalProperties={'ignoreFirstRecord': 'true'})
 # FILE_SIZE is the raw size of the data in bytes
 BLOB_DESCRIPTOR = BlobDescriptor(BLOB_PATH, FILE_SIZE)

articles/iot-edge/how-to-authenticate-downstream-device.md

@@ -136,10 +136,10 @@ If you don't have a certificate authority to create X.509 certificates, you can
 5. Depending on your preferred language, review samples of how X.509 certificates can be referenced in IoT applications:
 
    * C#: [Set up X.509 security in your Azure IoT hub](../iot-hub/iot-hub-security-x509-get-started.md#authenticate-your-x509-device-with-the-x509-certificates)
-   * C: [iotedge_downstream_device_sample](https://github.com/Azure/azure-iot-sdk-c/tree/x509_edge_bugbash/iothub_client/samples/iotedge_downstream_device_sample)
+   * C: [iotedge_downstream_device_sample.c](https://github.com/Azure/azure-iot-sdk-c/tree/master/iothub_client/samples/iotedge_downstream_device_sample)
    * Node.js: [simple_sample_device_x509.js](https://github.com/Azure/azure-iot-sdk-node/blob/master/device/samples/simple_sample_device_x509.js)
-   * Java: [SendEventX509.java](https://github.com/Azure/azure-iot-sdk-python/blob/master/device/samples/iothub_client_sample_x509.py)
-   * Python: [send_message_x509.py](https://github.com/Azure/azure-iot-sdk-python/blob/master/azure-iot-device/samples/advanced-hub-scenarios/send_message_x509.py)
+   * Java: [SendEventX509.java](https://github.com/Azure/azure-iot-sdk-java/tree/master/device/iot-device-samples/send-event-x509)
+   * Python: [send_message_x509.py](https://github.com/Azure/azure-iot-sdk-python/blob/master/azure-iot-device/samples/async-hub-scenarios/send_message_x509.py)
 
 You can use the [IoT extension for Azure CLI](https://github.com/Azure/azure-iot-cli-extension) to complete the same device creation operation. The following example creates a new IoT device with X.509 CA signed authentication and assigns a parent device:
 

articles/key-vault/media/private-link-service-8.png

@@ -53,7 +53,7 @@ After configuring the key vault basics, select the Networking tab and follow the
 1. Leave the "integrate with the private zone DNS" option unchanged.  
 1. Select "Ok".
 
-    ![Image](./media/private-link-service-2.png)
+    ![Image](./media/private-link-service-8.png)
 
 You will now be able to see the configured private endpoint. You now have the option to delete and edit this private endpoint. 
 Select the "Review + Create" button and create the key vault. It will take 5-10 minutes for the deployment to complete. 

articles/key-vault/private-link-service.md

@@ -17,7 +17,7 @@ ms.date: 03/18/2020
 In this article, you learn how to debug and troubleshoot [machine learning pipelines](concept-ml-pipelines.md) in the [Azure Machine Learning SDK](https://docs.microsoft.com/python/api/overview/azure/ml/intro?view=azure-ml-py) and [Azure Machine Learning designer (preview)](https://docs.microsoft.com/azure/machine-learning/concept-designer). Information is provided on how to:
 
 * Debug using the Azure Machine Learning SDK
-* Debug using the Azure Machine Learning Designer
+* Debug using the Azure Machine Learning designer
 * Debug using Application Insights
 * Debug interactively using Visual Studio Code (VS Code) and the Python Tools for Visual Studio (PTVSD)
 
@@ -88,7 +88,7 @@ The table below provides information for different debug options for pipelines.
 | Library                    | Type   | Example                                                          | Destination                                  | Resources                                                                                                                                                                                                                                                                                                                    |
 |----------------------------|--------|------------------------------------------------------------------|----------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Azure Machine Learning SDK | Metric | `run.log(name, val)`                                             | Azure Machine Learning Portal UI             | [How to track experiments](how-to-track-experiments.md#available-metrics-to-track)<br>[azureml.core.Run class](https://docs.microsoft.com/python/api/azureml-core/azureml.core.run(class)?view=experimental)                                                                                                                                                 |
-| Python printing/logging    | Log    | `print(val)`<br>`logging.info(message)`                          | Driver logs, Azure Machine Learning Designer | [How to track experiments](how-to-track-experiments.md#available-metrics-to-track)<br><br>[Python logging](https://docs.python.org/2/library/logging.html)                                                                                                                                                                       |
+| Python printing/logging    | Log    | `print(val)`<br>`logging.info(message)`                          | Driver logs, Azure Machine Learning designer | [How to track experiments](how-to-track-experiments.md#available-metrics-to-track)<br><br>[Python logging](https://docs.python.org/2/library/logging.html)                                                                                                                                                                       |
 | OpenCensus Python          | Log    | `logger.addHandler(AzureLogHandler())`<br>`logging.log(message)` | Application Insights - traces                | [Debug pipelines in Application Insights](how-to-debug-pipelines-application-insights.md)<br><br>[OpenCensus Azure Monitor Exporters](https://github.com/census-instrumentation/opencensus-python/tree/master/contrib/opencensus-ext-azure)<br>[Python logging cookbook](https://docs.python.org/3/howto/logging-cookbook.html) |
 
 #### Logging options example
@@ -133,8 +133,8 @@ For pipelines created in the designer, you can find the **log files** on either
 When you submit a pipeline run and stay in the authoring page, you can find the log files generated for each module.
 
 1. Select any module in the authoring canvas.
-1. In the right pane of the module, go to the  **Outputs+ogs** tab.
-1. Select the log file `70_driver_log.txt`
+1. In the right pane of the module, go to the  **Outputs + logs** tab.
+1. Select the log file `70_driver_log.txt`.
 
     ![Authoring page module logs](./media/how-to-debug-pipelines/pipelinerun-05.png)
 
@@ -145,8 +145,8 @@ You can also find the log files of specific runs in the pipeline run detail page
 1. Select a pipeline run created in the designer.
     ![Pipeline run page](./media/how-to-debug-pipelines/pipelinerun-04.png)
 1. Select any module in the preview pane.
-1. In the right pane of the module, go to the  **Outputs+ogs** tab.
-1. Select the log file `70_driver_log.txt`
+1. In the right pane of the module, go to the  **Outputs + logs** tab.
+1. Select the log file `70_driver_log.txt`.
 
 ## Debug and troubleshoot in Application Insights
 For more information on using the OpenCensus Python library in this manner, see this guide: [Debug and troubleshoot machine learning pipelines in Application Insights](how-to-debug-pipelines-application-insights.md)