Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

{AKS - ARC} fix: Update DCR creation to Clusters resource group instead of workspace #175

Merged
merged 5 commits into from
Sep 28, 2022
Merged

{AKS - ARC} fix: Update DCR creation to Clusters resource group instead of workspace #175

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
94f04fa
fix: Update DCR creation to Clusters resource group instead of workspace
bragi92 Sep 12, 2022
810d862
.
bragi92 Sep 13, 2022
cbacd72
.
bragi92 Sep 13, 2022
5135c10
casing check
bragi92 Sep 20, 2022
289190f
Merge branch 'k8s-extension/public' into patch-1
bragi92 Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/k8s-extension/azext_k8s_extension/partner_extensions/ContainerInsights.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,6 @@ def _ensure_container_insights_dcr_for_monitoring(cmd, subscription_id, cluster_

# extract subscription ID and resource group from workspace_resource_id URL
parsed = parse_resource_id(workspace_resource_id)
workspace_subscription_id, workspace_resource_group = parsed["subscription"], parsed["resource_group"]
bragi92 marked this conversation as resolved.
Show resolved Hide resolved
workspace_region = ''
resources = cf_resources(cmd.cli_ctx, workspace_subscription_id)
try:
Expand All @@ -601,7 +600,7 @@ def _ensure_container_insights_dcr_for_monitoring(cmd, subscription_id, cluster_
raise ex

dataCollectionRuleName = f"MSCI-{cluster_name}-{cluster_region}"
dcr_resource_id = f"/subscriptions/{workspace_subscription_id}/resourceGroups/{workspace_resource_group}/providers/Microsoft.Insights/dataCollectionRules/{dataCollectionRuleName}"
dcr_resource_id = f"/subscriptions/{subscription_id}/resourceGroups/{cluster_resource_group_name}/providers/Microsoft.Insights/dataCollectionRules/{dataCollectionRuleName}"

# first get the association between region display names and region IDs (because for some reason
# the "which RPs are available in which regions" check returns region display names)
Expand Down