From c009ac013ba7ed1559bdc92aee685378f571d8b0 Mon Sep 17 00:00:00 2001 From: nd Date: Fri, 22 May 2020 18:54:04 +0200 Subject: [PATCH] cleaned up scraper config --- tasks/main.yml | 2 +- templates/node-scraper.j2 | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index eec3d69..1c01612 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -70,4 +70,4 @@ delegate_to: "{{ item }}" template: src: node-scraper.j2 - dest: /etc/prometheus/conf.d/scrape_configs/{{ inventory_hostname }}.conf + dest: /etc/prometheus/conf.d/scrape_configs/agent_{{ inventory_hostname }}.conf diff --git a/templates/node-scraper.j2 b/templates/node-scraper.j2 index c799ed2..ffc15aa 100644 --- a/templates/node-scraper.j2 +++ b/templates/node-scraper.j2 @@ -1,16 +1,16 @@ -- job_name: prometheus-agent {{ inventory_hostname }} - scheme: https - static_configs: - - targets: - - {{ inventory_hostname }}:{{ prometheus_agent.scrapers[item] }} - labels: {{ merged_prometheus_labels|to_json }} - tls_config: - ca_file: /etc/prometheus/targetcerts/{{ inventory_hostname }}.crt - cert_file: /etc/ssl/prometheus_scraper.crt - key_file: /etc/ssl/private/prometheus_scraper.key - relabel_configs: - - source_labels: [__address__] - regex: '([^:]+):\d+' - target_label: instance - - replacement: 'prometheus-agent' - target_label: job +- job_name: prometheus-agent {{ inventory_hostname }} + scheme: https + static_configs: + - targets: + - {{ inventory_hostname }}:{{ prometheus_agent.scrapers[item] }} + labels: {{ merged_prometheus_labels|to_json }} + tls_config: + ca_file: /etc/prometheus/targetcerts/{{ inventory_hostname }}.crt + cert_file: /etc/ssl/prometheus_scraper.crt + key_file: /etc/ssl/private/prometheus_scraper.key + relabel_configs: + - source_labels: [__address__] + regex: '([^:]+):\d+' + target_label: instance + - replacement: 'prometheus-agent' + target_label: job