From b9106534051b92485cbb4527982f2d06d6596608 Mon Sep 17 00:00:00 2001 From: Alexis Bitaillou <alexis.bitaillou@inria.fr> Date: Mon, 24 Mar 2025 15:51:13 +0100 Subject: [PATCH 1/3] [Nantes] add pdu (power only) --- .../clusters/ecotype/nodes/ecotype-1.json | 10 + .../clusters/ecotype/nodes/ecotype-10.json | 10 + .../clusters/ecotype/nodes/ecotype-11.json | 10 + .../clusters/ecotype/nodes/ecotype-12.json | 10 + .../clusters/ecotype/nodes/ecotype-13.json | 10 + .../clusters/ecotype/nodes/ecotype-14.json | 10 + .../clusters/ecotype/nodes/ecotype-15.json | 10 + .../clusters/ecotype/nodes/ecotype-16.json | 10 + .../clusters/ecotype/nodes/ecotype-17.json | 10 + .../clusters/ecotype/nodes/ecotype-18.json | 10 + .../clusters/ecotype/nodes/ecotype-19.json | 10 + .../clusters/ecotype/nodes/ecotype-2.json | 10 + .../clusters/ecotype/nodes/ecotype-20.json | 10 + .../clusters/ecotype/nodes/ecotype-21.json | 10 + .../clusters/ecotype/nodes/ecotype-22.json | 10 + .../clusters/ecotype/nodes/ecotype-23.json | 10 + .../clusters/ecotype/nodes/ecotype-24.json | 10 + .../clusters/ecotype/nodes/ecotype-25.json | 10 + .../clusters/ecotype/nodes/ecotype-26.json | 10 + .../clusters/ecotype/nodes/ecotype-27.json | 10 + .../clusters/ecotype/nodes/ecotype-28.json | 10 + .../clusters/ecotype/nodes/ecotype-29.json | 10 + .../clusters/ecotype/nodes/ecotype-3.json | 10 + .../clusters/ecotype/nodes/ecotype-30.json | 10 + .../clusters/ecotype/nodes/ecotype-31.json | 10 + .../clusters/ecotype/nodes/ecotype-32.json | 10 + .../clusters/ecotype/nodes/ecotype-33.json | 10 + .../clusters/ecotype/nodes/ecotype-34.json | 10 + .../clusters/ecotype/nodes/ecotype-35.json | 10 + .../clusters/ecotype/nodes/ecotype-36.json | 10 + .../clusters/ecotype/nodes/ecotype-37.json | 10 + .../clusters/ecotype/nodes/ecotype-38.json | 10 + .../clusters/ecotype/nodes/ecotype-39.json | 10 + .../clusters/ecotype/nodes/ecotype-4.json | 10 + .../clusters/ecotype/nodes/ecotype-40.json | 10 + .../clusters/ecotype/nodes/ecotype-41.json | 10 + .../clusters/ecotype/nodes/ecotype-42.json | 10 + .../clusters/ecotype/nodes/ecotype-43.json | 10 + .../clusters/ecotype/nodes/ecotype-44.json | 10 + .../clusters/ecotype/nodes/ecotype-45.json | 10 + .../clusters/ecotype/nodes/ecotype-46.json | 10 + .../clusters/ecotype/nodes/ecotype-47.json | 10 + .../clusters/ecotype/nodes/ecotype-48.json | 10 + .../clusters/ecotype/nodes/ecotype-5.json | 10 + .../clusters/ecotype/nodes/ecotype-6.json | 10 + .../clusters/ecotype/nodes/ecotype-7.json | 10 + .../clusters/ecotype/nodes/ecotype-8.json | 10 + .../clusters/ecotype/nodes/ecotype-9.json | 10 + .../grid5000/sites/nantes/pdus/pdu-Z1.10.json | 57 ++++ .../grid5000/sites/nantes/pdus/pdu-Z1.11.json | 60 ++++ .../grid5000/sites/nantes/pdus/pdu-Z1.20.json | 57 ++++ .../grid5000/sites/nantes/pdus/pdu-Z1.21.json | 60 ++++ .../grid5000/sites/nantes/pdus/pdu-Z1.40.json | 60 ++++ .../grid5000/sites/nantes/pdus/pdu-Z1.41.json | 44 +++ .../grid5000/sites/nantes/pdus/pdu-Z1.50.json | 57 ++++ .../grid5000/sites/nantes/pdus/pdu-Z1.51.json | 60 ++++ input/grid5000/sites/nantes/pdus.yaml | 303 ++++++++++++++++++ 57 files changed, 1238 insertions(+) create mode 100644 data/grid5000/sites/nantes/pdus/pdu-Z1.10.json create mode 100644 data/grid5000/sites/nantes/pdus/pdu-Z1.11.json create mode 100644 data/grid5000/sites/nantes/pdus/pdu-Z1.20.json create mode 100644 data/grid5000/sites/nantes/pdus/pdu-Z1.21.json create mode 100644 data/grid5000/sites/nantes/pdus/pdu-Z1.40.json create mode 100644 data/grid5000/sites/nantes/pdus/pdu-Z1.41.json create mode 100644 data/grid5000/sites/nantes/pdus/pdu-Z1.50.json create mode 100644 data/grid5000/sites/nantes/pdus/pdu-Z1.51.json create mode 100644 input/grid5000/sites/nantes/pdus.yaml diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json index 4a64681e34c..6b417a29573 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json @@ -213,6 +213,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "pdu-Z1.50" + }, + { + "port": 2, + "uid": "pdu-Z1.51" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json index ce380c6a42f..21c47c72521 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "pdu-Z1.50" + }, + { + "port": 12, + "uid": "pdu-Z1.51" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json index abb771ba05c..fa9da4fc6f9 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 13, + "uid": "pdu-Z1.50" + }, + { + "port": 13, + "uid": "pdu-Z1.51" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json index 9cdfaa9dac5..143bbd7ff08 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 14, + "uid": "pdu-Z1.50" + }, + { + "port": 14, + "uid": "pdu-Z1.51" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json index e6aeed9d149..5977634a7e6 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "pdu-Z1.40" + }, + { + "port": 2, + "uid": "pdu-Z1.41" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json index 615d188025f..06b626038e7 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "pdu-Z1.40" + }, + { + "port": 3, + "uid": "pdu-Z1.41" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json index 2e0654dab64..9d7fd9dc9e8 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "pdu-Z1.40" + }, + { + "port": 4, + "uid": "pdu-Z1.41" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json index e019afc953e..80febc70531 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "pdu-Z1.40" + }, + { + "port": 5, + "uid": "pdu-Z1.41" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json index bde2755bb0f..26f8f69aaa1 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "pdu-Z1.40" + }, + { + "port": 6, + "uid": "pdu-Z1.41" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json index d3b1ea54858..30f3c32f99c 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "pdu-Z1.40" + }, + { + "port": 7, + "uid": "pdu-Z1.41" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json index cc912c4ff7d..847bc601922 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "pdu-Z1.40" + }, + { + "port": 9, + "uid": "pdu-Z1.41" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json index cd82438cba7..72af14b9bb3 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "pdu-Z1.50" + }, + { + "port": 3, + "uid": "pdu-Z1.51" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json index 448c03655c8..f75caae7d3a 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "pdu-Z1.40" + }, + { + "port": 10, + "uid": "pdu-Z1.41" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json index 257e4c0e637..36ff01abac5 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "pdu-Z1.40" + }, + { + "port": 11, + "uid": "pdu-Z1.41" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json index 8ed3d299b47..94f94783be4 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "pdu-Z1.40" + }, + { + "port": 12, + "uid": "pdu-Z1.41" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json index ac9a938f6e3..c47e93ecac5 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 13, + "uid": "pdu-Z1.40" + }, + { + "port": 13, + "uid": "pdu-Z1.41" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json index 6587e0b935d..9542f31d842 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 14, + "uid": "pdu-Z1.40" + }, + { + "port": 14, + "uid": "pdu-Z1.41" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json index 4281e1b4e1c..fa73bf0ef41 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "pdu-Z1.20" + }, + { + "port": 2, + "uid": "pdu-Z1.21" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json index c2e1181d815..6ec3c139055 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "pdu-Z1.20" + }, + { + "port": 3, + "uid": "pdu-Z1.21" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json index 131a41342c5..e23593bc8e0 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "pdu-Z1.20" + }, + { + "port": 4, + "uid": "pdu-Z1.21" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json index 366371057a0..7cefd7c9bac 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "pdu-Z1.20" + }, + { + "port": 5, + "uid": "pdu-Z1.21" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json index 58bc46fee61..4d13ac4e039 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "pdu-Z1.20" + }, + { + "port": 6, + "uid": "pdu-Z1.21" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json index da71e2c3163..fc667409892 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "pdu-Z1.50" + }, + { + "port": 4, + "uid": "pdu-Z1.51" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json index 98093093222..ae369ea895a 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "pdu-Z1.20" + }, + { + "port": 7, + "uid": "pdu-Z1.21" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json index 0c00d98a5e4..cf2c5d051cc 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "pdu-Z1.20" + }, + { + "port": 9, + "uid": "pdu-Z1.21" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json index 7de4f1c131a..b88ab908101 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "pdu-Z1.20" + }, + { + "port": 10, + "uid": "pdu-Z1.21" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json index ee057b2e6a0..f2c0cec8990 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "pdu-Z1.20" + }, + { + "port": 11, + "uid": "pdu-Z1.21" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json index f19c2452695..282e2d1b76e 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "pdu-Z1.20" + }, + { + "port": 12, + "uid": "pdu-Z1.21" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json index 84ba84ceb8f..c2b5a23659f 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 13, + "uid": "pdu-Z1.20" + }, + { + "port": 13, + "uid": "pdu-Z1.21" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json index 27239a0a6ab..26f19abf894 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 14, + "uid": "pdu-Z1.20" + }, + { + "port": 14, + "uid": "pdu-Z1.21" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json index b4a06537e24..e32f85ac8a9 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "pdu-Z1.10" + }, + { + "port": 2, + "uid": "pdu-Z1.11" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json index 9ffa259b9b0..a09bf177527 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "pdu-Z1.10" + }, + { + "port": 3, + "uid": "pdu-Z1.11" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json index 8f801c03b94..257b21f9380 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "pdu-Z1.10" + }, + { + "port": 4, + "uid": "pdu-Z1.11" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json index fa48bca4581..b35e3ba701b 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "pdu-Z1.50" + }, + { + "port": 5, + "uid": "pdu-Z1.51" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json index ec97ea64df3..766f02b6a21 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "pdu-Z1.10" + }, + { + "port": 5, + "uid": "pdu-Z1.11" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json index bc1d360e047..406d44b68eb 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "pdu-Z1.10" + }, + { + "port": 6, + "uid": "pdu-Z1.11" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json index 43b57d90430..1577b9f352f 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "pdu-Z1.10" + }, + { + "port": 7, + "uid": "pdu-Z1.11" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json index 8af9fe12d30..0b677f63e8a 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "pdu-Z1.10" + }, + { + "port": 9, + "uid": "pdu-Z1.11" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json index 61ec7c02e34..77561c1e785 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "pdu-Z1.10" + }, + { + "port": 10, + "uid": "pdu-Z1.11" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json index 02dc25ce9d5..dec4e68345a 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "pdu-Z1.10" + }, + { + "port": 11, + "uid": "pdu-Z1.11" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json index 3e77393671f..cfa763d9d86 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "pdu-Z1.10" + }, + { + "port": 12, + "uid": "pdu-Z1.11" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json index d39ca8087f4..b15a06063d6 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json @@ -213,6 +213,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 13, + "uid": "pdu-Z1.10" + }, + { + "port": 13, + "uid": "pdu-Z1.11" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json index aa0f6c94c1f..ba99f4db794 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 14, + "uid": "pdu-Z1.10" + }, + { + "port": 14, + "uid": "pdu-Z1.11" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json index 9e67b81e107..8b2029cd7dc 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "pdu-Z1.50" + }, + { + "port": 6, + "uid": "pdu-Z1.51" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json index 9b11314d8f0..fde58d6fcc5 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "pdu-Z1.50" + }, + { + "port": 7, + "uid": "pdu-Z1.51" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json index cd850823058..0c8547f28ef 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "pdu-Z1.50" + }, + { + "port": 9, + "uid": "pdu-Z1.51" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json index 6b6c25e085e..e037b71cd9c 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "pdu-Z1.50" + }, + { + "port": 10, + "uid": "pdu-Z1.51" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json index c9fe492870a..03f2204418c 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json @@ -259,6 +259,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "pdu-Z1.50" + }, + { + "port": 11, + "uid": "pdu-Z1.51" + } + ], "performance": { "core_flops": 28800000000, "node_flops": 576000000000 diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json new file mode 100644 index 00000000000..d95b6f219c6 --- /dev/null +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json @@ -0,0 +1,57 @@ +{ + "ip": "192.168.1.6", + "mac": "00:c0:b7:fb:aa:e1", + "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": "", + "ports": { + "10": { + "uid": "ecotype-44" + }, + "11": { + "uid": "ecotype-45" + }, + "12": { + "uid": "ecotype-46" + }, + "13": { + "uid": "ecotype-47" + }, + "14": { + "uid": "ecotype-48" + }, + "2": { + "uid": "ecotype-37" + }, + "3": { + "uid": "ecotype-38" + }, + "4": { + "uid": "ecotype-39" + }, + "5": { + "uid": "ecotype-40" + }, + "6": { + "uid": "ecotype-41" + }, + "7": { + "uid": "ecotype-42" + }, + "9": { + "uid": "ecotype-43" + } + }, + "type": "pdu", + "uid": "pdu-Z1.10", + "vendor": "APC" +} \ No newline at end of file diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json new file mode 100644 index 00000000000..293eebed2ad --- /dev/null +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json @@ -0,0 +1,60 @@ +{ + "ip": "192.168.1.14", + "mac": "00:c0:b7:fb:aa:a1", + "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": "", + "ports": { + "1": { + "uid": "electrical_mgmt_board" + }, + "10": { + "uid": "ecotype-44" + }, + "11": { + "uid": "ecotype-45" + }, + "12": { + "uid": "ecotype-46" + }, + "13": { + "uid": "ecotype-47" + }, + "14": { + "uid": "ecotype-48" + }, + "2": { + "uid": "ecotype-37" + }, + "3": { + "uid": "ecotype-38" + }, + "4": { + "uid": "ecotype-39" + }, + "5": { + "uid": "ecotype-40" + }, + "6": { + "uid": "ecotype-41" + }, + "7": { + "uid": "ecotype-42" + }, + "9": { + "uid": "ecotype-43" + } + }, + "type": "pdu", + "uid": "pdu-Z1.11", + "vendor": "APC" +} \ No newline at end of file diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json new file mode 100644 index 00000000000..0f8c3a66efd --- /dev/null +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json @@ -0,0 +1,57 @@ +{ + "ip": "192.168.1.15", + "mac": "00:c0:b7:fb:aa:f0", + "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": "", + "ports": { + "10": { + "uid": "ecotype-32" + }, + "11": { + "uid": "ecotype-33" + }, + "12": { + "uid": "ecotype-34" + }, + "13": { + "uid": "ecotype-35" + }, + "14": { + "uid": "ecotype-36" + }, + "2": { + "uid": "ecotype-25" + }, + "3": { + "uid": "ecotype-26" + }, + "4": { + "uid": "ecotype-27" + }, + "5": { + "uid": "ecotype-28" + }, + "6": { + "uid": "ecotype-29" + }, + "7": { + "uid": "ecotype-30" + }, + "9": { + "uid": "ecotype-31" + } + }, + "type": "pdu", + "uid": "pdu-Z1.20", + "vendor": "APC" +} \ No newline at end of file diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json new file mode 100644 index 00000000000..dc18a8d7489 --- /dev/null +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json @@ -0,0 +1,60 @@ +{ + "ip": "192.168.1.16", + "mac": "00:c0:b7:fb:aa:5b", + "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": "", + "ports": { + "1": { + "uid": "ecotype-prod2" + }, + "10": { + "uid": "ecotype-32" + }, + "11": { + "uid": "ecotype-33" + }, + "12": { + "uid": "ecotype-34" + }, + "13": { + "uid": "ecotype-35" + }, + "14": { + "uid": "ecotype-36" + }, + "2": { + "uid": "ecotype-25" + }, + "3": { + "uid": "ecotype-26" + }, + "4": { + "uid": "ecotype-27" + }, + "5": { + "uid": "ecotype-28" + }, + "6": { + "uid": "ecotype-29" + }, + "7": { + "uid": "ecotype-30" + }, + "9": { + "uid": "ecotype-31" + } + }, + "type": "pdu", + "uid": "pdu-Z1.21", + "vendor": "APC" +} \ No newline at end of file diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json new file mode 100644 index 00000000000..ce843d8e672 --- /dev/null +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json @@ -0,0 +1,60 @@ +{ + "ip": "192.168.1.5", + "mac": "00:c0:b7:fb:aa:93", + "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": "", + "ports": { + "1": { + "uid": "sw-ecotype-adm" + }, + "10": { + "uid": "ecotype-20" + }, + "11": { + "uid": "ecotype-21" + }, + "12": { + "uid": "ecotype-22" + }, + "13": { + "uid": "ecotype-23" + }, + "14": { + "uid": "ecotype-24" + }, + "2": { + "uid": "ecotype-13" + }, + "3": { + "uid": "ecotype-14" + }, + "4": { + "uid": "ecotype-15" + }, + "5": { + "uid": "ecotype-16" + }, + "6": { + "uid": "ecotype-17" + }, + "7": { + "uid": "ecotype-18" + }, + "9": { + "uid": "ecotype-19" + } + }, + "type": "pdu", + "uid": "pdu-Z1.40", + "vendor": "APC" +} \ No newline at end of file diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json new file mode 100644 index 00000000000..d09e741e2f5 --- /dev/null +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json @@ -0,0 +1,44 @@ +{ + "ip": "192.168.1.10", + "mac": "00:c0:b7:fb:aa:8b", + "ports": { + "10": { + "uid": "ecotype-20" + }, + "11": { + "uid": "ecotype-21" + }, + "12": { + "uid": "ecotype-22" + }, + "13": { + "uid": "ecotype-23" + }, + "14": { + "uid": "ecotype-24" + }, + "2": { + "uid": "ecotype-13" + }, + "3": { + "uid": "ecotype-14" + }, + "4": { + "uid": "ecotype-15" + }, + "5": { + "uid": "ecotype-16" + }, + "6": { + "uid": "ecotype-17" + }, + "7": { + "uid": "ecotype-18" + }, + "9": { + "uid": "ecotype-19" + } + }, + "type": "pdu", + "uid": "pdu-Z1.41" +} \ No newline at end of file diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json new file mode 100644 index 00000000000..bd0d437f671 --- /dev/null +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json @@ -0,0 +1,57 @@ +{ + "ip": "192.168.1.11", + "mac": "00:c0:b7:fb:aa:a7", + "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": "", + "ports": { + "10": { + "uid": "ecotype-8" + }, + "11": { + "uid": "ecotype-9" + }, + "12": { + "uid": "ecotype-10" + }, + "13": { + "uid": "ecotype-11" + }, + "14": { + "uid": "ecotype-12" + }, + "2": { + "uid": "ecotype-1" + }, + "3": { + "uid": "ecotype-2" + }, + "4": { + "uid": "ecotype-3" + }, + "5": { + "uid": "ecotype-4" + }, + "6": { + "uid": "ecotype-5" + }, + "7": { + "uid": "ecotype-6" + }, + "9": { + "uid": "ecotype-7" + } + }, + "type": "pdu", + "uid": "pdu-Z1.50", + "vendor": "APC" +} \ No newline at end of file diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json new file mode 100644 index 00000000000..91b593a988f --- /dev/null +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json @@ -0,0 +1,60 @@ +{ + "ip": "192.168.1.12", + "mac": "00:c0:b7:fb:aa:97", + "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": "", + "ports": { + "1": { + "uid": "ecotype-prod2" + }, + "10": { + "uid": "ecotype-8" + }, + "11": { + "uid": "ecotype-9" + }, + "12": { + "uid": "ecotype-10" + }, + "13": { + "uid": "ecotype-11" + }, + "14": { + "uid": "ecotype-12" + }, + "2": { + "uid": "ecotype-1" + }, + "3": { + "uid": "ecotype-2" + }, + "4": { + "uid": "ecotype-3" + }, + "5": { + "uid": "ecotype-4" + }, + "6": { + "uid": "ecotype-5" + }, + "7": { + "uid": "ecotype-6" + }, + "9": { + "uid": "ecotype-7" + } + }, + "type": "pdu", + "uid": "pdu-Z1.51", + "vendor": "APC" +} \ No newline at end of file diff --git a/input/grid5000/sites/nantes/pdus.yaml b/input/grid5000/sites/nantes/pdus.yaml new file mode 100644 index 00000000000..9aa0709fefd --- /dev/null +++ b/input/grid5000/sites/nantes/pdus.yaml @@ -0,0 +1,303 @@ +--- +pdus: + pdu-Z1.10: + vendor: APC + model: '' + 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% + ip: 192.168.1.6 + mac: 00:c0:b7:fb:aa:e1 + ports: + 2: + uid: ecotype-37 + 3: + uid: ecotype-38 + 4: + uid: ecotype-39 + 5: + uid: ecotype-40 + 6: + uid: ecotype-41 + 7: + uid: ecotype-42 + 9: + uid: ecotype-43 + 10: + uid: ecotype-44 + 11: + uid: ecotype-45 + 12: + uid: ecotype-46 + 13: + uid: ecotype-47 + 14: + uid: ecotype-48 + + pdu-Z1.11: + vendor: APC + model: '' + 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% + ip: 192.168.1.14 + mac: 00:c0:b7:fb:aa:a1 + ports: + 1: + uid: electrical_mgmt_board + 2: + uid: ecotype-37 + 3: + uid: ecotype-38 + 4: + uid: ecotype-39 + 5: + uid: ecotype-40 + 6: + uid: ecotype-41 + 7: + uid: ecotype-42 + 9: + uid: ecotype-43 + 10: + uid: ecotype-44 + 11: + uid: ecotype-45 + 12: + uid: ecotype-46 + 13: + uid: ecotype-47 + 14: + uid: ecotype-48 + + pdu-Z1.20: + vendor: APC + model: '' + 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% + ip: 192.168.1.15 + mac: 00:c0:b7:fb:aa:f0 + ports: + 2: + uid: ecotype-25 + 3: + uid: ecotype-26 + 4: + uid: ecotype-27 + 5: + uid: ecotype-28 + 6: + uid: ecotype-29 + 7: + uid: ecotype-30 + 9: + uid: ecotype-31 + 10: + uid: ecotype-32 + 11: + uid: ecotype-33 + 12: + uid: ecotype-34 + 13: + uid: ecotype-35 + 14: + uid: ecotype-36 + + pdu-Z1.21: + vendor: APC + model: '' + 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% + ip: 192.168.1.16 + mac: 00:c0:b7:fb:aa:5b + ports: + 1: + uid: ecotype-prod2 + 2: + uid: ecotype-25 + 3: + uid: ecotype-26 + 4: + uid: ecotype-27 + 5: + uid: ecotype-28 + 6: + uid: ecotype-29 + 7: + uid: ecotype-30 + 9: + uid: ecotype-31 + 10: + uid: ecotype-32 + 11: + uid: ecotype-33 + 12: + uid: ecotype-34 + 13: + uid: ecotype-35 + 14: + uid: ecotype-36 + pdu-Z1.40: + vendor: APC + model: '' + 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% + ip: 192.168.1.5 + mac: 00:c0:b7:fb:aa:93 + ports: + 1: + uid: sw-ecotype-adm + 2: + uid: ecotype-13 + 3: + uid: ecotype-14 + 4: + uid: ecotype-15 + 5: + uid: ecotype-16 + 6: + uid: ecotype-17 + 7: + uid: ecotype-18 + 9: + uid: ecotype-19 + 10: + uid: ecotype-20 + 11: + uid: ecotype-21 + 12: + uid: ecotype-22 + 13: + uid: ecotype-23 + 14: + uid: ecotype-24 + + pdu-Z1.41: + ip: 192.168.1.10 + mac: 00:c0:b7:fb:aa:8b + ports: + 2: + uid: ecotype-13 + 3: + uid: ecotype-14 + 4: + uid: ecotype-15 + 5: + uid: ecotype-16 + 6: + uid: ecotype-17 + 7: + uid: ecotype-18 + 9: + uid: ecotype-19 + 10: + uid: ecotype-20 + 11: + uid: ecotype-21 + 12: + uid: ecotype-22 + 13: + uid: ecotype-23 + 14: + uid: ecotype-24 + + pdu-Z1.50: + vendor: APC + model: '' + 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% + ip: 192.168.1.11 + mac: 00:c0:b7:fb:aa:a7 + ports: + 2: + uid: ecotype-1 + 3: + uid: ecotype-2 + 4: + uid: ecotype-3 + 5: + uid: ecotype-4 + 6: + uid: ecotype-5 + 7: + uid: ecotype-6 + 9: + uid: ecotype-7 + 10: + uid: ecotype-8 + 11: + uid: ecotype-9 + 12: + uid: ecotype-10 + 13: + uid: ecotype-11 + 14: + uid: ecotype-12 + + pdu-Z1.51: + vendor: APC + model: '' + 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% + ip: 192.168.1.12 + mac: 00:c0:b7:fb:aa:97 + ports: + 1: + uid: ecotype-prod2 + 2: + uid: ecotype-1 + 3: + uid: ecotype-2 + 4: + uid: ecotype-3 + 5: + uid: ecotype-4 + 6: + uid: ecotype-5 + 7: + uid: ecotype-6 + 9: + uid: ecotype-7 + 10: + uid: ecotype-8 + 11: + uid: ecotype-9 + 12: + uid: ecotype-10 + 13: + uid: ecotype-11 + 14: + uid: ecotype-12 -- GitLab From c7262b0fcab279057d6567cf995f8bde093d1ca7 Mon Sep 17 00:00:00 2001 From: Alexis Bitaillou <alexis.bitaillou@inria.fr> Date: Mon, 24 Mar 2025 16:30:13 +0100 Subject: [PATCH 2/3] [Nantes] pdu lower sample rate --- input/grid5000/sites/nantes/pdus.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/input/grid5000/sites/nantes/pdus.yaml b/input/grid5000/sites/nantes/pdus.yaml index 9aa0709fefd..6a0890607e9 100644 --- a/input/grid5000/sites/nantes/pdus.yaml +++ b/input/grid5000/sites/nantes/pdus.yaml @@ -6,7 +6,7 @@ pdus: metrics: - name: pdu_outlet_power_watt description: Power consumption per outlet reported by PDU, in watt - period: 1000 + period: 5000 source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% @@ -44,7 +44,7 @@ pdus: metrics: - name: pdu_outlet_power_watt description: Power consumption per outlet reported by PDU, in watt - period: 1000 + period: 5000 source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% @@ -84,7 +84,7 @@ pdus: metrics: - name: pdu_outlet_power_watt description: Power consumption per outlet reported by PDU, in watt - period: 1000 + period: 5000 source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% @@ -122,7 +122,7 @@ pdus: metrics: - name: pdu_outlet_power_watt description: Power consumption per outlet reported by PDU, in watt - period: 1000 + period: 5000 source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% @@ -161,7 +161,7 @@ pdus: metrics: - name: pdu_outlet_power_watt description: Power consumption per outlet reported by PDU, in watt - period: 1000 + period: 5000 source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% @@ -230,7 +230,7 @@ pdus: metrics: - name: pdu_outlet_power_watt description: Power consumption per outlet reported by PDU, in watt - period: 1000 + period: 5000 source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% @@ -268,7 +268,7 @@ pdus: metrics: - name: pdu_outlet_power_watt description: Power consumption per outlet reported by PDU, in watt - period: 1000 + period: 5000 source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% -- GitLab From 0323101df1bd6cb2555a66057b22f02e0045f932 Mon Sep 17 00:00:00 2001 From: Alexis Bitaillou <alexis.bitaillou@inria.fr> Date: Mon, 24 Mar 2025 16:59:46 +0100 Subject: [PATCH 3/3] [Nantes] fix name + add missing generated files --- .../grid5000/sites/nantes/pdus/pdu-Z1.10.json | 50 +-- .../grid5000/sites/nantes/pdus/pdu-Z1.11.json | 54 +--- .../grid5000/sites/nantes/pdus/pdu-Z1.20.json | 50 +-- .../grid5000/sites/nantes/pdus/pdu-Z1.21.json | 54 +--- .../grid5000/sites/nantes/pdus/pdu-Z1.40.json | 54 +--- .../grid5000/sites/nantes/pdus/pdu-Z1.41.json | 48 +-- .../grid5000/sites/nantes/pdus/pdu-Z1.50.json | 50 +-- .../grid5000/sites/nantes/pdus/pdu-Z1.51.json | 54 +--- input/grid5000/sites/nantes/pdus.yaml | 302 ++++++------------ 9 files changed, 208 insertions(+), 508 deletions(-) diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json index d95b6f219c6..cb0f4fb16bf 100644 --- a/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.10.json @@ -5,7 +5,7 @@ { "description": "Power consumption per outlet reported by PDU, in watt", "name": "pdu_outlet_power_watt", - "period": 1000, + "period": 5000, "source": { "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%", "protocol": "snmp" @@ -14,42 +14,18 @@ ], "model": "", "ports": { - "10": { - "uid": "ecotype-44" - }, - "11": { - "uid": "ecotype-45" - }, - "12": { - "uid": "ecotype-46" - }, - "13": { - "uid": "ecotype-47" - }, - "14": { - "uid": "ecotype-48" - }, - "2": { - "uid": "ecotype-37" - }, - "3": { - "uid": "ecotype-38" - }, - "4": { - "uid": "ecotype-39" - }, - "5": { - "uid": "ecotype-40" - }, - "6": { - "uid": "ecotype-41" - }, - "7": { - "uid": "ecotype-42" - }, - "9": { - "uid": "ecotype-43" - } + "10": "ecotype-44", + "11": "ecotype-45", + "12": "ecotype-46", + "13": "ecotype-47", + "14": "ecotype-48", + "2": "ecotype-37", + "3": "ecotype-38", + "4": "ecotype-39", + "5": "ecotype-40", + "6": "ecotype-41", + "7": "ecotype-42", + "9": "ecotype-43" }, "type": "pdu", "uid": "pdu-Z1.10", diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json index 293eebed2ad..4e1408be114 100644 --- a/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json @@ -5,7 +5,7 @@ { "description": "Power consumption per outlet reported by PDU, in watt", "name": "pdu_outlet_power_watt", - "period": 1000, + "period": 5000, "source": { "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%", "protocol": "snmp" @@ -14,45 +14,19 @@ ], "model": "", "ports": { - "1": { - "uid": "electrical_mgmt_board" - }, - "10": { - "uid": "ecotype-44" - }, - "11": { - "uid": "ecotype-45" - }, - "12": { - "uid": "ecotype-46" - }, - "13": { - "uid": "ecotype-47" - }, - "14": { - "uid": "ecotype-48" - }, - "2": { - "uid": "ecotype-37" - }, - "3": { - "uid": "ecotype-38" - }, - "4": { - "uid": "ecotype-39" - }, - "5": { - "uid": "ecotype-40" - }, - "6": { - "uid": "ecotype-41" - }, - "7": { - "uid": "ecotype-42" - }, - "9": { - "uid": "ecotype-43" - } + "1": "electrical_mgmt_board", + "10": "ecotype-44", + "11": "ecotype-45", + "12": "ecotype-46", + "13": "ecotype-47", + "14": "ecotype-48", + "2": "ecotype-37", + "3": "ecotype-38", + "4": "ecotype-39", + "5": "ecotype-40", + "6": "ecotype-41", + "7": "ecotype-42", + "9": "ecotype-43" }, "type": "pdu", "uid": "pdu-Z1.11", diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json index 0f8c3a66efd..56fcfd7c791 100644 --- a/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.20.json @@ -5,7 +5,7 @@ { "description": "Power consumption per outlet reported by PDU, in watt", "name": "pdu_outlet_power_watt", - "period": 1000, + "period": 5000, "source": { "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%", "protocol": "snmp" @@ -14,42 +14,18 @@ ], "model": "", "ports": { - "10": { - "uid": "ecotype-32" - }, - "11": { - "uid": "ecotype-33" - }, - "12": { - "uid": "ecotype-34" - }, - "13": { - "uid": "ecotype-35" - }, - "14": { - "uid": "ecotype-36" - }, - "2": { - "uid": "ecotype-25" - }, - "3": { - "uid": "ecotype-26" - }, - "4": { - "uid": "ecotype-27" - }, - "5": { - "uid": "ecotype-28" - }, - "6": { - "uid": "ecotype-29" - }, - "7": { - "uid": "ecotype-30" - }, - "9": { - "uid": "ecotype-31" - } + "10": "ecotype-32", + "11": "ecotype-33", + "12": "ecotype-34", + "13": "ecotype-35", + "14": "ecotype-36", + "2": "ecotype-25", + "3": "ecotype-26", + "4": "ecotype-27", + "5": "ecotype-28", + "6": "ecotype-29", + "7": "ecotype-30", + "9": "ecotype-31" }, "type": "pdu", "uid": "pdu-Z1.20", diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json index dc18a8d7489..b5b16f7eb9b 100644 --- a/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json @@ -5,7 +5,7 @@ { "description": "Power consumption per outlet reported by PDU, in watt", "name": "pdu_outlet_power_watt", - "period": 1000, + "period": 5000, "source": { "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%", "protocol": "snmp" @@ -14,45 +14,19 @@ ], "model": "", "ports": { - "1": { - "uid": "ecotype-prod2" - }, - "10": { - "uid": "ecotype-32" - }, - "11": { - "uid": "ecotype-33" - }, - "12": { - "uid": "ecotype-34" - }, - "13": { - "uid": "ecotype-35" - }, - "14": { - "uid": "ecotype-36" - }, - "2": { - "uid": "ecotype-25" - }, - "3": { - "uid": "ecotype-26" - }, - "4": { - "uid": "ecotype-27" - }, - "5": { - "uid": "ecotype-28" - }, - "6": { - "uid": "ecotype-29" - }, - "7": { - "uid": "ecotype-30" - }, - "9": { - "uid": "ecotype-31" - } + "1": "ecotype-prod2", + "10": "ecotype-32", + "11": "ecotype-33", + "12": "ecotype-34", + "13": "ecotype-35", + "14": "ecotype-36", + "2": "ecotype-25", + "3": "ecotype-26", + "4": "ecotype-27", + "5": "ecotype-28", + "6": "ecotype-29", + "7": "ecotype-30", + "9": "ecotype-31" }, "type": "pdu", "uid": "pdu-Z1.21", diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json index ce843d8e672..6e592d1d58f 100644 --- a/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.40.json @@ -5,7 +5,7 @@ { "description": "Power consumption per outlet reported by PDU, in watt", "name": "pdu_outlet_power_watt", - "period": 1000, + "period": 5000, "source": { "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%", "protocol": "snmp" @@ -14,45 +14,19 @@ ], "model": "", "ports": { - "1": { - "uid": "sw-ecotype-adm" - }, - "10": { - "uid": "ecotype-20" - }, - "11": { - "uid": "ecotype-21" - }, - "12": { - "uid": "ecotype-22" - }, - "13": { - "uid": "ecotype-23" - }, - "14": { - "uid": "ecotype-24" - }, - "2": { - "uid": "ecotype-13" - }, - "3": { - "uid": "ecotype-14" - }, - "4": { - "uid": "ecotype-15" - }, - "5": { - "uid": "ecotype-16" - }, - "6": { - "uid": "ecotype-17" - }, - "7": { - "uid": "ecotype-18" - }, - "9": { - "uid": "ecotype-19" - } + "1": "sw-ecotype-adm", + "10": "ecotype-20", + "11": "ecotype-21", + "12": "ecotype-22", + "13": "ecotype-23", + "14": "ecotype-24", + "2": "ecotype-13", + "3": "ecotype-14", + "4": "ecotype-15", + "5": "ecotype-16", + "6": "ecotype-17", + "7": "ecotype-18", + "9": "ecotype-19" }, "type": "pdu", "uid": "pdu-Z1.40", diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json index d09e741e2f5..f414c7a1352 100644 --- a/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json @@ -2,42 +2,18 @@ "ip": "192.168.1.10", "mac": "00:c0:b7:fb:aa:8b", "ports": { - "10": { - "uid": "ecotype-20" - }, - "11": { - "uid": "ecotype-21" - }, - "12": { - "uid": "ecotype-22" - }, - "13": { - "uid": "ecotype-23" - }, - "14": { - "uid": "ecotype-24" - }, - "2": { - "uid": "ecotype-13" - }, - "3": { - "uid": "ecotype-14" - }, - "4": { - "uid": "ecotype-15" - }, - "5": { - "uid": "ecotype-16" - }, - "6": { - "uid": "ecotype-17" - }, - "7": { - "uid": "ecotype-18" - }, - "9": { - "uid": "ecotype-19" - } + "10": "ecotype-20", + "11": "ecotype-21", + "12": "ecotype-22", + "13": "ecotype-23", + "14": "ecotype-24", + "2": "ecotype-13", + "3": "ecotype-14", + "4": "ecotype-15", + "5": "ecotype-16", + "6": "ecotype-17", + "7": "ecotype-18", + "9": "ecotype-19" }, "type": "pdu", "uid": "pdu-Z1.41" diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json index bd0d437f671..e70e65d7264 100644 --- a/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.50.json @@ -5,7 +5,7 @@ { "description": "Power consumption per outlet reported by PDU, in watt", "name": "pdu_outlet_power_watt", - "period": 1000, + "period": 5000, "source": { "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%", "protocol": "snmp" @@ -14,42 +14,18 @@ ], "model": "", "ports": { - "10": { - "uid": "ecotype-8" - }, - "11": { - "uid": "ecotype-9" - }, - "12": { - "uid": "ecotype-10" - }, - "13": { - "uid": "ecotype-11" - }, - "14": { - "uid": "ecotype-12" - }, - "2": { - "uid": "ecotype-1" - }, - "3": { - "uid": "ecotype-2" - }, - "4": { - "uid": "ecotype-3" - }, - "5": { - "uid": "ecotype-4" - }, - "6": { - "uid": "ecotype-5" - }, - "7": { - "uid": "ecotype-6" - }, - "9": { - "uid": "ecotype-7" - } + "10": "ecotype-8", + "11": "ecotype-9", + "12": "ecotype-10", + "13": "ecotype-11", + "14": "ecotype-12", + "2": "ecotype-1", + "3": "ecotype-2", + "4": "ecotype-3", + "5": "ecotype-4", + "6": "ecotype-5", + "7": "ecotype-6", + "9": "ecotype-7" }, "type": "pdu", "uid": "pdu-Z1.50", diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json index 91b593a988f..43627683cf2 100644 --- a/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json +++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json @@ -5,7 +5,7 @@ { "description": "Power consumption per outlet reported by PDU, in watt", "name": "pdu_outlet_power_watt", - "period": 1000, + "period": 5000, "source": { "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%", "protocol": "snmp" @@ -14,45 +14,19 @@ ], "model": "", "ports": { - "1": { - "uid": "ecotype-prod2" - }, - "10": { - "uid": "ecotype-8" - }, - "11": { - "uid": "ecotype-9" - }, - "12": { - "uid": "ecotype-10" - }, - "13": { - "uid": "ecotype-11" - }, - "14": { - "uid": "ecotype-12" - }, - "2": { - "uid": "ecotype-1" - }, - "3": { - "uid": "ecotype-2" - }, - "4": { - "uid": "ecotype-3" - }, - "5": { - "uid": "ecotype-4" - }, - "6": { - "uid": "ecotype-5" - }, - "7": { - "uid": "ecotype-6" - }, - "9": { - "uid": "ecotype-7" - } + "1": "ecotype-prod2", + "10": "ecotype-8", + "11": "ecotype-9", + "12": "ecotype-10", + "13": "ecotype-11", + "14": "ecotype-12", + "2": "ecotype-1", + "3": "ecotype-2", + "4": "ecotype-3", + "5": "ecotype-4", + "6": "ecotype-5", + "7": "ecotype-6", + "9": "ecotype-7" }, "type": "pdu", "uid": "pdu-Z1.51", diff --git a/input/grid5000/sites/nantes/pdus.yaml b/input/grid5000/sites/nantes/pdus.yaml index 6a0890607e9..14c59476f2a 100644 --- a/input/grid5000/sites/nantes/pdus.yaml +++ b/input/grid5000/sites/nantes/pdus.yaml @@ -13,30 +13,18 @@ pdus: ip: 192.168.1.6 mac: 00:c0:b7:fb:aa:e1 ports: - 2: - uid: ecotype-37 - 3: - uid: ecotype-38 - 4: - uid: ecotype-39 - 5: - uid: ecotype-40 - 6: - uid: ecotype-41 - 7: - uid: ecotype-42 - 9: - uid: ecotype-43 - 10: - uid: ecotype-44 - 11: - uid: ecotype-45 - 12: - uid: ecotype-46 - 13: - uid: ecotype-47 - 14: - uid: ecotype-48 + 2: ecotype-37 + 3: ecotype-38 + 4: ecotype-39 + 5: ecotype-40 + 6: ecotype-41 + 7: ecotype-42 + 9: ecotype-43 + 10: ecotype-44 + 11: ecotype-45 + 12: ecotype-46 + 13: ecotype-47 + 14: ecotype-48 pdu-Z1.11: vendor: APC @@ -51,32 +39,19 @@ pdus: ip: 192.168.1.14 mac: 00:c0:b7:fb:aa:a1 ports: - 1: - uid: electrical_mgmt_board - 2: - uid: ecotype-37 - 3: - uid: ecotype-38 - 4: - uid: ecotype-39 - 5: - uid: ecotype-40 - 6: - uid: ecotype-41 - 7: - uid: ecotype-42 - 9: - uid: ecotype-43 - 10: - uid: ecotype-44 - 11: - uid: ecotype-45 - 12: - uid: ecotype-46 - 13: - uid: ecotype-47 - 14: - uid: ecotype-48 + 1: electrical_mgmt_board + 2: ecotype-37 + 3: ecotype-38 + 4: ecotype-39 + 5: ecotype-40 + 6: ecotype-41 + 7: ecotype-42 + 9: ecotype-43 + 10: ecotype-44 + 11: ecotype-45 + 12: ecotype-46 + 13: ecotype-47 + 14: ecotype-48 pdu-Z1.20: vendor: APC @@ -91,30 +66,18 @@ pdus: ip: 192.168.1.15 mac: 00:c0:b7:fb:aa:f0 ports: - 2: - uid: ecotype-25 - 3: - uid: ecotype-26 - 4: - uid: ecotype-27 - 5: - uid: ecotype-28 - 6: - uid: ecotype-29 - 7: - uid: ecotype-30 - 9: - uid: ecotype-31 - 10: - uid: ecotype-32 - 11: - uid: ecotype-33 - 12: - uid: ecotype-34 - 13: - uid: ecotype-35 - 14: - uid: ecotype-36 + 2: ecotype-25 + 3: ecotype-26 + 4: ecotype-27 + 5: ecotype-28 + 6: ecotype-29 + 7: ecotype-30 + 9: ecotype-31 + 10: ecotype-32 + 11: ecotype-33 + 12: ecotype-34 + 13: ecotype-35 + 14: ecotype-36 pdu-Z1.21: vendor: APC @@ -129,32 +92,19 @@ pdus: ip: 192.168.1.16 mac: 00:c0:b7:fb:aa:5b ports: - 1: - uid: ecotype-prod2 - 2: - uid: ecotype-25 - 3: - uid: ecotype-26 - 4: - uid: ecotype-27 - 5: - uid: ecotype-28 - 6: - uid: ecotype-29 - 7: - uid: ecotype-30 - 9: - uid: ecotype-31 - 10: - uid: ecotype-32 - 11: - uid: ecotype-33 - 12: - uid: ecotype-34 - 13: - uid: ecotype-35 - 14: - uid: ecotype-36 + 1: ecotype-prod2 + 2: ecotype-25 + 3: ecotype-26 + 4: ecotype-27 + 5: ecotype-28 + 6: ecotype-29 + 7: ecotype-30 + 9: ecotype-31 + 10: ecotype-32 + 11: ecotype-33 + 12: ecotype-34 + 13: ecotype-35 + 14: ecotype-36 pdu-Z1.40: vendor: APC model: '' @@ -168,62 +118,37 @@ pdus: ip: 192.168.1.5 mac: 00:c0:b7:fb:aa:93 ports: - 1: - uid: sw-ecotype-adm - 2: - uid: ecotype-13 - 3: - uid: ecotype-14 - 4: - uid: ecotype-15 - 5: - uid: ecotype-16 - 6: - uid: ecotype-17 - 7: - uid: ecotype-18 - 9: - uid: ecotype-19 - 10: - uid: ecotype-20 - 11: - uid: ecotype-21 - 12: - uid: ecotype-22 - 13: - uid: ecotype-23 - 14: - uid: ecotype-24 + 1: sw-ecotype-adm + 2: ecotype-13 + 3: ecotype-14 + 4: ecotype-15 + 5: ecotype-16 + 6: ecotype-17 + 7: ecotype-18 + 9: ecotype-19 + 10: ecotype-20 + 11: ecotype-21 + 12: ecotype-22 + 13: ecotype-23 + 14: ecotype-24 pdu-Z1.41: ip: 192.168.1.10 mac: 00:c0:b7:fb:aa:8b ports: - 2: - uid: ecotype-13 - 3: - uid: ecotype-14 - 4: - uid: ecotype-15 - 5: - uid: ecotype-16 - 6: - uid: ecotype-17 - 7: - uid: ecotype-18 - 9: - uid: ecotype-19 - 10: - uid: ecotype-20 - 11: - uid: ecotype-21 - 12: - uid: ecotype-22 - 13: - uid: ecotype-23 - 14: - uid: ecotype-24 - + 2: ecotype-13 + 3: ecotype-14 + 4: ecotype-15 + 5: ecotype-16 + 6: ecotype-17 + 7: ecotype-18 + 9: ecotype-19 + 10: ecotype-20 + 11: ecotype-21 + 12: ecotype-22 + 13: ecotype-23 + 14: ecotype-24 + pdu-Z1.50: vendor: APC model: '' @@ -237,30 +162,18 @@ pdus: ip: 192.168.1.11 mac: 00:c0:b7:fb:aa:a7 ports: - 2: - uid: ecotype-1 - 3: - uid: ecotype-2 - 4: - uid: ecotype-3 - 5: - uid: ecotype-4 - 6: - uid: ecotype-5 - 7: - uid: ecotype-6 - 9: - uid: ecotype-7 - 10: - uid: ecotype-8 - 11: - uid: ecotype-9 - 12: - uid: ecotype-10 - 13: - uid: ecotype-11 - 14: - uid: ecotype-12 + 2: ecotype-1 + 3: ecotype-2 + 4: ecotype-3 + 5: ecotype-4 + 6: ecotype-5 + 7: ecotype-6 + 9: ecotype-7 + 10: ecotype-8 + 11: ecotype-9 + 12: ecotype-10 + 13: ecotype-11 + 14: ecotype-12 pdu-Z1.51: vendor: APC @@ -275,29 +188,16 @@ pdus: ip: 192.168.1.12 mac: 00:c0:b7:fb:aa:97 ports: - 1: - uid: ecotype-prod2 - 2: - uid: ecotype-1 - 3: - uid: ecotype-2 - 4: - uid: ecotype-3 - 5: - uid: ecotype-4 - 6: - uid: ecotype-5 - 7: - uid: ecotype-6 - 9: - uid: ecotype-7 - 10: - uid: ecotype-8 - 11: - uid: ecotype-9 - 12: - uid: ecotype-10 - 13: - uid: ecotype-11 - 14: - uid: ecotype-12 + 1: ecotype-prod2 + 2: ecotype-1 + 3: ecotype-2 + 4: ecotype-3 + 5: ecotype-4 + 6: ecotype-5 + 7: ecotype-6 + 9: ecotype-7 + 10: ecotype-8 + 11: ecotype-9 + 12: ecotype-10 + 13: ecotype-11 + 14: ecotype-12 -- GitLab