Merge pull request #303779 from dominicbetts/aio-device-topic

AIO: Add MQTT topic details

Author: prmerger-automator[bot]

articles/iot-operations/discover-manage-assets/howto-configure-opc-ua.md

@@ -173,12 +173,14 @@ Now you can define the tags associated with the asset. To add OPC UA tags:
     | ns=3;s=FastUInt10 | Temperature |
     | ns=3;s=FastUInt100 | Humidity |
 
-1. Select **Manage default settings** to configure default settings for messages from the asset. These settings apply to all the OPC UA tags that belong to the asset. You can override these settings for each tag that you add. Default settings include:
+1. To configure default settings for messages from the asset, select **Manage default settings**. These settings apply to all the OPC UA tags that belong to the asset. You can override these settings for each tag that you add. Default settings include:
 
     - **Sampling interval (milliseconds)**: The sampling interval indicates the fastest rate at which the OPC UA server should sample its underlying source for data changes.
     - **Publishing interval (milliseconds)**: The rate at which OPC UA server should publish data.
     - **Queue size**: The depth of the queue to hold the sampling data before publishing it.
 
+1. To configure the MQTT topic to publish the tag data to, select **Manage default dataset**. Enter an MQTT topic name such as `azure-iot-operations/data/thermostat`, then select **Update**.
+
 1. On the **Tags** page, select **Next** to go to the **Add events** page.
 
 # [Azure CLI](#tab/cli)
@@ -187,16 +189,16 @@ Use the following commands to add a "thermostat" namespace asset to your device
 
 ```azurecli
 # Create the asset
-az iot ops ns asset opcua create --name thermostat --instance {your instance name} -g  {your resource group name} --device opc-ua-connector --endpoint-name opc-ua-connector-0  --description 'A simulated thermostat asset'
+az iot ops ns asset opcua create --name thermostat --instance {your instance name} -g  {your resource group name} --device opc-ua-connector --endpoint opc-ua-connector-0  --description 'A simulated thermostat asset'
 
 # Add the dataset
-az iot ops ns asset opcua dataset add --asset thermostat --instance {your instance name} -g {your resource group name} --name default --data-source "ns=3;s=FastUInt10"
+az iot ops ns asset opcua dataset add --asset thermostat --instance {your instance name} -g {your resource group name} --name default --data-source "ns=3;s=FastUInt10" --dest topic="azure-iot-operations/data/thermostat" retain=Keep qos=Qos1 ttl=3600
 
 # Add the datapoints
 az iot ops ns asset opcua dataset point add --asset thermostat --instance {your instance name} -g {your resource group name} --dataset default --name temperature --data-source "ns=3;s=FastUInt10"
 az iot ops ns asset opcua dataset point add --asset thermostat --instance {your instance name} -g {your resource group name} --dataset default --name humidity --data-source "ns=3;s=FastUInt100"
 
-# Show the datapoints
+# Show the dataset and datapoints
 az iot ops ns asset opcua dataset show --asset thermostat -n default -g {your resource group name} --instance {your instance name}
 ```
 

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

@@ -198,7 +198,6 @@ To create an asset, select **Create namespace asset**. Then enter the following
 | Inbound 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:
 
@@ -216,18 +215,20 @@ Select **Next** to go to the **Add tags** page.
 
 ### Create OPC UA tags
 
-Add an OPC UA tag on the **Add tags** page. To add a tag, select **Add tag**. Enter the tag details shown in the following table:
+Add an OPC UA tag on the **Tags** page. To add a tag, select **Add tag**. Enter the tag details shown in the following table:
 
-| Node ID            | Tag name    |
+| Data source        | Tag name    |
 | ------------------ | ----------- |
 | ns=3;s=SpikeData   | temperature |
 
-The node ID here is specific to the OPC UA simulator. The node generates random values within a specified range and also has intermittent spikes.
+The data source value here is a specific OPC UA simulator node. The node generates random values within a specified range and also has intermittent spikes.
 
 You can select **Manage default settings** to change the default sampling interval and queue size for each tag.
 
 :::image type="content" source="media/tutorial-add-assets/add-tag.png" lightbox="media/tutorial-add-assets/add-tag.png" alt-text="Screenshot of Azure IoT Operations add tag page.":::
 
+To configure the MQTT topic to publish the tag data to, select **Manage default dataset**. Enter `azure-iot-operations/data/thermostat` as the MQTT topic, then select **Update**. This topic is used by the data flow in the next tutorial to send messages to the cloud.
+
 Select **Next** to go to the **Add events** page and then **Next** to go to the **Review** page.
 
 ### Review
@@ -236,10 +237,10 @@ Review your asset and tag details and make any adjustments you need before you s
 
 :::image type="content" source="media/tutorial-add-assets/review-asset.png" lightbox="media/tutorial-add-assets/review-asset.png" alt-text="Screenshot of Azure IoT Operations create asset review page.":::
 
-This configuration deploys a new asset called `thermostat` to the cluster. You can view your assets in your resource group in the Azure portal. You can also use `kubectl` to view the assets locally in your cluster:
+This configuration deploys a new asset called `thermostat` to the cluster. You can also use `kubectl` to view the assets locally in your cluster:
 
 ```console
-kubectl get assets -n azure-iot-operations
+kubectl get assets.namespace -n azure-iot-operations
 ```
 
 ## View resources in the Azure portal
@@ -256,7 +257,7 @@ The portal enables you to view the asset details. Select **JSON View** for more
 
 [!INCLUDE [deploy-mqttui](../includes/deploy-mqttui.md)]
 
-To verify that the thermostat asset you added is publishing data, view the messages in the `azure-iot-operations/data` topic:
+To verify that the thermostat asset you added is publishing data, view the messages in the `azure-iot-operations/data/thermostat` topic:
 
 ```output
 Client $server-generated/0000aaaa-11bb-cccc-dd22-eeeeee333333 received PUBLISH (d0, q0, r0, m0, 'azure-iot-operations/data/thermostat', ... (92 bytes))