Merge branch 'master' of https://git.cccv.de/infra/ansible/roles/prometheus-agent

templates/grafana-promtail.yml.j2

@@ -35,3 +35,10 @@ scrape_configs:
     labels:
       job: nginx
       __path__: /var/log/nginx/access-promtail.log
+- job_name: postfix-bounces
+  static_configs:
+  - targets:
+      - localhost
+    labels:
+      job: postfix-bounces
+      __path__: /var/log/mailman3/bounce.log

templates/node-scraper.j2

@@ -93,8 +93,8 @@
 {% 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', '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]) }}
+{% for i in ['scrape_timeout', 'scrape_interval', 'metrics_path', 'basic_auth'] if (i in prometheus_agent and prometheus_agent[i]) or (i in prometheus_agent.agents.proxy.mappings[j]) %}
+  {{ i }}: {{ prometheus_agent.agents.proxy.mappings[j].get(i, prometheus_agent[i])|to_json }}
 {% endfor %}
   params:
 {% for i in prometheus_agent.agents.proxy.mappings[j].params|d({}) %}