resolve conflicts
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing

This commit is contained in:
pz2891 2021-03-30 09:30:06 +02:00
commit dd274891a5
2 changed files with 6 additions and 3 deletions

2
hosts
View file

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

View file

@ -69,10 +69,13 @@ eatonups:
- labelname: upsOutputLineIndex - labelname: upsOutputLineIndex
type: gauge type: gauge
- name: xupsEnvRemoteTemp - 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 oid: 1.3.6.1.4.1.318.1.1.10.2.3.2.1.4
type: gauge 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 - name: xupsEnvRemoteHumidity
oid: 1.3.6.1.4.1.534.1.6.6 oid: 1.3.6.1.4.1.534.1.6.6
type: gauge type: gauge