From 486979ca9c9aba38a22cc065f160894706cad0e5 Mon Sep 17 00:00:00 2001 From: Amol Agrawal Date: Thu, 11 Aug 2022 13:15:09 -0700 Subject: [PATCH] add omsagent rename changes (#143) * add omsagent rename changes * fix flake8 errors Co-authored-by: Bavneet Singh <33008256+bavneetsingh16@users.noreply.github.com> --- .../partner_extensions/ContainerInsights.py | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/ContainerInsights.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/ContainerInsights.py index fe6d7d48867..d2e5ba2491c 100644 --- a/src/k8s-extension/azext_k8s_extension/partner_extensions/ContainerInsights.py +++ b/src/k8s-extension/azext_k8s_extension/partner_extensions/ContainerInsights.py @@ -87,10 +87,15 @@ def Delete(self, cmd, client, resource_group_name, cluster_name, name, cluster_t cluster_resource_id = '/subscriptions/{0}/resourceGroups/{1}/providers/{2}/{3}/{4}'.format(subscription_id, resource_group_name, cluster_rp, cluster_type, cluster_name) if (extension is not None) and (extension.configuration_settings is not None): configSettings = extension.configuration_settings + # omsagent is being renamed to ama-logs. Check for both for compatibility if 'omsagent.useAADAuth' in configSettings: useAADAuthSetting = configSettings['omsagent.useAADAuth'] if (isinstance(useAADAuthSetting, str) and str(useAADAuthSetting).lower() == "true") or (isinstance(useAADAuthSetting, bool) and useAADAuthSetting): useAADAuth = True + elif 'amalogs.useAADAuth' in configSettings: + useAADAuthSetting = configSettings['amalogs.useAADAuth'] + if (isinstance(useAADAuthSetting, str) and str(useAADAuthSetting).lower() == "true") or (isinstance(useAADAuthSetting, bool) and useAADAuthSetting): + useAADAuth = True if useAADAuth: association_url = cmd.cli_ctx.cloud.endpoints.resource_manager + f"{cluster_resource_id}/providers/Microsoft.Insights/dataCollectionRuleAssociations/ContainerInsightsExtension?api-version=2021-04-01" for _ in range(3): @@ -453,11 +458,17 @@ def _get_container_insights_settings(cmd, cluster_resource_group_name, cluster_r if 'logAnalyticsWorkspaceResourceID' in configuration_settings: workspace_resource_id = configuration_settings['logAnalyticsWorkspaceResourceID'] + # omsagent is being renamed to ama-logs. Check for both for compatibility if 'omsagent.useAADAuth' in configuration_settings: useAADAuthSetting = configuration_settings['omsagent.useAADAuth'] logger.info("provided useAADAuth flag is : %s", useAADAuthSetting) if (isinstance(useAADAuthSetting, str) and str(useAADAuthSetting).lower() == "true") or (isinstance(useAADAuthSetting, bool) and useAADAuthSetting): useAADAuth = True + elif 'amalogs.useAADAuth' in configuration_settings: + useAADAuthSetting = configuration_settings['amalogs.useAADAuth'] + logger.info("provided useAADAuth flag is : %s", useAADAuthSetting) + if (isinstance(useAADAuthSetting, str) and str(useAADAuthSetting).lower() == "true") or (isinstance(useAADAuthSetting, bool) and useAADAuthSetting): + useAADAuth = True workspace_resource_id = workspace_resource_id.strip() @@ -473,7 +484,9 @@ def _get_container_insights_settings(cmd, cluster_resource_group_name, cluster_r 'proxyEndpoint url should in this format http(s)://:@:' ) logger.info("successfully validated proxyEndpoint url hence passing proxy endpoint to extension") + # omsagent is being renamed to ama-logs. Set for both for compatibility configuration_protected_settings['omsagent.proxy'] = configuration_protected_settings['proxyEndpoint'] + configuration_protected_settings['amalogs.proxy'] = configuration_protected_settings['proxyEndpoint'] if not workspace_resource_id: workspace_resource_id = _ensure_default_log_analytics_workspace_for_monitoring( @@ -509,20 +522,28 @@ def _get_container_insights_settings(cmd, cluster_resource_group_name, cluster_r if not shared_keys: raise InvalidArgumentValueError('Failed to retrieve shared key for workspace {}'.format( log_analytics_workspace)) + # omsagent is being renamed to ama-logs. Set for both for compatibility configuration_protected_settings['omsagent.secret.key'] = shared_keys.primary_shared_key + configuration_protected_settings['amalogs.secret.key'] = shared_keys.primary_shared_key + # omsagent is being renamed to ama-logs. Set for both for compatibility configuration_protected_settings['omsagent.secret.wsid'] = log_analytics_workspace.customer_id + configuration_protected_settings['amalogs.secret.wsid'] = log_analytics_workspace.customer_id configuration_settings['logAnalyticsWorkspaceResourceID'] = workspace_resource_id # set the domain for the ci agent for non azure public clouds cloud_name = cmd.cli_ctx.cloud.name if cloud_name.lower() == 'azurechinacloud': configuration_settings['omsagent.domain'] = 'opinsights.azure.cn' + configuration_settings['amalogs.domain'] = 'opinsights.azure.cn' elif cloud_name.lower() == 'azureusgovernment': configuration_settings['omsagent.domain'] = 'opinsights.azure.us' + configuration_settings['amalogs.domain'] = 'opinsights.azure.us' elif cloud_name.lower() == 'usnat': configuration_settings['omsagent.domain'] = 'opinsights.azure.eaglex.ic.gov' + configuration_settings['amalogs.domain'] = 'opinsights.azure.eaglex.ic.gov' elif cloud_name.lower() == 'ussec': configuration_settings['omsagent.domain'] = 'opinsights.azure.microsoft.scloud' + configuration_settings['amalogs.domain'] = 'opinsights.azure.microsoft.scloud' def get_existing_container_insights_extension_dcr_tags(cmd, dcr_url):