Merge pull request 'roles: dns-internal: nsd: Update IP addresses for zola.vinishor.xyz' (#5) from dns-secondaire-vinishor into main

Reviewed-on: #5

ansible/inventory

@@ -9,7 +9,7 @@ all:
         git.labolyon.dn42:
         i2p.labolyon.dn42:
         labolyon-fr.labolyon.dn42:
-        lolix-ixpman.labolyon.dn42:
+#        lolix-ixpman.labolyon.dn42:
         lolix-rs1.labolyon.dn42:
         lolmox.labolyon.dn42:
         lolmox2.labolyon.dn42:

ansible/roles/dns-internal/templates/nsd.conf

@@ -31,10 +31,10 @@ zone:
   name: "labolyon.fr"
   zonefile: "labolyon.fr.zone"
   ## zola.vinishor.xyz
-  notify: 2a0e:e701:11e7:cafe:3737::1 clesecrete
-  provide-xfr: 2a0e:e701:11e7:cafe:3737::1 clesecrete
-  notify: 45.13.105.181 clesecrete
-  provide-xfr: 45.13.105.181 clesecrete
+  notify: 2001:41d0:fc32:d710:3737::1 clesecrete
+  provide-xfr: 2001:41d0:fc32:d710:3737::1 clesecrete
+  notify: 109.190.187.14 clesecrete
+  provide-xfr: 109.190.187.14 clesecrete
   ## ns1.1312.zone
   notify: 2a03:b0c0:2:d0::12f0:4001 dns_labolyon_fr_to_ns1_1312_zone
   provide-xfr: 2a03:b0c0:2:d0::12f0:4001 dns_labolyon_fr_to_ns1_1312_zone

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

@@ -1,14 +1,21 @@
----
-
-- name: Install Grafana
-  tags: grafana-install
-  ansible.builtin.package:
-    name: 'grafana'
-    state: latest
-
-- name: Enable Grafana service
-  tags: grafana-enable
-  ansible.builtin.service:
-    name: 'grafana-server'
-    state: started
-    enabled: yes
+---
+
+- name: Install Grafana
+  tags: grafana-install
+  ansible.builtin.package:
+    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:
+    name: 'grafana-server'
+    state: started
+    enabled: yes

ansible/roles/prometheus/templates/alertmanager.yml.j2

@@ -63,4 +63,5 @@ inhibit_rules:
 receivers:
   - name: 'all-admins-email'
     email_configs:
-      - to: 'mirsal@mirsal.fr'
+      - to: 'mirsal@mirsal.fr,mirsal@labolyon.fr,vinishor@vinishor.xyz'
+        send_resolved: true

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

@@ -8,7 +8,7 @@ scrape_configs:
          - git.labolyon.dn42:9100
          - i2p.labolyon.dn42:9100
          - labolyon-fr.labolyon.dn42:9100
-         - lolix-ixpman.labolyon.dn42:9100
+#         - lolix-ixpman.labolyon.dn42:9100
          - lolix-rs1.labolyon.dn42:9100
          - lolmox.labolyon.dn42:9100
          - lolmox2.labolyon.dn42:9100
@@ -20,3 +20,8 @@ scrape_configs:
          - reverse-proxy.labolyon.dn42:9100
          - wiki.labolyon.dn42:9100
          - zigbee2mqtt.labolyon.dn42:9100
+    metric_relabel_configs:
+      - source_labels: [__name__, state]
+        separator: '_'
+        regex: node_systemd_unit_state_[^f].*
+        action: drop