Skip to content

Commit

Permalink
{AKS} Monitoring addon MSI auth - update API version for DCR and stre…
Browse files Browse the repository at this point in the history 
…am group (Azure#22960)
  • Loading branch information
@ganga1980
ganga1980 authored Jun 28, 2022
1 parent 94eaa3a commit 50f0fcd
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 32 deletions.
33 changes: 6 additions & 27 deletions src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,9 +377,10 @@ def ensure_container_insights_for_monitoring(
region_ids = map(
lambda x: region_names_to_id[x], resource["locations"])
if cluster_region not in region_ids:
raise ClientRequestError(f"Data Collection Rule Associations are not supported for cluster region {cluster_region}")
raise ClientRequestError(
f"Data Collection Rule Associations are not supported for cluster region {cluster_region}")
dcr_url = cmd.cli_ctx.cloud.endpoints.resource_manager + \
f"{dcr_resource_id}?api-version=2019-11-01-preview"
f"{dcr_resource_id}?api-version=2021-04-01"
# get existing tags on the container insights extension DCR if the customer added any
existing_tags = get_existing_container_insights_extension_dcr_tags(
cmd, dcr_url)
Expand All @@ -394,18 +395,7 @@ def ensure_container_insights_for_monitoring(
{
"name": "ContainerInsightsExtension",
"streams": [
"Microsoft-Perf",
"Microsoft-ContainerInventory",
"Microsoft-ContainerLog",
"Microsoft-ContainerLogV2",
"Microsoft-ContainerNodeInventory",
"Microsoft-KubeEvents",
"Microsoft-KubeMonAgentEvents",
"Microsoft-KubeNodeInventory",
"Microsoft-KubePodInventory",
"Microsoft-KubePVInventory",
"Microsoft-KubeServices",
"Microsoft-InsightsMetrics",
"Microsoft-ContainerInsights-Group-Default"
],
"extensionName": "ContainerInsights",
}
Expand All @@ -414,18 +404,7 @@ def ensure_container_insights_for_monitoring(
"dataFlows": [
{
"streams": [
"Microsoft-Perf",
"Microsoft-ContainerInventory",
"Microsoft-ContainerLog",
"Microsoft-ContainerLogV2",
"Microsoft-ContainerNodeInventory",
"Microsoft-KubeEvents",
"Microsoft-KubeMonAgentEvents",
"Microsoft-KubeNodeInventory",
"Microsoft-KubePodInventory",
"Microsoft-KubePVInventory",
"Microsoft-KubeServices",
"Microsoft-InsightsMetrics",
"Microsoft-ContainerInsights-Group-Default"
],
"destinations": ["la-workspace"],
}
Expand Down Expand Up @@ -465,7 +444,7 @@ def ensure_container_insights_for_monitoring(
}
)
association_url = cmd.cli_ctx.cloud.endpoints.resource_manager + \
f"{cluster_resource_id}/providers/Microsoft.Insights/dataCollectionRuleAssociations/ContainerInsightsExtension?api-version=2019-11-01-preview"
f"{cluster_resource_id}/providers/Microsoft.Insights/dataCollectionRuleAssociations/ContainerInsightsExtension?api-version=2021-04-01"
for _ in range(3):
try:
send_raw_request(
Expand Down
10 changes: 5 additions & 5 deletions src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6533,14 +6533,14 @@ def create_new_cluster_with_monitoring_aad_auth(self, resource_group, resource_g
# check that the DCR was created
dataCollectionRuleName = f"MSCI-{aks_name}-{resource_group_location}"
dcr_resource_id = f"/subscriptions/{subscription}/resourceGroups/{workspace_resource_group}/providers/Microsoft.Insights/dataCollectionRules/{dataCollectionRuleName}"
get_cmd = f'rest --method get --url https://management.azure.com{dcr_resource_id}?api-version=2019-11-01-preview'
get_cmd = f'rest --method get --url https://management.azure.com{dcr_resource_id}?api-version=2021-04-01'
self.cmd(get_cmd, checks=[
self.check('properties.destinations.logAnalytics[0].workspaceResourceId', f'{workspace_resource_id}')
])

# check that the DCR-A was created
dcra_resource_id = f"{cluster_resource_id}/providers/Microsoft.Insights/dataCollectionRuleAssociations/ContainerInsightsExtension"
get_cmd = f'rest --method get --url https://management.azure.com{dcra_resource_id}?api-version=2019-11-01-preview'
get_cmd = f'rest --method get --url https://management.azure.com{dcra_resource_id}?api-version=2021-04-01'
self.cmd(get_cmd, checks=[
self.check('properties.dataCollectionRuleId', f'{dcr_resource_id}')
])
Expand Down Expand Up @@ -6606,14 +6606,14 @@ def enable_monitoring_existing_cluster_aad_auth(self, resource_group, resource_g
# check that the DCR was created
dataCollectionRuleName = f"MSCI-{aks_name}-{resource_group_location}"
dcr_resource_id = f"/subscriptions/{subscription}/resourceGroups/{workspace_resource_group}/providers/Microsoft.Insights/dataCollectionRules/{dataCollectionRuleName}"
get_cmd = f'rest --method get --url https://management.azure.com{dcr_resource_id}?api-version=2019-11-01-preview'
get_cmd = f'rest --method get --url https://management.azure.com{dcr_resource_id}?api-version=2021-04-01'
self.cmd(get_cmd, checks=[
self.check('properties.destinations.logAnalytics[0].workspaceResourceId', f'{workspace_resource_id}')
])

# check that the DCR-A was created
dcra_resource_id = f"{cluster_resource_id}/providers/Microsoft.Insights/dataCollectionRuleAssociations/ContainerInsightsExtension"
get_cmd = f'rest --method get --url https://management.azure.com{dcra_resource_id}?api-version=2019-11-01-preview'
get_cmd = f'rest --method get --url https://management.azure.com{dcra_resource_id}?api-version=2021-04-01'
self.cmd(get_cmd, checks=[
self.check('properties.dataCollectionRuleId', f'{dcr_resource_id}')
])
Expand Down Expand Up @@ -6660,7 +6660,7 @@ def test_aks_create_with_monitoring_legacy_auth(self, resource_group, resource_g
# check that the DCR was created
dataCollectionRuleName = f"MSCI-{aks_name}-{resource_group_location}"
dcr_resource_id = f"/subscriptions/{subscription}/resourceGroups/{workspace_resource_group}/providers/Microsoft.Insights/dataCollectionRules/{dataCollectionRuleName}"
get_cmd = f'rest --method get --url https://management.azure.com{dcr_resource_id}?api-version=2019-11-01-preview'
get_cmd = f'rest --method get --url https://management.azure.com{dcr_resource_id}?api-version=2021-04-01'
self.cmd(get_cmd, checks=[
self.check('properties.destinations.logAnalytics[0].workspaceResourceId', f'{workspace_resource_id}')
])
Expand Down

0 comments on commit 50f0fcd

Please sign in to comment.