Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into esuavs

Author: MikeWeiner-Microsoft

articles/container-apps/media/observability/metrics-main-page.png

@@ -79,7 +79,11 @@ The event filter enables users to receive alerts for a specific resource group,
 
 ### Sample ResourceAnnotated event
 
+<<<<<<< HEAD
 Here's a sample `Microsoft.ResourceNotifications.HealthResources.ResourceAnnotated` event: 
+=======
+Here's a sample `ResourceAnnotated` event. Notice that the `type` is set to `Microsoft.ResourceNotifications.HealthResources.ResourceAnnotated`.
+>>>>>>> 3c6ef7ea55d8faa5800374b18c6919bddaa9c845
 
 ```json
 {
@@ -116,7 +120,11 @@ Here's a sample `Microsoft.ResourceNotifications.HealthResources.ResourceAnnotat
 
 ### Sample AvailabilityStatusChanged event
 
+<<<<<<< HEAD
 Here's a sample `Microsoft.ResourceNotifications.HealthResources.AvailabilityStatusChanged` event: 
+=======
+Here's a sample `AvailabilityStatusChanged` event. Notice that the `type` is set to `Microsoft.ResourceNotifications.HealthResources.AvailabilityStatusChanged`.
+>>>>>>> 3c6ef7ea55d8faa5800374b18c6919bddaa9c845
 
 ```json
 {

articles/event-grid/handle-health-resources-events-using-azure-monitor-alerts.md

@@ -4,7 +4,7 @@ description: How to create a trusted connection between an IoT Edge gateway and
 author: PatAltimore
 
 ms.author: patricka
-ms.date: 07/17/2023
+ms.date: 05/15/2024
 ms.topic: conceptual
 ms.service: iot-edge
 services: iot-edge
@@ -957,7 +957,7 @@ Learn more about the [Defender for IoT micro agent](../defender-for-iot/device-b
 
 1. Select the :::image type="icon" source="media/how-to-connect-downstream-iot-edge-device/copy-icon.png" border="false"::: button to copy your Connection string (primary key).
 
-1. Paste the Connection string into a text editing application, and add the GatewayHostName to the string. For example, `HostName=nested11.azure-devices.net;DeviceId=downstream1;ModuleId=module1;SharedAccessKey=xxx;GatewayHostName=10.16.7.4`.
+1. Paste the connection string into a text editing application, and add the *GatewayHostName* to the string. The [GatewayHostName](iot-edge-as-gateway.md#gateway-discovery) is the fully qualified domain name or IP address of the parent device. For example, `HostName=nested11.azure-devices.net;DeviceId=downstream1;ModuleId=module1;SharedAccessKey=xxx;GatewayHostName=10.16.7.4`.
 
 1. Open a terminal on the downstream device.
 

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

@@ -15,9 +15,9 @@ ms.custom:
 ms.devlang: azurecli
 ---
 
-# Migrate MySQL on-premises or Virtual Machine (VM) workload to Azure Database for MySQL - Flexible Server using Azure Database for MySQL Import CLI (Public Preview)
+# Migrate MySQL on-premises or Virtual Machine (VM) workload to Azure Database for MySQL - Flexible Server using Azure Database for MySQL Import CLI
 
-Azure Database for MySQL Import for external migrations (Public Preview) enables you to migrate your MySQL on-premises or Virtual Machine (VM) workload seamlessly to Azure Database for MySQL - Flexible Server. It uses a user-provided physical backup file and restores the source server's physical data files to the target server, offering a simple and fast migration path. Post-import operation, you can take advantage of the benefits of a flexible server, which include better price and performance, granular control over database configuration, and custom maintenance windows.
+Azure Database for MySQL Import for external migrations enables you to migrate your MySQL on-premises or Virtual Machine (VM) workload seamlessly to Azure Database for MySQL - Flexible Server. It uses a user-provided physical backup file and restores the source server's physical data files to the target server, offering a simple and fast migration path. Post-import operation, you can take advantage of the benefits of a flexible server, which include better price and performance, granular control over database configuration, and custom maintenance windows.
 
 Based on user-inputs, it takes up the responsibility of provisioning your target Flexible Server and then restoring the user-provided physical backup of the source server stored in the Azure Blob storage account to the target Flexible Server instance.
 

articles/mysql/migrate/migrate-external-mysql-import-cli.md

@@ -36,7 +36,7 @@ select azure_ai.set_setting('azure_ml.scoring_endpoint','<URI>');
 select azure_ai.set_setting('azure_ml.endpoint_key', '<Key>');
 ```
 
-### `azure_ml.inference`
+### `azure_ml.invoke`
 
 Scores the input data invoking an Azure Machine Learning model deployment on an [online endpoint](../../machine-learning/how-to-authenticate-online-endpoint.md).