From c769595755eea9f0c79f2f04d5b16bf7c449fa5c Mon Sep 17 00:00:00 2001 From: nd Date: Sat, 25 Sep 2021 23:54:33 +0200 Subject: [PATCH] add support for params and different metrics paths for proxied exporter --- defaults/main.yml | 1 + templates/node-scraper.j2 | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 6ed466f..cb94126 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -242,6 +242,7 @@ prometheus_agent: jobs: {} scrape_timeout: ~ scrape_interval: ~ + metrics_path: ~ scrapers: {} ansible_groups_as_labels: True labels: {} diff --git a/templates/node-scraper.j2 b/templates/node-scraper.j2 index a85c439..23fb3de 100644 --- a/templates/node-scraper.j2 +++ b/templates/node-scraper.j2 @@ -58,8 +58,12 @@ {% for j in prometheus_agent.scrapers[item].proxy|d({}) %} - job_name: "prometheus-agent - proxy - {{ j }} : {{ inventory_hostname }}" scheme: https -{% for i in ['scrape_timeout', 'scrape_interval'] if prometheus_agent[i] or i in prometheus_agent.agents.proxy.mappings[j] %} +{% for i in ['scrape_timeout', 'scrape_interval', 'metrics_path'] if prometheus_agent[i] or i in prometheus_agent.agents.proxy.mappings[j] %} {{ i }}: {{ prometheus_agent.agents.proxy.mappings[j].get(i, prometheus_agent[i]) }} +{% endfor %} + params: +{% for i in prometheus_agent.agents.proxy.mappings[j].params|d({}) %} + {{ i|to_json }}: {{ prometheus_agent.agents.proxy.mappings[j].params[i]|to_json }} {% endfor %} static_configs: - targets: