some config changes

Azure · Feb 21, 2025 · a916835 · a916835
1 parent e44b30f
commit a916835
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 16 deletions.
diff --git a/otelcollector/configmaps/ama-metrics-settings-configmap-v2.yaml b/otelcollector/configmaps/ama-metrics-settings-configmap-v2.yaml
@@ -8,7 +8,7 @@ data:
     #string.used by customer to keep track of this config file's version in their source control/repository (max allowed 10 chars, other chars will be truncated)
     ver1
   dataplane-metrics: |-
-    default-scrape-settings-enabled: |-
+    default-targets-scrape-enabled: |-
       kubelet = true
       coredns = false
       cadvisor = true
@@ -63,10 +63,8 @@ data:
       acstor-metrics-exporter = "30s"
       prometheuscollectorhealth = "30s"
       podannotations = "30s"
-    debug-mode: |-
-      enabled = false 
   controlplane-metrics: |-
-    default-scrape-settings-enabled: |-
+    default-targets-scrape-enabled: |-
       apiserver = true
       cluster-autoscaler = false
       kube-scheduler = false
@@ -83,6 +81,7 @@ data:
   shared: |-
     prometheus-collector-settings: |-
       cluster_alias = ""
+      debug-mode = "true"
 metadata:
   name: ama-metrics-settings-configmap
   namespace: kube-system
