Merge branch 'MicrosoftDocs:main' into doc/mysql-consistent-backup

Author: hariramt

articles/aks/nat-gateway.md

@@ -67,10 +67,10 @@ az group create --name myresourcegroup --location southcentralus
 
 ```azurecli-interactive
 az aks create \
-    --resource-group myresourcegroup \
+    --resource-group myResourceGroup \
     --name natcluster \
     --node-count 3 \
-    --outbound-type managedNATGateway \ 
+    --outbound-type managedNATGateway \
     --nat-gateway-managed-outbound-ip-count 2 \
     --nat-gateway-idle-timeout 30
 ```

articles/blockchain/workbench/includes/retire.md

@@ -2,9 +2,9 @@
 author: PatAltimore
 ms.service: azure-blockchain
 ms.topic: include
-ms.date: 02/18/2022
-ms.author: patricka
+ms.date: 04/19/2022
+ms.author: sunir
 ---
 
 > [!IMPORTANT]
-> On August 16, 2022, Azure Blockchain Workbench will be retired. Please migrate workloads to ConsenSys [Quorum Blockchain Service](https://azuremarketplace.microsoft.com/marketplace/apps/consensys.qbs-contact-me) prior to the retirement date. Select the **Contact me** button on the [Quorum Blockchain Service Azure Marketplace page](https://azuremarketplace.microsoft.com/marketplace/apps/consensys.qbs-contact-me) to contact ConsenSys to learn about their offerings for your requirements.
+> On October 31, 2022, Azure Blockchain Workbench will be retired. Please migrate workloads to ConsenSys [Quorum Blockchain Service](https://azuremarketplace.microsoft.com/marketplace/apps/consensys.qbs-contact-me) prior to the retirement date. Select the **Contact me** button on the [Quorum Blockchain Service Azure Marketplace page](https://azuremarketplace.microsoft.com/marketplace/apps/consensys.qbs-contact-me) to contact ConsenSys to learn about their offerings for your requirements.

articles/container-apps/deploy-visual-studio-code.md

@@ -120,7 +120,7 @@ Now that you have a container app environment in Azure you can create a containe
 
 9) Choose **External** to configure the HTTP traffic that the endpoint will accept.
 
-10) Leave the default value of 80 for the port, and then select **Enter** to complete the workflow.
+10) Enter a value of 3000 for the port, and then select **Enter** to complete the workflow. This value should be set to the port number that your container uses, which in the case of the sample app is 3000.
 
 During this process, Visual Studio Code and Azure create the container app for you.  The published Docker image you created earlier is also be deployed to the app.  Once this process finishes, Visual Studio Code displays a notification with a link to browse to the site.  Click this link, and to view your app in the browser. 
 

articles/cosmos-db/sql/troubleshoot-changefeed-functions.md

@@ -4,7 +4,7 @@ description: Common issues, workarounds, and diagnostic steps, when using the Az
 author: ealsur
 ms.service: cosmos-db
 ms.subservice: cosmosdb-sql
-ms.date: 03/28/2022
+ms.date: 04/14/2022
 ms.author: maquaran
 ms.topic: troubleshooting
 ms.reviewer: sngun
