Merge "prometheus: Fix etcd scrape when etcd uses TLS"

2023-11-02 09:19:57 +00:00 · 2023-11-02 09:19:57 +00:00 · 255ce5c11e
commit 255ce5c11e
parent 6eea013ea3 05df4e7209
2 changed files with 9 additions and 0 deletions
--- a/ansible/roles/prometheus/templates/prometheus.yml.j2
+++ b/ansible/roles/prometheus/templates/prometheus.yml.j2
@ -203,6 +203,9 @@ scrape_configs:

 {% if enable_prometheus_etcd_integration | bool %}
  - job_name: etcd
+{% if etcd_enable_tls | bool %}
+    scheme: https
+{% endif %}
    static_configs:
 {% for host in groups["etcd"] %}
      - targets:
--- a/releasenotes/notes/prometheus-etcd-tls-313e7cf454f6763a.yaml
+++ b/releasenotes/notes/prometheus-etcd-tls-313e7cf454f6763a.yaml
@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue where Prometheus scraping of Etcd metrics would fail if Etcd
+    TLS is enabled. `LP#2036950
+    <https://bugs.launchpad.net/kolla-ansible/+bug/2036950>`__