Skip to content

{AKS} Update addon preparation - part 3 #20504

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

Merged
zhoxing-ms merged 3 commits into from
Nov 26, 2021
Merged

{AKS} Update addon preparation - part 3 #20504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3ae0c0
switch internal functions
FumingZhang Nov 24, 2021
396f6d4
replace workspace & container insight preparer
FumingZhang Nov 24, 2021
f693420
sync aks-preview
FumingZhang Nov 24, 2021
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
8 changes: 2 additions & 6 deletions src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,8 @@ def ensure_default_log_analytics_workspace_for_monitoring(
if ex.status_code != 404:
raise ex
else:
ResourceGroup = cmd.get_models(
"ResourceGroup", resource_type=ResourceType.MGMT_RESOURCE_RESOURCES
)
resource_group = ResourceGroup(location=workspace_region)
resource_groups.create_or_update(
default_workspace_resource_group, resource_group
default_workspace_resource_group, {"location": workspace_region}
)

GenericResource = cmd.get_models(
Expand Down Expand Up @@ -314,7 +310,7 @@ def ensure_container_insights_for_monitoring(
f"/subscriptions/{cluster_subscription}/resourceGroups/{cluster_resource_group_name}/"
f"providers/Microsoft.ContainerService/managedClusters/{cluster_name}"
)
dataCollectionRuleName = f"DCR-{workspace_name}"
dataCollectionRuleName = f"MSCI-{workspace_name}"
dcr_resource_id = (
f"/subscriptions/{subscription_id}/resourceGroups/{resource_group}/"
f"providers/Microsoft.Insights/dataCollectionRules/{dataCollectionRuleName}"
Expand Down
Loading