diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/amw/create.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/amw/create.py index 03f904895ab..0a6d737d66b 100644 --- a/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/amw/create.py +++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/amw/create.py @@ -13,7 +13,7 @@ def create_default_mac(cmd, cluster_subscription, cluster_region): from azure.cli.core.util import send_raw_request - default_mac_name, default_mac_region = get_default_mac_name_and_region(cmd, cluster_region) + default_mac_name, default_mac_region = get_default_mac_name_and_region(cmd, cluster_region, cluster_subscription) default_resource_group_name = f"DefaultResourceGroup-{default_mac_region}" azure_monitor_workspace_resource_id = f"/subscriptions/{cluster_subscription}/resourceGroups/{default_resource_group_name}/providers/microsoft.monitor/accounts/{default_mac_name}" # Check if default resource group exists or not, if it does not then create it diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/amw/defaults.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/amw/defaults.py index 996eeafbcbf..fed9731eda1 100644 --- a/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/amw/defaults.py +++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/amw/defaults.py @@ -11,20 +11,20 @@ from knack.util import CLIError -def get_supported_rp_locations(cmd, rp_name): +def get_supported_rp_locations(cmd, rp_name, subscription): from azure.cli.core.util import send_raw_request supported_locations = [] headers = ['User-Agent=arc-azuremonitormetrics.get_supported_rp_locations'] armendpoint = cmd.cli_ctx.cloud.endpoints.resource_manager - association_url = f"{armendpoint}/providers/{rp_name}?api-version={RP_LOCATION_API}" + association_url = f"{armendpoint}/subscriptions/{subscription}/providers/{rp_name}?api-version={RP_LOCATION_API}" r = send_raw_request(cmd.cli_ctx, "GET", association_url, headers=headers) data = json.loads(r.text) supported_locations = parseResourceProviderResponseForLocations(data) return supported_locations -def get_default_mac_region(cmd, cluster_region): - supported_locations = get_supported_rp_locations(cmd, 'Microsoft.Monitor') +def get_default_mac_region(cmd, cluster_region, subscription): + supported_locations = get_supported_rp_locations(cmd, 'Microsoft.Monitor', subscription) if cluster_region in supported_locations: return cluster_region if len(supported_locations) > 0: @@ -33,8 +33,8 @@ def get_default_mac_region(cmd, cluster_region): return get_default_region(cmd) -def get_default_mac_name_and_region(cmd, cluster_region): - default_mac_region = get_default_mac_region(cmd, cluster_region) +def get_default_mac_name_and_region(cmd, cluster_region, subscription): + default_mac_region = get_default_mac_region(cmd, cluster_region, subscription) default_mac_name = "DefaultAzureMonitorWorkspace-" + default_mac_region default_mac_name = default_mac_name[0:43] return default_mac_name, default_mac_region diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/dce_api.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/dce_api.py index 100cd6dffac..9f9f1a6f134 100644 --- a/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/dce_api.py +++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/dce_api.py @@ -10,7 +10,7 @@ def create_dce(cmd, cluster_subscription, cluster_resource_group_name, cluster_name, mac_region): from azure.cli.core.util import send_raw_request - dce_name = get_default_dce_name(cmd, mac_region, cluster_name) + dce_name = get_default_dce_name(mac_region, cluster_name) dce_resource_id = f"/subscriptions/{cluster_subscription}/resourceGroups/{cluster_resource_group_name}/providers/Microsoft.Insights/dataCollectionEndpoints/{dce_name}" try: armendpoint = cmd.cli_ctx.cloud.endpoints.resource_manager diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/dcr_api.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/dcr_api.py index 0363a99140f..dda1b2918e2 100644 --- a/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/dcr_api.py +++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/dcr_api.py @@ -4,26 +4,16 @@ # -------------------------------------------------------------------------------------------- import json from knack.util import CLIError -from ..constants import MapToClosestMACRegion -from .defaults import get_default_region, sanitize_name +from .defaults import get_default_dcr_name, sanitize_name from ..constants import ( - DC_TYPE, DC_API ) -def get_default_dcr_name(cmd, mac_region, cluster_name): - region = get_default_region(cmd) - if dict.get(MapToClosestMACRegion, mac_region): - region = MapToClosestMACRegion[mac_region] - default_dcr_name = "MSProm-" + region + "-" + cluster_name - return sanitize_name(default_dcr_name, DC_TYPE.DCR, 64) - - # pylint: disable=too-many-locals,too-many-branches,too-many-statements,line-too-long def create_dcr(cmd, mac_region, azure_monitor_workspace_resource_id, cluster_subscription, cluster_resource_group_name, cluster_name, dce_resource_id): from azure.cli.core.util import send_raw_request - dcr_name = get_default_dcr_name(cmd, mac_region, cluster_name) + dcr_name = get_default_dcr_name(mac_region, cluster_name) dcr_resource_id = f"/subscriptions/{cluster_subscription}/resourceGroups/{cluster_resource_group_name}/providers/Microsoft.Insights/dataCollectionRules/{dcr_name}" dcr_creation_body = json.dumps({"location": mac_region, "kind": "Linux", diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/dcra_api.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/dcra_api.py index 66e4688cf33..d54701e79de 100644 --- a/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/dcra_api.py +++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/dcra_api.py @@ -12,7 +12,7 @@ def create_dcra(cmd, cluster_region, cluster_subscription, cluster_resource_group_name, cluster_name, dcr_resource_id): from azure.cli.core.util import send_raw_request cluster_resource_id = f"/subscriptions/{cluster_subscription}/resourceGroups/{cluster_resource_group_name}/providers/Microsoft.Kubernetes/connectedClusters/{cluster_name}" - dcra_name = get_default_dcra_name(cmd, cluster_region, cluster_name) + dcra_name = get_default_dcra_name() dcra_resource_id = f"/subscriptions/{cluster_subscription}/resourceGroups/{cluster_resource_group_name}/providers/Microsoft.Insights/dataCollectionRuleAssociations/{dcra_name}" description_str = "Promtheus data collection association between DCR, DCE and target AKS resource" # only create or delete the association between the DCR and cluster diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/defaults.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/defaults.py index 9acd2ae8e23..15d09b02999 100644 --- a/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/defaults.py +++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/azuremonitormetrics/dc/defaults.py @@ -2,10 +2,7 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from ..constants import ( - DC_TYPE, - MapToClosestMACRegion -) +from ..constants import DC_TYPE from ..deaults import get_default_region @@ -25,17 +22,15 @@ def sanitize_name(name, objtype, length): return name[0:lastIndexAlphaNumeric + 1] -def get_default_dce_name(cmd, mac_region, cluster_name): - region = get_default_region(cmd) - if dict.get(MapToClosestMACRegion, mac_region): - region = MapToClosestMACRegion[mac_region] - default_dce_name = "MSProm-" + region + "-" + cluster_name +def get_default_dcr_name(mac_region, cluster_name): + default_dcr_name = "MSProm-" + mac_region + "-" + cluster_name + return sanitize_name(default_dcr_name, DC_TYPE.DCR, 64) + + +def get_default_dce_name(mac_region, cluster_name): + default_dce_name = "MSProm-" + mac_region + "-" + cluster_name return sanitize_name(default_dce_name, DC_TYPE.DCE, 44) -def get_default_dcra_name(cmd, cluster_region, cluster_name): - region = get_default_region(cmd) - if dict.get(MapToClosestMACRegion, cluster_region): - region = MapToClosestMACRegion[cluster_region] - default_dcra_name = "ContainerInsightsMetricsExtension-" + region + "-" + cluster_name - return sanitize_name(default_dcra_name, DC_TYPE.DCRA, 64) +def get_default_dcra_name(): + return "ContainerInsightsMetricsExtension-Arc"