Skip to content

Commit 3a96546

Browse files
authored
Merge pull request #112312 from kpeechara/kapil-branch-1
Updating container insights docs with Managed Identity updates
2 parents 1f58b55 + 0e7e418 commit 3a96546

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

articles/aks/learn/quick-kubernetes-deploy-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ The following example creates a resource group named *myResourceGroup* in the *e
7575
7676
The following example creates a cluster named *myAKSCluster* with one node and enables a system-assigned managed identity.
7777
78-
* Create an AKS cluster using the [`az aks create`][az-aks-create] command with the `--enable-addons monitoring` and `--enable-msi-auth-for-monitoring` parameters to enable [Azure Monitor Container insights][azure-monitor-containers] with managed identity authentication (preview).
78+
* Create an AKS cluster using the [`az aks create`][az-aks-create] command with the `--enable-addons monitoring` parameter to enable [Azure Monitor Container insights][azure-monitor-containers] with managed identity authentication (Minimum Azure CLI version 2.49.0 or higher).
7979
8080
```azurecli-interactive
81-
az aks create -g myResourceGroup -n myAKSCluster --enable-managed-identity --node-count 1 --enable-addons monitoring --enable-msi-auth-for-monitoring --generate-ssh-keys
81+
az aks create -g myResourceGroup -n myAKSCluster --enable-managed-identity --node-count 1 --enable-addons monitoring --generate-ssh-keys
8282
```
8383
8484
After a few minutes, the command completes and returns JSON-formatted information about the cluster.

articles/azure-monitor/containers/container-insights-cost-config.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,26 @@ Create a file and provide values for _interval_, _namespaceFilteringMode_, and _
125125

126126
## Onboarding to a new AKS cluster
127127

128+
> [!NOTE]
129+
> Minimum Azure CLI version 2.49.0 or higher.
130+
128131
Use the following command to enable monitoring of your AKS cluster
129132

130133
```azcli
131-
az aks create -g myResourceGroup -n myAKSCluster --enable-managed-identity --node-count 1 --enable-addons monitoring --enable-msi-auth-for-monitoring --data-collection-settings dataCollectionSettings.json --generate-ssh-keys
134+
az aks create -g myResourceGroup -n myAKSCluster --enable-managed-identity --node-count 1 --enable-addons monitoring --data-collection-settings dataCollectionSettings.json --generate-ssh-keys
132135
```
133136

134137
## Onboarding to an existing AKS Cluster
135138

136139
## [Azure CLI](#tab/create-CLI)
137140

141+
> [!NOTE]
142+
> Minimum Azure CLI version 2.49.0 or higher.
143+
138144
### Onboard to a cluster without the monitoring addon
139145

140146
```azcli
141-
az aks enable-addons -a monitoring --enable-msi-auth-for-monitoring -g <clusterResourceGroup> -n <clusterName> --data-collection-settings dataCollectionSettings.json
147+
az aks enable-addons -a monitoring -g <clusterResourceGroup> -n <clusterName> --data-collection-settings dataCollectionSettings.json
142148
```
143149

144150
### Onboard to a cluster with an existing monitoring addon
@@ -151,7 +157,7 @@ az aks show -g <clusterResourceGroup> -n <clusterName> | grep -i "logAnalyticsWo
151157
az aks disable-addons -a monitoring -g <clusterResourceGroup> -n <clusterName>
152158
153159
# enable monitoring with data collection settings
154-
az aks enable-addons -a monitoring --enable-msi-auth-for-monitoring -g <clusterResourceGroup> -n <clusterName> --workspace-resource-id <logAnalyticsWorkspaceResourceId> --data-collection-settings dataCollectionSettings.json
160+
az aks enable-addons -a monitoring -g <clusterResourceGroup> -n <clusterName> --workspace-resource-id <logAnalyticsWorkspaceResourceId> --data-collection-settings dataCollectionSettings.json
155161
```
156162

157163
## [Azure portal](#tab/create-portal)

articles/azure-monitor/containers/container-insights-enable-aks.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Use any of the following methods to enable monitoring for an existing AKS cluste
3030
## [CLI](#tab/azure-cli)
3131

3232
> [!NOTE]
33-
> Azure CLI version 2.39.0 or higher is required for managed identity authentication.
33+
> Managed identity authentication will be default in CLI version 2.49.0 or higher. If you need to use legacy/non-managed identity authentication, use CLI version < 2.49.0.
3434
3535
### Use a default Log Analytics workspace
3636

@@ -338,6 +338,9 @@ This section explains two methods for migrating to managed identity authenticati
338338

339339
AKS clusters with a service principal must first disable monitoring and then upgrade to managed identity. Only Azure public cloud, Azure China cloud, and Azure Government cloud are currently supported for this migration.
340340

341+
> [!NOTE]
342+
> Minimum Azure CLI version 2.49.0 or higher.
343+
341344
1. Get the configured Log Analytics workspace resource ID:
342345

343346
```cli
@@ -359,13 +362,16 @@ AKS clusters with a service principal must first disable monitoring and then upg
359362
1. Enable the monitoring add-on with the managed identity authentication option by using the Log Analytics workspace resource ID obtained in step 1:
360363
361364
```cli
362-
az aks enable-addons -a monitoring --enable-msi-auth-for-monitoring -g <resource-group-name> -n <cluster-name> --workspace-resource-id <workspace-resource-id>
365+
az aks enable-addons -a monitoring -g <resource-group-name> -n <cluster-name> --workspace-resource-id <workspace-resource-id>
363366
```
364367
365368
### Existing clusters with system or user-assigned identity
366369
367370
AKS clusters with system-assigned identity must first disable monitoring and then upgrade to managed identity. Only Azure public cloud, Azure China cloud, and Azure Government cloud are currently supported for clusters with system identity. For clusters with user-assigned identity, only Azure public cloud is supported.
368371
372+
> [!NOTE]
373+
> Minimum Azure CLI version 2.49.0 or higher.
374+
369375
1. Get the configured Log Analytics workspace resource ID:
370376
371377
```cli
@@ -381,7 +387,7 @@ AKS clusters with system-assigned identity must first disable monitoring and the
381387
1. Enable the monitoring add-on with the managed identity authentication option by using the Log Analytics workspace resource ID obtained in step 1:
382388
383389
```cli
384-
az aks enable-addons -a monitoring --enable-msi-auth-for-monitoring -g <resource-group-name> -n <cluster-name> --workspace-resource-id <workspace-resource-id>
390+
az aks enable-addons -a monitoring -g <resource-group-name> -n <cluster-name> --workspace-resource-id <workspace-resource-id>
385391
```
386392
387393
## Private link

0 commit comments

Comments
 (0)