Merge pull request 'WIP : add_rives_vm_master' (#42) from add_rives_vm_master into master

Reviewed-on: Aurore/ansible#42

hosts

@@ -267,8 +267,12 @@ ep-1-1.borne.auro.re
 ep-1-3.borne.auro.re
 ep-1-2.borne.auro.re
 ep-0-1.borne.auro.re
+eo-0-1.borne.auro.re
 eo-2-1.borne.auro.re
+eo-2-2.borne.auro.re
 ee-2-1.borne.auro.re
+ee-2-2.borne.auro.re
+
 
 ###############################################################################
 # George Sand
@@ -353,6 +357,10 @@ radius-rives-backup.adm.auro.re
 routeur-rives-backup.adm.auro.re
 ldap-replica-rives.adm.auro.re
 prometheus-rives.adm.auro.re
+dhcp-rives.adm.auro.re
+dns-rives.adm.auro.re
+radius-rives.adm.auro.re
+routeur-rives.adm.auro.re
 
 [rives_unifi]
 r3-4-4.borne.auro.re

roles/prometheus/templates/snmp.yml.j2

@@ -69,10 +69,13 @@ eatonups:
     - labelname: upsOutputLineIndex
       type: gauge
   - name: xupsEnvRemoteTemp
-#    oid: 1.3.6.1.4.1.534.1.6.5
     oid: 1.3.6.1.4.1.318.1.1.10.2.3.2.1.4
     type: gauge
-    help: The reading of an EMP's temperature sensor. - 1.3.6.1.4.1.318.1.1.10.2.3.2.1.4
+    help: The reading of an EMP's temperature sensor (APC MIB) - 1.3.6.1.4.1.318.1.1.10.2.3.2.1.4
+  - name: xupsEnvRemoteTemp
+    oid: 1.3.6.1.4.1.534.1.6.5
+    type: gauge
+    help: The reading of an EMP's temperature sensor (Eaton MIB) - 1.3.6.1.4.1.534.1.6.5
   - name: xupsEnvRemoteHumidity
     oid: 1.3.6.1.4.1.534.1.6.6
     type: gauge

roles/radius/tasks/main.yml

@@ -128,7 +128,8 @@
   apt:
     name:
       - postgresql
-      - postgresql-client
+      - postgresql-client-11=11.7-0+deb10u1
+    force: yes
 
 - name: Install postgresql ansible module requirement(s)
   pip: