Merge pull request #212286 from kgremban/sep22-hubui

Devices and Configurations+Deployments UI changes

Author: v-dirichards

articles/iot-hub-device-update/create-update-group.md

@@ -9,11 +9,11 @@ ms.service: iot-hub-device-update
 ---
 
 # Create device groups in Device Update for IoT Hub
-Device Update for IoT Hub allows deploying an update to a group of IoT devices.
 
-  > [!NOTE] 
-  > If you would like to deploy to a default group instead of a user-created group, you can directly move to [How to Deploy an Update](deploy-update.md)
+Device Update for IoT Hub allows deploying an update to a group of IoT devices.
 
+> [!NOTE] 
+> If you would like to deploy to a default group instead of a user-created group, you can directly move to [How to deploy an update](deploy-update.md)
 
 ## Prerequisites
 
@@ -28,38 +28,44 @@ Device Update for IoT Hub allows deploying an update to a group of IoT devices.
 
 The below documentation describes how to add and update a tag.
 
-### Programmatically update Device Twin
+### Programmatically update device twins
+
+You can update a device twin with the appropriate tag using RegistryManager after enrolling the device with Device Update.
 
-You can update the Device Twin with the appropriate Tag using RegistryManager after enrolling the device with Device Update. 
-[Learn how to add tags using a sample .NET app.](../iot-hub/iot-hub-csharp-csharp-twin-getstarted.md)  
-[Learn about tag properties](../iot-hub/iot-hub-devguide-device-twins.md#tags-and-properties-format).
+* [Learn how to add tags using a sample .NET app.](../iot-hub/iot-hub-csharp-csharp-twin-getstarted.md)  
+* [Learn about tag properties](../iot-hub/iot-hub-devguide-device-twins.md#tags-and-properties-format).
 
-#### Device Update Tag Format
+#### Device Update tag format
 
 ```json
      "tags": {
               "ADUGroup": "<CustomTagValue>"
              }
 ```
 
-### Using Jobs
+### Using jobs
+
+It is possible to schedule a job on multiple devices to add or update a Device Update tag. For examples, see [Schedule jobs on multiple devices](../iot-hub/iot-hub-devguide-jobs.md). You can update a device twin or module twin (if the Device Update agent is set up as a module identity) using jobs. For more information, see [Schedule and broadcast jobs](../iot-hub/iot-hub-csharp-csharp-schedule-jobs.md).
+
+> [!NOTE]
+> This action counts against your IoT Hub messages quota and it is recommended to change only up to 50,000 device or module twin tags at a time otherwise you may need to buy more IoT Hub units if you exceed your daily IoT Hub message quota. Details can be found at [Quotas and throttling](../iot-hub/iot-hub-devguide-quotas-throttling.md#quotas-and-throttling).
 
-It is possible to schedule a Job on multiple devices to add or update a Device Update tag following [these](../iot-hub/iot-hub-devguide-jobs.md) examples. You can update Device Twin or Module Twin (if Device Update agent is set up as a Module Identity) using Jobs. [Learn more](../iot-hub/iot-hub-csharp-csharp-schedule-jobs.md).
+### Direct twin updates
 
-  > [!NOTE] 
-  > This action goes against your current IOT Hub messages quota and it is recommended to change only up to 50,000 device or module twin Tags at a time otherwise you may need to buy more IoT Hub units if you exceed your daily IoT Hub message quota. Details can be found at [Quotas and throttling](../iot-hub/iot-hub-devguide-quotas-throttling.md#quotas-and-throttling).
+Tags can also be added or updated in a device twin or module twin directly.
 
-### Direct Twin Updates
+1. Sign in to the [Azure portal](https://portal.azure.com) and navigate to your IoT Hub.
 
-Tags can also be added or updated in Device twin or Module Twin directly.
+1. Select **Devices** from the navigation menu and select your IoT device to open its device details.
 
-1. Log into [Azure portal](https://portal.azure.com) and navigate to your IoT Hub.
+1. Open the twin details.
 
-2. From **Devices** or **IoT Edge** on the left navigation pane find your IoT device and navigate to the Device Twin, or the Device Update Module and then its Module Twin (this will be available if Device Update agent is set up as a Module Identity).
+   * If the Device Update agent is configured as a device identity, select **Device twin**.
+   * If the Device Update agent is configured as a module identity, select the Device Update module and then **Module identity twin**.
 
-3. In the Device Twin or Module Twin, delete any existing Device Update tag value by setting them to null.
+1. In the device twin or module twin, delete any existing Device Update tag value by setting them to null.
 
-4. Add a new Device Update tag value as shown below. [Example device twin JSON document with tags.](../iot-hub/iot-hub-devguide-device-twins.md#device-twins)
+1. Add a new Device Update tag value as shown below. [Example device twin JSON document with tags.](../iot-hub/iot-hub-devguide-device-twins.md#device-twins)
 
 ```JSON
     "tags": {

articles/iot-hub-device-update/device-update-raspberry-pi.md

@@ -214,10 +214,10 @@ Use that version number in the later "Import the update" section.
 ## Add a tag to your device
 
 1. Sign in to the [Azure portal](https://portal.azure.com) and go to the IoT hub.
-1. On the left pane, under **Devices** or **IoT Edge**, find your IoT device and go to the device twin or module twin.
+1. On the left pane, under **Devices**, find your IoT device and go to the device twin or module twin.
 1. In the module twin of the Device Update agent module, delete any existing Device Update tag values by setting them to null. If you're using the device identity with the Device Update agent, make these changes on the device twin.
 1. Add a new Device Update tag value, as shown:
-    
+
     ```JSON
         "tags": {
                 "ADUGroup": "<CustomTagValue>"

articles/iot-hub-device-update/device-update-simulator.md

@@ -128,7 +128,7 @@ Read the license terms prior to using the agent. Your installation and use const
 ## Add a tag to your device
 
 1. Sign in to the [Azure portal](https://portal.azure.com) and go to the IoT hub.
-1. From **Devices** or **IoT Edge** on the left pane, find your IoT device and go to the device twin or module twin.
+1. From **Devices** on the left pane, find your IoT device and go to the device twin or module twin.
 1. In the module twin of the Device Update agent module, delete any existing Device Update tag values by setting them to null. If you're using the device identity with a Device Update agent, make these changes on the device twin.
 1. Add a new Device Update tag value, as shown:
 

articles/iot-hub-device-update/device-update-ubuntu-agent.md

@@ -138,10 +138,10 @@ Read the license terms before you use a package. Your installation and use of a
 ## Add a tag to your device
 
 1. Sign in to the [Azure portal](https://portal.azure.com) and go to the IoT hub.
-1. On the left pane, under **IoT Edge**, find your IoT Edge device and go to the device twin or module twin.
+1. On the left pane, under **Devices**, find your IoT Edge device and go to the device twin or module twin.
 1. In the module twin of the Device Update agent module, delete any existing Device Update tag values by setting them to null. If you're using Device identity with Device Update agent, make these changes on the device twin.
 1. Add a new Device Update tag value, as shown:
-    
+
     ```JSON
         "tags": {
                 "ADUGroup": "<CustomTagValue>"

articles/iot-hub/iot-hub-automatic-device-management.md

@@ -1,11 +1,11 @@
 ---
-title: Automatic device management at scale with Azure IoT Hub | Microsoft Docs
-description: Use Azure IoT Hub automatic configurations to manage multiple IoT devices and modules
+title: Automatic device management at scale with Azure IoT Hub
+description: Use Azure IoT Hub automatic configurations to manage multiple IoT devices and modules in the Azure portal
 author: kgremban
 ms.service: iot-hub
 services: iot-hub
 ms.topic: conceptual
-ms.date: 10/26/2021
+ms.date: 09/22/2022
 ms.author: kgremban
 ms.custom: ['Role: Cloud Development', 'Role: IoT Device']
 ---
@@ -18,7 +18,7 @@ Automatic device management in Azure IoT Hub automates many of the repetitive an
 
 [!INCLUDE [iot-hub-basic](../../includes/iot-hub-basic-whole.md)]
 
-Automatic device management works by updating a set of device twins or module twins with desired properties and reporting a summary that's based on twin reported properties.  It introduces a new class and JSON document called a *Configuration* that has three parts:
+Automatic device management works by updating a set of device twins or module twins with desired properties and reporting a summary that's based on twin reported properties.  It introduces a new class and JSON document called a _Configuration_ that has three parts:
 
 * The **target condition** defines the scope of device twins or module twins to be updated. The target condition is specified as a query on twin tags and/or reported properties.
 
@@ -53,23 +53,23 @@ You can create a maximum of 100 automatic configurations on standard tier IoT hu
 
 1. In the [Azure portal](https://portal.azure.com), go to your IoT hub.
 
-2. Select **Configurations** in the left navigation pane.
+2. Select **Configurations + Deployments** in the left navigation pane.
 
-3. Select **Add device configuration** or **Add module configuration**.
+3. Select **Add** and choose **Device twin configuration** or **Module twin configuration** from the drop-down list.
 
    :::image type="content" source="./media/iot-hub-automatic-device-management/create-automatic-configuration.png" alt-text="Screenshot showing how to add a configuration." border="true":::
 
-There are five steps to create a configuration. The following sections walk through each one. 
+There are five steps to create a configuration. The following sections walk through each one.
 
-### Name and Label
+### Name and label
 
 1. Give your configuration a unique name that is up to 128 characters long. Lowercase letters and the following special characters are allowed: `-+%_*!'`. Spaces are not allowed.
 
 2. Add labels to help track your configurations. Labels are **Name**, **Value** pairs that describe your configuration. For example, `HostPlatform, Linux` or `Version, 3.0.1`.
 
 3. Select **Next** to move to the next step. 
 
-### Specify Settings
+### Twin settings
 
 This section defines the content to be set in targeted device twin or module twin desired properties. There are two inputs for each set of settings. The first is the twin path, which is the path to the JSON section within the twin desired properties that will be set. The second is the JSON content to be inserted in that section. 
 
@@ -82,8 +82,7 @@ For example, you could set the twin path to `properties.desired.chiller-water` a
 }
 ```
 
-![Set the twin path and content](./media/iot-hub-automatic-device-management/module-config-twin-settings.png)
-
+:::image type="content" source="./media/iot-hub-automatic-device-management/module-config-twin-settings.png" alt-text="Screenshot of setting the device or module twin property and json content.":::
 
 You can also set individual settings by specifying the entire twin path and providing the value with no brackets. For example, with the twin path `properties.desired.chiller-water.temperature`, set the content to `66`. Then create a new twin setting for the pressure property. 
 
@@ -93,55 +92,53 @@ If you wish to remove an existing property, specify the property value to `null`
 
 You can add additional settings by selecting **Add Device Twin Setting** or **Add Module Twin Setting**.
 
-### Specify Metrics (optional)
+### Target devices or modules
 
-Metrics provide summary counts of the various states that a device or module may report back after applying configuration content. For example, you may create a metric for pending settings changes, a metric for errors, and a metric for successful settings changes.
+Use the tags property from your twins to target the specific devices or modules that should receive this configuration. You can also target twin reported properties.
 
-Each configuration can have up to five custom metrics. 
+Automatic device configurations can only target device twin tags, and automatic module configurations can only target module twin tags. 
 
-1. Enter a name for **Metric Name**.
+Since multiple configurations may target the same device or module, each configuration needs a priority number. If there's ever a conflict, the configuration with the highest priority wins. 
 
-2. Enter a query for **Metric Criteria**.  The query is based on device twin reported properties.  The metric represents the number of rows returned by the query.
+1. Enter a positive integer for the configuration **Priority**. The highest numerical value is considered the highest priority. If two configurations have the same priority number, the one that was created most recently wins. 
 
-For example:
+2. Enter a **Target condition** to determine which devices or modules will be targeted with this configuration. The condition is based on twin tags or twin reported properties and should match the expression format. 
 
-```sql
-SELECT deviceId FROM devices 
-  WHERE properties.reported.chillerWaterSettings.status='pending'
-```
+   For automatic device configuration, you can specify just the tag or reported property to target. For example, `tags.environment='test'` or `properties.reported.chillerProperties.model='4000x'`. You can specify `*` to target all devices. 
+   
+   For automatic module configuration, use a query to specify tags or reported properties from the modules registered to the IoT hub. For example, `from devices.modules where tags.environment='test'` or `from devices.modules where properties.reported.chillerProperties.model='4000x'`. The wildcard cannot be used to target all modules. 
 
-You can include a clause that the configuration was applied, for example: 
+### Metrics
 
-```sql
-/* Include the double brackets. */
-SELECT deviceId FROM devices 
-  WHERE configurations.[[yourconfigname]].status='Applied'
-```
-
-If you're building a metric to report on configured modules, select `moduleId` from `devices.modules`. For example:
+Metrics provide summary counts of the various states that a device or module may report back after applying configuration content. For example, you may create a metric for pending settings changes, a metric for errors, and a metric for successful settings changes.
 
-```sql
-SELECT deviceId, moduleId FROM devices.modules
-  WHERE properties.reported.lastDesiredStatus.code = 200
-```
+Each configuration can have up to five custom metrics. 
 
-### Target Devices
+1. Enter a name for **Metric Name**.
 
-Use the tags property from your twins to target the specific devices or modules that should receive this configuration. You can also target twin reported properties.
+2. Enter a query for **Metric Criteria**.  The query is based on device twin reported properties.  The metric represents the number of rows returned by the query.
 
-Automatic device configurations can only target device twin tags, and automatic module configurations can only target module twin tags. 
+   For example:
 
-Since multiple configurations may target the same device or module, each configuration needs a priority number. If there's ever a conflict, the configuration with the highest priority wins. 
+   ```sql
+   SELECT deviceId FROM devices 
+     WHERE properties.reported.chillerWaterSettings.status='pending'
+   ```
 
-1. Enter a positive integer for the configuration **Priority**. The highest numerical value is considered the highest priority. If two configurations have the same priority number, the one that was created most recently wins. 
+   You can include a clause that the configuration was applied, for example:
 
-2. Enter a **Target condition** to determine which devices or modules will be targeted with this configuration. The condition is based on twin tags or twin reported properties and should match the expression format. 
+   ```sql
+   /* Include the double brackets. */
+   SELECT deviceId FROM devices 
+     WHERE configurations.[[yourconfigname]].status='Applied'
+   ```
 
-   For automatic device configuration, you can specify just the tag or reported property to target. For example, `tags.environment='test'` or `properties.reported.chillerProperties.model='4000x'`. You can specify `*` to target all devices. 
-   
-   For automatic module configuration, use a query to specify tags or reported properties from the modules registered to the IoT hub. For example, `from devices.modules where tags.environment='test'` or `from devices.modules where properties.reported.chillerProperties.model='4000x'`. The wildcard cannot be used to target all modules. 
+   If you're building a metric to report on configured modules, select `moduleId` from `devices.modules`. For example:
 
-3. Select **Next** to move on to the final step.
+   ```sql
+   SELECT deviceId, moduleId FROM devices.modules
+     WHERE properties.reported.lastDesiredStatus.code = 200
+   ```
 
 ### Review Configuration
 
@@ -153,7 +150,7 @@ To view the details of a configuration and monitor the devices running it, use t
 
 1. In the [Azure portal](https://portal.azure.com), go to your IoT hub. 
 
-2. Select **Configurations** in Device management.
+2. Select **Configurations ** in Device management.
 
 3. Inspect the configuration list. For each configuration, you can view the following details:
 
@@ -173,13 +170,13 @@ To view the details of a configuration and monitor the devices running it, use t
 
 5. Inspect the configuration details. You can use tabs to view specific details about the devices that received the configuration.
 
-   * **Target Condition** - the devices or modules that match the target condition. 
+   * **Target Devices** or **Target Modules** - the devices or modules that match the target condition.
 
    * **Metrics** - a list of system metrics and custom metrics.  You can view a list of devices or modules that are counted for each metric by selecting the metric in the drop-down and then selecting **View Devices** or **View Modules**.
 
-   * **Device Twin Settings** or **Module Twin Settings** - the twin settings that are set by the configuration. 
+   * **Labels** - key-value pairs used to describe a configuration.  Labels have no impact on functionality.
 
-   * **Configuration Labels** - key-value pairs used to describe a configuration.  Labels have no impact on functionality. 
+   * **Device Twin Settings** or **Module Twin Settings** - the twin settings that are set by the configuration, if any.
 
 ## Modify a configuration
 
@@ -197,16 +194,16 @@ To modify a configuration, use the following steps:
 
 1. In the [Azure portal](https://portal.azure.com), go to your IoT hub. 
 
-2. Select **Configurations** in Device management. 
+2. Select **Configurations + Deployments** in Device management. 
 
 3. Select the configuration that you want to modify. 
 
-4. Make updates to the following fields: 
+4. You can make updates to the following fields:
 
-   * Priority 
+   * Priority
    * Metrics
-   * Target condition 
-   * Labels 
+   * Target condition
+   * Labels
 
 4. Select **Save**.
 
@@ -218,7 +215,7 @@ When you delete a configuration, any device twins take on their next highest pri
 
 1. In the [Azure portal](https://portal.azure.com), go to your IoT hub. 
 
-2. Select **Configurations** in Device management.
+2. Select **Configurations + Deployments** in Device management.
 
 3. Use the checkbox to select the configuration that you want to delete.