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

group_vars/infra/firewall.yml

@@ -232,6 +232,15 @@ firewall__forward:
       udp:
         dport: 161
     verdict: accept
+  - src: monit
+    dst:
+      - sw
+      - ups
+      - bmc
+    protocols:
+      tcp:
+        dport: 161
+    verdict: accept
   # Alertmanager
   - src: monit
     dst: docker-ovh.adm

group_vars/prom/prometheus_snmp/eaton.yml

@@ -6,8 +6,6 @@ prometheus_snmp__modules_eaton:
   walk:
     - sysUpTime
     #- upsBattery
-    #- xupsBattery
-    #- xupsInput
     - xupsInput
     - xupsOutput
     - xupsBypass
@@ -25,8 +23,8 @@ prometheus_snmp__modules_eaton:
         - xupsBypassPhase
       lookup: xupsBypassName
   overrides:
-    #upsBatteryStatus:
-    #  type: EnumAsStateSet
+    upsBatteryStatus:
+      type: EnumAsStateSet
     xupsInputId:
       type: EnumAsStateSet
     xupsOutputId:

group_vars/prom/prometheus_snmp/ilo.yml

@@ -1,8 +1,8 @@
 ---
 prometheus_snmp__modules_ilo:
   version: 3
-  timeout: 60s
-  retries: 3
+  timeout: 10s
+  retries: 10
   auth:
     security_level: authPriv
     auth_protocol: SHA
@@ -12,4 +12,8 @@ prometheus_snmp__modules_ilo:
     priv_password: "{{ vault_snmp_ilo_priv }}"
   walk:
     - sysUpTime
+    - cpqHeTemperatureTable
+  overrides:
+    cpqHeTemperatureThresholdType:
+      type: EnumAsStateSet
 ...

roles/borgbackup_client/templates/borgmatic.timer.j2

@@ -4,7 +4,7 @@
 Description=Timer for borgmatic backup
 
 [Timer]
-{% if borg_keep_hourly > 0 %}
+{% if borgmatic__hourly %}
 OnCalendar=hourly
 RandomizedDelaySec=60m
 {% else %}

roles/prometheus_snmp/tasks/main.yml

@@ -31,6 +31,11 @@
     - CPQSINFO-MIB.txt
     - CPQHOST-MIB.txt
     - CPQHLTH-MIB.txt
+    - CPQIDA-MIB.txt
+    - CPQNIC-MIB.txt
+    - CPQSM2-MIB.txt
+    - CPQSTDEQ-MIB.txt
+    - CPQSTSYS-MIB.txt
 
 - name: Configure prometheus-snmp-exporter generator
   template: