diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 3196f5f5..eac6348e 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,10 +1,11 @@ # Azure Monitor Metrics for AKS clusters -## Release 12-04-2024 (hot-fix for ccp config map issue ) - CCP release only - +## Release 12-05-2024 (hot-fix for ccp config map issue ) - CCP release only - * CCP image - * Changelog - - Fix for CCP Config map processing issue - (https://github.com/Azure/prometheus-collector/pull/1017) + - Fix a bug where by with miminal ingestion profile is false, keep list wasn't effective - (https://github.com/Azure/prometheus-collector/pull/1024) ## Release 10-21-2024 * Linux image - `mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:6.11.0-main-10-21-2024-91ec49e3` diff --git a/otelcollector/VERSION b/otelcollector/VERSION index d4e6cb42..5917993c 100644 --- a/otelcollector/VERSION +++ b/otelcollector/VERSION @@ -1 +1 @@ -6.12.0 +6.13.0 diff --git a/otelcollector/shared/configmap/ccp/tomlparser-ccp-default-targets-metrics-keep-list.go b/otelcollector/shared/configmap/ccp/tomlparser-ccp-default-targets-metrics-keep-list.go index 481f186e..30a8bef4 100644 --- a/otelcollector/shared/configmap/ccp/tomlparser-ccp-default-targets-metrics-keep-list.go +++ b/otelcollector/shared/configmap/ccp/tomlparser-ccp-default-targets-metrics-keep-list.go @@ -111,24 +111,34 @@ func populateSettingValuesFromConfigMap(parsedConfig map[string]interface{}) (Re } func populateRegexValuesWithMinimalIngestionProfile(regexValues RegexValues) { - if regexValues.MinimalIngestionProfile == "true" { + + fmt.Println("populateRegexValuesWithMinimalIngestionProfile::minimalIngestionProfile:", regexValues.MinimalIngestionProfile) + + if regexValues.MinimalIngestionProfile == "false" { + + controlplaneKubeControllerManagerRegex += regexValues.ControlplaneKubeControllerManager + controlplaneKubeSchedulerRegex += regexValues.ControlplaneKubeScheduler + controlplaneApiserverRegex += regexValues.ControlplaneApiserver + controlplaneClusterAutoscalerRegex += regexValues.ControlplaneClusterAutoscaler + controlplaneEtcdRegex += regexValues.ControlplaneEtcd + + // Print the updated regex strings after appending values + + fmt.Println("populateRegexValuesWithMinimalIngestionProfile::Regex Strings for CCP tergets: collecting ONLY below metrics for targets") + fmt.Println("ControlplaneKubeControllerManagerRegex:", controlplaneKubeControllerManagerRegex) + fmt.Println("ControlplaneKubeSchedulerRegex:", controlplaneKubeSchedulerRegex) + fmt.Println("ControlplaneApiserverRegex:", controlplaneApiserverRegex) + fmt.Println("ControlplaneClusterAutoscalerRegex:", controlplaneClusterAutoscalerRegex) + fmt.Println("ControlplaneEtcdRegex:", controlplaneEtcdRegex) + + } else { //else accounts for "true" and any other values including "nil" (meaning no configmap or no minimal setting in the configmap) + controlplaneKubeControllerManagerRegex += regexValues.ControlplaneKubeControllerManager + "|" + controlplaneKubeControllerManagerMinMac controlplaneKubeSchedulerRegex += regexValues.ControlplaneKubeScheduler + "|" + controlplaneKubeSchedulerMinMac controlplaneApiserverRegex += regexValues.ControlplaneApiserver + "|" + controlplaneApiserverMinMac controlplaneClusterAutoscalerRegex += regexValues.ControlplaneClusterAutoscaler + "|" + controlplaneClusterAutoscalerMinMac controlplaneEtcdRegex += regexValues.ControlplaneEtcd + "|" + controlplaneEtcdMinMac - - // Print the updated regex strings after appending values - // Only log this in debug mode - // fmt.Println("Updated Regex Strings After Appending:") - // fmt.Println("ControlplaneKubeControllerManagerRegex:", controlplaneKubeControllerManagerRegex) - // fmt.Println("ControlplaneKubeSchedulerRegex:", controlplaneKubeSchedulerRegex) - // fmt.Println("ControlplaneApiserverRegex:", controlplaneApiserverRegex) - // fmt.Println("ControlplaneClusterAutoscalerRegex:", controlplaneClusterAutoscalerRegex) - // fmt.Println("ControlplaneEtcdRegex:", controlplaneEtcdRegex) - - } else { - fmt.Println("populateRegexValuesWithMinimalIngestionProfile::minimalIngestionProfile:", regexValues.MinimalIngestionProfile) + } }