diff --git a/data/grid5000/sites/lille/pdus/pdu-b3p3.json b/data/grid5000/sites/lille/pdus/pdu-b3p3.json index af80a4a8d726d09f528e638370788f9c24fb2401..cd4f00d8df383e304534a7f67dea27d8a472bdcb 100644 --- a/data/grid5000/sites/lille/pdus/pdu-b3p3.json +++ b/data/grid5000/sites/lille/pdus/pdu-b3p3.json @@ -1,18 +1,7 @@ { "ip": "172.17.47.249", - "mac": "00:c0:b7:f2:b0:db", - "metrics": [ - { - "description": "Power consumption per outlet reported by PDU, in watt", - "name": "pdu_outlet_power_watt", - "period": 1000, - "source": { - "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%", - "protocol": "snmp" - } - } - ], - "model": "AP8659", + "mac": "00:c0:b7:4f:32:78", + "model": "AP7951", "ports": { "1": "chetemi-8", "10": "chifflet-6", @@ -26,22 +15,6 @@ "7": "chetemi-14", "9": "chifflet-5" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "pdu-b3p3", "vendor": "APC" diff --git a/input/grid5000/sites/lille/pdus.yaml b/input/grid5000/sites/lille/pdus.yaml index bab2241543bef2ea6ba65d92cc5ed883e8fa787a..aac79c0a5eaa045ddef80471191dd4d9ec3cd552 100644 --- a/input/grid5000/sites/lille/pdus.yaml +++ b/input/grid5000/sites/lille/pdus.yaml @@ -89,23 +89,6 @@ pdus: mac: 00:23:ae:e2:d8:8d pdu-b3p3: vendor: APC - model: AP8659 - metrics: - - name: pdu_outlet_power_watt - description: Power consumption per outlet reported by PDU, in watt - period: 1000 - source: - protocol: snmp - id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% - sensors: - - power: - per_outlets: true - resolution: 1 - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.318.1.1.12.1.16.0 - unit: W - outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7 + model: AP7951 ip: 172.17.47.249 - mac: 00:c0:b7:f2:b0:db + mac: 00:c0:b7:4f:32:78