diff --git a/src/azure-cli-core/azure/cli/core/cloud.py b/src/azure-cli-core/azure/cli/core/cloud.py index 8181a66aaea..b03c6f96544 100644 --- a/src/azure-cli-core/azure/cli/core/cloud.py +++ b/src/azure-cli-core/azure/cli/core/cloud.py @@ -66,7 +66,9 @@ def __init__(self, active_directory_data_lake_resource_id=None, vm_image_alias_doc=None, media_resource_id=None, - ossrdbms_resource_id=None): + ossrdbms_resource_id=None, + log_analytics_resource_id=None, + app_insights_resource_id=None): # Attribute names are significant. They are used when storing/retrieving clouds from config self.management = management self.resource_manager = resource_manager @@ -81,6 +83,8 @@ def __init__(self, self.vm_image_alias_doc = vm_image_alias_doc self.media_resource_id = media_resource_id self.ossrdbms_resource_id = ossrdbms_resource_id + self.log_analytics_resource_id = log_analytics_resource_id + self.app_insights_resource_id = app_insights_resource_id def has_endpoint_set(self, endpoint_name): try: @@ -172,7 +176,9 @@ def _arm_to_cli_mapper(arm_dict): vm_image_alias_doc=arm_dict['vmImageAliasDoc'], # pylint: disable=line-too-long media_resource_id=arm_dict['media'], ossrdbms_resource_id=_get_ossrdbms_resource_id(arm_dict['name']), # pylint: disable=line-too-long # change once ossrdbms_resource_id is available via ARM - active_directory_data_lake_resource_id=arm_dict['activeDirectoryDataLake'] if 'activeDirectoryDataLake' in arm_dict else None), # pylint: disable=line-too-long + active_directory_data_lake_resource_id=arm_dict['activeDirectoryDataLake'] if 'activeDirectoryDataLake' in arm_dict else None, # pylint: disable=line-too-long + app_insights_resource_id=arm_dict['appInsightsResourceId'] if 'appInsightsResourceId' in arm_dict else None, + log_analytics_resource_id=arm_dict['logAnalyticsResourceId'] if 'logAnalyticsResourceId' in arm_dict else None), # pylint: disable=line-too-long suffixes=CloudSuffixes( storage_endpoint=arm_dict['suffixes']['storage'], keyvault_dns=arm_dict['suffixes']['keyVaultDns'], @@ -223,7 +229,9 @@ def __str__(self): active_directory_data_lake_resource_id='https://datalake.azure.net/', vm_image_alias_doc='https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-compute/quickstart-templates/aliases.json', # pylint: disable=line-too-long media_resource_id='https://rest.media.azure.net', - ossrdbms_resource_id='https://ossrdbms-aad.database.windows.net'), + ossrdbms_resource_id='https://ossrdbms-aad.database.windows.net', + app_insights_resource_id='https://api.applicationinsights.io', + log_analytics_resource_id='https://api.loganalytics.io'), suffixes=CloudSuffixes( storage_endpoint='core.windows.net', keyvault_dns='.vault.azure.net', @@ -246,7 +254,9 @@ def __str__(self): microsoft_graph_resource_id='https://microsoftgraph.chinacloudapi.cn', vm_image_alias_doc='https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-compute/quickstart-templates/aliases.json', # pylint: disable=line-too-long media_resource_id='https://rest.media.chinacloudapi.cn', - ossrdbms_resource_id='https://ossrdbms-aad.database.chinacloudapi.cn'), + ossrdbms_resource_id='https://ossrdbms-aad.database.chinacloudapi.cn', + app_insights_resource_id='https://api.applicationinsights.azure.cn', + log_analytics_resource_id='https://api.loganalytics.azure.cn'), suffixes=CloudSuffixes( storage_endpoint='core.chinacloudapi.cn', keyvault_dns='.vault.azure.cn', @@ -267,7 +277,9 @@ def __str__(self): microsoft_graph_resource_id='https://graph.microsoft.us/', vm_image_alias_doc='https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-compute/quickstart-templates/aliases.json', # pylint: disable=line-too-long media_resource_id='https://rest.media.usgovcloudapi.net', - ossrdbms_resource_id='https://ossrdbms-aad.database.usgovcloudapi.net'), + ossrdbms_resource_id='https://ossrdbms-aad.database.usgovcloudapi.net', + app_insights_resource_id='https://api.applicationinsights.us', + log_analytics_resource_id='https://api.loganalytics.us'), suffixes=CloudSuffixes( storage_endpoint='core.usgovcloudapi.net', keyvault_dns='.vault.usgovcloudapi.net',