From 001ec2c5e837cdf8b121a2ce2866bc47d9c2ac99 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Wed, 18 Oct 2023 20:30:08 +0000 Subject: [PATCH] casing --- otelcollector/configmapparser/prometheus-config-merger.rb | 2 +- .../configmapparser/tomlparser-default-scrape-settings.rb | 2 +- otelcollector/telegraf/telegraf-prometheus-collector.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/otelcollector/configmapparser/prometheus-config-merger.rb b/otelcollector/configmapparser/prometheus-config-merger.rb index 4feadf0fc..f724e989a 100644 --- a/otelcollector/configmapparser/prometheus-config-merger.rb +++ b/otelcollector/configmapparser/prometheus-config-merger.rb @@ -315,7 +315,7 @@ def populateDefaultPrometheusConfig end end - if !ENV["AZMON_PROMETHEUS_retinaBASIC_SCRAPING_ENABLED"].nil? && ENV["AZMON_PROMETHEUS_retinaBASIC_SCRAPING_ENABLED"].downcase == "true" + if !ENV["AZMON_PROMETHEUS_RETINABASIC_SCRAPING_ENABLED"].nil? && ENV["AZMON_PROMETHEUS_RETINABASIC_SCRAPING_ENABLED"].downcase == "true" retinabasicMetricsKeepListRegex = @regexHash["retinaBASIC_METRICS_KEEP_LIST_REGEX"] retinabasicScrapeInterval = @intervalHash["retinaBASIC_SCRAPE_INTERVAL"] if currentControllerType == @replicasetControllerType diff --git a/otelcollector/configmapparser/tomlparser-default-scrape-settings.rb b/otelcollector/configmapparser/tomlparser-default-scrape-settings.rb index 0d5470d19..3723a660a 100644 --- a/otelcollector/configmapparser/tomlparser-default-scrape-settings.rb +++ b/otelcollector/configmapparser/tomlparser-default-scrape-settings.rb @@ -167,7 +167,7 @@ def populateSettingValuesFromConfigMap(parsedConfig) file.write($export + "AZMON_PROMETHEUS_COLLECTOR_HEALTH_SCRAPING_ENABLED=#{@prometheusCollectorHealthEnabled}\n") file.write($export + "AZMON_PROMETHEUS_WINDOWSEXPORTER_SCRAPING_ENABLED=#{@windowsexporterEnabled}\n") file.write($export + "AZMON_PROMETHEUS_WINDOWSKUBEPROXY_SCRAPING_ENABLED=#{@windowskubeproxyEnabled}\n") - file.write($export + "AZMON_PROMETHEUS_retinaBASIC_SCRAPING_ENABLED=#{@retinabasicEnabled}\n") + file.write($export + "AZMON_PROMETHEUS_RETINABASIC_SCRAPING_ENABLED=#{@retinabasicEnabled}\n") file.write($export + "AZMON_PROMETHEUS_POD_ANNOTATION_SCRAPING_ENABLED=#{@podannotationEnabled}\n") # Close file after writing all metric collection setting environment variables file.close diff --git a/otelcollector/telegraf/telegraf-prometheus-collector.conf b/otelcollector/telegraf/telegraf-prometheus-collector.conf index aa56193a1..21b4095a1 100644 --- a/otelcollector/telegraf/telegraf-prometheus-collector.conf +++ b/otelcollector/telegraf/telegraf-prometheus-collector.conf @@ -170,7 +170,7 @@ defaultscrapewindowskubeproxy = "$AZMON_PROMETHEUS_WINDOWSKUBEPROXY_SCRAPING_ENABLED" defaultscrapepodannotations = "$AZMON_PROMETHEUS_POD_ANNOTATION_SCRAPING_ENABLED" podannotationns = "$AZMON_PROMETHEUS_POD_ANNOTATION_NAMESPACES_REGEX" - defaultscraperetinabasic = "$AZMON_PROMETHEUS_retinaBASIC_SCRAPING_ENABLED" + defaultscraperetinabasic = "$AZMON_PROMETHEUS_RETINABASIC_SCRAPING_ENABLED" nodeexportertargetport= "$NODE_EXPORTER_TARGETPORT" nodeexportername = "$NODE_EXPORTER_NAME" kubestatename = "$KUBE_STATE_NAME"