From a2927e0cdd76f10f3b6e067b8de387f358016cc9 Mon Sep 17 00:00:00 2001 From: Redouane Kachach Date: Mon, 27 Mar 2023 12:56:58 +0200 Subject: [PATCH] mgr/cephadm: fixing ceph-exporter prometheus's job section Fixes: https://tracker.ceph.com/issues/59170 Signed-off-by: Redouane Kachach --- .../templates/services/prometheus/prometheus.yml.j2 | 12 ++++++++++++ src/pybind/mgr/cephadm/tests/test_services.py | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2 b/src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2 index acbda6b991166..b56843994555e 100644 --- a/src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2 +++ b/src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2 @@ -89,9 +89,21 @@ scrape_configs: {% if ceph_exporter_sd_url %} - job_name: 'ceph-exporter' +{% if secure_monitoring_stack %} honor_labels: true + scheme: https + tls_config: + ca_file: root_cert.pem http_sd_configs: - url: {{ ceph_exporter_sd_url }} + basic_auth: + username: {{ service_discovery_username }} + password: {{ service_discovery_password }} tls_config: ca_file: root_cert.pem +{% else %} + honor_labels: true + http_sd_configs: + - url: {{ ceph_exporter_sd_url }} +{% endif %} {% endif %} diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py index 8e37836c77b0b..514646005992f 100644 --- a/src/pybind/mgr/cephadm/tests/test_services.py +++ b/src/pybind/mgr/cephadm/tests/test_services.py @@ -528,8 +528,6 @@ class TestMonitoring: honor_labels: true http_sd_configs: - url: http://[::1]:8765/sd/prometheus/sd-config?service=ceph-exporter - tls_config: - ca_file: root_cert.pem """).lstrip() _run_cephadm.assert_called_with( @@ -650,8 +648,14 @@ class TestMonitoring: - job_name: 'ceph-exporter' honor_labels: true + scheme: https + tls_config: + ca_file: root_cert.pem http_sd_configs: - url: https://[::1]:8765/sd/prometheus/sd-config?service=ceph-exporter + basic_auth: + username: admin + password: fake_password tls_config: ca_file: root_cert.pem """).lstrip() -- 2.39.5