From 4557503763c8f0fc2f4d6698bc47260bac63cf8c Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Fri, 3 Jul 2020 11:12:06 +0200
Subject: [PATCH] [all_sites] Fix bmc_node_power_watt_total unit (watthour)
---
data/grid5000/sites/grenoble/clusters/dahu/dahu.json | 2 +-
data/grid5000/sites/grenoble/clusters/troll/troll.json | 2 +-
data/grid5000/sites/grenoble/clusters/yeti/yeti.json | 2 +-
data/grid5000/sites/lille/clusters/chetemi/chetemi.json | 2 +-
data/grid5000/sites/lille/clusters/chiclet/chiclet.json | 2 +-
data/grid5000/sites/lille/clusters/chifflet/chifflet.json | 2 +-
data/grid5000/sites/lille/clusters/chifflot/chifflot.json | 2 +-
.../sites/luxembourg/clusters/petitprince/petitprince.json | 2 +-
data/grid5000/sites/lyon/clusters/nova/nova.json | 2 +-
data/grid5000/sites/lyon/clusters/orion/orion.json | 2 +-
data/grid5000/sites/lyon/clusters/taurus/taurus.json | 2 +-
data/grid5000/sites/nancy/clusters/graffiti/graffiti.json | 2 +-
data/grid5000/sites/nancy/clusters/graoully/graoully.json | 2 +-
data/grid5000/sites/nancy/clusters/graphique/graphique.json | 2 +-
data/grid5000/sites/nancy/clusters/graphite/graphite.json | 2 +-
data/grid5000/sites/nancy/clusters/grele/grele.json | 2 +-
data/grid5000/sites/nancy/clusters/grimani/grimani.json | 2 +-
data/grid5000/sites/nancy/clusters/grimoire/grimoire.json | 2 +-
data/grid5000/sites/nancy/clusters/grisou/grisou.json | 2 +-
data/grid5000/sites/nancy/clusters/gros/gros.json | 2 +-
data/grid5000/sites/nancy/clusters/grue/grue.json | 2 +-
data/grid5000/sites/nancy/clusters/grvingt/grvingt.json | 2 +-
data/grid5000/sites/nantes/clusters/ecotype/ecotype.json | 2 +-
data/grid5000/sites/rennes/clusters/parasilo/parasilo.json | 2 +-
data/grid5000/sites/rennes/clusters/paravance/paravance.json | 2 +-
input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml | 2 +-
input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml | 2 +-
input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml | 2 +-
.../grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml | 2 +-
.../grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml | 2 +-
.../sites/lille/clusters/chifflet/chifflet_metrics.yaml | 2 +-
.../sites/lille/clusters/chifflot/chifflot_metrics.yaml | 2 +-
.../luxembourg/clusters/petitprince/petitprince_metrics.yaml | 2 +-
input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml | 2 +-
input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml | 2 +-
input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml | 2 +-
.../sites/nancy/clusters/graffiti/graffiti_metrics.yaml | 2 +-
.../sites/nancy/clusters/graoully/graoully_metrics.yaml | 2 +-
.../sites/nancy/clusters/graphique/graphique_metrics.yaml | 2 +-
.../sites/nancy/clusters/graphite/graphite_metrics.yaml | 2 +-
input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml | 2 +-
.../grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml | 2 +-
.../sites/nancy/clusters/grimoire/grimoire_metrics.yaml | 2 +-
input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml | 2 +-
input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml | 2 +-
input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml | 2 +-
.../grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml | 2 +-
.../grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml | 2 +-
.../sites/rennes/clusters/parasilo/parasilo_metrics.yaml | 2 +-
.../sites/rennes/clusters/paravance/paravance_metrics.yaml | 2 +-
50 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
index f627f0e7e2..861a073deb 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/grenoble/clusters/troll/troll.json b/data/grid5000/sites/grenoble/clusters/troll/troll.json
index 3b4663e34e..301d98c35d 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/troll.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/troll.json
@@ -60,7 +60,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
index bd9f36a78d..9052e1a685 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
@@ -87,7 +87,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lille/clusters/chetemi/chetemi.json b/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
index 3ee8676db9..26db16dde3 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
index 00824259e6..91a4724f68 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lille/clusters/chifflet/chifflet.json b/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
index b3a1e8552e..cfa0131123 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
index c9eb540100..59258789ba 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
index 9d90b49441..b246cc23c3 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
@@ -24,7 +24,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lyon/clusters/nova/nova.json b/data/grid5000/sites/lyon/clusters/nova/nova.json
index 3071a98285..1c545b9b5b 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nova.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nova.json
@@ -33,7 +33,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lyon/clusters/orion/orion.json b/data/grid5000/sites/lyon/clusters/orion/orion.json
index ad91fdebf4..c86510c9f0 100644
--- a/data/grid5000/sites/lyon/clusters/orion/orion.json
+++ b/data/grid5000/sites/lyon/clusters/orion/orion.json
@@ -60,7 +60,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/lyon/clusters/taurus/taurus.json b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
index f4d79303ec..3bafe1a393 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/taurus.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
@@ -60,7 +60,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
index dee727ae2e..2f47b54267 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/graoully/graoully.json b/data/grid5000/sites/nancy/clusters/graoully/graoully.json
index 27ce73840d..7cd5ff558a 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/graoully.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/graoully.json
@@ -59,7 +59,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/graphique/graphique.json b/data/grid5000/sites/nancy/clusters/graphique/graphique.json
index 103e46cc25..743d8097e8 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/graphique.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/graphique.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/graphite/graphite.json b/data/grid5000/sites/nancy/clusters/graphite/graphite.json
index 1ff2c71367..786801e397 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/graphite.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/graphite.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/grele/grele.json b/data/grid5000/sites/nancy/clusters/grele/grele.json
index 7346acd558..54ce58edfa 100644
--- a/data/grid5000/sites/nancy/clusters/grele/grele.json
+++ b/data/grid5000/sites/nancy/clusters/grele/grele.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/grimani/grimani.json b/data/grid5000/sites/nancy/clusters/grimani/grimani.json
index 34dbce1240..d9d517cce7 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/grimani.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/grimani.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json b/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
index 6ba365f0e2..87ddfb2d13 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
@@ -59,7 +59,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/grisou/grisou.json b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
index f42f103eb7..16df87f589 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/grisou.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
@@ -59,7 +59,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/gros/gros.json b/data/grid5000/sites/nancy/clusters/gros/gros.json
index 064f4e2788..d949f9def2 100644
--- a/data/grid5000/sites/nancy/clusters/gros/gros.json
+++ b/data/grid5000/sites/nancy/clusters/gros/gros.json
@@ -60,7 +60,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/grue/grue.json b/data/grid5000/sites/nancy/clusters/grue/grue.json
index 1ece0a49e4..ecd6444d37 100644
--- a/data/grid5000/sites/nancy/clusters/grue/grue.json
+++ b/data/grid5000/sites/nancy/clusters/grue/grue.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
index e648cffb1b..03fc1427c5 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
index 2c3b6b6f9d..56a39fc08c 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
@@ -78,7 +78,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
index 04aa91aeee..b8bea6355a 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
@@ -59,7 +59,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/data/grid5000/sites/rennes/clusters/paravance/paravance.json b/data/grid5000/sites/rennes/clusters/paravance/paravance.json
index 83def1b8f0..ffcd58836a 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/paravance.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/paravance.json
@@ -59,7 +59,7 @@
},
{
"description": "Cumulated power consumption of node reported by BMC, in watt",
- "name": "bmc_node_power_watt_total",
+ "name": "bmc_node_power_watthour_total",
"optional_period": 5000,
"period": 0,
"source": {
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml b/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
index 924530cf07..3b5100f4de 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml b/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
index 9179286031..d84ebe7719 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
@@ -54,7 +54,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml b/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
index 1f3c2779d4..eb78c9c3e6 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
@@ -73,7 +73,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml b/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
index e0eeca8b64..1c6de56ae2 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml b/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
index fc845c942d..96dbb4bfd2 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml b/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
index b770338d7e..3e8f4a66d3 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml b/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
index d7cd1c0134..2da75133b9 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
index 87c00a4efa..d3854fb51c 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
@@ -28,7 +28,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
index 2c376836e7..c99752d4b8 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
@@ -57,7 +57,7 @@ metrics:
# protocol: snmp
# id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
index 5b28c4990e..4d495763bf 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
@@ -74,7 +74,7 @@ metrics:
# protocol: snmp
# id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
index c83e454fed..10772233cd 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
@@ -75,7 +75,7 @@ metrics:
# protocol: snmp
# id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml b/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
index 933151ef69..4e09e8e200 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
index 2899d2ca52..d3fd32ca67 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
@@ -53,7 +53,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
index b770338d7e..3e8f4a66d3 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
index b770338d7e..3e8f4a66d3 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml b/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
index b770338d7e..3e8f4a66d3 100644
--- a/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml b/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
index b770338d7e..3e8f4a66d3 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml b/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
index 2899d2ca52..d3fd32ca67 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
@@ -53,7 +53,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
index 2899d2ca52..d3fd32ca67 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
@@ -53,7 +53,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml b/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
index 0e9b27458b..e65dc3f70b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
@@ -54,7 +54,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml b/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
index 15b96be44b..5f2ff52f8d 100644
--- a/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml b/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
index 924530cf07..3b5100f4de 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml b/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
index e0eeca8b64..1c6de56ae2 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
@@ -66,7 +66,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
index 2899d2ca52..d3fd32ca67 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
@@ -53,7 +53,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml b/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
index 2899d2ca52..d3fd32ca67 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
@@ -53,7 +53,7 @@ metrics:
protocol: snmp
id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
-- name: bmc_node_power_watt_total
+- name: bmc_node_power_watthour_total
description: Cumulated power consumption of node reported by BMC, in watt
period: 0
optional_period: 5000
--
GitLab