Merge remote-tracking branch 'BaherAbdullah/patch-77' into baher-update-2

aahill · aahill · commit 5f3c30d4f191 · 2022-03-15T11:17:45.000-07:00
diff --git a/articles/active-directory/saas-apps/bic-cloud-design-provisioning-tutorial.md b/articles/active-directory/saas-apps/bic-cloud-design-provisioning-tutorial.md
@@ -12,7 +12,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.tgt_pltfrm: na
-ms.topic: article
+ms.topic: tutorial
 ms.date: 11/15/2021
 ms.author: Thwimmer
 ---
diff --git a/articles/active-directory/saas-apps/bullseyetdp-provisioning-tutorial.md b/articles/active-directory/saas-apps/bullseyetdp-provisioning-tutorial.md
@@ -12,7 +12,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.devlang: na
-ms.topic: article
+ms.topic: tutorial
 ms.date: 02/03/2022
 ms.author: Thwimmer
 ---
diff --git a/articles/active-directory/saas-apps/directprint-io-provisioning-tutorial.md b/articles/active-directory/saas-apps/directprint-io-provisioning-tutorial.md
@@ -12,7 +12,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.tgt_pltfrm: na
-ms.topic: article
+ms.topic: tutorial
 ms.date: 09/24/2021
 ms.author: Thwimmer
 ---
diff --git a/articles/active-directory/saas-apps/facebook-work-accounts-provisioning-tutorial.md b/articles/active-directory/saas-apps/facebook-work-accounts-provisioning-tutorial.md
@@ -12,7 +12,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.tgt_pltfrm: na
-ms.topic: article
+ms.topic: tutorial
 ms.date: 10/27/2021
 ms.author: Zhchia
 ---
diff --git a/articles/active-directory/saas-apps/frankli-io-provisioning-tutorial.md b/articles/active-directory/saas-apps/frankli-io-provisioning-tutorial.md
@@ -11,7 +11,7 @@ ms.assetid: 936223d1-7ba5-4300-b05b-cbf78ee45d0e
 ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
-ms.topic: article
+ms.topic: tutorial
 ms.date: 12/16/2021
 ms.author: Thwimmer
 ---
diff --git a/articles/active-directory/saas-apps/gong-provisioning-tutorial.md b/articles/active-directory/saas-apps/gong-provisioning-tutorial.md
@@ -12,7 +12,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.devlang: na
-ms.topic: article
+ms.topic: tutorial
 ms.date: 02/09/2022
 ms.author: Thwimmer
 ---
diff --git a/articles/active-directory/saas-apps/klaxoon-provisioning-tutorial.md b/articles/active-directory/saas-apps/klaxoon-provisioning-tutorial.md
@@ -12,7 +12,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.tgt_pltfrm: na
-ms.topic: article
+ms.topic: tutorial
 ms.date: 09/22/2021
 ms.author: Thwimmer
 ---
diff --git a/articles/active-directory/saas-apps/klaxoon-saml-provisioning-tutorial.md b/articles/active-directory/saas-apps/klaxoon-saml-provisioning-tutorial.md
@@ -12,7 +12,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.tgt_pltfrm: na
-ms.topic: article
+ms.topic: tutorial
 ms.date: 09/22/2021
 ms.author: thwimmer
 ---
diff --git a/articles/active-directory/saas-apps/lanschool-air-provisioning-tutorial.md b/articles/active-directory/saas-apps/lanschool-air-provisioning-tutorial.md
@@ -12,7 +12,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.devlang: na
-ms.topic: article
+ms.topic: tutorial
 ms.date: 02/03/2022
 ms.author: Thwimmer
 ---
