Merge branch 'new-infra' of gitea.auro.re:aurore/ansible into new-infra

group_vars/prom/prometheus/quanta.yml

@@ -3,6 +3,7 @@ prometheus__scraping_quanta:
   targets: "{{ groups.quanta }}"
   address: 127.0.0.1:9116
   path: /snmp
+  timeout: 60s
   params:
     module:
       - quanta

group_vars/router/prometheus.yml

@@ -0,0 +1,3 @@
+---
+prometheus_keepalived__dest: /var/run/prometheus-node-exporter/keepalived.prom
+... 

hosts

@@ -58,7 +58,7 @@ edge
 [ntp]
 ntp-[1:2].int.infra.auro.re
 
-[radius]
+[radiusng]
 radius-[1:2].isp.infra.auro.re
 
 [vm_network:children]
@@ -66,7 +66,7 @@ vpn
 edge
 dhcp
 dns
-radius
+radiusng
 ntp
 #ldap
 isp

roles/prometheus/filter_plugins/prometheus.py

@@ -25,6 +25,9 @@ def convert_jobs(config):
         if "path" in job:
             config["metrics_path"] = job["path"]
 
+        if "timeout" in job:
+            config["scrape_timeout"] = job["timeout"]
+
         if "address" in job:
 
             try:

roles/prometheus_node/tasks/main.yml

@@ -28,7 +28,7 @@
     state: directory
     owner: root
     group: root
-    mode: u=rwx,g=rw,o=rw
+    mode: u=rwx,g=rx,o=rx
 
 - name: Override prometheus-node-exporter.service
   template: