Merge branch 'mail-certificate-check' into 'master'

Setup monitoring of SMTP, SMTP Submission(s), IMAPS and POP3S

See merge request !206

roles/prometheus/defaults/main.yml

@@ -4,37 +4,46 @@ prometheus_mysqld_exporter_port: '9104'
 
 # for d in $(curl -sf "https://crt.sh/?q=archlinux.org&output=json" "https://crt.sh/?q=pkgbuild.com&output=json" | jq -r ".[].name_value" | sort -u); do if curl -o /dev/null -sS "https://$d"; then echo $d; fi; done | grep -v "\@" | sort | sed "s/^/  - https:\/\//"
 blackbox_targets:
-  - https://accounts.archlinux.org
-  - https://america.archive.pkgbuild.com
-  - https://archive.archlinux.org
-  - https://archlinux.org
-  - https://asia.archive.pkgbuild.com
-  - https://aur.archlinux.org
-  - https://aur-dev.archlinux.org
-  - https://bbs.archlinux.org
-  - https://bugs.archlinux.org
-  - https://conf.archlinux.org
-  - https://dev.archlinux.org
-  - https://europe.archive.pkgbuild.com
-  - https://git.archlinux.org
-  - https://gitlab.archlinux.org
-  - https://ipxe.archlinux.org
-  - https://lists.archlinux.org
-  - https://mailman.archlinux.org
-  - https://man.archlinux.org
-  - https://master-key.archlinux.org
-  - https://matrix.archlinux.org
-  - https://mirror.pkgbuild.com
-  - https://monitoring.archlinux.org
-  - https://packages.archlinux.org
-  - https://patchwork.archlinux.org
-  - https://pkgbuild.com
-  - https://planet.archlinux.org
-  - https://projects.archlinux.org
-  - https://reproducible.archlinux.org
-  - https://security.archlinux.org
-  - https://sources.archlinux.org
-  - https://whatcanwedofor.archlinux.org
-  - https://wiki.archlinux.org
-  - https://www.archlinux.org
-  - https://www.pkgbuild.com
+  http_prometheus:
+    - https://accounts.archlinux.org
+    - https://america.archive.pkgbuild.com
+    - https://archive.archlinux.org
+    - https://archlinux.org
+    - https://asia.archive.pkgbuild.com
+    - https://aur.archlinux.org
+    - https://aur-dev.archlinux.org
+    - https://bbs.archlinux.org
+    - https://bugs.archlinux.org
+    - https://conf.archlinux.org
+    - https://dev.archlinux.org
+    - https://europe.archive.pkgbuild.com
+    - https://git.archlinux.org
+    - https://gitlab.archlinux.org
+    - https://ipxe.archlinux.org
+    - https://lists.archlinux.org
+    - https://mailman.archlinux.org
+    - https://man.archlinux.org
+    - https://master-key.archlinux.org
+    - https://matrix.archlinux.org
+    - https://mirror.pkgbuild.com
+    - https://monitoring.archlinux.org
+    - https://packages.archlinux.org
+    - https://patchwork.archlinux.org
+    - https://pkgbuild.com
+    - https://planet.archlinux.org
+    - https://projects.archlinux.org
+    - https://reproducible.archlinux.org
+    - https://security.archlinux.org
+    - https://sources.archlinux.org
+    - https://whatcanwedofor.archlinux.org
+    - https://wiki.archlinux.org
+    - https://www.archlinux.org
+    - https://www.pkgbuild.com
+  tls_connect:
+    - mail.archlinux.org:465
+    - mail.archlinux.org:993
+    - mail.archlinux.org:995
+  smtp_starttls:
+    - luna.archlinux.org:25
+    - mail.archlinux.org:25
+    - mail.archlinux.org:587

roles/prometheus/templates/prometheus.yml.j2

@@ -75,14 +75,15 @@ scrape_configs:
 
     {% endfor %}
 
-  - job_name: 'blackbox'
+{% for module in blackbox_targets.keys() %}
+  - job_name: 'blackbox_{{ module }}'
     metrics_path: /probe
     scrape_interval: 15s
     params:
-      module: [http_prometheus]
+      module: [{{ module }}]
     static_configs:
     - targets:
-    {% for target in blackbox_targets %}
+    {% for target in blackbox_targets[module] %}
       - {{ target }}
     {% endfor %}
 
@@ -93,3 +94,4 @@ scrape_configs:
         target_label: instance
       - target_label: __address__
         replacement: 127.0.0.1:9115
+{% endfor %}

roles/prometheus_exporters/files/blackbox.yml

@@ -3,3 +3,22 @@ modules:
     prober: http
     timeout: 5s
     http:
+  tls_connect:
+    prober: tcp
+    timeout: 5s
+    tcp:
+      tls: true
+  smtp_starttls:
+    prober: tcp
+    timeout: 5s
+    tcp:
+      query_response:
+        - expect: "^220 ([^ ]+) ESMTP (.+)$"
+        - send: "EHLO prober\r"
+        - expect: "^250-STARTTLS"
+        - send: "STARTTLS\r"
+        - expect: "^220"
+        - starttls: true
+        - send: "EHLO prober\r"
+        - expect: "^250"
+        - send: "QUIT\r"