From b6cdd8528b010f99c06d9196bf232b79bacbee4b Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Thu, 2 Sep 2021 14:17:04 +0200 Subject: [PATCH] bugfix: prometheus scrape config - skip traefik scraping when traefik_enabled is false - skip node_exporter scraping when node_exporter_enabled is false --- group_vars/maria/plain.yml | 3 +++ roles/prometheus/tasks/main.yml | 20 +++++++++++++++++++ .../config/prometheus/prometheus.yml.j2 | 14 ++++++++++++- 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/group_vars/maria/plain.yml b/group_vars/maria/plain.yml index 7f21636..cd031dd 100644 --- a/group_vars/maria/plain.yml +++ b/group_vars/maria/plain.yml @@ -6,3 +6,6 @@ hetzner_server_labels: "stage={{ stage }} service=maria" mysql_databases: [] mysql_users: [] + +traefik_enabled: false +node_exporter_enabled: false diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml index c508203..2b9f3cb 100644 --- a/roles/prometheus/tasks/main.yml +++ b/roles/prometheus/tasks/main.yml @@ -101,10 +101,30 @@ name: "iam", label_selector: "stage={{ stage }},service=iam", }, + { + name: "keycloak", + label_selector: "stage={{ stage }},service=keycloak", + }, + { + name: "kibana", + label_selector: "stage={{ stage }},service=kibana", + }, + { + name: "logstash", + label_selector: "stage={{ stage }},service=logstash", + }, + { + name: "maria", + label_selector: "stage={{ stage }},service=maria", + }, { name: "mail", label_selector: "stage={{ stage }},service=mail", }, + { + name: "postfix", + label_selector: "stage={{ stage }},service=postfix", + }, { name: "postgres", label_selector: "stage={{ stage }},service=postgres", diff --git a/templates/prometheus/config/prometheus/prometheus.yml.j2 b/templates/prometheus/config/prometheus/prometheus.yml.j2 index 3b81712..ba45f8f 100644 --- a/templates/prometheus/config/prometheus/prometheus.yml.j2 +++ b/templates/prometheus/config/prometheus/prometheus.yml.j2 @@ -49,8 +49,14 @@ scrape_configs: metrics_path: '/metrics' static_configs: - targets: [ -{% for host in server_group_names_all | difference(['dev-awx-01','dev-prometheus-01','dev-maria-01']) | default([]) %} +{% for host in server_group_names_all | default([]) %} +{% if + (hostvars[host].traefik_enabled is defined + and hostvars[host].traefik_enabled) + or (hostvars[host].traefik_enabled is not defined) +%} '{{ host }}.{{ domain }}:{{ monitor_port_service }}', +{% endif %} {% endfor %} ] labels: @@ -222,7 +228,13 @@ scrape_configs: static_configs: - targets: [ {% for host in server_group_names_all | default([]) %} +{% if + (hostvars[host].node_exporter_enabled is defined + and hostvars[host].node_exporter_enabled) + or (hostvars[host].node_exporter_enabled is not defined) +%} '{{ host }}.{{ domain }}:{{ monitor_port_system }}', +{% endif %} {% endfor %} ] labels: