From 35eb93814e11ef429572eb94f48acbb476f3839e Mon Sep 17 00:00:00 2001 From: shlokshah-dev Date: Tue, 1 Oct 2024 13:19:12 -0400 Subject: [PATCH] modify config merger with acstor targets --- .../configmap/mp/prometheus-config-merger.go | 48 +++++++++++++++++++ .../mp/tomlparser-default-scrape-settings.go | 4 +- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/otelcollector/shared/configmap/mp/prometheus-config-merger.go b/otelcollector/shared/configmap/mp/prometheus-config-merger.go index 42431438..43034c9e 100644 --- a/otelcollector/shared/configmap/mp/prometheus-config-merger.go +++ b/otelcollector/shared/configmap/mp/prometheus-config-merger.go @@ -662,6 +662,30 @@ func populateDefaultPrometheusConfig() { } } + if enabled, exists := os.LookupEnv("AZMON_PROMETHEUS_ACSTORCAPACITYPROVISIONER_SCRAPING_ENABLED"); exists && strings.ToLower(enabled) == "true" && currentControllerType == replicasetControllerType { + acstorCapacityProvisionerKeepListRegex, exists := regexHash["ACSTORCAPACITYPROVISONER_KEEP_LIST_REGEX"] + acstorCapacityProvisionerScrapeInterval, intervalExists := intervalHash["ACSTORCAPACITYPROVISIONER_SCRAPE_INTERVAL"] + if intervalExists { + UpdateScrapeIntervalConfig(acstorCapacityProvisionerDefaultFile, acstorCapacityProvisionerScrapeInterval) + } + if exists && acstorCapacityProvisionerKeepListRegex != "" { + AppendMetricRelabelConfig(acstorCapacityProvisionerDefaultFile, acstorCapacityProvisionerKeepListRegex) + } + defaultConfigs = append(defaultConfigs, acstorCapacityProvisionerDefaultFile) + } + + if enabled, exists := os.LookupEnv("AZMON_PROMETHEUS_ACSTORMETRICSEXPORTER_SCRAPING_ENABLED"); exists && strings.ToLower(enabled) == "true" && currentControllerType == replicasetControllerType { + acstorMetricsExporterKeepListRegex, exists := regexHash["ACSTORMETRICSEXPORTER_KEEP_LIST_REGEX"] + acstorMetricsExporterScrapeInterval, intervalExists := intervalHash["ACSTORMETRICSEXPORTER_SCRAPE_INTERVAL"] + if intervalExists { + UpdateScrapeIntervalConfig(acstorMetricsExporterDefaultFile, acstorMetricsExporterScrapeInterval) + } + if exists && acstorMetricsExporterKeepListRegex != "" { + AppendMetricRelabelConfig(acstorMetricsExporterDefaultFile, acstorMetricsExporterKeepListRegex) + } + defaultConfigs = append(defaultConfigs, acstorMetricsExporterDefaultFile) + } + mergedDefaultConfigs = mergeDefaultScrapeConfigs(defaultConfigs) // if mergedDefaultConfigs != nil { // fmt.Printf("Merged default scrape targets: %v\n", mergedDefaultConfigs) @@ -1099,6 +1123,30 @@ func populateDefaultPrometheusConfigWithOperator() { } } + if enabled, exists := os.LookupEnv("AZMON_PROMETHEUS_ACSTORCAPACITYPROVISIONER_SCRAPING_ENABLED"); exists && strings.ToLower(enabled) == "true" && currentControllerType == replicasetControllerType { + acstorCapacityProvisionerKeepListRegex, exists := regexHash["ACSTORCAPACITYPROVISONER_KEEP_LIST_REGEX"] + acstorCapacityProvisionerScrapeInterval, intervalExists := intervalHash["ACSTORCAPACITYPROVISIONER_SCRAPE_INTERVAL"] + if intervalExists { + UpdateScrapeIntervalConfig(acstorCapacityProvisionerDefaultFile, acstorCapacityProvisionerScrapeInterval) + } + if exists && acstorCapacityProvisionerKeepListRegex != "" { + AppendMetricRelabelConfig(acstorCapacityProvisionerDefaultFile, acstorCapacityProvisionerKeepListRegex) + } + defaultConfigs = append(defaultConfigs, acstorCapacityProvisionerDefaultFile) + } + + if enabled, exists := os.LookupEnv("AZMON_PROMETHEUS_ACSTORMETRICSEXPORTER_SCRAPING_ENABLED"); exists && strings.ToLower(enabled) == "true" && currentControllerType == replicasetControllerType { + acstorMetricsExporterKeepListRegex, exists := regexHash["ACSTORMETRICSEXPORTER_KEEP_LIST_REGEX"] + acstorMetricsExporterScrapeInterval, intervalExists := intervalHash["ACSTORMETRICSEXPORTER_SCRAPE_INTERVAL"] + if intervalExists { + UpdateScrapeIntervalConfig(acstorMetricsExporterDefaultFile, acstorMetricsExporterScrapeInterval) + } + if exists && acstorMetricsExporterKeepListRegex != "" { + AppendMetricRelabelConfig(acstorMetricsExporterDefaultFile, acstorMetricsExporterKeepListRegex) + } + defaultConfigs = append(defaultConfigs, acstorMetricsExporterDefaultFile) + } + mergedDefaultConfigs = mergeDefaultScrapeConfigs(defaultConfigs) // if mergedDefaultConfigs != nil { // fmt.Printf("Merged default scrape targets: %v\n", mergedDefaultConfigs) diff --git a/otelcollector/shared/configmap/mp/tomlparser-default-scrape-settings.go b/otelcollector/shared/configmap/mp/tomlparser-default-scrape-settings.go index 532f2302..febf02bd 100644 --- a/otelcollector/shared/configmap/mp/tomlparser-default-scrape-settings.go +++ b/otelcollector/shared/configmap/mp/tomlparser-default-scrape-settings.go @@ -25,8 +25,8 @@ func (fcl *FilesystemConfigLoader) SetDefaultScrapeSettings() (map[string]string config["networkobservabilityHubble"] = "true" config["networkobservabilityCilium"] = "true" config["noDefaultsEnabled"] = "false" - config["acstor-capacity-provisioner"] = "false" - config["acstor-metrics-exporter"] = "false" + config["acstor-capacity-provisioner"] = "true" + config["acstor-metrics-exporter"] = "true" return config, nil }