resolve conflicts

hosts

@@ -365,7 +365,7 @@ prometheus-rives.adm.auro.re
 dhcp-rives.adm.auro.re
 dns-rives.adm.auro.re
 radius-rives.adm.auro.re
-routeur-rives.auro.re
+routeur-rives.adm.auro.re
 
 [rives_unifi]
 r3-4-4.borne.auro.re

roles/prometheus/templates/prometheus/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