From 17c1bb0ffbcd642da3a539b7d2d445c45a647694 Mon Sep 17 00:00:00 2001
From: psy <psy@darmstadt.ccc.de>
Date: Thu, 29 Dec 2022 12:31:23 +0100
Subject: [PATCH 1/4] add postfix bounces.log

---
 templates/grafana-promtail.yml.j2 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/templates/grafana-promtail.yml.j2 b/templates/grafana-promtail.yml.j2
index 674c89a..1c78ef3 100644
--- a/templates/grafana-promtail.yml.j2
+++ b/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

From 17f40221b6390bd62ec7c5038d36647ccec6aa2b Mon Sep 17 00:00:00 2001
From: nd <git@notandy.de>
Date: Mon, 26 Feb 2024 22:25:30 +0100
Subject: [PATCH 2/4] add basic auth support

---
 templates/node-scraper.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/node-scraper.j2 b/templates/node-scraper.j2
index 23fb3de..299b985 100644
--- a/templates/node-scraper.j2
+++ b/templates/node-scraper.j2
@@ -58,8 +58,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({}) %}

From 4ffb1d7f2ed1e06a6182dafde949acb47c5669b2 Mon Sep 17 00:00:00 2001
From: Julian Rother <julian@cccv.de>
Date: Thu, 18 Apr 2024 01:42:58 +0200
Subject: [PATCH 3/4] Add AptUpgradesPending alert

---
 defaults/main.yml | 13 +++++++++++++
 tasks/main.yml    |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index c3aba96..5b3a482 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -260,3 +260,16 @@ prometheus_agent:
       annotations:
         title: '{%raw%}{{ $labels.instance }}: Uptime{%endraw%}'
         description: "Uptime is more than 30 days, please reboot soon"
+    AptUpgradesPending:
+      group: nodeexporter
+      enabled: True
+      alert: UpgradesPending
+      expr: |
+        sum(apt_upgrades_pending{job="node", instance="{{ inventory_hostname }}"}) > 0 or
+        sum(apt_upgrades_held{job="node", instance="{{ inventory_hostname }}"}) > 0
+      for: 25h
+      labels:
+        severity: warning
+      annotations:
+        title: '{%raw%}{{ $labels.instance }}: AptUpgradesPending{%endraw%}'
+        description: "Upgrades pending for more than 24 hours"
diff --git a/tasks/main.yml b/tasks/main.yml
index 700470d..5edcbd3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,6 +1,8 @@
 - name: install node-exporter
   apt:
-    pkg: prometheus-node-exporter
+    pkg:
+    - prometheus-node-exporter
+    - prometheus-node-exporter-collectors
 
 - name: copy node-exporter config
   notify: restart node-exporter

From a137da884a06d9c42abe1dffe0c8dbdaaf8e23aa Mon Sep 17 00:00:00 2001
From: Julian Rother <julian@cccv.de>
Date: Thu, 25 Apr 2024 14:34:42 +0200
Subject: [PATCH 4/4] Fix instance label of AptUpgradesPending alert

---
 defaults/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/main.yml b/defaults/main.yml
index 5b3a482..3a5fe17 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -270,6 +270,7 @@ prometheus_agent:
       for: 25h
       labels:
         severity: warning
+        instance: "{{ inventory_hostname }}"
       annotations:
         title: '{%raw%}{{ $labels.instance }}: AptUpgradesPending{%endraw%}'
         description: "Upgrades pending for more than 24 hours"