diff --git a/articles/active-directory/saas-apps/meta-networks-connector-provisioning-tutorial.md b/articles/active-directory/saas-apps/meta-networks-connector-provisioning-tutorial.md
diff --git a/articles/active-directory/saas-apps/mx3-diagnostics-connector-provisioning-tutorial.md b/articles/active-directory/saas-apps/mx3-diagnostics-connector-provisioning-tutorial.md
@@ -12,7 +12,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.tgt_pltfrm: na
-ms.topic: article
+ms.topic: tutorial
 ms.date: 10/12/2021
 ms.author: Thwimmer
 ---
diff --git a/articles/active-directory/saas-apps/netpresenter-provisioning-tutorial.md b/articles/active-directory/saas-apps/netpresenter-provisioning-tutorial.md
@@ -12,7 +12,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.tgt_pltfrm: na
-ms.topic: article
+ms.topic: tutorial
 ms.date: 10/04/2021
 ms.author: Zhchia
 ---
diff --git a/articles/active-directory/saas-apps/prodpad-provisioning-tutorial.md b/articles/active-directory/saas-apps/prodpad-provisioning-tutorial.md
@@ -12,7 +12,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.devlang: na
-ms.topic: article
+ms.topic: tutorial
 ms.date: 02/09/2022
 ms.author: Thwimmer
 ---
diff --git a/articles/active-directory/saas-apps/terratrue-provisioning-tutorial.md b/articles/active-directory/saas-apps/terratrue-provisioning-tutorial.md
@@ -12,7 +12,7 @@ ms.service: active-directory
 ms.subservice: saas-app-tutorial
 ms.workload: identity
 ms.devlang: na
-ms.topic: article
+ms.topic: tutorial
 ms.date: 12/16/2021
 ms.author: Thwimmer
 ---
diff --git a/articles/azure-sql/virtual-machines/windows/sql-server-iaas-agent-extension-automate-management.md b/articles/azure-sql/virtual-machines/windows/sql-server-iaas-agent-extension-automate-management.md
@@ -77,7 +77,7 @@ The following table details these benefits:
 | **Flexible licensing** | Save on cost by [seamlessly transitioning](licensing-model-azure-hybrid-benefit-ahb-change.md) from the bring-your-own-license (also known as the Azure Hybrid Benefit) to the pay-as-you-go licensing model and back again. <br/> Management mode: Lightweight & full| 
 | **Flexible version / edition** | If you decide to change the [version](change-sql-server-version.md) or [edition](change-sql-server-edition.md) of SQL Server, you can update the metadata within the Azure portal without having to redeploy the entire SQL Server VM.  <br/> Management mode: Lightweight & full| 
 | **Defender for Cloud portal integration** | If you've enabled [Microsoft Defender for SQL](../../../security-center/defender-for-sql-usage.md), then you can view Defender for Cloud recommendations directly in the [SQL virtual machines](manage-sql-vm-portal.md) resource of the Azure portal. See [Security best practices](security-considerations-best-practices.md) to learn more.  <br/> Management mode: Lightweight & full|
-| **SQL Assessment (Preview)** | Enables you to assess the health of your SQL Server VMs using configuration best practices. For more information, see [SQL Assessment](sql-assessment-for-sql-vm.md).  <br/> Management mode: Full| 
+| **SQL best practices assessment** | Enables you to assess the health of your SQL Server VMs using configuration best practices. For more information, see [SQL best practices assessment](sql-assessment-for-sql-vm.md).  <br/> Management mode: Full| 
 
 
 ## Management modes
diff --git a/articles/cognitive-services/language-service/conversational-language-understanding/how-to/deploy-query-model.md b/articles/cognitive-services/language-service/conversational-language-understanding/how-to/deploy-query-model.md
@@ -18,28 +18,53 @@ ms.custom: language-service-clu, ignite-fall-2021
 
 After you have [trained a model](./train-model.md) on your dataset, you're ready to deploy it. After deploying your model, you'll be able to query it for predictions. 
 
+> [!Tip]
+> Before deploying a model, make sure to view the model details to make sure that the model is performing as expected.
+
 ## Deploy model
 
