From 89289abaee641b346c3146739ecb9b31a43b20da Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Wed, 8 Jan 2020 11:37:15 +0100
Subject: [PATCH] [grenoble][troll] Fix cluster pdu/wattmetre
---
.../clusters/troll/nodes/troll-1.json | 20 ++++++++++++++++++-
.../clusters/troll/nodes/troll-2.json | 20 ++++++++++++++++++-
.../clusters/troll/nodes/troll-3.json | 20 ++++++++++++++++++-
.../clusters/troll/nodes/troll-4.json | 20 ++++++++++++++++++-
4 files changed, 76 insertions(+), 4 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
index b687989eea3..d5e5f7bbd29 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json
@@ -42,7 +42,7 @@
"ram_size": 2061584302080
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "true"
},
"network_adapters": [
{
@@ -124,6 +124,24 @@
"version": "Gold 5218"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 3,
+ "uid": "wattmetre9"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.grenoble.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"storage_devices": [
{
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
index f4db37db869..f3584fabd39 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json
@@ -42,7 +42,7 @@
"ram_size": 2061584302080
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "true"
},
"network_adapters": [
{
@@ -124,6 +124,24 @@
"version": "Gold 5218"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 4,
+ "uid": "wattmetre10"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.grenoble.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"storage_devices": [
{
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
index aa9c780dfdc..60d8f2918f8 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json
@@ -42,7 +42,7 @@
"ram_size": 2061584302080
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "true"
},
"network_adapters": [
{
@@ -124,6 +124,24 @@
"version": "Gold 5218"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 5,
+ "uid": "wattmetre11"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.grenoble.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"storage_devices": [
{
diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
index 4b980c02058..3e22b5d7e2a 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json
@@ -42,7 +42,7 @@
"ram_size": 2061584302080
},
"monitoring": {
- "wattmeter": "false"
+ "wattmeter": "true"
},
"network_adapters": [
{
@@ -124,6 +124,24 @@
"version": "Gold 5218"
},
"sensors": {
+ "power": {
+ "available": true,
+ "per_outlets": true,
+ "via": {
+ "api": {
+ "metric": "power"
+ },
+ "pdu": [
+ {
+ "port": 6,
+ "uid": "wattmetre12"
+ }
+ ],
+ "www": {
+ "url": "http://wattmetre.grenoble.grid5000.fr/GetWatts-json.php"
+ }
+ }
+ }
},
"storage_devices": [
{
--
GitLab