diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
index 6d358e66b35463493c3658c91225bd9c22fa701e..300b5e85786589c603c07868c1f564b0ee59ceab 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
@@ -81,7 +81,7 @@
       "model": "NetXtreme II BCM5708 Gigabit Ethernet",
       "mountable": true,
       "mounted": true,
-      "name": "enp4s0",
+      "name": "eno1",
       "network_address": "granduc-9.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-luxembourg",
@@ -101,7 +101,7 @@
       "model": "NetXtreme II BCM5708 Gigabit Ethernet",
       "mountable": true,
       "mounted": false,
-      "name": "enp8s0",
+      "name": "eno2",
       "network_address": "granduc-9-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-luxembourg",
@@ -163,7 +163,6 @@
   "operating_system": {
     "cstate_driver": "none",
     "cstate_governor": "menu",
-    "cstate_max_id": null,
     "ht_enabled": false,
     "pstate_driver": "none",
     "pstate_governor": "none",
diff --git a/grid5000-all.json b/grid5000-all.json
index 0e1e76dff056526ed896eafe0ac57a66c656fc40..e2a0a7673a0bd0727d336e89cd620f77d3bec672 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -33280,7 +33280,7 @@
                   "model": "NetXtreme II BCM5708 Gigabit Ethernet",
                   "mountable": true,
                   "mounted": true,
-                  "name": "enp4s0",
+                  "name": "eno1",
                   "network_address": "granduc-9.luxembourg.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "gw-luxembourg",
@@ -33300,7 +33300,7 @@
                   "model": "NetXtreme II BCM5708 Gigabit Ethernet",
                   "mountable": true,
                   "mounted": false,
-                  "name": "enp8s0",
+                  "name": "eno2",
                   "network_address": "granduc-9-eth1.luxembourg.grid5000.fr",
                   "rate": 1000000000,
                   "switch": "gw-luxembourg",
@@ -33362,7 +33362,6 @@
               "operating_system": {
                 "cstate_driver": "none",
                 "cstate_governor": "menu",
-                "cstate_max_id": null,
                 "ht_enabled": false,
                 "pstate_driver": "none",
                 "pstate_governor": "none",
@@ -108813,6 +108812,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -108911,6 +108914,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109009,6 +109016,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109107,6 +109118,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109205,6 +109220,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109303,6 +109322,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109401,6 +109424,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109499,6 +109526,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109597,6 +109628,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109695,6 +109730,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -109988,6 +110027,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110086,6 +110129,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110184,6 +110231,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110282,6 +110333,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110380,6 +110435,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110478,6 +110537,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110576,6 +110639,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110674,6 +110741,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110772,6 +110843,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -110870,6 +110945,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111170,6 +111249,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111268,6 +111351,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111366,6 +111453,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111464,6 +111555,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111562,6 +111657,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111660,6 +111759,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111758,6 +111861,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -111856,6 +111963,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -112751,6 +112862,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -112849,6 +112964,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -112947,6 +113066,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113045,6 +113168,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113143,6 +113270,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113241,6 +113372,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113339,6 +113474,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113437,6 +113576,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113535,6 +113678,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113835,6 +113982,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -113933,6 +114084,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114031,6 +114186,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114129,6 +114288,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114227,6 +114390,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114325,6 +114492,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114423,6 +114594,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114521,6 +114696,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114619,6 +114798,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -114717,6 +114900,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115017,6 +115204,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115115,6 +115306,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115213,6 +115408,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115311,6 +115510,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115409,6 +115612,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115507,6 +115714,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115605,6 +115816,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115703,6 +115918,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115801,6 +116020,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -115899,6 +116122,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116192,6 +116419,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116290,6 +116521,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
@@ -116388,6 +116623,10 @@
               "gpu": {
                 "gpu": false
               },
+              "monitoring": {
+                "metric": "power",
+                "wattmeter": "shared"
+              },
               "network_adapters": {
                 "bmc": {
                   "enabled": true,
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
index bfcf24bb931c6230e273f33b01d3946f31be55a0..0ee98fec866d907bd2c7656c5b94bd51e0298cb0 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
@@ -1,94 +1,98 @@
 # Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-9:
-  architecture:
-    nb_cores: 8
-    nb_procs: 2
-    nb_threads: 8
-    platform_type: x86_64
-  bios:
-    release_date: 10/30/2010
-    vendor: Dell Inc.
-    version: 2.7.0
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-    serial: 89N983J
-  main_memory:
-    ram_size: 17179869184
   network_adapters:
-    bmc:
-      ip: 172.17.176.9
-      mac: 00:1c:23:d3:42:88
-      management: true
     eth0:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
+      name: eno1
       interface: Ethernet
       ip: 172.16.176.9
+      driver: bnx2
       mac: 00:19:b9:f1:fc:49
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: enp4s0
       rate: 1000000000
+      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
+      model: NetXtreme II BCM5708 Gigabit Ethernet
       vendor: Broadcom
+      mounted: true
+      management: false
     eth1:
-      driver: bnx2
-      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
+      name: eno2
       interface: Ethernet
+      driver: bnx2
       mac: 00:19:b9:f1:fc:4b
-      management: false
-      model: NetXtreme II BCM5708 Gigabit Ethernet
-      name: enp8s0
       rate: 1000000000
+      firmware_version: 6.4.5 bc 5.0.7 UMP 1.1.9
+      model: NetXtreme II BCM5708 Gigabit Ethernet
       vendor: Broadcom
+      mounted: false
+      management: false
     eth2:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
+      name: enp13s0f0
       interface: Ethernet
+      driver: ixgbe
       mac: 00:1b:21:3d:14:31
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f0
       rate: 10000000000
+      firmware_version: '0xc7390000'
+      model: 82598EB 10-Gigabit AF Dual Port Network Connection
       vendor: Intel
+      mounted: false
+      management: false
     eth3:
-      driver: ixgbe
-      firmware_version: '0xc7390000'
+      name: enp13s0f1
       interface: Ethernet
+      driver: ixgbe
       mac: 00:1b:21:3d:14:30
-      management: false
-      model: 82598EB 10-Gigabit AF Dual Port Network Connection
-      name: enp13s0f1
       rate: 0
+      firmware_version: '0xc7390000'
+      model: 82598EB 10-Gigabit AF Dual Port Network Connection
       vendor: Intel
+      mounted: false
+      management: false
+    bmc:
+      ip: 172.17.176.9
+      mac: 00:1c:23:d3:42:88
+      management: true
+  supported_job_types:
+    virtual: ivt
+  bios:
+    vendor: Dell Inc.
+    version: 2.7.0
+    release_date: 10/30/2010
+  storage_devices:
+    sda:
+      device: sda
+      by_id: "/dev/disk/by-id/wwn-0x5000c5000ec6d79f"
+      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
+      size: 146815733760
+      model: ST9146802SS
+      firmware_version: S22A
+      vendor: SEAGATE
+  main_memory:
+    ram_size: 17179869184
   operating_system:
-    cstate_driver: none
-    cstate_governor: menu
-    cstate_max_id: 
     ht_enabled: false
     pstate_driver: none
     pstate_governor: none
     turboboost_enabled: false
+    cstate_driver: none
+    cstate_governor: menu
+  chassis:
+    serial: 89N983J
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
   processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 4194304
-    cache_l3: 0
     clock_speed: 2000000000
-    ht_capable: true
     instruction_set: x86-64
     model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    vendor: Intel
     version: L5335
-  storage_devices:
-    sda:
-      by_id: "/dev/disk/by-id/wwn-0x5000c5000ec6d79f"
-      by_path: "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0"
-      firmware_version: S22A
-      model: ST9146802SS
-      size: 146815733760
-      vendor: SEAGATE
-  supported_job_types:
-    virtual: ivt
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 4194304
+    cache_l3: 0
+    ht_capable: true
+  architecture:
+    platform_type: x86_64
+    nb_procs: 2
+    nb_cores: 8
+    nb_threads: 8