diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json
index cb0f4fb16bf4e080009c4612f44f65c34868e68f..c7c8bf99687f30324949676a037a7f7e351f972b 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json
@@ -12,7 +12,7 @@
}
}
],
- "model": "",
+ "model": "AP7940",
"ports": {
"10": "ecotype-44",
"11": "ecotype-45",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
index 4e1408be11405f1e8c2d475029ab2489478801a5..8fb267ac089a3880dabfc2789a4711c2b5caee87 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
@@ -10,9 +10,18 @@
"id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%",
"protocol": "snmp"
}
+ },
+ {
+ "description": "Sensor temperature reading in tenths of degrees Celsius",
+ "name": "pdu_temperature_tenth_celsius",
+ "period": 5000,
+ "source": {
+ "id": "1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1",
+ "protocol": "snmp"
+ }
}
],
- "model": "",
+ "model": "AP7940",
"ports": {
"1": "electrical_mgmt_board",
"10": "ecotype-44",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json
index 56fcfd7c7913cd7b03925086d13079e8275b9f98..74a344bd2913ae2bd626682bee298b9023a8402f 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json
@@ -12,7 +12,7 @@
}
}
],
- "model": "",
+ "model": "AP7940",
"ports": {
"10": "ecotype-32",
"11": "ecotype-33",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
index b5b16f7eb9bc1909a45a8dd9226750d22017ee6b..db8d89410e0d87ea4735131fc98f1e0a779e1b7d 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
@@ -10,9 +10,18 @@
"id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%",
"protocol": "snmp"
}
+ },
+ {
+ "description": "Sensor temperature reading in tenths of degrees Celsius",
+ "name": "pdu_temperature_tenth_celsius",
+ "period": 5000,
+ "source": {
+ "id": "1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1",
+ "protocol": "snmp"
+ }
}
],
- "model": "",
+ "model": "AP7940",
"ports": {
"1": "ecotype-prod2",
"10": "ecotype-32",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json
index 6e592d1d58fc5a735c97f03e3e06e39b80c3e34a..5d2b5128c84a5d147127606d79ae468efc0b744c 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json
@@ -12,7 +12,7 @@
}
}
],
- "model": "",
+ "model": "AP7940",
"ports": {
"1": "sw-ecotype-adm",
"10": "ecotype-20",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
index 97775214a9541c5c699cf4480e6adac4f295f5a5..790b361efbda57ea40ee31f5e353c30b15eb56db 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
@@ -10,9 +10,18 @@
"id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%",
"protocol": "snmp"
}
+ },
+ {
+ "description": "Sensor temperature reading in tenths of degrees Celsius",
+ "name": "pdu_temperature_tenth_celsius",
+ "period": 5000,
+ "source": {
+ "id": "1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1",
+ "protocol": "snmp"
+ }
}
],
- "model": "",
+ "model": "AP7940",
"ports": {
"10": "ecotype-20",
"11": "ecotype-21",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json
index e70e65d7264e2bc2c03d837eeeb401f228f90d27..6f3f0072c58232498790e13dcd5521186ae6c2fc 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json
@@ -12,7 +12,7 @@
}
}
],
- "model": "",
+ "model": "AP7940",
"ports": {
"10": "ecotype-8",
"11": "ecotype-9",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
index 43627683cf20c76edcf01aa1fcde02f9d49d3735..ed3c16c2cc2a3cc1ebfab291db9e7373ec97c489 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
@@ -10,9 +10,18 @@
"id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%",
"protocol": "snmp"
}
+ },
+ {
+ "description": "Sensor temperature reading in tenths of degrees Celsius",
+ "name": "pdu_temperature_tenth_celsius",
+ "period": 5000,
+ "source": {
+ "id": "1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1",
+ "protocol": "snmp"
+ }
}
],
- "model": "",
+ "model": "AP7940",
"ports": {
"1": "ecotype-prod2",
"10": "ecotype-8",
diff --git a/input/grid5000/sites/nantes/pdus.yaml b/input/grid5000/sites/nantes/pdus.yaml
index c6a79d8adbf5682447fff3a1d3bfd0577ca8cde3..bced731b5827955f1cb6895ec19b60d6c335a5aa 100644
--- a/input/grid5000/sites/nantes/pdus.yaml
+++ b/input/grid5000/sites/nantes/pdus.yaml
@@ -2,7 +2,7 @@
pdus:
pdu-Z1.10:
vendor: APC
- model: ''
+ model: 'AP7940'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -28,7 +28,7 @@ pdus:
pdu-Z1.11:
vendor: APC
- model: ''
+ model: 'AP7940'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -36,6 +36,12 @@ pdus:
source:
protocol: snmp
id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
+ - name: pdu_temperature_tenth_celsius
+ description: Sensor temperature reading in tenths of degrees Celsius
+ period: 5000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1
ip: 192.168.1.14
mac: 00:c0:b7:fb:aa:a1
ports:
@@ -55,7 +61,7 @@ pdus:
pdu-Z1.20:
vendor: APC
- model: ''
+ model: 'AP7940'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -81,7 +87,7 @@ pdus:
pdu-Z1.21:
vendor: APC
- model: ''
+ model: 'AP7940'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -89,6 +95,12 @@ pdus:
source:
protocol: snmp
id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
+ - name: pdu_temperature_tenth_celsius
+ description: Sensor temperature reading in tenths of degrees Celsius
+ period: 5000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1
ip: 192.168.1.16
mac: 00:c0:b7:fb:aa:5b
ports:
@@ -107,7 +119,7 @@ pdus:
14: ecotype-36
pdu-Z1.40:
vendor: APC
- model: ''
+ model: 'AP7940'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -134,7 +146,7 @@ pdus:
pdu-Z1.41:
vendor: APC
- model: ''
+ model: 'AP7940'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -142,6 +154,12 @@ pdus:
source:
protocol: snmp
id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
+ - name: pdu_temperature_tenth_celsius
+ description: Sensor temperature reading in tenths of degrees Celsius
+ period: 5000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1
ip: 192.168.1.10
mac: 00:c0:b7:fb:aa:8b
ports:
@@ -160,7 +178,7 @@ pdus:
pdu-Z1.50:
vendor: APC
- model: ''
+ model: 'AP7940'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -186,7 +204,7 @@ pdus:
pdu-Z1.51:
vendor: APC
- model: ''
+ model: 'AP7940'
metrics:
- name: pdu_outlet_power_watt
description: Power consumption per outlet reported by PDU, in watt
@@ -194,6 +212,12 @@ pdus:
source:
protocol: snmp
id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
+ - name: pdu_temperature_tenth_celsius
+ description: Sensor temperature reading in tenths of degrees Celsius
+ period: 5000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1
ip: 192.168.1.12
mac: 00:c0:b7:fb:aa:97
ports: