From b4b057d480254bdb0c046b57a0d517b3dfb86569 Mon Sep 17 00:00:00 2001 From: Denis Patrakeev Date: Tue, 4 Mar 2025 18:27:25 +0300 Subject: [PATCH] [hotfix] fix use env prometheus (!93) Co-authored-by: denis.patrakeev Reviewed-on: https://git.avroid.tech/K8s/k8s-configs/pulls/93 --- .../prometheus/values-override.yaml | 143 +++++++++--------- 1 file changed, 69 insertions(+), 74 deletions(-) diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/prometheus/values-override.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/prometheus/values-override.yaml index 2408521..8b781d7 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/prometheus/values-override.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/prometheus/values-override.yaml @@ -165,80 +165,75 @@ serverFiles: static_configs: - targets: - localhost:9090 - -# adds additional scrape configs to prometheus.yml -# must be a string so you have to add a | after extraScrapeConfigs: -# example adds prometheus-blackbox-exporter scrape config -extraScrapeConfigs: | - - job_name: 'postgres_exporter' - consul_sd_configs: - - server: consul.avroid.tech - scheme: https - datacenter: "avroid-office" - tags: [ k8s_postgres_exporter ] - services: [ monitoring_k8s_postgres_exporter ] - authorization: - credentials: "${CONSUL_SECRET}" - relabel_configs: - - source_labels: [ __meta_consul_service_metadata_metrics_path ] - target_label: __metrics_path__ - - source_labels: [ __meta_consul_service_metadata_job_name ] - target_label: job - - source_labels: [ __meta_consul_service_metadata_auth_module ] - target_label: __param_auth_module - - source_labels: [ __meta_consul_service_metadata_ssl_mode ] - target_label: __param_sslmode - - source_labels: [ __address__,__meta_consul_service_metadata_db_name ] - separator: "/" - target_label: __param_target - - source_labels: [ __meta_consul_node ] - target_label: instance - regex: "([^:]+).*" - replacement: '${1}' - - target_label: __address__ - replacement: cloud-postgres-exporter-prometheus-postgres-exporter:9187 - - job_name: 'redis_exporter' - consul_sd_configs: - - server: consul.avroid.tech - scheme: https - datacenter: "avroid-office" - tags: [ k8s_redis_exporter ] - services: [ monitoring_k8s_redis_exporter ] - authorization: - credentials: "${CONSUL_SECRET}" - relabel_configs: - - source_labels: [ __meta_consul_service_metadata_metrics_path ] - target_label: __metrics_path__ - - source_labels: [ __meta_consul_service_metadata_job_name ] - target_label: job - - source_labels: [ __address__ ] - target_label: __param_target - - source_labels: [ __meta_consul_node ] - target_label: instance - regex: "([^:]+).*" - replacement: '${1}' - - target_label: __address__ - replacement: cloud-redis-exporter-prometheus-redis-exporter:9121 - - job_name: 'patroni_exporter' - consul_sd_configs: - - server: consul.avroid.tech - scheme: https - datacenter: "avroid-office" - tags: [ k8s_patroni_exporter ] - services: [ monitoring_k8s_patroni_exporter ] - authorization: - credentials: "${CONSUL_SECRET}" - relabel_configs: - - source_labels: [ __meta_consul_service_metadata_metrics_path ] - target_label: __metrics_path__ - - source_labels: [ __meta_consul_service_metadata_job_name ] - target_label: job - - source_labels: [ __address__ ] - target_label: __param_target - - source_labels: [ __meta_consul_node ] - target_label: instance - regex: "([^:]+).*" - replacement: '${1}' + - job_name: postgres_exporter + consul_sd_configs: + - server: consul.avroid.tech + scheme: https + datacenter: "avroid-office" + tags: [ k8s_postgres_exporter ] + services: [ monitoring_k8s_postgres_exporter ] + authorization: + credentials: ${CONSUL_SECRET} + relabel_configs: + - source_labels: [ __meta_consul_service_metadata_metrics_path ] + target_label: __metrics_path__ + - source_labels: [ __meta_consul_service_metadata_job_name ] + target_label: job + - source_labels: [ __meta_consul_service_metadata_auth_module ] + target_label: __param_auth_module + - source_labels: [ __meta_consul_service_metadata_ssl_mode ] + target_label: __param_sslmode + - source_labels: [ __address__,__meta_consul_service_metadata_db_name ] + separator: "/" + target_label: __param_target + - source_labels: [ __meta_consul_node ] + target_label: instance + regex: "([^:]+).*" + replacement: '${1}' + - target_label: __address__ + replacement: cloud-postgres-exporter-prometheus-postgres-exporter:9187 + - job_name: redis_exporter + consul_sd_configs: + - server: consul.avroid.tech + scheme: https + datacenter: "avroid-office" + tags: [ k8s_redis_exporter ] + services: [ monitoring_k8s_redis_exporter ] + authorization: + credentials: ${CONSUL_SECRET} + relabel_configs: + - source_labels: [ __meta_consul_service_metadata_metrics_path ] + target_label: __metrics_path__ + - source_labels: [ __meta_consul_service_metadata_job_name ] + target_label: job + - source_labels: [ __address__ ] + target_label: __param_target + - source_labels: [ __meta_consul_node ] + target_label: instance + regex: "([^:]+).*" + replacement: '${1}' + - target_label: __address__ + replacement: cloud-redis-exporter-prometheus-redis-exporter:9121 + - job_name: patroni_exporter + consul_sd_configs: + - server: consul.avroid.tech + scheme: https + datacenter: "avroid-office" + tags: [ k8s_patroni_exporter ] + services: [ monitoring_k8s_patroni_exporter ] + authorization: + credentials: ${CONSUL_SECRET} + relabel_configs: + - source_labels: [ __meta_consul_service_metadata_metrics_path ] + target_label: __metrics_path__ + - source_labels: [ __meta_consul_service_metadata_job_name ] + target_label: job + - source_labels: [ __address__ ] + target_label: __param_target + - source_labels: [ __meta_consul_node ] + target_label: instance + regex: "([^:]+).*" + replacement: '${1}' # Configuration of subcharts defined in Chart.yaml