ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prometheus: enforce osd nodes in templates 

When osd nodes are collocated in the clients group (HCI context for
instance), the current logic will exclude osd nodes since they are
present in the client group.

The best fix would be to exclude clients node only when they are not
member of another group but for now, as a workaround, we can enforce
the addition of osd nodes to fix this specific case.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1947695

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 664dae0564)
pull/6559/head
Guillaume Abrioux 2021-05-25 09:26:28 +02:00
parent 01256ffe1b
commit e0bcd59c04
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ceph-prometheus/templates/prometheus.yml.j2
View File

@ -19,7 +19,7 @@ scrape_configs:
{% endfor %} {% endfor %}
- job_name: 'node' - job_name: 'node'
static_configs: static_configs:
{% for host in (groups['all'] | difference(groups[monitoring_group_name] | union(groups.get(client_group_name, [])))) %} {% for host in (groups['all'] | difference(groups[monitoring_group_name] | union(groups.get(client_group_name, []))) | union(groups.get(osd_group_name, []))) %}
- targets: ['{{ host }}:{{ node_exporter_port }}'] - targets: ['{{ host }}:{{ node_exporter_port }}']
labels: labels:
instance: "{{ hostvars[host]['ansible_facts']['nodename'] }}" instance: "{{ hostvars[host]['ansible_facts']['nodename'] }}"