Merge pull request #198322 from MicrosoftDocs/main

Revert 198300

Author: JiayueHu

articles/azure-resource-manager/management/move-support-resources.md

@@ -52,6 +52,7 @@ Jump to a resource provider namespace:
 > - [Microsoft.ClassicSubscription](#microsoftclassicsubscription)
 > - [Microsoft.CognitiveServices](#microsoftcognitiveservices)
 > - [Microsoft.Commerce](#microsoftcommerce)
+> - [Microsoft.Communication](#microsoftcommunication)
 > - [Microsoft.Compute](#microsoftcompute)
 > - [Microsoft.Confluent](#microsoftconfluent)
 > - [Microsoft.Consumption](#microsoftconsumption)
@@ -594,6 +595,13 @@ Jump to a resource provider namespace:
 > | ratecard | No | No | No |
 > | usageaggregates | No | No | No |
 
+## Microsoft.Communication
+
+> [!div class="mx-tableFixed"]
+> | Resource type | Resource group | Subscription | Region move |
+> | ------------- | ----------- | ---------- | ----------- |
+> | communicationservices | Yes | Yes | No |
+
 ## Microsoft.Compute
 
 > [!IMPORTANT]

articles/backup/backup-azure-vm-backup-faq.yml

@@ -69,8 +69,7 @@ sections:
 
       - question: I enabled a lock on the resource group created by Azure Backup Service (for example, `AzureBackupRG_<geo>_<number>`). Will my backups continue to work?
         answer: |
-          If you lock the resource group created by the Azure Backup Service, backups will start to fail as there's a maximum limit of 18 restore points.
-
+          If you lock the resource group created by the Azure Backup Service, backups will start to fail.
           Remove the lock, and clear the restore point collection from that resource group to make the future backups successful. [Follow these steps](backup-azure-troubleshoot-vm-backup-fails-snapshot-timeout.md#clean-up-restore-point-collection-from-azure-portal) to remove the restore point collection.
 
       - question: I have a lock at the resource group level that contains all the resources related to my virtual machine. Will my backup work?

articles/event-grid/includes/event-grid-event-hubs-functions-synapse-analytics.md

@@ -2,7 +2,7 @@
 title: 'Tutorial: Migrate event data to Azure Synapse Analytics - Azure Event Hubs'
 description: Describes how to use Azure Event Grid and Functions to migrate Event Hubs captured data to Azure Synapse Analytics.
 services: event-hubs
-ms.date: 03/08/2022
+ms.date: 04/29/2022
 ms.topic: tutorial
 ms.custom: devx-track-csharp
 ---

articles/event-grid/includes/media/event-grid-event-hubs-functions-synapse-analytics/cloud-shell-initialized.png

@@ -0,0 +1,136 @@
+---
+title: Configure JMeter user properties
+titleSuffix: Azure Load Testing
+description: Learn how to use JMeter user properties with Azure Load Testing.
+services: load-testing
+ms.service: load-testing
+ms.author: nicktrog
+author: ntrogh
+ms.date: 04/27/2022
+ms.topic: how-to
+zone_pivot_groups: load-testing-config
+---
+
+# Use JMeter user properties with Azure Load Testing Preview
+
+In this article, learn how to configure and use Apache JMeter user properties with Azure Load Testing Preview. With user properties, you can make your test configurable by keeping test settings outside of the JMeter test script. Use cases for user properties include:
+
+- You want to use the JMX test script in multiple deployment environments with different application endpoints.
+- Your test script needs to accommodate multiple load patterns, such as smoke tests, peak load, or soak tests.
+- You want to override default JMeter behavior by configuring JMeter settings, such as the results file format.
+
+Azure Load Testing supports the standard [Apache JMeter properties](https://jmeter.apache.org/usermanual/test_plan.html#properties) and enables you to upload a user properties file. You can configure one user properties file per load test.
+
+Alternately, you can also [use environment variables and secrets in Azure Load Testing](./how-to-parameterize-load-tests.md) to make your tests configurable.
+
+> [!IMPORTANT]
+> Azure Load Testing is currently in preview. For legal terms that apply to Azure features that are in beta, in preview, or otherwise not yet released into general availability, see the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
+
+## Prerequisites
+
+- An Azure account with an active subscription. If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.  
+- An Azure Load Testing resource. If you need to create an Azure Load Testing resource, see the quickstart [Create and run a load test](./quickstart-create-and-run-load-test.md).  
+
+## Add a JMeter user properties file to your load test
+
+You can define user properties for your JMeter test script by uploading a *.properties* file to the load test. The following code snippet shows an example user properties file:
+
+```properties
+# peak-load.properties
+# User properties for testing peak load
+threadCount=250
+rampUpSeconds=30
+durationSeconds=600
+
+# Override default JMeter properties
+jmeter.save.saveservice.thread_name=false
+```
+
+Azure Load Testing supports using a single properties file per load test. Additional property files are ignored.
+
+You can also specify [JMeter configuration settings](https://jmeter.apache.org/usermanual/properties_reference.html) in user properties file to override default behavior. For example, you can modify any of the `jmeter.save.saveservice.*` settings to configure the JMeter results file.
+
+::: zone pivot="experience-azp"
+
+To add a user properties file to your load test by using the Azure portal, follow these steps:
+
+1. In the [Azure portal](https://portal.azure.com), go to your Azure Load Testing resource.
+1. On the left pane, select **Tests** to view the list of tests.
+1. Select your test from the list by selecting the checkbox, and then select **Edit**. Alternately, select **Create test** to create a new load test.
+1. Select the **Test plan** tab.
+1. Select the properties file from your computer, and then select **Upload** to upload the file to Azure.
+
+    :::image type="content" source="media/how-to-configure-user-properties/edit-test-upload-properties.png" alt-text="Screenshot that shows the steps to upload a user properties file on the Test plan tab on the Edit test pane.":::
+  
+1. Select **User properties** in the **File relevance** dropdown list.
+
+    :::image type="content" source="media/how-to-configure-user-properties/edit-test-upload-properties-file-relevance.png" alt-text="Screenshot that highlights the file relevance dropdown for a user properties file on the Test plan pane.":::
+
+    You can select only one file as a user properties file for a load test.
+
+1. Select **Apply** to modify the test, or **Review + create**, and then **Create** to create the new test.
+::: zone-end
+
+::: zone pivot="experience-pipelines,experience-ghactions"
+
+If you run a load test within your CI/CD workflow, you add the user properties file to the source control repository. You then specify this properties file in the [load test configuration YAML file](./reference-test-config-yaml.md).
+
+For more information about running a load test in a CI/CD workflow, see the [Automated regression testing tutorial](./tutorial-cicd-azure-pipelines.md).
+
+To add a user properties file to your load test, follow these steps:
+
+1. Add the *.properties* file to the source control repository.
+1. Open your YAML test configuration file in Visual Studio Code or your editor of choice.
+1. Specify the *.properties* file in the `properties.userPropertyFile` setting.
+    ```yaml
+    testName: MyTest
+    testPlan: SampleApp.jmx
+    description: Configure a load test with peak load properties.
+    engineInstances: 1
+    properties:
+      userPropertyFile: peak-load.properties
+    configurationFiles:
+      - input-data.csv
+    ```
+
+    > [!NOTE]
+    > If you store the properties file in a separate folder, specify the file with a relative path name. For more information, see the [Test configuration YAML syntax](./reference-test-config-yaml.md).
+
+1. Save the YAML configuration file and commit it to your source control repository.
+
+    The next time the CI/CD workflow runs, it will use the updated configuration.
+
+::: zone-end
+
+## Reference properties in JMeter
+
+Azure Load Testing supports the built-in Apache JMeter functionality to reference user properties in your JMeter test script (JMX). You can use the [**__property**](https://jmeter.apache.org/usermanual/functions.html#__property) or [**__P**](https://jmeter.apache.org/usermanual/functions.html#__P) functions to retrieve the property values from the property file you uploaded previously.
+
+The following code snippet shows an example of how to reference properties in a JMX file:
+
+  ```xml
+  <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Test home page" enabled="true">
+  <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+  <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+      <boolProp name="LoopController.continue_forever">false</boolProp>
+      <intProp name="LoopController.loops">-1</intProp>
+  </elementProp>
+  <stringProp name="ThreadGroup.num_threads">${__P(threadCount,1)}</stringProp>
+  <stringProp name="ThreadGroup.ramp_time">${__P(rampUpSeconds,1)}</stringProp>
+  <boolProp name="ThreadGroup.scheduler">true</boolProp>
+  <stringProp name="ThreadGroup.duration">${__P(durationSeconds,30)}</stringProp>
+  <stringProp name="ThreadGroup.delay"></stringProp>
+  <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp>
+  </ThreadGroup>
+  ```
+
+Alternately, you also specify properties in the JMeter user interface. The following image shows how to use properties to configure a JMeter thread group:
+
+  :::image type="content" source="media/how-to-configure-user-properties/jmeter-user-properties.png" alt-text="Screenshot that shows how to reference user properties in the JMeter user interface.":::
+
+You can [download the JMeter errors logs](./how-to-find-download-logs.md) to troubleshoot errors during the load test.
+
+## Next steps
+
+- Learn more about [parameterizing a load test by using environment variables and secrets](./how-to-parameterize-load-tests.md).
+- Learn more about [troubleshooting load test execution errors](./how-to-find-download-logs.md).

articles/event-grid/includes/media/event-grid-event-hubs-functions-synapse-analytics/get-publish-profile.png

@@ -97,7 +97,7 @@ To add a CSV file to your load test by using the Azure portal:
 
   1. Select the CSV file from your computer, and then select **Upload** to upload the file to Azure.
 
-      :::image type="content" source="media/how-to-read-csv-data/edit-test-upload-csv.png" alt-text="Screenshot of the 'Load' tab on the 'Edit test' pane.":::
+      :::image type="content" source="media/how-to-read-csv-data/edit-test-upload-csv.png" alt-text="Screenshot of the Test plan tab on the Edit test pane.":::
 
   1. Select **Apply** to modify the test and to use the new configuration when you rerun it.