-Deploying a model is to host it and make it available for predictions through an endpoint. You can only have 1 deployed model per project, deploying another one will overwrite the previously deployed model.
+Deploying a model hosts and makes it available for predictions through an endpoint.
 
 When a model is deployed, you will be able to test the model directly in the portal or by calling the API associated to it.
 
-Simply select a model and click on deploy model in the Deploy model page. 
+### Conversation projects deployments
+
+1.	Click on *Add deployment* to submit a new deployment job
+
+:::image type="content" source="../media/add-deployment-model.png" alt-text="A screenshot showing the model deployment page in Language Studio." lightbox="../media/add-deploy-model.png":::
+
+2. In the window that appears, you can create a new deployment name by giving the deployment a name or override an existing deployment name. Then, you can add a trained model to this deployment name.
+
+:::image type="content" source="../media/create-deployment-job.png" alt-text="A screenshot showing deployment job creation in Language Studio." lightbox="../media/create-deployment-job.png":::
+
+
+#### Swap deployments
 
-:::image type="content" source="../media/deploy-model.png" alt-text="A screenshot showing the model deployment page in Language Studio." lightbox="../media/deploy-model.png":::
+If you would like to swap the models between two deployments, simply select the two deployment names you want to swap and click on **Swap deployments**. From the window that appears, select the deployment name you want to swap with.
+
+:::image type="content" source="../media/swap-deployment.png" alt-text="A screenshot showing swaping deployments in Language Studio." lightbox="../media/swap-deployment.png":::
+
+#### Delete deployment
+
+To delete a deployment, select the deployment you want to delete and click on **Delete deployment**.
 
 > [!TIP]
 > If you're using the REST API, see the [quickstart](../quickstart.md?pivots=rest-api#deploy-your-model) and REST API [reference documentation](https://westus2.dev.cognitive.microsoft.com/docs/services/language-authoring-clu-apis-2021-11-01-preview/operations/Deployments_TriggerDeploymentJob) for examples and more information.
 
-**Orchestration workflow projects deployments**
+> [!NOTE]
+> You can only have ten deployment names.
+
+### Orchestration workflow projects deployments
+
+1.	Click on **Add deployment** to submit a new deployment job.
+
+Like conversation projects, In the window that appears, you can create a new deployment name by giving the deployment a name or override an existing deployment name. Then, you can add a trained model to this deployment name and press next.
 
-When you're deploying an orchestration workflow project, A small window will show up for you to confirm your deployment, and configure parameters for connected services.
+:::image type="content" source="../media/create-deployment-job-orch.png" alt-text="A screenshot showing deployment job creation in Language Studio." lightbox="../media/create-deployment-job-orch.png":::
 
-If you're connecting one or more LUIS applications, specify the deployment name, and whether you're using *slot* or *version* type deployment.       
-* The *slot* deployment type requires you to pick between a production and staging slot.
-* The *version* deployment type requires you to specify the version you have published.
+2. If you're connecting one or more LUIS applications or conversational language understanding projects, specify the deployment name.
 
-No configurations are required for custom question answering and conversational language understanding connections, or unlinked intents.
+No configurations are required for custom question answering or unlinked intents.
 
 LUIS projects **must be published** to the slot configured during the Orchestration deployment, and custom question answering KBs must also be published to their Production slots.
 
diff --git a/articles/cognitive-services/language-service/conversational-language-understanding/includes/quickstarts/language-studio.md b/articles/cognitive-services/language-service/conversational-language-understanding/includes/quickstarts/language-studio.md
@@ -99,15 +99,18 @@ When you're done, select **Save Changes** to save the utterances and labels to t
 
 ## Train your model and view its details
 
-Select **train model** on the left of the screen. Select **Start a training job**. To train your model, you need to provide a name for the model. Write a name like "*v1*" and press the enter key. 
+Select **train model** on the left of the screen. Select **Start a training job**. To train your model, you need to provide a name for the model. Write a name like "*v1*" and press the enter key.
 