@@ -53,6 +53,10 @@ The previous versions of the Azure Cosmos DB Extension did not support using a l
 
 This error means that you are currently using a partitioned lease collection with an old [extension dependency](#dependencies). Upgrade to the latest available version. If you are currently running on Azure Functions V1, you will need to upgrade to Azure Functions V2.
 
+### Azure Function fails to start with "Forbidden (403); Substatus: 5300... The given request [POST ...] cannot be authorized by AAD token in data plane"
+
+This error means your Function is attempting to [perform a non-data operation using Azure AD identities](troubleshoot-forbidden.md#non-data-operations-are-not-allowed). You cannot use `CreateLeaseContainerIfNotExists = true` when using Azure AD identities.
+
 ### Azure Function fails to start with "The lease collection, if partitioned, must have partition key equal to id."
 
 This error means that your current leases container is partitioned, but the partition key path is not `/id`. To resolve this issue, you need to recreate the leases container with `/id` as the partition key.

articles/cosmos-db/sql/troubleshoot-forbidden.md

@@ -4,7 +4,7 @@ description: Learn how to diagnose and fix forbidden exceptions.
 author: ealsur
 ms.service: cosmos-db
 ms.subservice: cosmosdb-sql
-ms.date: 10/06/2021
+ms.date: 04/14/2022
 ms.author: maquaran
 ms.topic: troubleshooting
 ms.reviewer: sngun
@@ -17,13 +17,13 @@ The HTTP status code 403 represents the request is forbidden to complete.
 
 ## Firewall blocking requests
 
-Data plane requests can come to Cosmos DB via the following 3 paths.
+Data plane requests can come to Cosmos DB via the following three paths.
 
 - Public internet (IPv4)
 - Service endpoint
 - Private endpoint
 
-When a data plane request is blocked with 403 Forbidden, the error message will specify via which of the above 3 paths the request came to Cosmos DB.
+When a data plane request is blocked with 403 Forbidden, the error message will specify via which of the above three paths the request came to Cosmos DB.
 
 - `Request originated from client IP {...} through public internet.`
 - `Request originated from client VNET through service endpoint.`
@@ -58,7 +58,7 @@ Partition key reached maximum size of {...} GB
 This error means that your current [partitioning design](../partitioning-overview.md#logical-partitions) and workload is trying to store more than the allowed amount of data for a given partition key value. There is no limit to the number of logical partitions in your container but the size of data each logical partition can store is limited. You can reach to support for clarification.
 
 ## Non-data operations are not allowed
-This scenario happens when non-data [operations are disallowed in the account](../how-to-setup-rbac.md#permission-model). On this scenario, it's common to see errors like the ones below:
+This scenario happens when [attempting to perform non-data operations](../how-to-setup-rbac.md#permission-model) using Azure Active Directory (Azure AD) identities. On this scenario, it's common to see errors like the ones below:
 
 ```
 Operation 'POST' on resource 'calls' is not allowed through Azure Cosmos DB endpoint
@@ -68,7 +68,8 @@ Forbidden (403); Substatus: 5300; The given request [PUT ...] cannot be authoriz
 ```
 
 ### Solution
-Perform the operation through Azure Resource Manager, Azure portal, Azure CLI, or Azure PowerShell. Or reallow execution of non-data operations.
+Perform the operation through Azure Resource Manager, Azure portal, Azure CLI, or Azure PowerShell.
+If you are using the [Azure Functions Cosmos DB Trigger](../../azure-functions/functions-bindings-cosmosdb-v2-trigger.md) make sure the `CreateLeaseContainerIfNotExists` property of the trigger isn't set to `true`. Using Azure AD identities blocks any non-data operation, such as creating the lease container.
 
 ## Next steps
 * Configure [IP Firewall](../how-to-configure-firewall.md).

articles/databox/data-box-troubleshoot-share-access.md

@@ -7,7 +7,7 @@ author: v-dalc
 ms.service: databox
 ms.subservice: pod
 ms.topic: troubleshooting
-ms.date: 08/23/2021
+ms.date: 04/15/2022
 ms.author: alkohli
 ---
 
@@ -63,7 +63,11 @@ The failed connection attempts may include background processes, such as retries
 
 **Suggested resolution.** To connect to an SMB share after a share account lockout, do these steps:
 
-1. Verify the SMB credentials for the share. In the local web UI of your device, go to **Connect and copy**, and select **SMB** for the share. You'll see the following dialog box.
+1. If the dashboard status indicates the device is locked, unlock the device from the top command bar and retry the connection.
+
+    :::image type="content" source="media/data-box-troubleshoot-share-access/dashboard-locked.png" alt-text="Screenshot of the dashboard locked status.":::
+
+1. If you are still unable to connect to an SMB share after unlocking your device, verify the SMB credentials for the share. In the local web UI of your device, go to **Connect and copy**, and select **SMB** for the share. You'll see the following dialog box.
 
     ![Screenshot of Access Share And Copy Data screen for an SMB share on a Data Box. Copy icons for the account, username, and password are highlighted.](media/data-box-troubleshoot-share-access/get-share-credentials-01.png)
 

articles/databox/media/data-box-troubleshoot-share-access/dashboard-locked.png

@@ -4,14 +4,14 @@ description: Learn about the PySpark, PySpark3, and Spark kernels for Jupyter No
 ms.service: hdinsight
 ms.topic: how-to
 ms.custom: hdinsightactive,hdiseo17may2017,seoapr2020
-ms.date: 04/24/2020
+ms.date: 04/18/2022
 ---
 
 # Kernels for Jupyter Notebook on Apache Spark clusters in Azure HDInsight
 
 HDInsight Spark clusters provide kernels that you can use with the Jupyter Notebook on [Apache Spark](./apache-spark-overview.md) for testing your applications. A kernel is a program that runs and interprets your code. The three kernels are:
 
-- **PySpark** - for applications written in Python2.
+- **PySpark** - for applications written in Python2. (Applicable only for Spark 2.4 version clusters)
 - **PySpark3** - for applications written in Python3.
 - **Spark** - for applications written in Scala.
 
@@ -38,6 +38,12 @@ An Apache Spark cluster in HDInsight. For instructions, see [Create Apache Spark
 
     :::image type="content" source="./media/apache-spark-jupyter-notebook-kernels/kernel-jupyter-notebook-on-spark.png " alt-text="Kernels for Jupyter Notebook on Spark" border="true":::
 
+ > [!NOTE]  
+ > For Spark 3.1, only **PySpark3**, or **Spark** will be available.
+ >
+ :::image type="content" source="./media/apache-spark-jupyter-notebook-kernels/kernel-jupyter-notebook-on-spark-for-hdi-4-0.png " alt-text="Kernels for Jupyter Notebook on Spark HDI4.0" border="true":::
+ 
+
 4. A notebook opens with the kernel you selected.
 
 ## Benefits of using the kernels

articles/databox/media/data-box-troubleshoot-share-access/device-locked.png

@@ -1,23 +1,27 @@
 ---
 title: Deploy a Service Fabric managed cluster with stateless node types
 description: Learn how to create and deploy stateless node types in Service Fabric managed clusters
-ms.topic: how-to
-ms.date: 2/14/2022
+ms.topic: conceptual
+ms.date: 4/11/2022
+author: craftyhouse
+ms.author: micraft
+ms.service: service-fabric
 ---
 # Deploy a Service Fabric managed cluster with stateless node types
 
-Service Fabric node types come with an inherent assumption that at some point of time, stateful services might be placed on the nodes. Stateless node types relax this assumption for a node type. Relaxing this assumption enables node stateless node types to benefit from faster scale-out operations by removing some of the restrictions on repair and maintenance operations.
+Service Fabric node types come with an inherent assumption that at some point of time, stateful services might be placed on the nodes. Stateless node types change this assumption for a node type. This allows the node type to benefit from features such as faster scale out operations, support for Automatic OS Upgrades, Spot VMs, and scaling out to more than 100 nodes in a node type.
 
-* Primary node types cannot be configured to be stateless.
+* Primary node types can't be configured to be stateless.
 * Stateless node types require an API version of **2021-05-01** or later.
-* This will automatically set the **multipleplacementgroup** property to **true** which you can [learn more here](how-to-managed-cluster-large-virtual-machine-scale-sets.md).
+* This will automatically set the **multipleplacementgroup** property to **true** which you can [learn more about here](how-to-managed-cluster-large-virtual-machine-scale-sets.md).
 * This enables support for up to 1000 nodes for the given node type.
 * Stateless node types can utilize a VM SKU temporary disk.
 
-Sample templates are available: [Service Fabric Stateless Node types template](https://github.com/Azure-Samples/service-fabric-cluster-templates)
+## Enabling stateless node types in a Service Fabric managed cluster
+
+To set one or more node types as stateless in a node type resource, set the **isStateless** property to **true**. When deploying a Service Fabric cluster with stateless node types, it's required to have at least one primary node type, which is not stateless in the cluster.
 
-## Enable stateless node types in a Service Fabric managed cluster
-To set one or more node types as stateless in a node type resource, set the **isStateless** property to **true**. When deploying a Service Fabric cluster with stateless node types, it is required to have at least one primary node type, which is not stateless in the cluster.
+Sample templates are available: [Service Fabric Stateless Node types template](https://github.com/Azure-Samples/service-fabric-cluster-templates)
 
 * The Service Fabric managed cluster resource apiVersion should be **2021-05-01** or later.
 
@@ -44,11 +48,45 @@ To set one or more node types as stateless in a node type resource, set the **is
 }
 ```
 
-## Configure stateless node types with multiple Availability Zones
-To configure a Stateless node type spanning across multiple availability zones follow [Service Fabric clusters across availability zones](.\service-fabric-cross-availability-zones.md). 
+## Enabling stateless node types using Spot VMs in a Service Fabric managed cluster (Preview)
+
+[Azure Spot Virtual Machines on scale sets](../virtual-machine-scale-sets/use-spot.md) enables users to take advantage of unused compute capacity at a significant cost savings. At any point in time when Azure needs the capacity back, the Azure infrastructure will evict these Azure Spot Virtual Machine instances. Therefore, Spot VM node types are great for workloads that can handle interruptions and don't need to be completed within a specific time frame. Recommended workloads include development, testing, batch processing jobs, big data, or other large-scale stateless scenarios.
+
+To set one or more stateless node types to use Spot VM, set both **isStateless** and **IsSpotVM** properties to true. When deploying a Service Fabric cluster with stateless node types, it's required to have at least one primary node type, which is not stateless in the cluster. Stateless node types configured to use Spot VMs have Eviction Policy set to 'Delete'.
+
+Sample templates are available: [Service Fabric Stateless Node types template](https://github.com/Azure-Samples/service-fabric-cluster-templates)
+
+* The Service Fabric managed cluster resource apiVersion should be **2022-02-01-preview** or later.
+
+```json
+{
+  "apiVersion": "[variables('sfApiVersion')]",
+  "type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
+  "name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
+  "location": "[resourcegroup().location]",
+  "dependsOn": [
+    "[concat('Microsoft.ServiceFabric/managedclusters/', parameters('clusterName'))]"
+  ],
+  "properties": {
+    "isStateless": true,
+    "isPrimary": false,
+    "IsSpotVM": true,
+    "vmImagePublisher": "[parameters('vmImagePublisher')]",
+    "vmImageOffer": "[parameters('vmImageOffer')]",
+    "vmImageSku": "[parameters('vmImageSku')]",
+    "vmImageVersion": "[parameters('vmImageVersion')]",
+    "vmSize": "[parameters('nodeTypeSize')]",
+    "vmInstanceCount": "[parameters('nodeTypeVmInstanceCount')]",
+    "dataDiskSizeGB": "[parameters('nodeTypeDataDiskSizeGB')]"
+  }
+}
+```
+
+## Configure stateless node types for zone resiliency
+To configure a Stateless node type for zone resiliency you must [configure managed cluster zone spanning](how-to-managed-cluster-availability-zones.md) at the cluster level. 
 
 >[!NOTE]
-> The zonal resiliency property must be set at the cluster level, and this property cannot be changed in place.
+> The zonal resiliency property must be set at the cluster level, and this property can't be changed in place.
 
 ## Temporary disk support
 Stateless node types can be configured to use temporary disk as the data disk instead of a Managed Disk. Using a temporary disk can reduce costs for stateless workloads. To configure a stateless node type to use the temporary disk set the **useTempDataDisk** property to **true**. 
@@ -82,7 +120,7 @@ Stateless node types can be configured to use temporary disk as the data disk in
 
 
 ## Migrate to using stateless node types in a cluster
-For all migration scenarios, a new stateless node type needs to be added. Existing node type cannot be migrated to be stateless. You can add a new stateless node type to an existing Service Fabric managed cluster, and remove any original node types from the cluster. 
+For all migration scenarios, a new stateless node type needs to be added. An existing node type can't be migrated to be stateless. You can add a new stateless node type to an existing Service Fabric managed cluster, and remove any original node types from the cluster. 
 
 ## Next steps