Merge branch 'main' into whats-new-fix

Author: v-regandowner

articles/defender-for-iot/organizations/legacy-central-management/back-up-sensors-from-management.md

@@ -38,13 +38,13 @@ For more information, see [Set up backup and restore files](../back-up-restore-s
 1. Enter the number of GB you want to allocate for backup storage. When the configured limit is exceeded, the oldest backup file is deleted.
 
     **If you're storing backup files on the on-premises management console**, supported values are defined based on your [hardware profiles](../ot-appliance-sizing.md). For example:
-    
+
     |Hardware profile  |Backup storage availability  |
     |---------|---------|
     |**E1800**     |Default storage is 40 GB; limit is 100 GB.        |
     |**L500**     |   Default storage is 20 GB; limit is 50 GB.     |
     |**L100**     |  Default storage is 10 GB; limit is 25 GB.       |
-    |**L60** [*](../ot-appliance-sizing.md#l60)        |    Default storage is 10 GB; limit is 25 GB.     |
+    |**L60**      |    Default storage is 10 GB; limit is 25 GB.     |
 
     **If you're storing backup files on an external server**, there's no maximum storage. However, keep in mind:
 

articles/defender-for-iot/organizations/ot-appliance-sizing.md

@@ -48,12 +48,11 @@ Use the following hardware profiles for production line monitoring, typically in
 |---------|---------|---------|---------|
 |L500   | Up to 200 Mbps        |   1,000      |Physical / Virtual         |
 |L100    | Up to 60 Mbps        |   800      | Physical / Virtual        |
-|L60    | Up to 10 Mbps        |   100      |Physical / Virtual|
 
 > [!IMPORTANT]
-> <a name="l60"></a>Upcoming Defender for IoT software versions are planned to require a minimum disk size of 100 GB. When that happens, the L60 hardware profile, which supports 60 GB of hard disk, will be deprecated.
+> Defender for IoT software versions require a minimum disk size of 100 GB. The L60 hardware profile, which only supports 60 GB of hard disk, has been deprecated.
 >
-> We recommend that you plan any new deployments accordingly, using hardware profiles that support at least 100 GB. Migration steps from the L60 hardware profile will be provided together with the L60 deprecation.
+> If you have a legacy sensor, such as the L60 hardware profile, you can migrate it to a supported profile can be found by following the [back up and restore a sensor](back-up-restore-sensor.md) process.
 
 ## On-premises management console systems
 

articles/defender-for-iot/organizations/ot-virtual-appliances.md

@@ -59,7 +59,6 @@ For all deployments, bandwidth results for virtual machines may vary, depending
 |**E500**     |    **Max bandwidth**: 800 Mb/sec <br>**Max monitored assets**: 10,000      | **vCPU**: 8 <br>**Memory**: 32 GB <br>**Storage**: 500 GB (300 IOPS)        |
 |**L500**     |   **Max bandwidth**: 160 Mb/sec <br>**Max monitored assets**: 1,000      | **vCPU**: 4 <br>**Memory**: 8 GB <br>**Storage**: 500 GB (150 IOPS)        |
 |**L100**     |    **Max bandwidth**: 100 Mb/sec <br>**Max monitored assets**: 800      | **vCPU**: 4 <br>**Memory**: 8 GB <br>**Storage**: 100 GB (150 IOPS)        |
-|**L60** [*](ot-appliance-sizing.md#l60) |     **Max bandwidth**: 10 Mb/sec <br>**Max monitored assets**: 100      | **vCPU**: 4 <br>**Memory**: 8 GB <br>**Storage**: 60 GB (150 IOPS)        |
 
 > [!NOTE]
 > There is no need to pre-install an operating system on the VM, the sensor installation includes the operating system image.

articles/defender-for-iot/organizations/references-data-retention.md

@@ -40,7 +40,7 @@ The following table lists how long PCAP data is stored in each Defender for IoT
 | Storage type | Details |
 |---------|---------|
 | **Azure portal** | PCAP files are available for download from the Azure portal for as long as the OT network sensor stores them. <br><br> Once downloaded, the files are cached on the Azure portal for 48 hours. <br><br> For more information, see [Access alert PCAP data](how-to-manage-cloud-alerts.md#access-alert-pcap-data). |
-| **OT network sensor** | Dependent on the sensor's storage capacity allocated for PCAP files, which is determined by its [hardware profile](ot-appliance-sizing.md): <br><br>- **C5600**:   130 GB  <br>- **E1800**:   130 GB  <br>-  **E1000** :   78 GB<br>- **E500**:    78 GB <br>- **L500**: 7 GB   <br>- **L100**:    2.5 GB<br>- **L60** [*](ot-appliance-sizing.md#l60):    2.5 GB    <br><br> If a sensor exceeds its maximum storage capacity, the oldest PCAP file is deleted to accommodate the new one. <br><br> For more information, see [Access alert PCAP data](how-to-view-alerts.md#access-alert-pcap-data) and [Pre-configured physical appliances for OT monitoring](ot-pre-configured-appliances.md). |
+| **OT network sensor** | Dependent on the sensor's storage capacity allocated for PCAP files, which is determined by its [hardware profile](ot-appliance-sizing.md): <br><br>- **C5600**:   130 GB  <br>- **E1800**:   130 GB  <br>-  **E1000** :   78 GB<br>- **E500**:    78 GB <br>- **L500**: 7 GB   <br>- **L100**:    2.5 GB<br><br> If a sensor exceeds its maximum storage capacity, the oldest PCAP file is deleted to accommodate the new one. <br><br> For more information, see [Access alert PCAP data](how-to-view-alerts.md#access-alert-pcap-data) and [Pre-configured physical appliances for OT monitoring](ot-pre-configured-appliances.md). |
 | **On-premises management console** | PCAP files aren't stored on the on-premises management console and are only accessed from the on-premises management console via a direct link to the OT sensor. |
 
 The usage of available PCAP storage space depends on factors such as the number of alerts, the type of the alert, and the network bandwidth, all of which affect the size of the PCAP file.
@@ -72,7 +72,6 @@ The following table lists the maximum number of events that can be stored for ea
 | **E500** | 6M events |
 | **L500** | 3M events |
 | **L100** | 500-K events |
-| **L60** [*](ot-appliance-sizing.md#l60) | 500-K events |
 
 For more information, see [Track sensor activity](how-to-track-sensor-activity.md) and [Pre-configured physical appliances for OT monitoring](ot-pre-configured-appliances.md).
 
@@ -105,7 +104,6 @@ The retention of backup files depends on the sensor's architecture, as each hard
 
 | Hardware profile  | Allocated hard disk space  |
 |---------|---------|
-| **L60** [*](ot-appliance-sizing.md#l60)    |  Backups are not supported       |
 | **L100**     |  Backups are not supported       |
 | **L500**     |  20 GB   |
 | **E1000** |   60 GB  |

articles/defender-for-iot/organizations/release-notes.md

@@ -113,8 +113,9 @@ This version includes the following updates and enhancements:
 
 - [Alert suppression rules from the Azure portal](how-to-accelerate-alert-incident-response.md#suppress-irrelevant-alerts)
 - [Focused alerts in OT/IT environments](alerts.md#focused-alerts-in-otit-environments)
-- [Alert ID (Id field) is now aligned on the Azure portal and sensor console](how-to-manage-cloud-alerts.md#view-alerts-on-the-azure-portal)
+- [Alert ID (ID field) is now aligned on the Azure portal and sensor console](how-to-manage-cloud-alerts.md#view-alerts-on-the-azure-portal)
 - [Newly supported protocols](concept-supported-protocols.md)
+- [L60 hardware profile is no longer supported](ot-appliance-sizing.md#production-line-monitoring-medium-and-small-deployments)
 
 ## Versions 23.2.x
 
@@ -474,5 +475,5 @@ This version includes the following new updates and fixes:
 
 ## Next steps
 
-For more information about the features listed in this article, see [What's new in Microsoft Defender for IoT?](whats-new.md) and [What's new archive for in Microsoft Defender for IoT for organizations](release-notes-archive.md).
+For more information about the features listed in this article, see [What's new in Microsoft Defender for IoT](whats-new.md) and [What's new archive for in Microsoft Defender for IoT for organizations](release-notes-archive.md).
 

articles/defender-for-iot/organizations/whats-new.md

@@ -62,6 +62,12 @@ We now support these protocols:
 
 [See the updated protocol list](concept-supported-protocols.md).
 
+### L60 hardware profile is no longer supported
+
+The L60 hardware profile is no longer supported and is removed from support documentation. Hardware profiles now require a minimum of 100GB (the minimum hardware profile is now [L100](ot-virtual-appliances.md)).
+
+To migrate from the L60 profile to a supported profile follow the [Back up and restore OT network sensor](back-up-restore-sensor.md) procedure.
+
 ## January 2024
 
 |Service area  |Updates  |

articles/hdinsight-aks/TOC.yml

@@ -48,12 +48,12 @@ items:
     href: quickstart-create-cluster.md
   - name: Introduction to cluster storage
     href: cluster-storage.md
-  - name: Export ARM templates
+  - name: Export cluster ARM template
     items:
-    - name: Manual export
-      href: ./create-cluster-using-arm-template.md
-    - name: Script based export
+    - name: Export ARM template using Azure portal
       href: ./create-cluster-using-arm-template-script.md
+    - name: Export ARM template using Azure CLI
+      href: ./create-cluster-using-arm-template.md
   - name: Secure network traffic  
     items:
     - name: Use firewall with Azure CLI

articles/hdinsight-aks/create-cluster-using-arm-template-script.md

@@ -1,62 +1,39 @@
 ---
 title: Export ARM template in Azure HDInsight on AKS
-description: How to create an ARM template to cluster using script in Azure HDInsight on AKS
+description: How to create an ARM template of a cluster in Azure HDInsight on AKS
 ms.service: hdinsight-aks
 ms.custom: devx-track-arm-template
 ms.topic: how-to 
-ms.date: 08/29/2023
+ms.date: 02/12/2024
 ---
 
-# Export cluster ARM template using script
+# Export cluster ARM template - Azure portal
 
 [!INCLUDE [feature-in-preview](includes/feature-in-preview.md)]
 
-This article describes how to generate an ARM template for your cluster automatically using a script. You can use the ARM template to modify, clone, or recreate a cluster starting from the existing cluster's configurations.
+This article describes how to generate an ARM template for your cluster automatically. You can use the ARM template to modify, clone, or recreate a cluster starting from the existing cluster's configurations.
 
 ## Prerequisites
 
 * An operational HDInsight on AKS cluster.
-* Familiarity with [ARM template authoring and deployment](/azure/azure-resource-manager/templates/overview).
 
 ## Steps to generate ARM template for the cluster
 
 1. Sign in to [Azure portal](https://portal.azure.com).
 
-2. In the Azure portal search bar, type "HDInsight on AKS cluster" and select "Azure HDInsight on AKS clusters" from the drop-down list.
+1. In the Azure portal search bar, type "HDInsight on AKS cluster" and select "Azure HDInsight on AKS clusters" from the drop-down list.
 
    :::image type="content" source="./media/create-cluster-using-arm-template-script/cloud-portal-search.png" alt-text="Screenshot showing search option for getting started with HDInsight on AKS Cluster." border="true" lightbox="./media/create-cluster-using-arm-template-script/cloud-portal-search.png":::
 
-6. Select your cluster name from the list page.
+1. Select your cluster name from the list page.
 
    :::image type="content" source="./media/create-cluster-using-arm-template-script/cloud-portal-list-view.png" alt-text="Screenshot showing selecting the HDInsight on AKS Cluster you require from the list." border="true" lightbox="./media/create-cluster-using-arm-template-script/cloud-portal-list-view.png":::
 
-2. Navigate to the overview blade of your cluster and click on *JSON View* at the top right.
+1. Navigate to the "Export template" blade of your cluster and click "Download" to export the template.
 
-   :::image type="content" source="./media/create-cluster-using-arm-template-script/view-cost-json-view.png" alt-text="Screenshot showing how to view cost and JSON View buttons from the Azure portal." border="true" lightbox="./media/create-cluster-using-arm-template-script/view-cost-json-view.png":::
+   :::image type="content" source="./media/create-cluster-using-arm-template-script/export-template-download-view.png" alt-text="Screenshot showing export template option from the Azure portal." border="true" lightbox="./media/create-cluster-using-arm-template-script/export-template-download-view.png":::
 
-2. Copy the "Resource JSON" and save it to a local JSON file. For example, `template.json`.
-
-3. Click the following button at the top right in the Azure portal to launch Azure Cloud Shell.
-
-   :::image type="content" source="./media/create-cluster-using-arm-template-script/cloud-shell.png" alt-text="Screenshot screenshot showing Cloud Shell icon.":::
-  
-5. Make sure Cloud Shell is set to "Bash" on the top left and upload your `template.json` file.
-
-   :::image type="content" source="./media/create-cluster-using-arm-template-script/azure-cloud-shell-template-upload.png" alt-text="Screenshot showing how to upload your template.json file." border="true" lightbox="./media/create-cluster-using-arm-template-script/azure-cloud-shell-template-upload.png":::
-   
-2. Execute the following command to generate the ARM template.
-
-   ```azurecli
-      wget https://hdionaksresources.blob.core.windows.net/common/arm_transform.py
-
-      python arm_transform.py template.json
-   ```
-   
-    :::image type="content" source="./media/create-cluster-using-arm-template-script/azure-cloud-shell-script-output.png" alt-text="Screenshot showing results after running the script."  border="true" lightbox="./media/create-cluster-using-arm-template-script/azure-cloud-shell-script-output.png":::
-
-This script creates an ARM template with name `template-modified.json` for your cluster and generates a command to deploy the ARM template.
-
-Now, your cluster ARM template is ready. You can update the properties of the cluster and finally deploy the ARM template to refresh the resources. To redeploy, you can either use the Azure CLI command output by the script or [deploy an ARM template using Azure portal](/azure/azure-resource-manager/templates/deploy-portal#deploy-resources-from-custom-template).
+Now, your cluster ARM template is ready. You can update the properties of the cluster and finally deploy the ARM template to refresh the resources. To redeploy, you can either use the "Deploy" option in your cluster under "Export template" blade by replacing the existing template with the modified template or see [deploy an ARM template using Azure portal](/azure/azure-resource-manager/templates/deploy-portal#deploy-resources-from-custom-template).
 
 > [!IMPORTANT]
 > If you're cloning the cluster or creating a new cluster, you'll need to modify the `name`, `location`, and `fqdn` (the fqdn must match the cluster name).

articles/hdinsight-aks/create-cluster-using-arm-template.md

@@ -1,58 +1,35 @@
 ---
 title: Export cluster ARM template
-description: Learn how to Create cluster ARM template
+description: Learn how to Create cluster ARM template using Azure CLI
 ms.service: hdinsight-aks
 ms.custom: devx-track-arm-template
 ms.topic: how-to
-ms.date: 08/29/2023
+ms.date: 02/12/2024
 ---
 
-# Export cluster ARM template
+# Export cluster ARM template - Azure CLI
 
 [!INCLUDE [feature-in-preview](includes/feature-in-preview.md)]
 
-This article describes how to generate an ARM template from resource JSON of your cluster. 
-
-## Prerequisites
+This article describes how to generate an ARM template using Azure CLI. 
 
+[!INCLUDE [azure-cli-prepare-your-environment.md](~/articles/reusable-content/azure-cli/azure-cli-prepare-your-environment.md)]
 * An operational HDInsight on AKS cluster.
-* Familiarity with [ARM template authoring and deployment](/azure/azure-resource-manager/templates/overview).
-
-## Steps to generate ARM template for the cluster
-
-1. Sign in to [Azure portal](https://portal.azure.com).
-   
-1. In the Azure portal search bar, type "HDInsight on AKS cluster" and select "Azure HDInsight on AKS clusters" from the drop-down list.
 
-   :::image type="content" source="./media/create-cluster-using-arm-template/portal-search.png" alt-text="Screenshot showing search option for getting started with HDInsight on AKS Cluster." border="true" lightbox="./media/create-cluster-using-arm-template/portal-search.png":::
-   
-1. Select your cluster name from the list page.
-
-   :::image type="content" source="./media/create-cluster-using-arm-template/portal-search-result.png" alt-text="Screenshot showing selecting the HDInsight on AKS Cluster you require from the list." border="true" lightbox="./media/create-cluster-using-arm-template/portal-search-result.png":::
-   
-1. Go to the overview blade of your cluster and click on *JSON View* at the top right.
-
-   :::image type="content" source="./media/create-cluster-using-arm-template/view-cost-json-view.png" alt-text="Screenshot showing how to view cost and JSON View buttons from the Azure portal." border="true" lightbox="./media/create-cluster-using-arm-template/view-cost-json-view.png":::
-   
-1. Copy the response to an editor. For example: Visual Studio Code.
-1. Modify the response with the following changes to turn it into a valid ARM template.
-
-    * Remove the following objects-
-        * `id`, `systemData`
-        * `deploymentId`, `provisioningState`, and `status` under properties object.
 
-    * Change "name" value to `<your clusterpool name>/<your cluster name>`.
+## Steps to generate ARM template for the cluster
+    
+1. Run the following command.
 
-      :::image type="content" source="./media/create-cluster-using-arm-template/change-cluster-name.png" alt-text="Screenshot showing how to change cluster name.":::
-      
-    * Add "apiversion": "2023-06-01-preview" in the same section with name, location etc.
+   ```azurecli-interactive
 
-         :::image type="content" source="./media/create-cluster-using-arm-template/api-version.png" alt-text="Screenshot showing how to modify the API version.":::
+   az group export --resource-group "{cluster-rg}" --resource-ids "{resource_id}" --include-parameter-default-value --include-comments
 
-  1. Open [custom template](/azure/azure-resource-manager/templates/deploy-portal#deploy-resources-from-custom-template) from the Azure portal and select "Build your own template in the editor" option.
-  
-  1. Copy the modified response to the “resources” object in the ARM template format. For example:
+   # cluster-rg = Resource group of your cluster
+   # resource_id = Cluster resource id. You can get it from "JSON view" in the overview blade of your cluster in the Azure portal.
+   ```
 
-      :::image type="content" source="./media/create-cluster-using-arm-template/modify-get-response.png" alt-text="Screenshot showing how to  modify the get response." border="true" lightbox="./media/create-cluster-using-arm-template/modify-get-response.png":::
+   :::image type="content" source="./media/create-cluster-using-arm-template/command-execution-output.png" alt-text="Screenshot showing output of the command executed to get the ARM template of the HDInsight on AKS Cluster." border="true" lightbox="./media/create-cluster-using-arm-template/command-execution-output.png":::
+   
 
 Now, your cluster ARM template is ready. You can update the properties of the cluster and finally deploy the ARM template to refresh the resources. Learn how to [deploy an ARM template](/azure/azure-resource-manager/templates/deploy-portal).