From 246842b66ef60f0db08786b404f59694b41f805f Mon Sep 17 00:00:00 2001 From: nd Date: Sat, 23 May 2020 23:08:06 +0200 Subject: [PATCH] added support to overwrite scrap intervall --- defaults/main.yml | 2 ++ templates/node-exporter.j2 | 2 +- templates/node-scraper.j2 | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 1ddc36b..f14cec0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -8,3 +8,5 @@ prometheus_agent: scrapers: {} ansible_groups_as_labels: False labels: {} + scrape_timeout: ~ + scrape_interval: ~ diff --git a/templates/node-exporter.j2 b/templates/node-exporter.j2 index 1e50db8..48acf3c 100644 --- a/templates/node-exporter.j2 +++ b/templates/node-exporter.j2 @@ -2,7 +2,7 @@ # Due to shell scaping, to pass backslashes for regexes, you need to double # them (\\d for \d). If running under systemd, you need to double them again # (\\\\d to mean \d), and escape newlines too. -ARGS="{% for i in prometheus_agent.args %} --{{ i }}{% if prometheus_agent.args[i] and prometheus_agent.args[i] != {} %}='{{ prometheus_agent.args[i] }}'{% endif %} {% endfor %}" +ARGS="{% for i in prometheus_agent.args %} --{{ i }}{% if prometheus_agent.args[i] and prometheus_agent.args[i] != {} %}={{ prometheus_agent.args[i] }}{% endif %} {% endfor %}" #{{ prometheus_agent.args.keys()|list|join(' ') }}" diff --git a/templates/node-scraper.j2 b/templates/node-scraper.j2 index ffc15aa..6a093ae 100644 --- a/templates/node-scraper.j2 +++ b/templates/node-scraper.j2 @@ -1,5 +1,8 @@ - job_name: prometheus-agent {{ inventory_hostname }} scheme: https +{% for i in ['scrape_timeout', 'scrape_interval'] if prometheus_agent[i] %} + {{ i }}: {{ prometheus_agent[i] }} +{% endfor %} static_configs: - targets: - {{ inventory_hostname }}:{{ prometheus_agent.scrapers[item] }}