-Turn off **Run evaluation with training** before selecting **Train**. 
+> [!NOTE]
+> If you did not [add utterances to testing set](https://docs.microsoft.com/azure/cognitive-services/language-service/conversational-language-understanding/how-to/tag-utterances#tag-utterances), you will only be allowed to train using the **Automatically split the testing set from all data** option.
 
-You should see the **View model details** page. Wait until training completes, which may take about 5 minutes. When training succeeds, Select **Deploy Model** on the left of the screen.
+When the training job is complete, which may take some time, you should see the output model performance in the **View model details** page.
 
 ## Deploy your model
 
-From the **Deploy model** page on the left of the screen, select the trained model and select the **Deploy model** button. In the screen that appears, select **Deploy**.
+From the **Deploy model** page on the left of the screen, select **Add deployment**.
+
+In the window that appears, give your deployment a **deploment name** and then assign your trained model to this deployment name and then select **Submit**.
 
 ## Test your model
 
diff --git a/articles/cognitive-services/language-service/conversational-language-understanding/media/add-deployment-model.png b/articles/cognitive-services/language-service/conversational-language-understanding/media/add-deployment-model.png
diff --git a/articles/cognitive-services/language-service/conversational-language-understanding/media/create-deployment-job-orch.png b/articles/cognitive-services/language-service/conversational-language-understanding/media/create-deployment-job-orch.png
diff --git a/articles/cognitive-services/language-service/conversational-language-understanding/media/create-deployment-job.png b/articles/cognitive-services/language-service/conversational-language-understanding/media/create-deployment-job.png
diff --git a/articles/cognitive-services/language-service/conversational-language-understanding/media/swap-deployment.png b/articles/cognitive-services/language-service/conversational-language-understanding/media/swap-deployment.png
diff --git a/articles/defender-for-cloud/defender-for-container-registries-cicd.md b/articles/defender-for-cloud/defender-for-container-registries-cicd.md
@@ -65,9 +65,10 @@ To enable vulnerability scans of images in your GitHub workflows:
     >  The push to the registry must happen prior to the results being published.
 
     ```yml
-    - run: |
-      echo "github.sha=$GITHUB_SHA"
-      docker build -t githubdemo1.azurecr.io/k8sdemo:${{ github.sha }}
+    - name: Build and Tag Image
+      run: |
+        echo "github.sha=$GITHUB_SHA"
+        docker build -t githubdemo1.azurecr.io/k8sdemo:${{ github.sha }} .
     
     - uses: Azure/container-scan@v0 
       name: Scan image for vulnerabilities
@@ -76,9 +77,9 @@ To enable vulnerability scans of images in your GitHub workflows:
       with:
         image-name: githubdemo1.azurecr.io/k8sdemo:${{ github.sha }} 
     
-    - name: Push Docker image - githubdemo1.azurecr.io/k8sdemo:${{ github.sha }}
+    - name: Push Docker image 
       run: |
-      docker push githubdemo1.azurecr.io/k8sdemo:${{ github.sha }}
+        docker push githubdemo1.azurecr.io/k8sdemo:${{ github.sha }}
     
     - name: Post logs to appinsights
       uses: Azure/publish-security-assessments@v0
diff --git a/articles/iot-central/.openpublishing.redirection.iot-central.json b/articles/iot-central/.openpublishing.redirection.iot-central.json
@@ -1322,8 +1322,13 @@
     },
     {
       "source_path_from_root": "/articles/iot-central/core/concepts-best-practices.md",
-      "redirect_url": "/azure/iot-central/core/overview-iot-central-developer/",
+      "redirect_url": "/azure/iot-central/core/overview-iot-central-developer#best-practices",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-central/core/concepts-scalability-availability.md",
+      "redirect_url": "/azure/iot-central/core/concepts-faq-scalability-availability",
+      "redirect_document_id": true
     }
   ]
 }
diff --git a/articles/iot-central/TOC.yml b/articles/iot-central/TOC.yml
@@ -82,8 +82,6 @@
   items:
     - name: Architecture
       href: core/concepts-architecture.md
-    - name: Scalability and high availability
-      href: core/concepts-scalability-availability.md
     - name: Device connectivity guide
       href: core/overview-iot-central-developer.md
       items:
@@ -109,6 +107,8 @@
         href: core/concepts-faq-start-iot-central.md
       - name: How do I extend IoT Central?
         href: core/concepts-faq-extend.md
+      - name: How does IoT Central scale and enable HADR?
+        href: core/concepts-faq-scalability-availability.md
       - name: What are IoT Central's scale limits?
         href: core/concepts-quotas-limits.md
       - name: How do I move between aPaaS and PaaS solutions?
diff --git a/articles/iot-central/core/concepts-architecture.md b/articles/iot-central/core/concepts-architecture.md
@@ -100,4 +100,4 @@ Build integrations that let other applications and services manage your applicat
 
 ## Next steps
 
-Now that you've learned about the architecture of Azure IoT Central, the suggested next step is to learn about [scalability and high availability](concepts-scalability-availability.md) in Azure IoT Central.
+Now that you've learned about the architecture of Azure IoT Central, the suggested next step is to learn about [device connectivity](overview-iot-central-developer.md) in Azure IoT Central.
diff --git a/articles/iot-central/core/concepts-faq-scalability-availability.md b/articles/iot-central/core/concepts-faq-scalability-availability.md
@@ -0,0 +1,83 @@
+---
+title: Azure IoT Central scalability and high availability | Microsoft Docs
+description: This article describes how IoT Central automatically scales to handle more devices, its high availability disaster recovery capabilities.
+author: dominicbetts
+ms.author: dobett
+ms.date: 03/01/2022
+ms.topic: conceptual
+ms.service: iot-central
+services: iot-central
+
+---
+
+# What does it mean for IoT Central to have high availability, disaster recovery (HADR), and elastic scale?
+
+Azure IoT Central is an application platform as a service (aPaaS) that manages scalability and HADR for you. An IoT Central application can scale to support millions of connected devices. For more information about device and message pricing, see [Azure IoT Central pricing](https://azure.microsoft.com/pricing/details/iot-central/). For more information about the service level agreement, see [SLA for Azure IoT Central](https://azure.microsoft.com/support/legal/sla/iot-central/v1_0/).
+
+This article provides background information about how IoT Central scales and delivers HADR. The article also includes guidance on how to take advantage of these capabilities.
+
+## Scalability
+
+IoT Central applications internally use multiple Azure services such as IoT Hub and the Device Provisioning Service (DPS). Many of these underlying services are multi-tenanted. However, to ensure the full isolation of customer data, IoT Central uses single-tenant IoT hubs.
+
+IoT Central automatically scales its IoT hubs based on the load profiles in your application. IoT Central can scale up individual IoT hubs and scale out the number of IoT hubs in an application. IoT Central also automatically scales other underlying services.
+
+## High availability and disaster recovery
+
+For highly available device connectivity, an IoT Central application always have at least two IoT hubs. For exceptions to to this rule, see [Limitations](#limitations). The number of hubs can grow or shrink as IoT Central scales the application in response to changes in the load profile.
+
+IoT Central also uses [availability zones](../../availability-zones/az-overview.md#availability-zones) to make various services it uses highly available.
+
+An incident that requires disaster recovery could range from a subset of services becoming unavailable to a whole region becoming unavailable. IoT Central follows different recovery processes depending on the nature and scale of the incident. For example, if an entire Azure region becomes unavailable in the wake of a catastrophic failure, disaster recovery procedures failover applications to another region in the same geography.
+
+## Work with multiple IoT hubs
+
+As a consequence of automatic scaling and HADR support, the IoT hub instances in your application can change. For example:
+
+- The number of hubs could increase or decrease as the application scales.
+- A hub could fail and become unavailable.
+- The disaster recovery procedures could add new hubs in a different region to replace the hubs in a failed region.
+
+Although IoT Central manages the IoT hubs in your application for you, a device must be able to re-establish a connection if the hub it connects to is unavailable:
+
+### Device provisioning
+
+As the number of IoT hubs in your application changes, a device might need to connect to a different hub.
+
+Before a device connects to IoT Central, it must be registered and provisioned in the underlying services. When you add a device to an IoT Central application, IoT Central adds an entry to a DPS enrollment group. Information from the enrollment group such as the ID scope, device ID, and keys is surfaced in the IoT Central UI.
+
+When a device first connects to your IoT Central application, DPS provisions the device in one of the enrollments group's linked IoT hubs. The device is then associated with that IoT hub. DPS uses an allocation policy to load balance the provisioning across the IoT hubs in the application. This process makes sure each IoT hub has a similar number of provisioned devices.
+
+To learn more about registration and provisioning in IoT Central, see [Get connected to Azure IoT Central](concepts-get-connected.md).
+
+### Device connections
+
+After DPS provisions a device to an IoT hub, the device always tries to connect to that hub. If a device can't reach the IoT hub it's provisioned to, it can't connect to your IoT Central application. To handle this scenario, your device firmware should include a retry strategy that reprovisions the device to another hub.
+
+To learn more about how device firmware should handle connection errors and connect to a different hub, see [Best practices](overview-iot-central-developer.md#best-practices).
+
+To learn more about how to verify your device firmware can handle connection failures, see [Test failover capabilities](overview-iot-central-developer.md#test-failover-capabilities).
+
+## Data export
+
+IoT Central applications often use other, user configured services. For example, you can configure your IoT Central application to continuously export data to services such as Azure Event Hubs and Azure Blob Storage.
+
+If a configured data export can't write to its destination, IoT Central tries to retransmit the data for up to 15 minutes, after which IoT Central marks the destination as failed. Failed destinations are periodically checked to verify if they're writable.
+
+You can force IoT Central to restart the failed exports by disabling and re-enabling the data export.
+
+Review the high availability and scalability best practices for the data export destination service you're using:
+
+- Azure Blob Storage: [Azure Storage redundancy](../../storage/common/storage-redundancy.md) and [Performance and scalability checklist for Blob storage](../../storage/blobs/storage-performance-checklist.md)
+- Azure Event Hubs: [Availability and consistency in Event Hubs](../../event-hubs/event-hubs-availability-and-consistency.md) and [Scaling with Event Hubs](../../event-hubs/event-hubs-scalability.md)
+- Azure Service Bus: [Best practices for insulating applications against Service Bus outages and disasters](../../service-bus-messaging/service-bus-outages-disasters.md) and [Automatically update messaging units of an Azure Service Bus namespace](../../service-bus-messaging/automate-update-messaging-units.md)
+
+## Limitations
+
+Currently, there are a few legacy IoT Central applications created before April 2021 that haven't yet migrated to the multiple IoT hub architecture. Use the `az iot central device manual-failover` command to check if your application still uses a single IoT hub.
+
+Currently, IoT Edge devices can't move between IoT hubs.
+
+## Next steps
+
+Now that you've learned about the scalability and high availability of Azure IoT Central, the suggested next step is to learn about [Quotas and limits](concepts-quotas-limits.md) in Azure IoT Central.
diff --git a/articles/iot-central/core/concepts-get-connected.md b/articles/iot-central/core/concepts-get-connected.md
diff --git a/articles/iot-central/core/concepts-scalability-availability.md b/articles/iot-central/core/concepts-scalability-availability.md
diff --git a/articles/iot-central/core/overview-iot-central-developer.md b/articles/iot-central/core/overview-iot-central-developer.md
diff --git a/articles/iot-central/index.yml b/articles/iot-central/index.yml
