Author SHA1 Message Date
mirsal 18852dbc2f roles: prometheus: scrape-blackbox: Monitor webmail.labolyon.fr 2026-06-12 07:42:37 +00:00
mirsal 006f174778 roles: blackbox-exporter: templates: blackbox.config.j2: switch to LF 2026-06-12 07:33:21 +00:00
mirsal 43c7959d85 Rework prometheus blackbox monitoring configuration
* Use scrape_config_files correctly
 * Do not separate prometheus and blackbox exporter nodes
 * Add a http_2xx_selfsigned module for self-signed certs
 * Monitor missing services
 * Switch from CRLF to LF in prometheus.config.j2
2026-06-12 07:27:30 +00:00
vincent daca460fdd inventory: add octoprint server 2026-06-09 15:32:40 +02:00
vincent 47b1067cb4 Ajout de sudo en passwordless 2026-06-09 10:53:43 +02:00
vincent 6615aeff55 Retrait des vieux paquets 2026-06-09 10:53:26 +02:00
vincent 46d14d6ac1 Maj de la config Prometheus 2026-06-09 10:53:17 +02:00
vincent 1d67e6a18f Suppression des fichiers var inutiles 2026-06-09 10:52:58 +02:00
vincent c1ca38a42a Refactoring de l'inventaire 2026-06-09 10:52:35 +02:00
vincent 05b5c63fe5 Merge pull request 'nsd.conf: Set up ns1.1312.zone as secondary for labolyon.fr' (#1) from dns-secondaire-mirsal into main
Reviewed-on: #1
2025-07-29 21:10:38 +02:00
13 changed files with 166 additions and 189 deletions
+18 -16
View File
@@ -2,24 +2,26 @@ all:
children: children:
debian: debian:
hosts: hosts:
reverse-proxy.labolyon.dn42:
git.labolyon.dn42:
labolyon-fr.labolyon.dn42:
matrix.labolyon.dn42:
wiki.labolyon.dn42:
blogs.labolyon.dn42:
mail.labolyon.dn42:
radius.labolyon.dn42:
ansible.labolyon.dn42: ansible.labolyon.dn42:
blogs.labolyon.dn42:
dn42-router.labolyon.dn42: dn42-router.labolyon.dn42:
lolix-rs1.labolyon.dn42:
lolix-ixpman.labolyon.dn42:
dns.labolyon.dn42: dns.labolyon.dn42:
mosquitto.labolyon.dn42: git.labolyon.dn42:
monitoring.labolyon.dn42: i2p.labolyon.dn42:
labolyon-fr.labolyon.dn42:
lolix-ixpman.labolyon.dn42:
lolix-rs1.labolyon.dn42:
lolmox.labolyon.dn42: lolmox.labolyon.dn42:
lolmox2.labolyon.dn42: lolmox2.labolyon.dn42:
i2p.labolyon.dn42: mail.labolyon.dn42:
# blackbox: matrix.labolyon.dn42:
# hosts: monitoring.labolyon.dn42:
# monitoring: mosquitto.labolyon.dn42:
octoprint.labolyon.dn42:
radius.labolyon.dn42:
reverse-proxy.labolyon.dn42:
wiki.labolyon.dn42:
zigbee2mqtt.labolyon.dn42:
monitoring:
hosts:
monitoring.labolyon.dn42:
+2 -12
View File
@@ -12,21 +12,11 @@
become: yes become: yes
roles: roles:
- prometheus - prometheus
- blackbox-exporter
vars: vars:
blackbox: false
scrape_files: scrape_files:
- /etc/prometheus/scrape-main.yml - /etc/prometheus/scrape-main.yml
- /etc/prometheus/scrape-blackbox.yml
#- name: Install and configure Prometheus node - Blackbox nodes
# hosts: blackbox
# become: yes
# roles:
# - prometheus
# - blackbox-exporter
# vars:
# blackbox: true
# scrape_files:
# - /etc/prometheus/scrape-blackbox.yml
- name: Install and configure nodes - name: Install and configure nodes
hosts: all hosts: all
@@ -1,60 +1,65 @@
{{ ansible_managed | comment }} {{ ansible_managed | comment }}
modules: modules:
http_2xx: http_2xx:
prober: http prober: http
{% if inventory_hostname == 'check.home.arpa' %} {% if inventory_hostname == 'check.home.arpa' %}
http: http:
preferred_ip_protocol: "ip4" preferred_ip_protocol: "ip4"
ip_protocol_fallback: true ip_protocol_fallback: true
{% endif %} {% endif %}
http_post_2xx: http_2xx_selfsigned:
prober: http prober: http
{% if inventory_hostname == 'check.home.arpa' %} http:
http: tls_config:
method: POST insecure_skip_verify: true
preferred_ip_protocol: "ip4" http_post_2xx:
ip_protocol_fallback: true prober: http
{% endif %} {% if inventory_hostname == 'check.home.arpa' %}
tcp_connect: http:
prober: tcp method: POST
smtp_check: preferred_ip_protocol: "ip4"
prober: tcp ip_protocol_fallback: true
timeout: 5s {% endif %}
tcp: tcp_connect:
{% if inventory_hostname == 'check.home.arpa' %} prober: tcp
preferred_ip_protocol: "ip4" smtp_check:
ip_protocol_fallback: true prober: tcp
{% endif %} timeout: 5s
query_response: tcp:
- expect: "^220(.*)ESMTP(.*)$" {% if inventory_hostname == 'check.home.arpa' %}
- send: "EHLO prober\r" preferred_ip_protocol: "ip4"
- expect: "^250-STARTTLS" ip_protocol_fallback: true
- send: "STARTTLS\r" {% endif %}
- expect: "^220" query_response:
- starttls: true - expect: "^220(.*)ESMTP(.*)$"
- send: "EHLO prober\r" - send: "EHLO prober\r"
- expect: "^250-AUTH" - expect: "^250-STARTTLS"
- send: "QUIT\r" - send: "STARTTLS\r"
imap_check: - expect: "^220"
prober: tcp - starttls: true
timeout: 5s - send: "EHLO prober\r"
tcp: - expect: "^250-AUTH"
{% if inventory_hostname == 'check.home.arpa' %} - send: "QUIT\r"
preferred_ip_protocol: "ip4" imap_check:
ip_protocol_fallback: true prober: tcp
{% endif %} timeout: 5s
query_response: tcp:
- expect: "OK.*STARTTLS" {% if inventory_hostname == 'check.home.arpa' %}
- send: ". STARTTLS" preferred_ip_protocol: "ip4"
- expect: "OK" ip_protocol_fallback: true
- starttls: true {% endif %}
- send: ". capability" query_response:
- expect: "CAPABILITY IMAP4rev1" - expect: "OK.*STARTTLS"
icmp: - send: ". STARTTLS"
prober: icmp - expect: "OK"
{% if inventory_hostname == 'check.home.arpa' %} - starttls: true
icmp: - send: ". capability"
preferred_ip_protocol: "ip4" - expect: "CAPABILITY IMAP4rev1"
ip_protocol_fallback: true icmp:
{% endif %} prober: icmp
{% if inventory_hostname == 'check.home.arpa' %}
icmp:
preferred_ip_protocol: "ip4"
ip_protocol_fallback: true
{% endif %}
@@ -1,6 +0,0 @@
---
# vars file for node-exporter role
node_service: node-exporter
node_package:
- prometheus-node-exporter
@@ -1,6 +0,0 @@
---
# vars file for node-exporter role
node_service: prometheus-node-exporter
node_package:
- golang-github-prometheus-node-exporter
@@ -1,6 +0,0 @@
---
# vars file for node-exporter role
node_service: prometheus-node_exporter
node_package:
- golang-github-prometheus-node_exporter
@@ -1,71 +1,31 @@
{{ ansible_managed | comment }} {{ ansible_managed | comment }}
# Global configuration # Global configuration
global: global:
scrape_interval: 15s # Set the scrape interval to every 15 seconds. Default is every 1 minute. scrape_interval: 15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute. evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
# scrape_timeout is set to the global default (10s). # scrape_timeout is set to the global default (10s).
# Alertmanager configuration # Alertmanager configuration
alerting: alerting:
alertmanagers: alertmanagers:
- static_configs: - static_configs:
- targets: - targets:
- localhost:9093 - localhost:9093
# Load rules once and periodically evaluate them according to the global 'evaluation_interval'. # Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
rule_files: rule_files:
- "{{ alertmanager_rules }}/prometheus.rules.yml" - "{{ alertmanager_rules }}/prometheus.rules.yml"
- "{{ alertmanager_rules }}/blackbox.rules.yml" - "{{ alertmanager_rules }}/blackbox.rules.yml"
- "{{ alertmanager_rules }}/hosts.rules.yml" - "{{ alertmanager_rules }}/hosts.rules.yml"
# A scrape configuration containing exactly one endpoint to scrape: # A scrape configuration containing exactly one endpoint to scrape:
scrape_config_files:
#scrape_config_files: {% for item in scrape_files %}
#{% for item in scrape_files %} - "{{ item }}"
# - "{{ item }}" {% endfor %}
#{% endfor %}
scrape_configs:
scrape_configs: - job_name: "prometheus"
- job_name: "prometheus" static_configs:
static_configs: - targets: ["localhost:9090"]
- targets: ["localhost:9090"]
{% if blackbox %}
- job_name: "blackbox"
metrics_path: /probe
params:
module: [http_2xx]
scrape_interval: 5s
static_configs:
- targets:
- https://labolyon.fr
- https://mail.labolyon.fr
- https://wiki.labolyon.fr
- https://git.labolyon.fr
relabel_configs:
- source_labels: [__address__]
target_label: __param_target
- source_labels: [__param_target]
target_label: target
- target_label: __address__
replacement: 127.0.0.1:9115 # The blackbox exporter's real hostname:port.
{% else %}
- job_name: "linux-nodes"
static_configs:
- targets:
- lolmox.labolyon.dn42:9100
- lolmox2.labolyon.dn42:9100
- blogs.labolyon.dn42:9100
- dn42-router.labolyon.dn42:9100
- git.labolyon.dn42:9100
- labolyon-fr.labolyon.dn42:9100
- lolix-rs1.labolyon.dn42:9100
- mail.labolyon.dn42:9100
- matrix.labolyon.dn42:9100
- monitoring.labolyon.dn42:9100
- mosquitto.labolyon.dn42:9100
- radius.labolyon.dn42:9100
- reverse-proxy.labolyon.dn42:9100
- wiki.labolyon.dn42:9100
{% endif %}
@@ -1,4 +1,8 @@
- job_name: "blackbox" # managed by ansible
scrape_configs:
- job_name: "blackbox-public-https"
metrics_path: /probe metrics_path: /probe
params: params:
module: [http_2xx] module: [http_2xx]
@@ -6,13 +10,33 @@
static_configs: static_configs:
- targets: - targets:
- https://labolyon.fr - https://labolyon.fr
- https://mail.labolyon.fr - https://webmail.labolyon.fr
- https://wiki.labolyon.fr - https://wiki.labolyon.fr
- https://git.labolyon.fr - https://git.labolyon.fr
- https://sso.labolyon.fr
- https://chat.labolyon.fr
- https://grafana.labolyon.fr
relabel_configs: relabel_configs:
- source_labels: [__address__] - source_labels: [__address__]
target_label: __param_target target_label: __param_target
- source_labels: [__param_target] - source_labels: [__param_target]
target_label: target target_label: instance
- target_label: __address__
replacement: 127.0.0.1:9115 # The blackbox exporter's real hostname:port.
- job_name: "blackbox-internal-https"
metrics_path: /probe
params:
module: [http_2xx_selfsigned]
scrape_interval: 5s
static_configs:
- targets:
- https://octoprint.labolyon.dn42/login/
- https://stickers.labolyon.dn42
relabel_configs:
- source_labels: [__address__]
target_label: __param_target
- source_labels: [__param_target]
target_label: instance
- target_label: __address__ - target_label: __address__
replacement: 127.0.0.1:9115 # The blackbox exporter's real hostname:port. replacement: 127.0.0.1:9115 # The blackbox exporter's real hostname:port.
@@ -1,13 +1,17 @@
scrape_configs:
- job_name: "linux-nodes" - job_name: "linux-nodes"
static_configs: static_configs:
- targets: - targets:
- ansible.labolyon.dn42:9100
- dn42-router.labolyon.dn42:9100
- dns.labolyon.dn42:9100
- git.labolyon.dn42:9100
- i2p.labolyon.dn42:9100
- labolyon-fr.labolyon.dn42:9100
- lolix-ixpman.labolyon.dn42:9100
- lolix-rs1.labolyon.dn42:9100
- lolmox.labolyon.dn42:9100 - lolmox.labolyon.dn42:9100
- lolmox2.labolyon.dn42:9100 - lolmox2.labolyon.dn42:9100
- blogs.labolyon.dn42:9100
- dn42-router.labolyon.dn42:9100
- git.labolyon.dn42:9100
- labolyon-fr.labolyon.dn42:9100
- lolix-rs1.labolyon.dn42:9100
- mail.labolyon.dn42:9100 - mail.labolyon.dn42:9100
- matrix.labolyon.dn42:9100 - matrix.labolyon.dn42:9100
- monitoring.labolyon.dn42:9100 - monitoring.labolyon.dn42:9100
@@ -15,3 +19,4 @@
- radius.labolyon.dn42:9100 - radius.labolyon.dn42:9100
- reverse-proxy.labolyon.dn42:9100 - reverse-proxy.labolyon.dn42:9100
- wiki.labolyon.dn42:9100 - wiki.labolyon.dn42:9100
- zigbee2mqtt.labolyon.dn42:9100
-2
View File
@@ -2,7 +2,6 @@
# vars file for tools role # vars file for tools role
common_packages: common_packages:
- htop - htop
- neofetch
- curl - curl
- bash - bash
- figlet - figlet
@@ -10,6 +9,5 @@ common_packages:
- rsync - rsync
- needrestart - needrestart
- lynis - lynis
- apt-listbugs
- dnsutils - dnsutils
- libpam-radius-auth - libpam-radius-auth
+10 -1
View File
@@ -1,5 +1,4 @@
--- ---
- name: Load variables - name: Load variables
include_vars: "{{ ansible_os_family|lower }}.yml" include_vars: "{{ ansible_os_family|lower }}.yml"
@@ -50,6 +49,16 @@
group: root group: root
mode: 0640 mode: 0640
- name: Linux | Install sudoers file for sudo group
ansible.builtin.template:
src: sudo_sudoers
dest: "/etc/sudoers.d/sudo"
backup: yes
owner: root
group: root
mode: 0640
validate: /usr/sbin/visudo -cf %s
- name: Linux | Define MOTD file - name: Linux | Define MOTD file
ansible.builtin.shell: ansible.builtin.shell:
cmd: figlet -t {{ inventory_hostname_short | quote }} > /etc/motd cmd: figlet -t {{ inventory_hostname_short | quote }} > /etc/motd
@@ -0,0 +1,2 @@
# Enable passwordless sudo for sudo members
%sudo ALL=(ALL) NOPASSWD: ALL
+1 -1
View File
@@ -1,5 +1,5 @@
--- ---
## Define custom UIDs to avoid conflicts
user_details: user_details:
- { name: vinishor, uid: 2000 } - { name: vinishor, uid: 2000 }
- { name: mirsal, uid: 2001 } - { name: mirsal, uid: 2001 }