From 139868350545fa00c83c8cbb4b074a258632cc15 Mon Sep 17 00:00:00 2001 From: Teoman ONAY Date: Wed, 2 Oct 2024 16:36:31 +0200 Subject: [PATCH 1/2] cephadm-adopt: custom prometheus port lost after adoption If a custom Prometheus port was used before adoption, it was not taken into account and default 9095 was set instead. Now custom port is re-applied. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2242346 Signed-off-by: Teoman ONAY (cherry picked from commit b41b7bf869982a82d9ddddcef714a672c530b6f7) --- infrastructure-playbooks/cephadm-adopt.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index 8fb2beba70..2ecf68dbdf 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -1500,7 +1500,18 @@ CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}' - name: Update the placement of prometheus hosts - ansible.builtin.command: "{{ cephadm_cmd }} shell -k /etc/ceph/{{ cluster }}.client.admin.keyring --fsid {{ fsid }} -- ceph orch apply prometheus --placement='{{ groups.get(monitoring_group_name, []) | length }} label:{{ monitoring_group_name }}'" + ceph_orch_apply: + fsid: "{{ fsid }}" + spec: | + service_name: prometheus + service_id: "{{ ansible_facts['hostname'] }}" + placement: + label: {{ monitoring_group_name }} + count: {{ groups.get(monitoring_group_name, []) | length }} + {% if prometheus_port is defined and prometheus_port != 9095 %} + spec: + port: {{ prometheus_port }} + {% endif %} changed_when: false environment: CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}' From dcbf616f466d7e3bb2f73b39c2f071564175ebd3 Mon Sep 17 00:00:00 2001 From: Teoman ONAY Date: Wed, 2 Oct 2024 16:43:39 +0200 Subject: [PATCH 2/2] cephadm-adopt: Alertmanager placement count missing Regression from #7576. Alertmanager placement count was missing after migration to ceph_orch_apply module Signed-off-by: Teoman ONAY (cherry picked from commit 31be49506118ece75371d0c86af794caee8bc051) --- infrastructure-playbooks/cephadm-adopt.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index 2ecf68dbdf..ebdd310e22 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -1475,7 +1475,7 @@ CEPHADM_IMAGE: '{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}' - name: With dashboard enabled - when: dashboard_enabled | bool + when: dashboard_enabled | bool and groups.get(monitoring_group_name, []) | length > 0 block: - name: Update the placement of alertmanager hosts ceph_orch_apply: @@ -1485,6 +1485,7 @@ service_id: "{{ ansible_facts['hostname'] }}" placement: label: "{{ monitoring_group_name }}" + count: "{{ groups.get(monitoring_group_name, []) | length }}" {% if grafana_server_addr is defined %} networks: - {{ grafana_server_addr }}