From: Paul Cuzner Date: Wed, 2 Jun 2021 23:34:19 +0000 (+1200) Subject: mgr/cephadm:fix alerts sent to wrong URL X-Git-Tag: v15.2.14~36^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F41660%2Fhead;p=ceph.git mgr/cephadm:fix alerts sent to wrong URL The path_prefix in prometheus.yml was specifying an endpoint prefix, which was invalid. This resulted in 404 errors when trying to send alerts to alertmanager and blocked alerts being sent on to the ceph-dashboard API receiver. This fix remves this prefix. Fixes: https://tracker.ceph.com/issues/51073 Signed-off-by: Paul Cuzner (cherry picked from commit 9d408a70c7d01fd7c94f9b814af916396d7cbf1f) --- 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 26af6db012d..b9834ee7819 100644 --- a/src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2 +++ b/src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2 @@ -8,7 +8,6 @@ rule_files: alerting: alertmanagers: - scheme: http - path_prefix: /alertmanager static_configs: - targets: [{{ alertmgr_targets|join(', ') }}] {% endif %}