From 8b0fa7040d3cd374439263e98d0f77c5931908fd Mon Sep 17 00:00:00 2001
From: Alexis Bitaillou <alexis.bitaillou@inria.fr>
Date: Tue, 25 Mar 2025 16:47:32 +0100
Subject: [PATCH 1/2] [Nantes] add pdu modele
---
data/grid5000/sites/nantes/pdus/pdu-Z1.10.json | 2 +-
data/grid5000/sites/nantes/pdus/pdu-Z1.11.json | 2 +-
data/grid5000/sites/nantes/pdus/pdu-Z1.20.json | 2 +-
data/grid5000/sites/nantes/pdus/pdu-Z1.21.json | 2 +-
data/grid5000/sites/nantes/pdus/pdu-Z1.40.json | 2 +-
data/grid5000/sites/nantes/pdus/pdu-Z1.41.json | 2 +-
data/grid5000/sites/nantes/pdus/pdu-Z1.50.json | 2 +-
data/grid5000/sites/nantes/pdus/pdu-Z1.51.json | 2 +-
input/grid5000/sites/nantes/pdus.yaml | 16 ++++++++--------
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json
index cb0f4fb16bf..c7c8bf99687 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 4e1408be114..3ea6c8db15e 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
@@ -12,7 +12,7 @@
}
}
],
- "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 56fcfd7c791..74a344bd291 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 b5b16f7eb9b..65392693001 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
@@ -12,7 +12,7 @@
}
}
],
- "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 6e592d1d58f..5d2b5128c84 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 97775214a95..7535cdd8b4a 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
@@ -12,7 +12,7 @@
}
}
],
- "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 e70e65d7264..6f3f0072c58 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 43627683cf2..1c941f33f56 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
@@ -12,7 +12,7 @@
}
}
],
- "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 c6a79d8adbf..9e59cb6d399 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
@@ -55,7 +55,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 +81,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
@@ -107,7 +107,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 +134,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
@@ -160,7 +160,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 +186,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
--
GitLab
From 6310d0e28f771544f0fe29caaeaa3a1a36d42e9c Mon Sep 17 00:00:00 2001
From: Alexis Bitaillou <alexis.bitaillou@inria.fr>
Date: Wed, 26 Mar 2025 14:20:47 +0100
Subject: [PATCH 2/2] [Nantes] add temp sensor from pdus
---
.../grid5000/sites/nantes/pdus/pdu-Z1.11.json | 9 +++++++
.../grid5000/sites/nantes/pdus/pdu-Z1.21.json | 9 +++++++
.../grid5000/sites/nantes/pdus/pdu-Z1.41.json | 9 +++++++
.../grid5000/sites/nantes/pdus/pdu-Z1.51.json | 9 +++++++
input/grid5000/sites/nantes/pdus.yaml | 24 +++++++++++++++++++
5 files changed, 60 insertions(+)
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
index 3ea6c8db15e..8fb267ac089 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
@@ -10,6 +10,15 @@
"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": "AP7940",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
index 65392693001..db8d89410e0 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
@@ -10,6 +10,15 @@
"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": "AP7940",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
index 7535cdd8b4a..790b361efbd 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
@@ -10,6 +10,15 @@
"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": "AP7940",
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
index 1c941f33f56..ed3c16c2cc2 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
@@ -10,6 +10,15 @@
"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": "AP7940",
diff --git a/input/grid5000/sites/nantes/pdus.yaml b/input/grid5000/sites/nantes/pdus.yaml
index 9e59cb6d399..bced731b582 100644
--- a/input/grid5000/sites/nantes/pdus.yaml
+++ b/input/grid5000/sites/nantes/pdus.yaml
@@ -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:
@@ -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:
@@ -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:
@@ -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:
--
GitLab