Merge pull request #290461 from kgremban/ga-1112sync

Misc updates

Author: denrea

articles/iot-operations/deploy-iot-ops/concept-production-guidelines.md

@@ -18,7 +18,7 @@ Decide whether you're deploying Azure IoT Operations to a single-node or multi-n
 
 ## Platform
 
-Currently, K3s on Ubuntu 20.04 is the only generally available platform for deploying Azure IoT Operations in production.
+Currently, K3s on Ubuntu 24.04 is the only generally available platform for deploying Azure IoT Operations in production.
 
 ## Cluster setup
 

articles/iot-operations/deploy-iot-ops/howto-prepare-cluster.md

@@ -84,7 +84,7 @@ This section provides steps to create clusters in validated environments on Linu
 
 To prepare a K3s Kubernetes cluster on Ubuntu:
 
-1. Install K3s following the instructions in the [K3s quick-start guide](https://docs.k3s.io/quick-start).
+1. Create a single-node or multi-node K3s cluster. For examples, see the [K3s quick-start guide](https://docs.k3s.io/quick-start) or [K3s related projects](https://docs.k3s.io/related-projects).
 
 1. Check to see that kubectl was installed as part of K3s. If not, follow the instructions to [Install kubectl on Linux](https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/).
 

articles/iot-operations/get-started-end-to-end-sample/quickstart-deploy.md

@@ -139,6 +139,18 @@ To connect your cluster to Azure Arc:
    >[!TIP]
    >The value of `$CLUSTER_NAME` is automatically set to the name of your codespace. Replace the environment variable if you want to use a different name.
 
+1. Get the `objectId` of the Microsoft Entra ID application that the Azure Arc service uses in your tenant and save it as an environment variable. Run the following command exactly as written, without changing the GUID value.
+
+   ```azurecli
+   export OBJECT_ID=$(az ad sp show --id bc313c14-388c-4e7d-a58e-70017303ee3b --query id -o tsv)
+   ```
+
+1. Use the [az connectedk8s enable-features](/cli/azure/connectedk8s#az-connectedk8s-enable-features) command to enable custom location support on your cluster. This command uses the `objectId` of the Microsoft Entra ID application that the Azure Arc service uses. Run this command on the machine where you deployed the Kubernetes cluster:
+
+   ```azurecli
+   az connectedk8s enable-features -n <CLUSTER_NAME> -g <RESOURCE_GROUP> --custom-locations-oid $OBJECT_ID --features cluster-connect custom-locations
+   ```
+
 ## Create storage account and schema registry
 
 Schema registry is a synchronized repository that stores message definitions both in the cloud and at the edge. Azure IoT Operations requires a schema registry on your cluster. Schema registry requires an Azure storage account for the schema information stored in the cloud.

articles/iot-operations/manage-layered-network/howto-configure-layered-network.md

@@ -59,7 +59,7 @@ An extra custom DNS needs to be set up in the local network to provide domain na
 ### Example of logical segmentation in Azure
 In this example, a test environment is created with a [virtual network](/azure/virtual-network/virtual-networks-overview) and a [Linux virtual machine](/azure/virtual-machines/linux/quick-create-portal) in Azure.
 > [!IMPORTANT]
-> Virtual environment is for exploration and evaluation only. For more information, see [validated environments](../overview-iot-operations.md#validated-environments) for Azure IoT Operations.
+> Virtual environment is for exploration and evaluation only. For more information, see [supported environments](../deploy-iot-ops/overview-deploy.md#supported-environments) for Azure IoT Operations.
 
 1. Create a virtual network in your Azure subscription. Create subnets for at least two layers (level 4 and level 3).
 :::image type="content" source="./media/howto-configure-layered-network/vnet-subnet.png" alt-text="Screenshot for virtual network in Azure." lightbox="./media/howto-configure-layered-network/vnet-subnet.png":::
@@ -72,7 +72,7 @@ In this example, a test environment is created with a [virtual network](/azure/v
     - [Optional] If you create a *jumpbox* subnet, create inbound and outbound rules for allowing traffic to and from this subnet.
 :::image type="content" source="./media/howto-configure-layered-network/vnet-security-rule.png" alt-text="Screenshot for level 3 security group." lightbox="./media/howto-configure-layered-network/vnet-security-rule.png":::
 1. Create Linux VMs in level 3 and level 4. 
-    - Refer to [validated environments](../overview-iot-operations.md#validated-environments) for specification of the VM.
+    - Refer to [supported environments](../deploy-iot-ops/overview-deploy.md#supported-environments) for specification of the VM.
     - When creating the VM, connect the machine to the subnet that is created in earlier steps.
     - Skip the security group creation for VM.
 

articles/iot-operations/overview-iot-operations.md

@@ -12,7 +12,7 @@ ms.date: 10/22/2024
 
 # What is Azure IoT Operations?
 
-_Azure IoT Operations_ is a unified data plane for the edge. It's a collection of modular, scalable, and highly available data services that run on Azure Arc-enabled edge Kubernetes clusters such as [AKS Edge Essentials](#validated-environments). It enables data capture from various different systems and integrates with data modeling applications such as Microsoft Fabric to help organizations deploy the industrial metaverse.
+_Azure IoT Operations_ is a unified data plane for the edge. It's a collection of modular, scalable, and highly available data services that run on Azure Arc-enabled edge Kubernetes clusters such as [AKS Edge Essentials](#supported-environments). It enables data capture from various different systems and integrates with data modeling applications such as Microsoft Fabric to help organizations deploy the industrial metaverse.
 
 Azure IoT Operations:
 
@@ -119,9 +119,15 @@ To visualize and analyze telemetry from your devices and assets, you can use clo
 
 To secure communication between devices and the cloud through isolated network environments based on the ISA-95/Purdue Network architecture, use the Azure IoT Layered Network Management (preview) component.
 
-## Validated environments
+## Supported environments
 
-[!INCLUDE [validated-environments](includes/validated-environments.md)]
+Microsoft supports the following environments for Azure IoT Operations deployments.
+
+| Environment | Minimum version | Availability |
+| ----------- | --------------- | ------------ |
+| K3s on Ubuntu 24.04 | K3s version 1.31.1 | General availability |
+| Azure Kubernetes Service (AKS) Edge Essentials on Windows 11 IoT Enterprise | AksEdge-K3s-1.29.6-1.8.202.0 | Public preview |
+| Azure Kubernetes Service (AKS) on Azure Local | Azure Stack HCI OS, version 23H2, build 2411 | Public preview |
 
 ## Supported regions
 

articles/iot-operations/troubleshoot/known-issues.md

@@ -105,4 +105,4 @@ kubectl delete pod aio-opc-opc.tcp-1-f95d76c54-w9v9c -n azure-iot-operations
 <!-- TODO: double check -->
 - Creating an X.509 secret in the operations experience portal results in a secret with incorrectly encoded data. To work around this issue, create the [multi-line secrets through Azure Key Vault](/azure/key-vault/secrets/multiline-secrets), then select it from the list of secrets in the operations experience portal.
 
-- When connecting multiple IoT Operations instances to the same Event Grid MQTT namespace, connection failures may occur due to client ID conflicts. Client IDs are currently derived from dataflow resource names, and when using Infrastructure as Code (IaC) patterns for deployment, the generated client IDs may be identical. As a temporary workaround, add randomness to the data flow names in your deployment templates. 
+- When connecting multiple IoT Operations instances to the same Event Grid MQTT namespace, connection failures may occur due to client ID conflicts. Client IDs are currently derived from dataflow resource names, and when using Infrastructure as Code (IaC) patterns for deployment, the generated client IDs may be identical. As a temporary workaround, add randomness to the dataflow names in your deployment templates.