From 16a8bc9af7ab7f99f58307fa0040b4689705fd59 Mon Sep 17 00:00:00 2001 From: bragi92 Date: Tue, 29 Dec 2020 11:29:36 -0800 Subject: [PATCH 1/2] {AKS} Update region mapping list for Container Insights to include latest regions --- src/aks-preview/azext_aks_preview/custom.py | 110 +++++++++++++------- 1 file changed, 70 insertions(+), 40 deletions(-) diff --git a/src/aks-preview/azext_aks_preview/custom.py b/src/aks-preview/azext_aks_preview/custom.py index 86ac71fa0bb..9ee172af5af 100644 --- a/src/aks-preview/azext_aks_preview/custom.py +++ b/src/aks-preview/azext_aks_preview/custom.py @@ -1967,62 +1967,92 @@ def _ensure_default_log_analytics_workspace_for_monitoring(cmd, subscription_id, # log analytics workspaces cannot be created in WCUS region due to capacity limits # so mapped to EUS per discussion with log analytics team AzureCloudLocationToOmsRegionCodeMap = { - "australiasoutheast": "ASE", + "southcentralus": "SCUS", + "uksouth": "SUK", + "southeastasia": "SEA", + "westeurope": "WEU", + "eastus": "EUS", "australiaeast": "EAU", - "australiacentral": "CAU", - "canadacentral": "CCA", - "centralindia": "CIN", + "eastus2": "EUS2", + "northeurope": "NEU", + "japaneast": "EJP", + "brazilsouth": "CQ", "centralus": "CUS", + "norwayeast": "NOE", + "chinaeast2": "CNE2", "eastasia": "EA", - "eastus": "EUS", - "eastus2": "EUS2", - "eastus2euap": "EAP", + "switzerlandnorth": "CHN", + "southafricanorth": "JNB", "francecentral": "PAR", - "japaneast": "EJP", + "northcentralus": "NCUS", + "westus": "WUS", + "westus2": "WUS2", + "centralindia": "CIN", "koreacentral": "SE", - "northeurope": "NEU", - "southcentralus": "SCUS", - "southeastasia": "SEA", - "uksouth": "SUK", + "uaenorth": "DXB", + "germanywestcentral": "DEWC", "usgovvirginia": "USGV", + "canadacentral": "CAC", + "usgovarizona": "PHX", + "ukwest": "WUK", + "australiasoutheast": "SEAU", "westcentralus": "EUS", - "westeurope": "WEU", - "westus": "WUS", - "westus2": "WUS2" + "switzerlandwest": "CHW", + "australiacentral": "CAU", + "uaecentral": "AUH", + "eastus2euap": "EASTUS2EUAP", + "brazilsoutheast": "BRSE" } AzureCloudRegionToOmsRegionMap = { - "australiacentral": "australiacentral", - "australiacentral2": "australiacentral", + "southcentralus": "southcentralus", + "uksouth": "uksouth", + "southeastasia": "southeastasia", + "westeurope": "westeurope", + "eastus": "eastus", "australiaeast": "australiaeast", - "australiasoutheast": "australiasoutheast", - "brazilsouth": "southcentralus", - "canadacentral": "canadacentral", - "canadaeast": "canadacentral", + "eastus2": "eastus2", + "northeurope": "northeurope", + "japaneast": "japaneast", + "brazilsouth": "brazilsouth", "centralus": "centralus", - "centralindia": "centralindia", + "norwayeast": "norwayeast", + "chinaeast2": "chinaeast2", "eastasia": "eastasia", - "eastus": "eastus", - "eastus2": "eastus2", + "switzerlandnorth": "switzerlandnorth", + "southafricanorth": "southafricanorth", "francecentral": "francecentral", - "francesouth": "francecentral", - "japaneast": "japaneast", - "japanwest": "japaneast", + "northcentralus": "northcentralus", + "westus": "westus", + "westus2": "westus2", + "centralindia": "centralindia", "koreacentral": "koreacentral", - "koreasouth": "koreacentral", - "northcentralus": "eastus", - "northeurope": "northeurope", - "southafricanorth": "westeurope", - "southafricawest": "westeurope", - "southcentralus": "southcentralus", - "southeastasia": "southeastasia", - "southindia": "centralindia", - "uksouth": "uksouth", - "ukwest": "uksouth", + "uaenorth": "uaenorth", + "germanywestcentral": "germanywestcentral", + "usgovvirginia": "usgovvirginia", + "canadacentral": "canadacentral", + "usgovarizona": "usgovarizona", + "ukwest": "ukwest", + "australiasoutheast": "australiasoutheast", "westcentralus": "eastus", - "westeurope": "westeurope", + "switzerlandwest": "switzerlandwest", + "australiacentral": "australiacentral", + "uaecentral": "uaecentral", + "eastus2euap": "eastus2euap", + "brazilsoutheast": "brazilsoutheast", + "southafricawest": "southafricanorth", "westindia": "centralindia", - "westus": "westus", - "westus2": "westus2" + "chinaeast": "chinaeast2", + "chinanorth": "chinaeast2", + "australiacentral2": "australiacentral", + "norwaywest": "norwayeast", + "germanynorth": "germanywestcentral", + "southindia": "centralindia", + "koreasouth": "koreacentral", + "chinanorth2": "chinaeast2", + "francesouth": "francecentral", + "canadaeast": "canadacentral", + "usgovtexas": "usgovvirginia", + "japanwest": "japaneast" } # mapping for azure china cloud From 51e1ba18e0e175654193b298c97fcf1241d5280e Mon Sep 17 00:00:00 2001 From: bragi92 Date: Fri, 15 Jan 2021 12:19:02 -0800 Subject: [PATCH 2/2] update with final list --- src/aks-preview/azext_aks_preview/custom.py | 120 ++++++++++---------- 1 file changed, 57 insertions(+), 63 deletions(-) diff --git a/src/aks-preview/azext_aks_preview/custom.py b/src/aks-preview/azext_aks_preview/custom.py index 9ee172af5af..f36739abb4f 100644 --- a/src/aks-preview/azext_aks_preview/custom.py +++ b/src/aks-preview/azext_aks_preview/custom.py @@ -1967,92 +1967,83 @@ def _ensure_default_log_analytics_workspace_for_monitoring(cmd, subscription_id, # log analytics workspaces cannot be created in WCUS region due to capacity limits # so mapped to EUS per discussion with log analytics team AzureCloudLocationToOmsRegionCodeMap = { - "southcentralus": "SCUS", - "uksouth": "SUK", - "southeastasia": "SEA", - "westeurope": "WEU", - "eastus": "EUS", + "australiasoutheast": "ASE", "australiaeast": "EAU", + "australiacentral": "CAU", + "canadacentral": "CCA", + "centralindia": "CIN", + "centralus": "CUS", + "eastasia": "EA", + "eastus": "EUS", "eastus2": "EUS2", - "northeurope": "NEU", + "eastus2euap": "EAP", + "francecentral": "PAR", "japaneast": "EJP", + "koreacentral": "SE", + "northeurope": "NEU", + "southcentralus": "SCUS", + "southeastasia": "SEA", + "uksouth": "SUK", + "usgovvirginia": "USGV", + "westcentralus": "EUS", + "westeurope": "WEU", + "westus": "WUS", + "westus2": "WUS2", "brazilsouth": "CQ", - "centralus": "CUS", + "brazilsoutheast": "BRSE", "norwayeast": "NOE", - "chinaeast2": "CNE2", - "eastasia": "EA", - "switzerlandnorth": "CHN", "southafricanorth": "JNB", - "francecentral": "PAR", "northcentralus": "NCUS", - "westus": "WUS", - "westus2": "WUS2", - "centralindia": "CIN", - "koreacentral": "SE", "uaenorth": "DXB", "germanywestcentral": "DEWC", - "usgovvirginia": "USGV", - "canadacentral": "CAC", - "usgovarizona": "PHX", "ukwest": "WUK", - "australiasoutheast": "SEAU", - "westcentralus": "EUS", + "switzerlandnorth": "CHN", "switzerlandwest": "CHW", - "australiacentral": "CAU", - "uaecentral": "AUH", - "eastus2euap": "EASTUS2EUAP", - "brazilsoutheast": "BRSE" + "uaecentral": "AUH" } AzureCloudRegionToOmsRegionMap = { - "southcentralus": "southcentralus", - "uksouth": "uksouth", - "southeastasia": "southeastasia", - "westeurope": "westeurope", - "eastus": "eastus", + "australiacentral": "australiacentral", + "australiacentral2": "australiacentral", "australiaeast": "australiaeast", - "eastus2": "eastus2", - "northeurope": "northeurope", - "japaneast": "japaneast", + "australiasoutheast": "australiasoutheast", "brazilsouth": "brazilsouth", + "canadacentral": "canadacentral", + "canadaeast": "canadacentral", "centralus": "centralus", - "norwayeast": "norwayeast", - "chinaeast2": "chinaeast2", + "centralindia": "centralindia", "eastasia": "eastasia", - "switzerlandnorth": "switzerlandnorth", - "southafricanorth": "southafricanorth", + "eastus": "eastus", + "eastus2": "eastus2", "francecentral": "francecentral", + "francesouth": "francecentral", + "japaneast": "japaneast", + "japanwest": "japaneast", + "koreacentral": "koreacentral", + "koreasouth": "koreacentral", "northcentralus": "northcentralus", + "northeurope": "northeurope", + "southafricanorth": "southafricanorth", + "southafricawest": "southafricanorth", + "southcentralus": "southcentralus", + "southeastasia": "southeastasia", + "southindia": "centralindia", + "uksouth": "uksouth", + "ukwest": "ukwest", + "westcentralus": "eastus", + "westeurope": "westeurope", + "westindia": "centralindia", "westus": "westus", "westus2": "westus2", - "centralindia": "centralindia", - "koreacentral": "koreacentral", + "norwayeast": "norwayeast", + "norwaywest": "norwayeast", + "switzerlandnorth": "switzerlandnorth", + "switzerlandwest": "switzerlandwest", "uaenorth": "uaenorth", "germanywestcentral": "germanywestcentral", - "usgovvirginia": "usgovvirginia", - "canadacentral": "canadacentral", - "usgovarizona": "usgovarizona", - "ukwest": "ukwest", - "australiasoutheast": "australiasoutheast", - "westcentralus": "eastus", - "switzerlandwest": "switzerlandwest", - "australiacentral": "australiacentral", + "germanynorth": "germanywestcentral", "uaecentral": "uaecentral", "eastus2euap": "eastus2euap", - "brazilsoutheast": "brazilsoutheast", - "southafricawest": "southafricanorth", - "westindia": "centralindia", - "chinaeast": "chinaeast2", - "chinanorth": "chinaeast2", - "australiacentral2": "australiacentral", - "norwaywest": "norwayeast", - "germanynorth": "germanywestcentral", - "southindia": "centralindia", - "koreasouth": "koreacentral", - "chinanorth2": "chinaeast2", - "francesouth": "francecentral", - "canadaeast": "canadacentral", - "usgovtexas": "usgovvirginia", - "japanwest": "japaneast" + "brazilsoutheast": "brazilsoutheast" } # mapping for azure china cloud @@ -2072,10 +2063,13 @@ def _ensure_default_log_analytics_workspace_for_monitoring(cmd, subscription_id, # mapping for azure us governmner cloud AzureFairfaxLocationToOmsRegionCodeMap = { - "usgovvirginia": "USGV" + "usgovvirginia": "USGV", + "usgovarizona": "PHX" } AzureFairfaxRegionToOmsRegionMap = { - "usgovvirginia": "usgovvirginia" + "usgovvirginia": "usgovvirginia", + "usgovtexas": "usgovvirginia", + "usgovarizona": "usgovarizona" } rg_location = _get_rg_location(cmd.cli_ctx, resource_group_name)