Merge branch 'MicrosoftDocs:release-aio-ga' into release-aio-ga

Author: ryanwinter

articles/iot-operations/.openpublishing.redirection.iot-operations.json

@@ -529,6 +529,11 @@
             "source_path_from_root": "/articles/iot-operations/manage-mqtt-broker/overview-iot-mq.md",
             "redirect_url": "/azure/iot-operations/manage-mqtt-broker/overview-broker",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/iot-operations/reference/glossary.md",
+            "redirect_url": "/azure/iot/iot-glossary?toc=/azure/iot-operations/toc.json&bc=/azure/iot-operations/breadcrumb/toc.json",
+            "redirect_document_id": false
         }
     ]
 }

articles/iot-operations/end-to-end-tutorials/media/tutorial-add-assets/create-asset-details.png

@@ -115,6 +115,7 @@ To create an asset, select **Create asset**. Then enter the following asset info
 | Asset Endpoint | `opc-ua-connector-0` |
 | Asset name | `thermostat` |
 | Description | `A simulated thermostat asset` |
+| Default MQTT topic | `azure-iot-operations/data/thermostat` |
 
 Remove the existing **Custom properties** and add the following custom properties. Be careful to use the exact property names, as the Power BI template in a later tutorial queries for them:
 

articles/iot-operations/end-to-end-tutorials/media/tutorial-upload-telemetry-to-cloud/dataflow-complete.png

@@ -137,18 +137,22 @@ To create the dataflow:
     |-----------|--------------------|
     | Tag 10.Value    | ThermostatHumidity          |
     | temperature.Value | ThermostatTemperature       |
+
+1. To copy the asset ID from the message metadata, add the following rename transform:
+
+    | Datapoint | New datapoint name |
+    |-----------|--------------------|
+    | $metadata.user_property.externalAssetId | AssetId |
 
     The rename transformation looks like the following screenshot:
 
     :::image type="content" source="media/tutorial-upload-telemetry-to-cloud/rename-transform.png" alt-text="Screenshot of the rename transformation.":::
 
     Select **Apply**.
 
-1. To add an asset ID field to the message, select the **Transforms** box in the editor and then select **+ Add** in the **New property** tile.
-
-1. In the **New property** editor, enter *AssetId* as the property key, *thermostat-01* as the property value, and select **Apply**. The dataflow editor now looks like the following screenshot:
+1. The dataflow editor now looks like the following screenshot:
 
-    :::image type="content" source="media/tutorial-upload-telemetry-to-cloud/dataflow-complete.png" alt-text="Screenshot of the dataflow.":::
+    :::image type="content" source="media/tutorial-upload-telemetry-to-cloud/dataflow-complete.png" alt-text="Screenshot of the completed dataflow.":::
 
 1. To start the dataflow running, enter *tutorial-dataflow* as its name and then select **Save**. After a few minutes, the **Provisioning State** changes to **Succeeded**. The dataflow is now running in your cluster.
 

articles/iot-operations/end-to-end-tutorials/media/tutorial-upload-telemetry-to-cloud/rename-transform.png

@@ -201,5 +201,6 @@ items:
           href: reference/observability-metrics-layered-network.md
       - name: MQTT support
         href: reference/mqtt-support.md
-      - name: Glossary
-        href: reference/glossary.md
+      - name: IoT Glossary
+        href: ../iot/iot-glossary.md?toc=/azure/iot-operations/toc.json&bc=/azure/iot-operations/breadcrumb/toc.json
+

articles/iot-operations/end-to-end-tutorials/tutorial-add-assets.md

@@ -20,15 +20,15 @@ sections:
       answer: Share your feedback on the [Azure IoT Operations public feedback forum](https://feedback.azure.com/d365community/forum/20152d6e-6a76-ee11-8179-000d3a1abe9e).
     - question: |
          Is message persistence supported?
-      answer: Currently, message persistence isn't supported in the preview version of Azure IoT Operations.
+      answer: Currently, message persistence isn't supported in Azure IoT Operations.
     - question: |
          Does Azure IoT Operations offer high availability and zero data loss features?
-      answer: Currently, zero data loss features aren't available in the preview version of Azure IoT Operations.
+      answer: Currently, zero data loss features aren't available in Azure IoT Operations.
     - question: |
          Does Azure IoT Operations offer high availability across multi-node setups?
       answer: Yes, Azure IoT Operations workloads on K3s and HCI/AKS-Arc multi-node clusters support distribution of Azure IoT Operations workloads across multi-nodes setups in the preview version.
     - question: |
-         Does Azure Device Registry Preview offer high availability across availability zones and regions?
+         Does Azure Device Registry offer high availability across availability zones and regions?
       answer: For information on high availability across availability zones and regions for ADR, see [Reliability in Azure Device Registry](../../reliability/reliability-device-registry.md).
     - question: |
          Can I migrate my IoT Edge workloads to Azure IoT Operations?
@@ -41,7 +41,7 @@ sections:
       answer: Azure IoT Operations is only officially supported on two platforms now Ubuntu using K3s, Windows IoT using AKS Edge Essentials. For more information, see [Prepare your Azure Arc-enabled Kubernetes cluster](../deploy-iot-ops/howto-prepare-cluster.md).
     - question: |
          For IoT Operations, which device communication protocols supported.
-      answer: Currently, OPC-UA and MQTT are supported in the preview version.
+      answer: Currently, OPC-UA and MQTT are supported.
     - question: |
          Is there a non-Dapr Azure IoT Operations state store code example?
       answer: |
@@ -54,18 +54,10 @@ sections:
       answer: Azure IoT Operations is available in East US2, West US 3, West Europe, East US, West US, West US 2, North Europe regions.
     - question: |
          Is there a way to gracefully fail over between two redundant OPC UA servers in case one of them fails? 
-      answer: Currently, fail over between two redundant OPC UA servers isn't supported in the preview version of Azure IoT Operations.
+      answer: Currently, fail over between two redundant OPC UA servers isn't supported in Azure IoT Operations.
     - question: |
          Is there a hard limit on the sampling intervals for OPC UA tags for minimum and maximum sampling interval?
       answer: The minimum is 1 ms, however there's no upper restriction imposed at the connector level.
-  - name: Pricing
-    questions:
-    - question: |
-         Does Azure IoT Operations offer a free trial?
-      answer: Currently, there's no charge for the preview version.
-    - question: |
-         What is the cost involved in using Azure IoT Operations?
-      answer: We're currently working on pricing. The General Availability pricing isn't available yet.
 additionalContent: |
     ## Related content