diff --git a/otelcollector/shared/configmap/ccp/tomlparser-ccp-default-scrape-settings.go b/otelcollector/shared/configmap/ccp/tomlparser-ccp-default-scrape-settings.go
@@ -48,7 +48,7 @@ func (fcl *FilesystemConfigLoader) ParseConfigMapForDefaultScrapeSettings(metric
 	} else if schemaVersion == "v2" {
 		fmt.Println("ParseConfigMapForDefaultScrapeSettings::Processing v2 schema")
 		// For v2, control plane jobs are under "controlplane-metrics" without "controlplane-" prefix
-		if settings, ok := metricsConfigBySection["default-scrape-settings-enabled"]; ok {
+		if settings, ok := metricsConfigBySection["default-targets-scrape-enabled"]; ok {
 			fmt.Println("ParseConfigMapForDefaultScrapeSettings::Found default scrape settings section")
 			// Map v2 keys to v1 keys
 			v2ToV1KeyMap := map[string]string{
@@ -201,8 +201,14 @@ func (c *Configurator) ConfigureDefaultScrapeSettings(metricsConfigBySection map
 func tomlparserCCPDefaultScrapeSettings(metricsConfigBySection map[string]map[string]string) {
 	fmt.Println("tomlparserCCPDefaultScrapeSettings::Start ccp-default-scrape-settings Processing")
 
+	configSchemaVersion := os.Getenv("AZMON_AGENT_CFG_SCHEMA_VERSION")
+	configLoaderPath := "/etc/config/settings/default-targets-scrape-enabled"
+	if configSchemaVersion != "" && strings.TrimSpace(configSchemaVersion) == "v2" {
+		configLoaderPath = "/etc/config/settings/default-targets-scrape-enabled"
+	}
+
 	configurator := &Configurator{
-		ConfigLoader:   &FilesystemConfigLoader{ConfigMapMountPath: "/etc/config/settings/default-scrape-settings-enabled"},
+		ConfigLoader:   &FilesystemConfigLoader{ConfigMapMountPath: configLoaderPath},
 		ConfigWriter:   &FileConfigWriter{},
 		ConfigFilePath: "/opt/microsoft/configmapparser/config_default_scrape_settings_env_var",
 		ConfigParser:   &ConfigProcessor{},

diff --git a/otelcollector/shared/configmap/mp/configmapparser.go b/otelcollector/shared/configmap/mp/configmapparser.go
@@ -144,7 +144,7 @@ func Configmapparser() {
 	var metricsConfigBySection map[string]map[string]string
 	var err error
 	if os.Getenv("AZMON_AGENT_CFG_SCHEMA_VERSION") == "v2" {
-		filePaths := []string{"/etc/config/settings/dataplane-metrics", "/etc/config/settings/shared"}
+		filePaths := []string{"/etc/config/settings/cluster-metrics", "/etc/config/settings/shared"}
 		metricsConfigBySection, err = shared.ParseMetricsFiles(filePaths)
 		if err != nil {
 			fmt.Printf("Using defaults as error parsing files: %v\n", err)

diff --git a/otelcollector/shared/configmap/mp/definitions.go b/otelcollector/shared/configmap/mp/definitions.go
@@ -7,6 +7,7 @@ var (
 	replicaSetCollectorConfig                    = "/opt/microsoft/otelcollector/collector-config-replicaset.yml"
 	debugModeEnvVarPath                          = "/opt/microsoft/configmapparser/config_debug_mode_env_var"
 	defaultSettingsMountPath                     = "/etc/config/settings/default-scrape-settings-enabled"
+	defaultSettingsMountPathv2                   = "/etc/config/settings/default-targets-scrape-enabled"
 	defaultSettingsEnvVarPath                    = "/opt/microsoft/configmapparser/config_default_scrape_settings_env_var"
 	configMapMountPathForPodAnnotation           = "/etc/config/settings/pod-annotation-based-scraping"
 	podAnnotationEnvVarPath                      = "/opt/microsoft/configmapparser/config_def_pod_annotation_based_scraping"

diff --git a/otelcollector/shared/configmap/mp/tomlparser-debug-mode.go b/otelcollector/shared/configmap/mp/tomlparser-debug-mode.go
@@ -84,19 +84,15 @@ func ConfigureDebugModeSettings(metricsConfigBySection map[string]map[string]str
 }
 
 func populateSettingValuesFromConfigMap(metricsConfigBySection map[string]map[string]string) bool {
-		fmt.Println("Parsed config map is empty. Using default debug mode value: false")
-		return false
-	}
-
-	debugSettings, ok := metricsConfigBySection["debug-mode"]
+	debugSettings, ok := metricsConfigBySection["prometheus-collector-settings"]
 	if !ok {
-		fmt.Println("The 'debug-mode' section is not present in the parsed data. Using default value: false")
+		fmt.Println("The 'prometheus-collector-settings' section is not present in the parsed data. Using default value: false")
 		return false
 	}
 
-	val, ok := debugSettings["enabled"]
+	val, ok := debugSettings["debug-mode"]
 	if !ok {
-		fmt.Println("The 'enabled' key is missing in the 'debug-mode-config' section. Using default value: false")
+		fmt.Println("The 'debug-mode' section is not present in the parsed data. Using default value: false")
 		return false
 	}
 

diff --git a/otelcollector/shared/configmap/mp/tomlparser-default-scrape-settings.go b/otelcollector/shared/configmap/mp/tomlparser-default-scrape-settings.go
@@ -237,8 +237,15 @@ func (c *Configurator) ConfigureDefaultScrapeSettings(metricsConfigBySection map
 }
 
 func tomlparserDefaultScrapeSettings(metricsConfigBySection map[string]map[string]string) {
+
+	configSchemaVersion := os.Getenv("AZMON_AGENT_CFG_SCHEMA_VERSION")
+	configLoaderPath := defaultSettingsMountPath
+	if configSchemaVersion != "" && strings.TrimSpace(configSchemaVersion) == "v2" {
+		configLoaderPath = defaultSettingsMountPathv2
+	}
+
 	configurator := &Configurator{
-		ConfigLoader:   &FilesystemConfigLoader{ConfigMapMountPath: defaultSettingsMountPath},
+		ConfigLoader:   &FilesystemConfigLoader{ConfigMapMountPath: configLoaderPath},
 		ConfigWriter:   &FileConfigWriter{},
 		ConfigFilePath: defaultSettingsEnvVarPath,
 		ConfigParser:   &ConfigProcessor{},