roles: grafana: Add grafana configuration

ansible/inventory

@@ -22,6 +22,6 @@ all:
         reverse-proxy.labolyon.dn42:
         wiki.labolyon.dn42:
         zigbee2mqtt.labolyon.dn42:
-    monitoring:
-      hosts:
-        monitoring.labolyon.dn42:
+#    blackbox:
+#      hosts:
+#        monitoring:

ansible/playbooks/monitoring.yml

@@ -12,11 +12,21 @@
   become: yes
   roles:
     - prometheus
-    - blackbox-exporter
   vars:
+    blackbox: false
     scrape_files:
       - /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
   hosts: all

ansible/roles/blackbox-exporter/templates/blackbox.config.j2

@@ -8,11 +8,6 @@ modules:
       preferred_ip_protocol: "ip4"
       ip_protocol_fallback: true
 {% endif %}
-  http_2xx_selfsigned:
-    prober: http
-    http:
-      tls_config:
-        insecure_skip_verify: true
   http_post_2xx:
     prober: http
 {% if inventory_hostname == 'check.home.arpa' %}

ansible/roles/grafana/handlers/main.yml

@@ -0,0 +1,5 @@
+## Restart grafana on changes
+- name: restart grafana
+  ansible.builtin.service:
+    name: 'grafana-server'
+    state: restarted

ansible/roles/grafana/tasks/main.yml

@@ -6,6 +6,13 @@
     name: 'grafana'
     state: latest
 
+- name: Add grafana configuration
+  tags: grafana-configure
+  ansible.builtin.template:
+    src: grafana.ini.j2
+    dest: '/etc/grafana/grafana.ini'
+  notify: restart grafana
+
 - name: Enable Grafana service
   tags: grafana-enable
   ansible.builtin.service:

ansible/roles/prometheus/templates/prometheus.config.j2

@@ -20,12 +20,56 @@ rule_files:
    - "{{ alertmanager_rules }}/hosts.rules.yml"
 
 # A scrape configuration containing exactly one endpoint to scrape:
-scrape_config_files:
-{% for item in scrape_files %}
-  - "{{ item }}"
-{% endfor %}
+
+#scrape_config_files:
+#{% for item in scrape_files %}
+#  - "{{ item }}"
+#{% endfor %}
 
 scrape_configs:
   - job_name: "prometheus"
     static_configs:
       - 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:
+         - 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
+         - lolmox2.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
+         - zigbee2mqtt.labolyon.dn42:9100
+{% endif %}

ansible/roles/prometheus/templates/scrape-blackbox.yml

@@ -1,8 +1,4 @@
-# managed by ansible
-
-scrape_configs:
-
-  - job_name: "blackbox-public-https"
+  - job_name: "blackbox"
     metrics_path: /probe
     params:
       module: [http_2xx]
@@ -10,33 +6,13 @@ scrape_configs:
     static_configs:
       - targets:
           - https://labolyon.fr
-          - https://webmail.labolyon.fr
+          - https://mail.labolyon.fr
           - https://wiki.labolyon.fr
           - https://git.labolyon.fr
-          - https://sso.labolyon.fr
-          - https://chat.labolyon.fr
-          - https://grafana.labolyon.fr
     relabel_configs:
        - source_labels: [__address__]
          target_label: __param_target
        - source_labels: [__param_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: target
        - target_label: __address__
          replacement: 127.0.0.1:9115  # The blackbox exporter's real hostname:port.

ansible/roles/prometheus/templates/scrape-main.yml

@@ -1,4 +1,3 @@
-scrape_configs:
   - job_name: "linux-nodes"
     static_configs:
       - targets: