diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e05114f9b1e865dfb2d41f23f7ac5e7e03147aa4..1a403f8c019e40abf62962adb3947ee39b62a9e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,38 +1,44 @@
+---
 stages:
-- validate
-- generate
-- deploy
+  - validate
+  - generate
+  - deploy
+
+include:
+  - project: 'grid5000/grid5000-gitlab-templates'
+    ref: master
+    file: '/sonarqube.yml'
 
 rubocop:
   stage: validate
   tags:
-   - grid5000-docker
+    - grid5000-docker
   image: debian:buster
   script:
-      - apt-get update && apt-get -y install rubocop
-      - rubocop -l --fail-level W
+    - apt-get update && apt-get -y install rubocop
+    - rubocop -l --fail-level W
 
 validate-data:
-   stage: validate
-   tags:
+  stage: validate
+  tags:
     - grid5000-docker
-   image: debian:buster
-   script:
+  image: debian:buster
+  script:
     - apt-get update && apt-get -y install ruby ruby-dev build-essential rake wget
     - gem install bundler -v 1.17.3
     - bundle install --without development
-      # Add G5K CA certificate
+    # Add G5K CA certificate
     - wget --no-check-certificate -q https://www.grid5000.fr/certs/ca2019.grid5000.fr.crt -O /usr/local/share/ca-certificates/ca2019.grid5000.fr.crt
     - /usr/sbin/update-ca-certificates
     - rake valid:schema
     - rake valid:duplicates
 
 generate-reference-api:
-   stage: generate
-   tags:
+  stage: generate
+  tags:
     - grid5000-docker
-   image: debian:buster
-   script:
+  image: debian:buster
+  script:
     - apt-get update && apt-get -y install ruby ruby-dev build-essential rake git
     - gem install bundler -v 1.17.3
     - bundle install --without development
@@ -44,18 +50,18 @@ generate-reference-api:
     - git diff --exit-code
 
 deploy:
-   stage: deploy
-   tags:
+  stage: deploy
+  tags:
     - grid5000-shell
-   script:
+  script:
     - /srv/ci-runner-scripts/bin/update-api-servers
 
 rspec:
-   stage: deploy # we use 'deploy' here to avoid blocking on this when updating the ref-repo
-   tags:
+  stage: deploy  # we use 'deploy' here to avoid blocking on this when updating the ref-repo
+  tags:
     - grid5000-docker
-   image: debian:buster
-   script:
+  image: debian:buster
+  script:
     - apt-get update && apt-get -y install ruby ruby-dev build-essential rake git
     - gem install bundler -v 1.17.3
     - bundle install
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index f7982dc322e71ea43805505b4db910fe7e9dc908..dbe9ee836c4331d3c5a296615df4ceab89918b3c 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -1,3 +1,4 @@
+---
 disk_vendor_model_mapping:
   Avago:
     - MRROMB
diff --git a/input/grid5000/grid5000.yaml b/input/grid5000/grid5000.yaml
index 55620cfedd5081881da0a3cda83c35f0abced390..3535a4ed5d8b37022613e51b7f11f647441eed99 100644
--- a/input/grid5000/grid5000.yaml
+++ b/input/grid5000/grid5000.yaml
@@ -1 +1,2 @@
-uid: grid5000
\ No newline at end of file
+---
+uid: grid5000
diff --git a/input/grid5000/ipv6.yaml b/input/grid5000/ipv6.yaml
index cd94bb7cb445ea43895d2c55f13fa6960970616c..913b62eab9cec5580c4f14a50caf06a300776ce8 100644
--- a/input/grid5000/ipv6.yaml
+++ b/input/grid5000/ipv6.yaml
@@ -1,3 +1,4 @@
+---
 ipv6:
   site-indexes:
     grenoble: 1
diff --git a/input/grid5000/network_equipments/renater.yaml b/input/grid5000/network_equipments/renater.yaml
index 76fde8efadcf77eb3f91fa70c0599ba879c0dc21..0c2a148805ab0bc2f16075a93e74908710c6320f 100644
--- a/input/grid5000/network_equipments/renater.yaml
+++ b/input/grid5000/network_equipments/renater.yaml
@@ -16,7 +16,7 @@ renater-lille:
   linecards:
     0:
       rate: 10000000000
-      ports: 
+      ports:
         0:
           uid: renater-paris
         1:
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml b/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml
index 02576b8247152a5d39eba07e2ee8471cc4819dd5..9eeffcbc50c0041ae095ee1108ceaf587f5555b2 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/dahu.yaml
@@ -1,3 +1,4 @@
+---
 model: Dell PowerEdge C6420
 created_at: 2018-03-22 11:00:00 GMT
 priority: '201800'
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml b/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
index 3b5100f4de30b562de9b722b295ed9b76cf5e117..17650f97efb2ac1de322e639fe7be2380530ab4f 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
@@ -1,167 +1,176 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_voltage_volt
-  labels: {"psu": "2"}
-  description: Voltage of PSU 2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_psu_current_amp
-  labels: {"psu": "2"}
-  description: Current of PSU 2 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1a"}
-  description: Speed of Fan 1A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1b"}
-  description: Speed of Fan 1B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2a"}
-  description: Speed of Fan 2A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2b"}
-  description: Speed of Fan 2B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3a"}
-  description: Speed of Fan 3A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3b"}
-  description: Speed of Fan 3B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4a"}
-  description: Speed of Fan 4A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4b"}
-  description: Speed of Fan 4B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1a"}
+    description: Speed of Fan 1A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1b"}
+    description: Speed of Fan 1B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2a"}
+    description: Speed of Fan 2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2b"}
+    description: Speed of Fan 2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3a"}
+    description: Speed of Fan 3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3b"}
+    description: Speed of Fan 3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4a"}
+    description: Speed of Fan 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4b"}
+    description: Speed of Fan 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
diff --git a/input/grid5000/sites/grenoble/clusters/troll/troll.yaml b/input/grid5000/sites/grenoble/clusters/troll/troll.yaml
index 6f3fb95dd99a296509d4a4ace0cb3999e22cfe91..ab03121355c1ef9a36e33638d9248c303af377b4 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/troll.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/troll.yaml
@@ -13,9 +13,9 @@ nodes:
     software:
       standard-environment: debian10-x64-std
     supported_job_types:
-       deploy: true
-       besteffort: true
-       max_walltime: 0
+      deploy: true
+      besteffort: true
+      max_walltime: 0
     performance:
       core_flops: 16118000000
       node_flops: 466290000000
diff --git a/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml b/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
index d84ebe7719ee7e73f38c6e9e00f63fabe4472303..2a7d04be1b8625680b6bb3722c878cef10721053 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
@@ -1,236 +1,243 @@
 ---
 metrics:
 
-- name: wattmetre_power_watt
-  description: Power consumption reported by wattmetre, in watt
-  period: 1000
-  optional_period: 20
-  source:
-    protocol: wattmetre
-
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1a"}
-  description: Speed of Fan 1A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1b"}
-  description: Speed of Fan 1B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2a"}
-  description: Speed of Fan 2A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2b"}
-  description: Speed of Fan 2B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3a"}
-  description: Speed of Fan 3A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3b"}
-  description: Speed of Fan 3B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4a"}
-  description: Speed of Fan 4A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4b"}
-  description: Speed of Fan 4B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5a"}
-  description: Speed of Fan 5A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5b"}
-  description: Speed of Fan 5B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6a"}
-  description: Speed of Fan 6A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6b"}
-  description: Speed of Fan 6B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7a"}
-  description: Speed of Fan 7A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7b"}
-  description: Speed of Fan 7B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "8a"}
-  description: Speed of Fan 8A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.15
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "8b"}
-  description: Speed of Fan 8B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.16
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: wattmetre_power_watt
+    description: Power consumption reported by wattmetre, in watt
+    period: 1000
+    optional_period: 20
+    source:
+      protocol: wattmetre
+
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1a"}
+    description: Speed of Fan 1A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1b"}
+    description: Speed of Fan 1B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2a"}
+    description: Speed of Fan 2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2b"}
+    description: Speed of Fan 2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3a"}
+    description: Speed of Fan 3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3b"}
+    description: Speed of Fan 3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4a"}
+    description: Speed of Fan 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4b"}
+    description: Speed of Fan 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5a"}
+    description: Speed of Fan 5A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5b"}
+    description: Speed of Fan 5B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6a"}
+    description: Speed of Fan 6A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6b"}
+    description: Speed of Fan 6B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7a"}
+    description: Speed of Fan 7A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7b"}
+    description: Speed of Fan 7B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "8a"}
+    description: Speed of Fan 8A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.15
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "8b"}
+    description: Speed of Fan 8B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.16
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/grenoble/clusters/troll/troll_pdu.yaml b/input/grid5000/sites/grenoble/clusters/troll/troll_pdu.yaml
index 29f82c0bed8c302a928f266687e66b72c27dcf84..1c6ea5451f8ee21f4a755fb90e1092c1b0c4b1fb 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/troll_pdu.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/troll_pdu.yaml
@@ -1,3 +1,4 @@
+---
 nodes:
   troll-1:
     pdu:
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml b/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
index eb78c9c3e6a98988c52b2ca0289596656b1e3f22..381b329bee99b34149eb29f5f27a9e8a84876b39 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
@@ -1,203 +1,212 @@
 ---
 metrics:
 
-- name: wattmetre_power_watt
-  description: Power consumption reported by wattmetre, in watt
-  period: 1000
-  optional_period: 20
-  source:
-    protocol: wattmetre
-
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_voltage_volt
-  labels: {"psu": "2"}
-  description: Voltage of PSU 2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_psu_current_amp
-  labels: {"psu": "2"}
-  description: Current of PSU 2 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1"}
-  description: Speed of Fan 1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2"}
-  description: Speed of Fan 2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3"}
-  description: Speed of Fan 3 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4"}
-  description: Speed of Fan 4 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5"}
-  description: Speed of Fan 5 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6"}
-  description: Speed of Fan 6 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7"}
-  description: Speed of Fan 7 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "8"}
-  description: Speed of Fan 8 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "3"}
-  description: Temperature of CPU 3 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "4"}
-  description: Temperature of CPU 4 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.5
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.6
+  - name: wattmetre_power_watt
+    description: Power consumption reported by wattmetre, in watt
+    period: 1000
+    optional_period: 20
+    source:
+      protocol: wattmetre
+
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1"}
+    description: Speed of Fan 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2"}
+    description: Speed of Fan 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3"}
+    description: Speed of Fan 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4"}
+    description: Speed of Fan 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5"}
+    description: Speed of Fan 5 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6"}
+    description: Speed of Fan 6 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7"}
+    description: Speed of Fan 7 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "8"}
+    description: Speed of Fan 8 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "3"}
+    description: Temperature of CPU 3 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "4"}
+    description: Temperature of CPU 4 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.5
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.6
diff --git a/input/grid5000/sites/grenoble/grenoble.yaml b/input/grid5000/sites/grenoble/grenoble.yaml
index bdc9d134358f6a50244590e57ba127c7ee651368..0b923fea0229cccb2bd35927c6c0362e618c1a81 100644
--- a/input/grid5000/sites/grenoble/grenoble.yaml
+++ b/input/grid5000/sites/grenoble/grenoble.yaml
@@ -63,4 +63,3 @@ kavlans:
   11:
     network: 10.7.192.0/18
     gateway: 10.7.255.254
-
diff --git a/input/grid5000/sites/grenoble/networks/gw.yaml b/input/grid5000/sites/grenoble/networks/gw.yaml
index 4d53a0919a9f7f6b34ab0b3ba1ff3bf0826b92fa..3f888377f0788000d870331349dfe62eceb90bac 100644
--- a/input/grid5000/sites/grenoble/networks/gw.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw.yaml
@@ -11,18 +11,18 @@ gw:
   backplane_bps: 800000000000
   snmp_community: public
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   ip: 172.16.31.254
   vlans:
     "vlan100":
diff --git a/input/grid5000/sites/grenoble/pdus.yaml b/input/grid5000/sites/grenoble/pdus.yaml
index 6739b43b8077c2540f5245da433dfe4aed8a6046..ff1cd502f98b382c82dbe5e332b1697b89d7af23 100644
--- a/input/grid5000/sites/grenoble/pdus.yaml
+++ b/input/grid5000/sites/grenoble/pdus.yaml
@@ -14,9 +14,9 @@ pdus:
             www:
               url: "http://digwatt.grenoble.grid5000.fr/GetWatts-json.php"
     metrics:
-    - name: wattmetre_power_watt
-      description: Power consumption per outlet reported by wattmetre, in watt
-      period: 1000
-      optional_period: 20
-      source:
-        protocol: wattmetre
+      - name: wattmetre_power_watt
+        description: Power consumption per outlet reported by wattmetre, in watt
+        period: 1000
+        optional_period: 20
+        source:
+          protocol: wattmetre
diff --git a/input/grid5000/sites/grenoble/servers/servers.yaml b/input/grid5000/sites/grenoble/servers/servers.yaml
index 1efbc9df49e0cada112fe2e919f5ac2eed281f43..9e066aa014dbc1527b35c011a5fa8a16a305e3f0 100644
--- a/input/grid5000/sites/grenoble/servers/servers.yaml
+++ b/input/grid5000/sites/grenoble/servers/servers.yaml
@@ -1,3 +1,4 @@
+---
 digsed:
   kind: physical
   alias: [nfs, public, home-g5k, ntp, modules]
@@ -56,7 +57,7 @@ digwatt:
 
 digxp:
   kind: physical
-  alias: 
+  alias:
   warranty: n/a
   serial: n/a
   network_adapters:
@@ -69,10 +70,9 @@ digxp:
 
 digarm:
   kind: physical
-  alias: 
+  alias:
   warranty: n/a
   serial: n/a
   network_adapters:
     default:
       ip: 172.16.31.11
-
diff --git a/input/grid5000/sites/grenoble/servers/virtual.yaml b/input/grid5000/sites/grenoble/servers/virtual.yaml
index 15788132c60706c0a0e62346848dde047d9317e7..7cc567df656385fff6360540a6016d57556525c4 100644
--- a/input/grid5000/sites/grenoble/servers/virtual.yaml
+++ b/input/grid5000/sites/grenoble/servers/virtual.yaml
@@ -1,3 +1,4 @@
+---
 nat:
   kind: virtual
   alias: [access]
diff --git a/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml b/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml
index 74977bc3a97211058c1427a7b7726b3c708089d0..f99364a3df861484855d5030a00387eaed353cdc 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml
@@ -8,8 +8,7 @@ queues:
   - default
 
 nodes:
-
-# Global node properties
+  # Global node properties
   chetemi-[1-15]:
     supported_job_types:
       deploy: true
@@ -21,8 +20,8 @@ nodes:
     software:
       standard-environment: debian10-x64-std
     performance:
-        core_flops: 15690000000
-        node_flops: 331400000000
+      core_flops: 15690000000
+      node_flops: 331400000000
     monitoring:
       wattmeter: multiple
     network_adapters:
diff --git a/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml b/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
index 1c6de56ae2cf56045d7550247174908220e76f08..1d74b6174c3fedc0460b1096ffe05ab5dfdee10c 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
@@ -1,230 +1,239 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_voltage_volt
-  labels: {"psu": "2"}
-  description: Voltage of PSU 2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_psu_current_amp
-  labels: {"psu": "2"}
-  description: Current of PSU 2 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1a"}
-  description: Speed of Fan 1A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2a"}
-  description: Speed of Fan 2A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3a"}
-  description: Speed of Fan 3A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4a"}
-  description: Speed of Fan 4A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5a"}
-  description: Speed of Fan 5A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6a"}
-  description: Speed of Fan 6A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7a"}
-  description: Speed of Fan 7A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1b"}
-  description: Speed of Fan 1B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2b"}
-  description: Speed of Fan 2B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3b"}
-  description: Speed of Fan 3B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4b"}
-  description: Speed of Fan 4B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5b"}
-  description: Speed of Fan 5B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6b"}
-  description: Speed of Fan 6B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7b"}
-  description: Speed of Fan 7B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1a"}
+    description: Speed of Fan 1A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2a"}
+    description: Speed of Fan 2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3a"}
+    description: Speed of Fan 3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4a"}
+    description: Speed of Fan 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5a"}
+    description: Speed of Fan 5A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6a"}
+    description: Speed of Fan 6A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7a"}
+    description: Speed of Fan 7A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1b"}
+    description: Speed of Fan 1B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2b"}
+    description: Speed of Fan 2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3b"}
+    description: Speed of Fan 3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4b"}
+    description: Speed of Fan 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5b"}
+    description: Speed of Fan 5B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6b"}
+    description: Speed of Fan 6B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7b"}
+    description: Speed of Fan 7B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml b/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml
index a2401f3f0ab52b06967471e25060077d7af1b9d1..a4810003bd59556e418c38ae5eeb7df60c0a73b5 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml
@@ -8,8 +8,7 @@ queues:
   - default
 
 nodes:
-
-# Global node properties
+  # Global node properties
   chiclet-[1-8]:
     supported_job_types:
       deploy: true
@@ -21,8 +20,8 @@ nodes:
     software:
       standard-environment: debian10-x64-std
     performance:
-        core_flops: 12600000000
-        node_flops: 380100000000
+      core_flops: 12600000000
+      node_flops: 380100000000
     monitoring:
       wattmeter: multiple
     network_adapters:
diff --git a/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml b/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
index 96dbb4bfd2e746d5b196b167904b61294193a4c1..662cb4cced4a8c99ca4db0a3652259d0a4b1d5f2 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
@@ -1,158 +1,167 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_voltage_volt
-  labels: {"psu": "2"}
-  description: Voltage of PSU 2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_psu_current_amp
-  labels: {"psu": "2"}
-  description: Current of PSU 2 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1"}
-  description: Speed of Fan 1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2"}
-  description: Speed of Fan 2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3"}
-  description: Speed of Fan 3 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4"}
-  description: Speed of Fan 4 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5"}
-  description: Speed of Fan 5 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6"}
-  description: Speed of Fan 6 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1"}
+    description: Speed of Fan 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2"}
+    description: Speed of Fan 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3"}
+    description: Speed of Fan 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4"}
+    description: Speed of Fan 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5"}
+    description: Speed of Fan 5 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6"}
+    description: Speed of Fan 6 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml b/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml
index fbcce04332d2f2b0c85201139aa753e31a9877f9..ba672803f2cdc7a7a23204a9b352de82ba87f8c1 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml
@@ -8,8 +8,7 @@ queues:
   - default
 
 nodes:
-
-# Global node properties
+  # Global node properties
   chifflet-[1-8]:
     supported_job_types:
       deploy: true
@@ -21,8 +20,8 @@ nodes:
     software:
       standard-environment: debian10-x64-std
     performance:
-        core_flops: 15730000000
-        node_flops: 419500000000
+      core_flops: 15730000000
+      node_flops: 419500000000
     monitoring:
       wattmeter: multiple
     network_adapters:
diff --git a/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml b/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
index 3e8f4a66d3cdbf8d4e5ad8eecf2bad513a579bbe..2d30473df3e876e5a63dd2af5b8768509f66e6ed 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
@@ -1,158 +1,167 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_voltage_volt
-  labels: {"psu": "2"}
-  description: Voltage of PSU 2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_psu_current_amp
-  labels: {"psu": "2"}
-  description: Current of PSU 2 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1"}
-  description: Speed of Fan 1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2"}
-  description: Speed of Fan 2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3"}
-  description: Speed of Fan 3 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4"}
-  description: Speed of Fan 4 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5"}
-  description: Speed of Fan 5 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6"}
-  description: Speed of Fan 6 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1"}
+    description: Speed of Fan 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2"}
+    description: Speed of Fan 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3"}
+    description: Speed of Fan 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4"}
+    description: Speed of Fan 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5"}
+    description: Speed of Fan 5 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6"}
+    description: Speed of Fan 6 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml b/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml
index da7837d74b311251dd2204c91ba4c54942644541..1a2da8e379677b69da5658281831c83bb7af9f43 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml
@@ -8,8 +8,7 @@ queues:
   - default
 
 nodes:
-
-# Global node properties
+  # Global node properties
   chifflot-[1-8]:
     supported_job_types:
       deploy: true
@@ -21,8 +20,8 @@ nodes:
     software:
       standard-environment: debian10-x64-std
     performance:
-        core_flops: 16360000000
-        node_flops: 408900000000
+      core_flops: 16360000000
+      node_flops: 408900000000
     monitoring:
       wattmeter: multiple
     network_adapters:
diff --git a/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml b/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
index 2da75133b96e97b727c35654670267fdbd64c4a1..5241dde4565e529112056b51075b7e78dbced726 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
@@ -1,178 +1,187 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_voltage_volt
-  labels: {"psu": "2"}
-  description: Voltage of PSU 2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_psu_current_amp
-  labels: {"psu": "2"}
-  description: Current of PSU 2 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1"}
-  description: Speed of Fan 1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2"}
-  description: Speed of Fan 2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3"}
-  description: Speed of Fan 3 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4"}
-  description: Speed of Fan 4 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5"}
-  description: Speed of Fan 5 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6"}
-  description: Speed of Fan 6 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_gpu_temp_celsius
-  labels: {"gpu": "1"}
-  description: Temperature of GPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
-
-- name: bmc_gpu_temp_celsius
-  labels: {"gpu": "8"}
-  description: Temperature of GPU 8 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.5
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.6
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1"}
+    description: Speed of Fan 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2"}
+    description: Speed of Fan 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3"}
+    description: Speed of Fan 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4"}
+    description: Speed of Fan 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5"}
+    description: Speed of Fan 5 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6"}
+    description: Speed of Fan 6 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_gpu_temp_celsius
+    labels: {"gpu": "1"}
+    description: Temperature of GPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+
+  - name: bmc_gpu_temp_celsius
+    labels: {"gpu": "8"}
+    description: Temperature of GPU 8 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.5
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.6
diff --git a/input/grid5000/sites/lille/lille.yaml b/input/grid5000/sites/lille/lille.yaml
index e2380a8bf2a9c825565f59f40f0983b7a29d02fd..dad9b0ed17dde448fe6e5b95f77395653da1b0f4 100644
--- a/input/grid5000/sites/lille/lille.yaml
+++ b/input/grid5000/sites/lille/lille.yaml
@@ -1,3 +1,4 @@
+---
 name: Lille
 location: Lille, France
 web: http://www.grid5000.fr/mediawiki/index.php/Lille:Home
@@ -63,6 +64,3 @@ kavlans:
   12:
     network: 10.11.192.0/18
     gateway: 10.11.255.254
-
-
-
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
index 32ead9eeff91586443b6c2fa43da363daf6bf117..d90a6326436b86606d5e5821265ca770e2a23329 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
@@ -9,18 +9,18 @@ sw-chiclet-1:
   snmp_community: public
   backplane_bps: 36000000000000
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       kind: node
@@ -30,69 +30,69 @@ sw-chiclet-1:
       rate: 25000000000
       ports:
         1:
-          uid:  chifflot-1
+          uid: chifflot-1
         2:
-          uid:  chifflot-2
+          uid: chifflot-2
         3:
-          uid:  chifflot-3
+          uid: chifflot-3
         4:
-          uid:  chifflot-4
+          uid: chifflot-4
         5:
-          uid:  chifflot-5
+          uid: chifflot-5
         6:
-          uid:  chifflot-6
+          uid: chifflot-6
         7:
-          uid:  chifflot-7
+          uid: chifflot-7
         8:
-          uid:  chifflot-8
+          uid: chifflot-8
         9:
-          uid:  chiclet-1
+          uid: chiclet-1
         10:
-          uid:  chiclet-2
+          uid: chiclet-2
         11:
-          uid:  chiclet-3
+          uid: chiclet-3
         12:
-          uid:  chiclet-4
+          uid: chiclet-4
         13:
-          uid:  chiclet-5
+          uid: chiclet-5
         14:
-          uid:  chiclet-6
+          uid: chiclet-6
         15:
-          uid:  chiclet-7
+          uid: chiclet-7
         16:
-          uid:  chiclet-8
+          uid: chiclet-8
         17:
-          uid:  chifflot-1-eth1
+          uid: chifflot-1-eth1
         18:
-          uid:  chifflot-2-eth1
+          uid: chifflot-2-eth1
         19:
-          uid:  chifflot-3-eth1
+          uid: chifflot-3-eth1
         20:
-          uid:  chifflot-4-eth1
+          uid: chifflot-4-eth1
         21:
-          uid:  chifflot-5-eth1
+          uid: chifflot-5-eth1
         22:
-          uid:  chifflot-6-eth1
+          uid: chifflot-6-eth1
         23:
-          uid:  chifflot-7-eth1
+          uid: chifflot-7-eth1
         24:
-          uid:  chifflot-8-eth1
+          uid: chifflot-8-eth1
         25:
-          uid:  chiclet-1-eth1
+          uid: chiclet-1-eth1
         26:
-          uid:  chiclet-2-eth1
+          uid: chiclet-2-eth1
         27:
-          uid:  chiclet-3-eth1
+          uid: chiclet-3-eth1
         28:
-          uid:  chiclet-4-eth1
+          uid: chiclet-4-eth1
         29:
-          uid:  chiclet-5-eth1
+          uid: chiclet-5-eth1
         30:
-          uid:  chiclet-6-eth1
+          uid: chiclet-6-eth1
         31:
-          uid:  chiclet-7-eth1
+          uid: chiclet-7-eth1
         32:
-          uid:  chiclet-8-eth1
+          uid: chiclet-8-eth1
         53:
           uid: port-channel1
           kind: channel
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
index 5edef7cab15ca924476649504721168424714f0e..56e799c1d15a1027a6bcf5071d62121910c1a31a 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
@@ -14,18 +14,18 @@ sw-chiclet-2:
   snmp_community: public
   backplane_bps: 36000000000000
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   vlans:
     "vlan100":
       administrative: yes
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
index 8dab86e72535fb591917ec5b5294a5cf61d7c7a7..6595ee088b01ab689e76121d17b07a0f6ef4d278 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
@@ -9,18 +9,18 @@ sw-chiclet-3:
   snmp_community: public
   backplane_bps: 36000000000000
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       kind: node
@@ -30,97 +30,97 @@ sw-chiclet-3:
       rate: 10000000000
       ports:
         1:
-          uid:  chetemi-1
+          uid: chetemi-1
         2:
-          uid:  chetemi-2
+          uid: chetemi-2
         3:
-          uid:  chetemi-3
+          uid: chetemi-3
         4:
-          uid:  chetemi-4
+          uid: chetemi-4
         5:
-          uid:  chetemi-5
+          uid: chetemi-5
         6:
-          uid:  chetemi-6
+          uid: chetemi-6
         7:
-          uid:  chetemi-7
+          uid: chetemi-7
         8:
-          uid:  chetemi-8
+          uid: chetemi-8
         9:
-          uid:  chetemi-9
+          uid: chetemi-9
         10:
-          uid:  chetemi-10
+          uid: chetemi-10
         11:
-          uid:  chetemi-11
+          uid: chetemi-11
         12:
-          uid:  chetemi-12
+          uid: chetemi-12
         13:
-          uid:  chetemi-13
+          uid: chetemi-13
         14:
-          uid:  chetemi-14
+          uid: chetemi-14
         15:
-          uid:  chetemi-15
+          uid: chetemi-15
         17:
-          uid:  chifflet-1
+          uid: chifflet-1
         18:
-          uid:  chifflet-2
+          uid: chifflet-2
         19:
-          uid:  chifflet-3
+          uid: chifflet-3
         20:
-          uid:  chifflet-4
+          uid: chifflet-4
         21:
-          uid:  chifflet-5
+          uid: chifflet-5
         22:
-          uid:  chifflet-6
+          uid: chifflet-6
         23:
-          uid:  chifflet-7
+          uid: chifflet-7
         24:
-          uid:  chifflet-8
+          uid: chifflet-8
         25:
-          uid:  chetemi-1-eth1
+          uid: chetemi-1-eth1
         26:
-          uid:  chetemi-2-eth1
+          uid: chetemi-2-eth1
         27:
-          uid:  chetemi-3-eth1
+          uid: chetemi-3-eth1
         28:
-          uid:  chetemi-4-eth1
+          uid: chetemi-4-eth1
         29:
-          uid:  chetemi-5-eth1
+          uid: chetemi-5-eth1
         30:
-          uid:  chetemi-6-eth1
+          uid: chetemi-6-eth1
         31:
-          uid:  chetemi-7-eth1
+          uid: chetemi-7-eth1
         32:
-          uid:  chetemi-8-eth1
+          uid: chetemi-8-eth1
         33:
-          uid:  chetemi-9-eth1
+          uid: chetemi-9-eth1
         34:
-          uid:  chetemi-10-eth1
+          uid: chetemi-10-eth1
         35:
-          uid:  chetemi-11-eth1
+          uid: chetemi-11-eth1
         36:
-          uid:  chetemi-12-eth1
+          uid: chetemi-12-eth1
         37:
-          uid:  chetemi-13-eth1
+          uid: chetemi-13-eth1
         38:
-          uid:  chetemi-14-eth1
+          uid: chetemi-14-eth1
         39:
-          uid:  chetemi-15-eth1
+          uid: chetemi-15-eth1
         40:
-          uid:  chifflet-1-eth1
+          uid: chifflet-1-eth1
         41:
-          uid:  chifflet-2-eth1
+          uid: chifflet-2-eth1
         42:
-          uid:  chifflet-3-eth1
+          uid: chifflet-3-eth1
         43:
-          uid:  chifflet-4-eth1
+          uid: chifflet-4-eth1
         44:
-          uid:  chifflet-5-eth1
+          uid: chifflet-5-eth1
         45:
-          uid:  chifflet-6-eth1
+          uid: chifflet-6-eth1
         46:
-          uid:  chifflet-7-eth1
+          uid: chifflet-7-eth1
         47:
-          uid:  chifflet-8-eth1
+          uid: chifflet-8-eth1
         53:
           uid: port-channel1
           kind: channel
diff --git a/input/grid5000/sites/lille/pdus.yaml b/input/grid5000/sites/lille/pdus.yaml
index bccf6872aa3e02da74b7cc1a7d25cde403a09960..bc2055dc4e4d28aa171bca3da0b1891be05322d0 100644
--- a/input/grid5000/sites/lille/pdus.yaml
+++ b/input/grid5000/sites/lille/pdus.yaml
@@ -1,14 +1,15 @@
+---
 pdus:
   pdu-b1p[1-3]: &ap8659
     vendor: APC
     model: AP8659
     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%
+      - 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%
     sensors:
       - power:
           per_outlets: true
@@ -34,12 +35,12 @@ pdus:
     vendor: APC
     model: AP8659
     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%
+      - 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%
     sensors:
       - power:
           per_outlets: true
@@ -62,12 +63,12 @@ pdus:
     vendor: APC
     model: AP8659
     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%
+      - 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%
     sensors:
       - power:
           per_outlets: true
diff --git a/input/grid5000/sites/lille/servers/physical.yaml b/input/grid5000/sites/lille/servers/physical.yaml
index 6ebd2074b20dad1ac027566b64a6e4b8ba6c6621..fb98d4d0ad18b81f2bd5895aa5b549fff46192c8 100644
--- a/input/grid5000/sites/lille/servers/physical.yaml
+++ b/input/grid5000/sites/lille/servers/physical.yaml
@@ -1,3 +1,4 @@
+---
 fives:
   kind: physical
   warranty: 2017-07-28
diff --git a/input/grid5000/sites/lille/servers/users-vm.yaml b/input/grid5000/sites/lille/servers/users-vm.yaml
index bbfd6a9092264472ecf0c66619b857799417c194..a21406f098e488963f826963918edb9658d766e5 100644
--- a/input/grid5000/sites/lille/servers/users-vm.yaml
+++ b/input/grid5000/sites/lille/servers/users-vm.yaml
@@ -1,33 +1,33 @@
 ---
 pneyron-vm:
- kind: virtual
- expire: 2019-10
- network_adapters: {default: {ip: 172.16.45.1}}
+  kind: virtual
+  expire: 2019-10
+  network_adapters: {default: {ip: 172.16.45.1}}
 
 jbowden-vm:
- kind: virtual
- expire: 2022-06-30
- network_adapters: {default: {ip: 172.16.45.2}}
+  kind: virtual
+  expire: 2022-06-30
+  network_adapters: {default: {ip: 172.16.45.2}}
 
 lnussbaum-vm:
- kind: virtual
- expire: 2020-02
- network_adapters: {default: {ip: 172.16.45.5}}
+  kind: virtual
+  expire: 2020-02
+  network_adapters: {default: {ip: 172.16.45.5}}
 
 zournani-vm:
- kind: virtual
- expire: 2021-04
- network_adapters: {default: {ip: 172.16.45.6}}
+  kind: virtual
+  expire: 2021-04
+  network_adapters: {default: {ip: 172.16.45.6}}
 
 mbelgaid-vm:
- kind: virtual
- expire: 2021-01
- network_adapters: {default: {ip: 172.16.45.8}}
+  kind: virtual
+  expire: 2021-01
+  network_adapters: {default: {ip: 172.16.45.8}}
 
 sataas-vm:
- kind: virtual
- expire: 2021-01
- network_adapters: {default: {ip: 172.16.45.9}}
+  kind: virtual
+  expire: 2021-01
+  network_adapters: {default: {ip: 172.16.45.9}}
 
 jedartois-vm:
   kind: virtual
@@ -40,11 +40,11 @@ rkoutsiamanis-vm:
   network_adapters: {default: {ip: 172.16.45.11}}
 
 mpoquet-vm:
- kind: virtual
- expire: 2021-12
- network_adapters: {default: {ip: 172.16.45.13}}
+  kind: virtual
+  expire: 2021-12
+  network_adapters: {default: {ip: 172.16.45.13}}
 
 lbertot-vm:
- kind: virtual
- expire: 2021-10
- network_adapters: {default: {ip: 172.16.45.14}}
+  kind: virtual
+  expire: 2021-10
+  network_adapters: {default: {ip: 172.16.45.14}}
diff --git a/input/grid5000/sites/lille/servers/virtual.yaml b/input/grid5000/sites/lille/servers/virtual.yaml
index 0976ba6a2e8d004160cd5028dbeffe4fc3d56fbe..535a8ed02f877c1719ac3eb390548bdeea417ea4 100644
--- a/input/grid5000/sites/lille/servers/virtual.yaml
+++ b/input/grid5000/sites/lille/servers/virtual.yaml
@@ -1,3 +1,4 @@
+---
 dns:
   kind: virtual
   network_adapters:
@@ -253,10 +254,10 @@ frontend-dev:
 mailbox:
   kind: virtual
   network_adapters:
-    default: 
+    default:
       ip: 172.16.47.125
 kwollect:
   kind: virtual
-  network_adapters: 
+  network_adapters:
     default:
       ip: 172.16.47.157
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
index 5ea790d2798699e2e6d32d9db20883e0705815ba..4e2e609e876368b4b90030e5b8af575d38c8a0e8 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/granduc.yaml
@@ -1,3 +1,4 @@
+---
 model: Dell PowerEdge 1950
 created_at: 2011-12-01
 kavlan: true
@@ -53,4 +54,3 @@ nodes:
         switch: gw-luxembourg
     monitoring:
       wattmeter: false
-
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_metrics.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_metrics.yaml
index cd244be002c3d1e90c272b99ef3b6e42a34d5231..e93f712b214d17e26496ca4a5cbe7a26436d6079 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_metrics.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_metrics.yaml
@@ -1,165 +1,167 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5 #Ambient Temp
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod1a"}
-  description: Speed of FAN MOD 1A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 22 #FAN MOD 1A RPM
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod1b"}
-  description: Speed of FAN MOD 1B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 23 #FAN MOD 1B RPM
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod1c"}
-  description: Speed of FAN MOD 1C reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 24 #FAN MOD 1C RPM
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod1d"}
-  description: Speed of FAN MOD 1D reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 25 #FAN MOD 1D RPM
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod2a"}
-  description: Speed of FAN MOD 2A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 26 #FAN MOD 2A RPM
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod2b"}
-  description: Speed of FAN MOD 2B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 27 #FAN MOD 2B RPM
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod2c"}
-  description: Speed of FAN MOD 2C reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 28 #FAN MOD 2C RPM
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod2d"}
-  description: Speed of FAN MOD 2D reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 29 #FAN MOD 2D RPM
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod3a"}
-  description: Speed of FAN MOD 3A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 30 #FAN MOD 3A RPM
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod3b"}
-  description: Speed of FAN MOD 3B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 31 #FAN MOD 3B RPM
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod3c"}
-  description: Speed of FAN MOD 3C reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 32 #FAN MOD 3C RPM
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod3d"}
-  description: Speed of FAN MOD 3D reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 33 #FAN MOD 3D RPM
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod4a"}
-  description: Speed of FAN MOD 4A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 34 #FAN MOD 4A RPM
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod4b"}
-  description: Speed of FAN MOD 4B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 35 #FAN MOD 4B RPM
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod4c"}
-  description: Speed of FAN MOD 4C reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 36 #FAN MOD 4C RPM
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod4d"}
-  description: Speed of FAN MOD 4D reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 37 #FAN MOD 4D RPM
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5  # Ambient Temp
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod1a"}
+    description: Speed of FAN MOD 1A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 22  # FAN MOD 1A RPM
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod1b"}
+    description: Speed of FAN MOD 1B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 23  # FAN MOD 1B RPM
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod1c"}
+    description: Speed of FAN MOD 1C reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 24  # FAN MOD 1C RPM
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod1d"}
+    description: Speed of FAN MOD 1D reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 25  # FAN MOD 1D RPM
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod2a"}
+    description: Speed of FAN MOD 2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 26  # FAN MOD 2A RPM
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod2b"}
+    description: Speed of FAN MOD 2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 27  # FAN MOD 2B RPM
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod2c"}
+    description: Speed of FAN MOD 2C reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 28  # FAN MOD 2C RPM
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod2d"}
+    description: Speed of FAN MOD 2D reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 29  # FAN MOD 2D RPM
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod3a"}
+    description: Speed of FAN MOD 3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 30  # FAN MOD 3A RPM
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod3b"}
+    description: Speed of FAN MOD 3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 31  # FAN MOD 3B RPM
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod3c"}
+    description: Speed of FAN MOD 3C reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 32  # FAN MOD 3C RPM
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod3d"}
+    description: Speed of FAN MOD 3D reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 33  # FAN MOD 3D RPM
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod4a"}
+    description: Speed of FAN MOD 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 34  # FAN MOD 4A RPM
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod4b"}
+    description: Speed of FAN MOD 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 35  # FAN MOD 4B RPM
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod4c"}
+    description: Speed of FAN MOD 4C reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 36  # FAN MOD 4C RPM
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod4d"}
+    description: Speed of FAN MOD 4D reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 37  # FAN MOD 4D RPM
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
index 500fb6ac56fe49d8be3cfd955ff5380f489012c4..a4aa176c8f54eaace2bd41ed822dc8ab08175e29 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml
@@ -1,3 +1,4 @@
+---
 model: Dell PowerEdge M620
 created_at: 2013-09-10
 kavlan: true
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_extra.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_extra.yaml
index 48b35f9404e8d9b96035e7960dc6a650f60c0769..1f4714c31dc30128e5c63d4cda5678fa49840942 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_extra.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_extra.yaml
@@ -128,4 +128,3 @@ nodes:
         switch_port: Te0/16
       bmc:
         switch_port: Gi2/36
-  
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
index d3854fb51c94de429c6543e3968d7636267d0202..86e6c2ece4166b07ca2d24547705040c7ce0284d 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
@@ -1,57 +1,62 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
 
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
 
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
 
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+  - name: bmc_node_power_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
 
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
 
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
diff --git a/input/grid5000/sites/luxembourg/luxembourg.yaml b/input/grid5000/sites/luxembourg/luxembourg.yaml
index d9bf319c59d1e802089a91859a57f3fa900c8750..79d65a552ba24d7a2d0749a51523ee0d01694f5e 100644
--- a/input/grid5000/sites/luxembourg/luxembourg.yaml
+++ b/input/grid5000/sites/luxembourg/luxembourg.yaml
@@ -14,9 +14,6 @@ kavlan_ip_range: 10.40.0.0/14
 virt_ip_range: 10.172.0.0/14
 renater_ip: 192.168.4.21
 production: true
-#queues:
-#  - default
-#  - admin
 frontend_ip: 172.16.191.109
 
 g5ksubnet:
@@ -67,5 +64,3 @@ kavlans:
   20:
     network: 10.43.192.0/18
     gateway: 10.43.255.254
-
-
diff --git a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
index facf91f4d4f99504a63546217ee024671dc8a7c0..b66cee38a30dfe112d6cc2993a729020338ba93e 100644
--- a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
+++ b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
@@ -11,18 +11,18 @@ gw:
   backplane_bps: 720000000000
   ip: 172.16.191.254
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   vlans:
     "vlan50":
       addresses:
diff --git a/input/grid5000/sites/luxembourg/networks/mxl1.yaml b/input/grid5000/sites/luxembourg/networks/mxl1.yaml
index 86a1fbd86e2fc6fcd5eb70a44fc6249ed6c7664b..c35dd3a182f81934a289a5e5ef8ce1c209692f90 100644
--- a/input/grid5000/sites/luxembourg/networks/mxl1.yaml
+++ b/input/grid5000/sites/luxembourg/networks/mxl1.yaml
@@ -11,18 +11,18 @@ mxl1:
     - m1000-mxl1
   ip: 172.17.191.251
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     0:
       snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/luxembourg/networks/mxl2.yaml b/input/grid5000/sites/luxembourg/networks/mxl2.yaml
index d10c78b0de0bce3746e105c494d01d16d192f444..04e8b85b5bd63d3dd1939228d7fbe23f10ee0cff 100644
--- a/input/grid5000/sites/luxembourg/networks/mxl2.yaml
+++ b/input/grid5000/sites/luxembourg/networks/mxl2.yaml
@@ -11,18 +11,18 @@ mxl2:
     - m1000-mxl2
   ip: 172.17.191.252
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     0:
       snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
index 9699c7d6328e7cc584632775b83f6e30a86f923a..f1f4ea0654456b8f6c8199f62649e5340e452e23 100644
--- a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
+++ b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
@@ -9,18 +9,18 @@ ul-grid5000-sw02:
   backplane_bps: 1040000000000
   ip: 172.17.191.253
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
 #    0:
 #      naming_pattern: "mgmt%PORT%"
diff --git a/input/grid5000/sites/luxembourg/servers/servers.yaml b/input/grid5000/sites/luxembourg/servers/servers.yaml
index c296db951b244958c8e4889825c36bfb2ba28551..5aac6becfd202cb8ea919061bdd0d2ee9e41b4ea 100644
--- a/input/grid5000/sites/luxembourg/servers/servers.yaml
+++ b/input/grid5000/sites/luxembourg/servers/servers.yaml
@@ -1,3 +1,4 @@
+---
 cronos:
   kind: physical
   alias: [adminfront, af, granduc-srv]
diff --git a/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml b/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml
index 3d67029666607899cb104abf69fb23e9ba195134..4dd35e7ff321dd0c773d0102cf5ba9bd507959f1 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml
@@ -1,3 +1,4 @@
+---
 model: Nvidia DGX-1
 created_at: 2019-09-01
 kavlan: true
diff --git a/input/grid5000/sites/lyon/clusters/gemini/gemini_ib.yaml b/input/grid5000/sites/lyon/clusters/gemini/gemini_ib.yaml
index 245627f768cd504a8ca5878a9089bdf275c53c27..d2896b3c9c558841cf519193d1720d5c30202e06 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/gemini_ib.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/gemini_ib.yaml
@@ -1,3 +1,4 @@
+---
 nodes:
   gemini-[1-2]:
     network_adapters:
diff --git a/input/grid5000/sites/lyon/clusters/gemini/gemini_metrics.yaml b/input/grid5000/sites/lyon/clusters/gemini/gemini_metrics.yaml
index 74ff9f93a28266fd7b122cfd1c9d1fb991639f7f..1a1b0ba4ec8f8b0a984e67a995f595300d387d8a 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/gemini_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/gemini_metrics.yaml
@@ -1,645 +1,656 @@
+---
 metrics:
 
-- name: wattmetre_power_watt
-  description: Power consumption reported by wattmetre, in watt
-  period: 1000
-  optional_period: 20
-  source:
-    protocol: wattmetre
-
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambient_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 97 #Temp_Ambient_FP
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 91 #Pwr_Node
-
-- name: bmc_gpu_power_watt
-  labels: {"gpu": "0"}
-  description: Power consumption of GPU 0 reported by BMC, in watt by BMC, in watt
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 83 #Power_GPGPU0
-
-- name: bmc_gpu_power_watt
-  labels: {"gpu": "1"}
-  description: Power consumption of GPU 1 reported by BMC, in watt by BMC, in watt
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 84 #Power_GPGPU1
-
-- name: bmc_gpu_power_watt
-  labels: {"gpu": "2"}
-  description: Power consumption of GPU 2 reported by BMC, in watt by BMC, in watt
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 85 #Power_GPGPU2
-
-- name: bmc_gpu_power_watt
-  labels: {"gpu": "3"}
-  description: Power consumption of GPU 3 reported by BMC, in watt by BMC, in watt
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 86 #Power_GPGPU3
-
-- name: bmc_gpu_power_watt
-  labels: {"gpu": "4"}
-  description: Power consumption of GPU 4 reported by BMC, in watt by BMC, in watt
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 87 #Power_GPGPU4
-
-- name: bmc_gpu_power_watt
-  labels: {"gpu": "5"}
-  description: Power consumption of GPU 5 reported by BMC, in watt by BMC, in watt
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 88 #Power_GPGPU5
-
-- name: bmc_gpu_power_watt
-  labels: {"gpu": "6"}
-  description: Power consumption of GPU 6 reported by BMC, in watt by BMC, in watt
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 89 #Power_GPGPU6
-
-- name: bmc_gpu_power_watt
-  labels: {"gpu": "7"}
-  description: Power consumption of GPU 7 reported by BMC, in watt by BMC, in watt
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 90 #Power_GPGPU7
-
-- name: bmc_airflow_cfm
-  description: Airflow reported by BMC, in CFM
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 2 #Airflow
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "01"}
-  description: Speed of SYS fan 0_1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 18 #Fan_SYS0_1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "02"}
-  description: Speed of SYS fan 0_2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 19 #Fan_SYS0_2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "11"}
-  description: Speed of SYS fan 1_1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 20 #Fan_SYS1_1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "12"}
-  description: Speed of SYS fan 1_2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 21 #Fan_SYS1_2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "21"}
-  description: Speed of SYS fan 2_1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 22 #Fan_SYS2_1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "22"}
-  description: Speed of SYS fan 2_2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 23 #Fan_SYS2_2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "31"}
-  description: Speed of SYS fan 3_1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 24 #Fan_SYS3_1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "32"}
-  description: Speed of SYS fan 3_2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 25 #Fan_SYS3_2
-
-- name: bmc_hsc_power_watt
-  labels: {"hsc": "0"}
-  description: Power consumption of HSC0 reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 48 #HSC0 Input
-
-- name: bmc_hsc_power_watt
-  labels: {"hsc": "1"}
-  description: Power consumption of HSC1 reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 51 #HSC1 Input
-
-- name: bmc_hsc_power_watt
-  labels: {"hsc": "2"}
-  description: Power consumption of HSC2 reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 53 #HSC2 Input
-
-- name: bmc_psu_power_watt
-  labels: {"psu": "1"}
-  description: Power consumption of PSU1 reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 74 #PSU1 Input
-
-- name: bmc_psu_power_watt
-  labels: {"psu": "2"}
-  description: Power consumption of PSU2 reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 76 #PSU2 Input
-
-- name: bmc_psu_power_watt
-  labels: {"psu": "3"}
-  description: Power consumption of PSU3 reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 78 #PSU3 Input
-
-- name: bmc_psu_power_watt
-  labels: {"psu": "4"}
-  description: Power consumption of PSU4 reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 80 #PSU4 Input
-
-- name: bmc_temp_ambient_bp0_celsius
-  description: Temperature of BP0 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 95 #Temp_Ambient_BP0
-
-- name: bmc_temp_ambient_bp1_celsius
-  description: Temperature of BP1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 96 #Temp_Ambient_BP1
-
-- name: bmc_temp_ambient_pci_celsius
-  description: Temperature of PCI reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 98 #Temp_Ambient_PCI
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 99 #Temp_CPU0
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 100 #Temp_CPU1
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "ab"}
-  description: Temperature of DIMM_AB reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 101 #Temp_DIMM_AB
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cd"}
-  description: Temperature of DIMM_CD reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 102 #Temp_DIMM_CD
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "ef"}
-  description: Temperature of DIMM_EF reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 103 #Temp_DIMM_EF
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "gh"}
-  description: Temperature of DIMM_GH reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 104 #Temp_DIMM_GH
-
-- name: bmc_temp_expb_celsius
-  description: Temperature of EXPB reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 105 #Temp_EXPB
-
-- name: bmc_gpu_temp_celsius
-  labels: {"gpu": "0"}
-  description: Temperature of GPU0 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 106 #Temp_GPGPU0
-
-- name: bmc_gpu_temp_celsius
-  labels: {"gpu": "1"}
-  description: Temperature of GPU1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 107 #Temp_GPGPU1
-
-- name: bmc_gpu_temp_celsius
-  labels: {"gpu": "2"}
-  description: Temperature of GPU2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 108 #Temp_GPGPU2
-
-- name: bmc_gpu_temp_celsius
-  labels: {"gpu": "3"}
-  description: Temperature of GPU3 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 109 #Temp_GPGPU3
-
-- name: bmc_gpu_temp_celsius
-  labels: {"gpu": "4"}
-  description: Temperature of GPU4 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 110 #Temp_GPGPU4
-
-- name: bmc_gpu_temp_celsius
-  labels: {"gpu": "5"}
-  description: Temperature of GPU5 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 111 #Temp_GPGPU5
-
-- name: bmc_gpu_temp_celsius
-  labels: {"gpu": "6"}
-  description: Temperature of GPU6 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 112 #Temp_GPGPU6
-
-- name: bmc_gpu_temp_celsius
-  labels: {"gpu": "7"}
-  description: Temperature of GPU7 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 113 #Temp_GPGPU7
-
-- name: bmc_temp_gpub_celsius
-  labels: {"id": "0"}
-  description: Temperature of GPU B0 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 114 #Temp_GPUB0
-
-- name: bmc_temp_gpub_celsius
-  labels: {"id": "1"}
-  description: Temperature of GPU B1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 115 #Temp_GPUB1
-
-- name: bmc_temp_inlet_mb_celsius
-  description: Temperature of Inlet MB reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 116 #Temp_Inlet_MB
-
-- name: bmc_temp_ocp_mezz_celsius
-  description: Temperature of OCP Mezz reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 117 #Temp_OCP_Mezz
-
-- name: bmc_temp_outlet_celsius
-  description: Temperature of Outlet reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 118 #Temp_Outlet
-
-- name: bmc_temp_pch_celsius
-  description: Temperature of PCH reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 119 #Temp_PCH
-
-- name: bmc_temp_pdb_celsius
-  description: Temperature of PDB reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 120 #Temp_PDB
-
-- name: bmc_temp_raidcard_celsius
-  description: Temperature of Raid Card reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 121 #Temp_RaidCard
-
-- name: bmc_cpu_temp_vr_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of VR CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 122 #Temp_VR_CPU0
-
-- name: bmc_cpu_temp_vr_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of VR CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 123 #Temp_VR_CPU1
-
-- name: bmc_temp_vr_dimm_celsius
-  labels: {"dimm": "ab"}
-  description: Temperature of VR DIMM_AB reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 124 #Temp_VR_DIMM_AB
-
-- name: bmc_temp_vr_dimm_celsius
-  labels: {"dimm": "cd"}
-  description: Temperature of VR DIMM_CD reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 125 #Temp_VR_DIMM_CD
-
-- name: bmc_temp_vr_dimm_celsius
-  labels: {"dimm": "ef"}
-  description: Temperature of VR DIMM_EF reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 126 #Temp_VR_DIMM_EF
-
-- name: bmc_temp_vr_dimm_celsius
-  labels: {"dimm": "gh"}
-  description: Temperature of VR DIMM_GH reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 127 #Temp_VR_DIMM_GH
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p12v"}
-  description: Voltage of P12V reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 128 #Volt_P12V
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p1v05"}
-  description: Voltage of P1V05 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 129 #Volt_P1V05
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p1v8_aux"}
-  description: Voltage of P1V8_AUX reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 130 #Volt_P1V8_AUX
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p3v3"}
-  description: Voltage of P3V3 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 131 #Volt_P3V3
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p3v3_aux"}
-  description: Voltage of P3V3_AUX reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 132 #Volt_P3V3_AUX
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p3v_bat"}
-  description: Voltage of P3V_BAT reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 133 #Volt_P3V_BAT
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p5v"}
-  description: Voltage of P5V reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 134 #Volt_P5V
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p5v_aux"}
-  description: Voltage of P5V_AUX reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 135 #Volt_P5V_AUX
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "vr_cpu1"}
-  description: Voltage of VR CPU1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 136 #Volt_VR_CPU0
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "vr_cpu2"}
-  description: Voltage of VR CPU2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 137 #Volt_VR_CPU1
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "vr_dimm_ab"}
-  description: Voltage of VR DIMM_AB reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 138 #Volt_VR_DIMM_AB
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "vr_dimm_cd"}
-  description: Voltage of VR DIMM_CD reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 139 #Volt_VR_DIMM_CD
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "vr_dimm_ef"}
-  description: Voltage of VR DIMM_EF reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 140 #Volt_VR_DIMM_EF
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "vr_dimm_gh"}
-  description: Voltage of VR DIMM_GH reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 141 #Volt_VR_DIMM_GH
-
+  - name: wattmetre_power_watt
+    description: Power consumption reported by wattmetre, in watt
+    period: 1000
+    optional_period: 20
+    source:
+      protocol: wattmetre
+
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambient_celsius
+    description: >-
+      Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 97  # Temp_Ambient_FP
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 91  # Pwr_Node
+
+  - name: bmc_gpu_power_watt
+    labels: {"gpu": "0"}
+    description: >-
+      Power consumption of GPU 0 reported by BMC, in watt by BMC, in watt
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 83  # Power_GPGPU0
+
+  - name: bmc_gpu_power_watt
+    labels: {"gpu": "1"}
+    description: >-
+      Power consumption of GPU 1 reported by BMC, in watt by BMC, in watt
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 84  # Power_GPGPU1
+
+  - name: bmc_gpu_power_watt
+    labels: {"gpu": "2"}
+    description: >-
+      Power consumption of GPU 2 reported by BMC, in watt by BMC, in watt
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 85  # Power_GPGPU2
+
+  - name: bmc_gpu_power_watt
+    labels: {"gpu": "3"}
+    description: >-
+      Power consumption of GPU 3 reported by BMC, in watt by BMC, in watt
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 86  # Power_GPGPU3
+
+  - name: bmc_gpu_power_watt
+    labels: {"gpu": "4"}
+    description: >-
+      Power consumption of GPU 4 reported by BMC, in watt by BMC, in watt
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 87  # Power_GPGPU4
+
+  - name: bmc_gpu_power_watt
+    labels: {"gpu": "5"}
+    description: >-
+      Power consumption of GPU 5 reported by BMC, in watt by BMC, in watt
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 88  # Power_GPGPU5
+
+  - name: bmc_gpu_power_watt
+    labels: {"gpu": "6"}
+    description: >-
+      Power consumption of GPU 6 reported by BMC, in watt by BMC, in watt
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 89  # Power_GPGPU6
+
+  - name: bmc_gpu_power_watt
+    labels: {"gpu": "7"}
+    description: >-
+      Power consumption of GPU 7 reported by BMC, in watt by BMC, in watt
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 90  # Power_GPGPU7
+
+  - name: bmc_airflow_cfm
+    description: Airflow reported by BMC, in CFM
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 2  # Airflow
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "01"}
+    description: Speed of SYS fan 0_1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 18  # Fan_SYS0_1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "02"}
+    description: Speed of SYS fan 0_2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 19  # Fan_SYS0_2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "11"}
+    description: Speed of SYS fan 1_1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 20  # Fan_SYS1_1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "12"}
+    description: Speed of SYS fan 1_2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 21  # Fan_SYS1_2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "21"}
+    description: Speed of SYS fan 2_1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 22  # Fan_SYS2_1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "22"}
+    description: Speed of SYS fan 2_2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 23  # Fan_SYS2_2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "31"}
+    description: Speed of SYS fan 3_1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 24  # Fan_SYS3_1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "32"}
+    description: Speed of SYS fan 3_2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 25  # Fan_SYS3_2
+
+  - name: bmc_hsc_power_watt
+    labels: {"hsc": "0"}
+    description: Power consumption of HSC0 reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 48  # HSC0 Input
+
+  - name: bmc_hsc_power_watt
+    labels: {"hsc": "1"}
+    description: Power consumption of HSC1 reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 51  # HSC1 Input
+
+  - name: bmc_hsc_power_watt
+    labels: {"hsc": "2"}
+    description: Power consumption of HSC2 reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 53  # HSC2 Input
+
+  - name: bmc_psu_power_watt
+    labels: {"psu": "1"}
+    description: Power consumption of PSU1 reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 74  # PSU1 Input
+
+  - name: bmc_psu_power_watt
+    labels: {"psu": "2"}
+    description: Power consumption of PSU2 reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 76  # PSU2 Input
+
+  - name: bmc_psu_power_watt
+    labels: {"psu": "3"}
+    description: Power consumption of PSU3 reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 78  # PSU3 Input
+
+  - name: bmc_psu_power_watt
+    labels: {"psu": "4"}
+    description: Power consumption of PSU4 reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 80  # PSU4 Input
+
+  - name: bmc_temp_ambient_bp0_celsius
+    description: Temperature of BP0 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 95  # Temp_Ambient_BP0
+
+  - name: bmc_temp_ambient_bp1_celsius
+    description: Temperature of BP1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 96  # Temp_Ambient_BP1
+
+  - name: bmc_temp_ambient_pci_celsius
+    description: Temperature of PCI reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 98  # Temp_Ambient_PCI
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 99  # Temp_CPU0
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 100  # Temp_CPU1
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "ab"}
+    description: Temperature of DIMM_AB reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 101  # Temp_DIMM_AB
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cd"}
+    description: Temperature of DIMM_CD reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 102  # Temp_DIMM_CD
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "ef"}
+    description: Temperature of DIMM_EF reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 103  # Temp_DIMM_EF
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "gh"}
+    description: Temperature of DIMM_GH reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 104  # Temp_DIMM_GH
+
+  - name: bmc_temp_expb_celsius
+    description: Temperature of EXPB reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 105  # Temp_EXPB
+
+  - name: bmc_gpu_temp_celsius
+    labels: {"gpu": "0"}
+    description: Temperature of GPU0 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 106  # Temp_GPGPU0
+
+  - name: bmc_gpu_temp_celsius
+    labels: {"gpu": "1"}
+    description: Temperature of GPU1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 107  # Temp_GPGPU1
+
+  - name: bmc_gpu_temp_celsius
+    labels: {"gpu": "2"}
+    description: Temperature of GPU2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 108  # Temp_GPGPU2
+
+  - name: bmc_gpu_temp_celsius
+    labels: {"gpu": "3"}
+    description: Temperature of GPU3 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 109  # Temp_GPGPU3
+
+  - name: bmc_gpu_temp_celsius
+    labels: {"gpu": "4"}
+    description: Temperature of GPU4 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 110  # Temp_GPGPU4
+
+  - name: bmc_gpu_temp_celsius
+    labels: {"gpu": "5"}
+    description: Temperature of GPU5 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 111  # Temp_GPGPU5
+
+  - name: bmc_gpu_temp_celsius
+    labels: {"gpu": "6"}
+    description: Temperature of GPU6 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 112  # Temp_GPGPU6
+
+  - name: bmc_gpu_temp_celsius
+    labels: {"gpu": "7"}
+    description: Temperature of GPU7 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 113  # Temp_GPGPU7
+
+  - name: bmc_temp_gpub_celsius
+    labels: {"id": "0"}
+    description: Temperature of GPU B0 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 114  # Temp_GPUB0
+
+  - name: bmc_temp_gpub_celsius
+    labels: {"id": "1"}
+    description: Temperature of GPU B1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 115  # Temp_GPUB1
+
+  - name: bmc_temp_inlet_mb_celsius
+    description: Temperature of Inlet MB reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 116  # Temp_Inlet_MB
+
+  - name: bmc_temp_ocp_mezz_celsius
+    description: Temperature of OCP Mezz reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 117  # Temp_OCP_Mezz
+
+  - name: bmc_temp_outlet_celsius
+    description: Temperature of Outlet reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 118  # Temp_Outlet
+
+  - name: bmc_temp_pch_celsius
+    description: Temperature of PCH reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 119  # Temp_PCH
+
+  - name: bmc_temp_pdb_celsius
+    description: Temperature of PDB reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 120  # Temp_PDB
+
+  - name: bmc_temp_raidcard_celsius
+    description: Temperature of Raid Card reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 121  # Temp_RaidCard
+
+  - name: bmc_cpu_temp_vr_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of VR CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 122  # Temp_VR_CPU0
+
+  - name: bmc_cpu_temp_vr_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of VR CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 123  # Temp_VR_CPU1
+
+  - name: bmc_temp_vr_dimm_celsius
+    labels: {"dimm": "ab"}
+    description: Temperature of VR DIMM_AB reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 124  # Temp_VR_DIMM_AB
+
+  - name: bmc_temp_vr_dimm_celsius
+    labels: {"dimm": "cd"}
+    description: Temperature of VR DIMM_CD reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 125  # Temp_VR_DIMM_CD
+
+  - name: bmc_temp_vr_dimm_celsius
+    labels: {"dimm": "ef"}
+    description: Temperature of VR DIMM_EF reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 126  # Temp_VR_DIMM_EF
+
+  - name: bmc_temp_vr_dimm_celsius
+    labels: {"dimm": "gh"}
+    description: Temperature of VR DIMM_GH reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 127  # Temp_VR_DIMM_GH
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p12v"}
+    description: Voltage of P12V reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 128  # Volt_P12V
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p1v05"}
+    description: Voltage of P1V05 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 129  # Volt_P1V05
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p1v8_aux"}
+    description: Voltage of P1V8_AUX reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 130  # Volt_P1V8_AUX
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p3v3"}
+    description: Voltage of P3V3 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 131  # Volt_P3V3
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p3v3_aux"}
+    description: Voltage of P3V3_AUX reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 132  # Volt_P3V3_AUX
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p3v_bat"}
+    description: Voltage of P3V_BAT reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 133  # Volt_P3V_BAT
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p5v"}
+    description: Voltage of P5V reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 134  # Volt_P5V
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p5v_aux"}
+    description: Voltage of P5V_AUX reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 135  # Volt_P5V_AUX
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "vr_cpu1"}
+    description: Voltage of VR CPU1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 136  # Volt_VR_CPU0
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "vr_cpu2"}
+    description: Voltage of VR CPU2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 137  # Volt_VR_CPU1
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "vr_dimm_ab"}
+    description: Voltage of VR DIMM_AB reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 138  # Volt_VR_DIMM_AB
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "vr_dimm_cd"}
+    description: Voltage of VR DIMM_CD reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 139  # Volt_VR_DIMM_CD
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "vr_dimm_ef"}
+    description: Voltage of VR DIMM_EF reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 140  # Volt_VR_DIMM_EF
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "vr_dimm_gh"}
+    description: Voltage of VR DIMM_GH reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 141  # Volt_VR_DIMM_GH
diff --git a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
index 66f62044f60e0f56c415d26310ea2036f939b1bc..a4ccc084241848146ff4e7576798cf38a29dce49 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml
@@ -15,8 +15,8 @@ nodes:
     software:
       standard-environment: debian10-x64-std
     performance:
-        core_flops: 10170000000
-        node_flops: 127100000000
+      core_flops: 10170000000
+      node_flops: 127100000000
     supported_job_types:
       deploy: true
       besteffort: true
@@ -67,10 +67,10 @@ nodes:
         available: true
         per_outlets: false
         via:
-          api: 
-            metric: pdu_shared 
-          www: 
-            url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php 
+          api:
+            metric: pdu_shared
+          www:
+            url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php
 
   hercule-1:
     network_adapters:
diff --git a/input/grid5000/sites/lyon/clusters/hercule/hercule_metrics.yaml b/input/grid5000/sites/lyon/clusters/hercule/hercule_metrics.yaml
index d89c8ff0536b86a758012578592decb8dbe46214..943644ae9c0fe1120a4d4887dc0af5f33f42aece 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/hercule_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/hercule_metrics.yaml
@@ -1,176 +1,180 @@
+---
 metrics:
-# - name: wattmetre_power_sharedchassis_watt
-#   description: "Power consumption of shared chassis reported by wattmetre, in watt"
-#   period: 1000
-#   optional_period: 20
-#   source:
-#     protocol: wattmetre
-
-- name: network_ifacein_bytes_total
-  description: "Input byte counter for the network device port connected to the node"
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: "Output byte counter for the network device port connected to the node"
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 49 #Inlet Temp
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "12vstandby"}
-  description: 12V Standby voltage reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5 #12V Standby
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "5vstandby"}
-  description: 5V Standby voltage reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6 #5V Standby
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "5v"}
-  description: 5V voltage reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 7 #5V
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "3.3vstandby"}
-  description: 3.3V Standby voltage reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 8 #3.3V Standby
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "3.3v"}
-  description: 3.3V voltage reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 9 #3.3V
-
-- name: bmc_temp_mezz1_celsius
-  description: Temperature of MEZZ1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 11 #MEZZ1 TEMP
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 12 #CPU1 Temp
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 13 #CPU2 Temp
-
-- name: bmc_temp_dimmzone_celsius
-  labels: {"zone": "1"}
-  description: Temperature of DIMM ZONE 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 14 #DIMM ZONE 1 Temp
-
-- name: bmc_temp_dimmzone_celsius
-  labels: {"zone": "2"}
-  description: Temperature of DIMM ZONE 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 15 #DIMM ZONE 2 Temp
-
-- name: bmc_temp_pch_celsius
-  description: Temperature of PCH reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 18 #PCH Temp
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "inputvoltage"}
-  description: Voltage of input reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 51 #Input Voltage
-
-- name: bmc_current_inputcurrent_amp
-  description: Current of input reported by BMC, in ampere
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 52 #Input Current
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "_1"}
-  description: Speed of fan 1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 96 #FAN_1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "_2"}
-  description: Speed of fan 2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 97 #FAN_2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "_3"}
-  description: Speed of fan 3 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 98 #FAN_3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "_4"}
-  description: Speed of fan 4 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 99 #FAN_4
+  # - name: wattmetre_power_sharedchassis_watt
+  #   description: >-
+  #     "Power consumption of shared chassis reported by wattmetre, in watt"
+  #   period: 1000
+  #   optional_period: 20
+  #   source:
+  #     protocol: wattmetre
+
+  - name: network_ifacein_bytes_total
+    description: >-
+      "Input byte counter for the network device port connected to the node"
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      "Output byte counter for the network device port connected to the node"
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 49  # Inlet Temp
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "12vstandby"}
+    description: 12V Standby voltage reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5  # 12V Standby
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "5vstandby"}
+    description: 5V Standby voltage reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6  # 5V Standby
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "5v"}
+    description: 5V voltage reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 7  # 5V
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "3.3vstandby"}
+    description: 3.3V Standby voltage reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 8  # 3.3V Standby
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "3.3v"}
+    description: 3.3V voltage reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 9  # 3.3V
+
+  - name: bmc_temp_mezz1_celsius
+    description: Temperature of MEZZ1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 11  # MEZZ1 TEMP
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 12  # CPU1 Temp
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 13  # CPU2 Temp
+
+  - name: bmc_temp_dimmzone_celsius
+    labels: {"zone": "1"}
+    description: Temperature of DIMM ZONE 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 14  # DIMM ZONE 1 Temp
+
+  - name: bmc_temp_dimmzone_celsius
+    labels: {"zone": "2"}
+    description: Temperature of DIMM ZONE 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 15  # DIMM ZONE 2 Temp
+
+  - name: bmc_temp_pch_celsius
+    description: Temperature of PCH reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 18  # PCH Temp
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "inputvoltage"}
+    description: Voltage of input reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 51  # Input Voltage
+
+  - name: bmc_current_inputcurrent_amp
+    description: Current of input reported by BMC, in ampere
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 52  # Input Current
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "_1"}
+    description: Speed of fan 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 96  # FAN_1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "_2"}
+    description: Speed of fan 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 97  # FAN_2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "_3"}
+    description: Speed of fan 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 98  # FAN_3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "_4"}
+    description: Speed of fan 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 99  # FAN_4
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
index c99752d4b8de745a14f90bce72cf0a0914d0c532..167820805d1cc9b8d4850abfb9b198da9ae2918a 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
@@ -1,176 +1,185 @@
 ---
 metrics:
 
-- name: wattmetre_power_watt
-  description: Power consumption reported by wattmetre, in watt
-  period: 1000
-  optional_period: 20
-  source:
-    protocol: wattmetre
-
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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 }}
-
-# SNMP error: No Such Instance currently exists at this OID
-# - name: bmc_psu_current_amp
-#   labels: {"psu": "1"}
-#   description: Current of PSU 1 reported by BMC, in amp
-#   period: 0
-#   optional_period: 5000
-#   scale_factor: 0.1
-#   source:
-#     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 }}
-
-# SNMP error: No Such Instance currently exists at this OID
-# - name: bmc_psu_current_amp
-#   labels: {"psu": "2"}
-#   description: Current of PSU 2 reported by BMC, in amp
-#   period: 0
-#   optional_period: 5000
-#   scale_factor: 0.1
-#   source:
-#     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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2a"}
-  description: Speed of Fan 2A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2b"}
-  description: Speed of Fan 2B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3a"}
-  description: Speed of Fan 3A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3b"}
-  description: Speed of Fan 3B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4a"}
-  description: Speed of Fan 4A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4b"}
-  description: Speed of Fan 4B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5a"}
-  description: Speed of Fan 5A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5b"}
-  description: Speed of Fan 5B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6a"}
-  description: Speed of Fan 6A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6b"}
-  description: Speed of Fan 6B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+  - name: wattmetre_power_watt
+    description: Power consumption reported by wattmetre, in watt
+    period: 1000
+    optional_period: 20
+    source:
+      protocol: wattmetre
+
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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 }}
+
+  # SNMP error: No Such Instance currently exists at this OID
+  # - name: bmc_psu_current_amp
+  #   labels: {"psu": "1"}
+  #   description: Current of PSU 1 reported by BMC, in amp
+  #   period: 0
+  #   optional_period: 5000
+  #   scale_factor: 0.1
+  #   source:
+  #     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 }}
+
+  # SNMP error: No Such Instance currently exists at this OID
+  # - name: bmc_psu_current_amp
+  #   labels: {"psu": "2"}
+  #   description: Current of PSU 2 reported by BMC, in amp
+  #   period: 0
+  #   optional_period: 5000
+  #   scale_factor: 0.1
+  #   source:
+  #     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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2a"}
+    description: Speed of Fan 2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2b"}
+    description: Speed of Fan 2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3a"}
+    description: Speed of Fan 3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3b"}
+    description: Speed of Fan 3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4a"}
+    description: Speed of Fan 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4b"}
+    description: Speed of Fan 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5a"}
+    description: Speed of Fan 5A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5b"}
+    description: Speed of Fan 5B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6a"}
+    description: Speed of Fan 6A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6b"}
+    description: Speed of Fan 6B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion.yaml b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
index bfba63fa6d8600cf512ad79be411c1fa0af665df..92a10f366ec443dc0a2e4bc383c784be1018b114 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion.yaml
@@ -1,3 +1,4 @@
+---
 model: Dell PowerEdge R720
 created_at: 2012-09-14 12:00:00 GMT
 priority: '201299'
@@ -80,8 +81,8 @@ nodes:
         via:
           api:
             metric: power
-          www: 
-            url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php 
+          www:
+            url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php
 
   orion-1:
     network_adapters:
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
index 4d495763bfda14b3438b1579b90e0677c47916da..b75192f4ebd4897f9a026392e7289fd96e399b50 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
@@ -1,166 +1,176 @@
+---
 metrics:
 
-- name: wattmetre_power_watt
-  description: Power consumption reported by wattmetre, in watt
-  period: 1000
-  optional_period: 20
-  source:
-    protocol: wattmetre
-
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-# PSU2 not plugged
-# - name: bmc_psu_voltage_volt
-#   labels: {"psu": "2"}
-#   description: Voltage of PSU 2 reported by BMC, in volt
-#   period: 0
-#   optional_period: 5000
-#   source:
-#     protocol: snmp
-#     id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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 }}
-
-# PSU2 not plugged
-# - name: bmc_psu_current_amp
-#   labels: {"psu": "2"}
-#   description: Current of PSU 2 reported by BMC, in amp
-#   period: 0
-#   optional_period: 5000
-#   scale_factor: 0.1
-#   source:
-#     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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1"}
-  description: Speed of Fan 1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2"}
-  description: Speed of Fan 2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3"}
-  description: Speed of Fan 3 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4"}
-  description: Speed of Fan 4 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5"}
-  description: Speed of Fan 5 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6"}
-  description: Speed of Fan 6 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: wattmetre_power_watt
+    description: Power consumption reported by wattmetre, in watt
+    period: 1000
+    optional_period: 20
+    source:
+      protocol: wattmetre
+
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  # PSU2 not plugged
+  # - name: bmc_psu_voltage_volt
+  #   labels: {"psu": "2"}
+  #   description: Voltage of PSU 2 reported by BMC, in volt
+  #   period: 0
+  #   optional_period: 5000
+  #   source:
+  #     protocol: snmp
+  #     id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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 }}
+
+  # PSU2 not plugged
+  # - name: bmc_psu_current_amp
+  #   labels: {"psu": "2"}
+  #   description: Current of PSU 2 reported by BMC, in amp
+  #   period: 0
+  #   optional_period: 5000
+  #   scale_factor: 0.1
+  #   source:
+  #     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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1"}
+    description: Speed of Fan 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2"}
+    description: Speed of Fan 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3"}
+    description: Speed of Fan 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4"}
+    description: Speed of Fan 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5"}
+    description: Speed of Fan 5 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6"}
+    description: Speed of Fan 6 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml b/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
index cc9933ded6b7a7622e079b763a6bd2ed0a286558..20a9b2d56aaa0103c49529d6bbb68fc873a58a0f 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
@@ -16,8 +16,8 @@ nodes:
       core_flops: 0
       node_flops: 0
     processor:
-       microarchitecture: Vulcan
-       clock_speed: 2200000000
+      microarchitecture: Vulcan
+      clock_speed: 2200000000
     software:
       standard-environment: debian10-arm64-std
     network_adapters:
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/pyxis_ib.yaml b/input/grid5000/sites/lyon/clusters/pyxis/pyxis_ib.yaml
index cfe6a1af79da53892889c954a5804ec5346f2871..6b081850e4b8c79905be19fd8da6796b56deec11 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/pyxis_ib.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/pyxis_ib.yaml
@@ -1,3 +1,4 @@
+---
 nodes:
   pyxis-[1-4]:
     network_adapters:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
index 39f4bf6c330321f730f1f95ffd1375cc4dec7df0..7a946a258bb9d8fa46e95a658a9a8b18d2333ddd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
@@ -21,18 +21,18 @@ sagittaire-73:
   network_adapters:
     bmc:
       ip: 172.17.49.73
-      mac: 
+      mac:
     eth0:
       driver: tg3
       interface: Ethernet
-      mac: 
+      mac:
       management: false
       mounted: false
     eth1:
       driver: tg3
       interface: Ethernet
       ip: 172.16.49.73
-      mac: 
+      mac:
       management: false
       mounted: true
       rate: 1000000000
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_metrics.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_metrics.yaml
index d915f595d08a1858d184439a12b409f93b2991ae..c4db19964ee4ebd57cd9c11c95889ce04d5112f4 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_metrics.yaml
@@ -1,21 +1,23 @@
+---
 metrics:
 
-- name: wattmetre_power_watt
-  description: "Power consumption reported by wattmetre, in watt"
-  period: 1000
-  optional_period: 20
-  source:
-    protocol: wattmetre
+  - name: wattmetre_power_watt
+    description: "Power consumption reported by wattmetre, in watt"
+    period: 1000
+    optional_period: 20
+    source:
+      protocol: wattmetre
 
-- name: network_ifacein_bytes_total
-  description: "Input byte counter for the network device port connected to the node"
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: "Output byte counter for the network device port connected to the node"
-  period: 1000
-  source:
-    protocol: network_equipment
+  - name: network_ifacein_bytes_total
+    description: >-
+      "Input byte counter for the network device port connected to the node"
+    period: 1000
+    source:
+      protocol: network_equipment
 
+  - name: network_ifaceout_bytes_total
+    description: >-
+      "Output byte counter for the network device port connected to the node"
+    period: 1000
+    source:
+      protocol: network_equipment
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
index a23cdb6259385c145451dee1aa9a9223c3424a5e..44c5a823c4e736fab9b11ce6fdfec131c821442b 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
@@ -18,8 +18,8 @@ nodes:
     software:
       standard-environment: debian10-x64-std
     performance:
-        core_flops: 11770000000
-        node_flops: 146900000000
+      core_flops: 11770000000
+      node_flops: 146900000000
     supported_job_types:
       deploy: true
       besteffort: true
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
index 10772233cd4cccccd592860f78108bcff490bcda..3ca71e708abecb8a793a67f9f40011c384cb6124 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
@@ -1,167 +1,176 @@
 ---
 metrics:
 
-- name: wattmetre_power_watt
-  description: Power consumption per node reported by wattmetre, in watt
-  period: 1000
-  optional_period: 20
-  source:
-    protocol: wattmetre
-
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-# PSU2 not plugged
-# - name: bmc_psu_voltage_volt
-#   labels: {"psu": "2"}
-#   description: Voltage of PSU 2 reported by BMC, in volt
-#   period: 0
-#   optional_period: 5000
-#   source:
-#     protocol: snmp
-#     id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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 }}
-
-# PSU2 not plugged
-# - name: bmc_psu_current_amp
-#   labels: {"psu": "2"}
-#   description: Current of PSU 2 reported by BMC, in amp
-#   period: 0
-#   optional_period: 5000
-#   scale_factor: 0.1
-#   source:
-#     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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1"}
-  description: Speed of Fan 1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2"}
-  description: Speed of Fan 2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3"}
-  description: Speed of Fan 3 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4"}
-  description: Speed of Fan 4 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5"}
-  description: Speed of Fan 5 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6"}
-  description: Speed of Fan 6 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: wattmetre_power_watt
+    description: Power consumption per node reported by wattmetre, in watt
+    period: 1000
+    optional_period: 20
+    source:
+      protocol: wattmetre
+
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  # PSU2 not plugged
+  # - name: bmc_psu_voltage_volt
+  #   labels: {"psu": "2"}
+  #   description: Voltage of PSU 2 reported by BMC, in volt
+  #   period: 0
+  #   optional_period: 5000
+  #   source:
+  #     protocol: snmp
+  #     id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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 }}
+
+  # PSU2 not plugged
+  # - name: bmc_psu_current_amp
+  #   labels: {"psu": "2"}
+  #   description: Current of PSU 2 reported by BMC, in amp
+  #   period: 0
+  #   optional_period: 5000
+  #   scale_factor: 0.1
+  #   source:
+  #     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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1"}
+    description: Speed of Fan 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2"}
+    description: Speed of Fan 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3"}
+    description: Speed of Fan 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4"}
+    description: Speed of Fan 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5"}
+    description: Speed of Fan 5 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6"}
+    description: Speed of Fan 6 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/lyon/lyon.yaml b/input/grid5000/sites/lyon/lyon.yaml
index cea7077f2a64febf8aeb38415d9db2a8e2745f17..dea9eb4db3c328f93a9ec2834e7a5e866cfcb7e9 100644
--- a/input/grid5000/sites/lyon/lyon.yaml
+++ b/input/grid5000/sites/lyon/lyon.yaml
@@ -15,9 +15,6 @@ virt_ip_range: 10.140.0.0/14
 renater_ip: 192.168.4.13
 production: true
 frontend_ip: 172.16.63.101
-#queues:
-#  - default
-#  - admin
 
 g5ksubnet:
   network: 10.140.0.0/14
@@ -67,4 +64,3 @@ kavlans:
   13:
     network: 10.15.192.0/18
     gateway: 10.15.255.254
-
diff --git a/input/grid5000/sites/lyon/networks/force10.yaml b/input/grid5000/sites/lyon/networks/force10.yaml
index df2fc37c7da823ec00e679359c144561d3e6420c..a6a87bcf458281d9da0a6a1a62b1ad25bcd4bc43 100644
--- a/input/grid5000/sites/lyon/networks/force10.yaml
+++ b/input/grid5000/sites/lyon/networks/force10.yaml
@@ -14,18 +14,18 @@ force10:
     - sorion
     - shercule
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   backplane_bps: 1280000000000
   linecards:
     0:
diff --git a/input/grid5000/sites/lyon/networks/gw-lyon.yaml b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
index efb5b8e590688844748e82cdb9b25353926e651b..7dde8eb13d2577f72ab5160187ca15d86c99ac42 100644
--- a/input/grid5000/sites/lyon/networks/gw-lyon.yaml
+++ b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
@@ -13,18 +13,18 @@ gw:
   snmp_community: public
   ip: 172.16.63.254
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   vlans:
     "vlan100":
       administrative: yes
diff --git a/input/grid5000/sites/lyon/networks/salome.yaml b/input/grid5000/sites/lyon/networks/salome.yaml
index e5bb236e1c3fd2737ea68cdb178f0ca04f3a177c..e4a56eae90af6ada1edf44f9a668916c23c1c861 100644
--- a/input/grid5000/sites/lyon/networks/salome.yaml
+++ b/input/grid5000/sites/lyon/networks/salome.yaml
@@ -11,18 +11,18 @@ salome:
     - ssagittaire
   snmp_community: public
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   backplane_bps: 136000000000
   linecards:
     0:
diff --git a/input/grid5000/sites/lyon/pdus.yaml b/input/grid5000/sites/lyon/pdus.yaml
index 3433d52a66d97f03c32dab54f01e9a3b47e84edd..002f1595d620f68b0a5d260554e8d5c8620e7a14 100644
--- a/input/grid5000/sites/lyon/pdus.yaml
+++ b/input/grid5000/sites/lyon/pdus.yaml
@@ -14,12 +14,12 @@ pdus:
             www:
               url: "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
     metrics:
-    - name: wattmetre_power_watt
-      description: Power consumption per outlet reported by wattmetre, in watt
-      period: 1000
-      optional_period: 20
-      source:
-        protocol: wattmetre
+      - name: wattmetre_power_watt
+        description: Power consumption per outlet reported by wattmetre, in watt
+        period: 1000
+        optional_period: 20
+        source:
+          protocol: wattmetre
 
   wattmetre3:
     vendor: OmegaWatt
@@ -35,12 +35,12 @@ pdus:
             www:
               url: "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
     metrics:
-    - name: wattmetre_power_watt
-      description: Power consumption per outlet reported by wattmetre, in watt
-      period: 1000
-      optional_period: 20
-      source:
-        protocol: wattmetre
+      - name: wattmetre_power_watt
+        description: Power consumption per outlet reported by wattmetre, in watt
+        period: 1000
+        optional_period: 20
+        source:
+          protocol: wattmetre
 
   wattmetre4:
     vendor: OmegaWatt
@@ -56,9 +56,9 @@ pdus:
             www:
               url: "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php"
     metrics:
-    - name: wattmetre_power_watt
-      description: Power consumption per outlet reported by wattmetre, in watt
-      period: 1000
-      optional_period: 20
-      source:
-        protocol: wattmetre
+      - name: wattmetre_power_watt
+        description: Power consumption per outlet reported by wattmetre, in watt
+        period: 1000
+        optional_period: 20
+        source:
+          protocol: wattmetre
diff --git a/input/grid5000/sites/lyon/servers/servers.yaml b/input/grid5000/sites/lyon/servers/servers.yaml
index 79defd21c5c83fb1ad039db447d9953158a67bd0..1487083ff63c7eed61ca965d47bddbd5f47b54df 100644
--- a/input/grid5000/sites/lyon/servers/servers.yaml
+++ b/input/grid5000/sites/lyon/servers/servers.yaml
@@ -1,3 +1,4 @@
+---
 cyrrus:
   kind: physical
   alias: []
diff --git a/input/grid5000/sites/lyon/servers/virtual.yaml b/input/grid5000/sites/lyon/servers/virtual.yaml
index 0c2c347959dd0a84fcd1b766252b779b4cc9a4ba..21081884952f80e85f0024c7eb0f2e31ef326f7c 100644
--- a/input/grid5000/sites/lyon/servers/virtual.yaml
+++ b/input/grid5000/sites/lyon/servers/virtual.yaml
@@ -1,3 +1,4 @@
+---
 flyon:
   kind: virtual
   alias: [frontend, oar-api]
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml b/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml
index 69803bdb495519e9c55b23c158289f4582288092..1cbe487e2cbe98e5c1dcbcc4cd74955ad1736f9b 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/graffiti.yaml
@@ -13,8 +13,8 @@ nodes:
     software:
       standard-environment: debian10-x64-std
     supported_job_types:
-       deploy: true
-       besteffort: true
+      deploy: true
+      besteffort: true
     performance:
       core_flops: 17713000000
       node_flops: 202670000000
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml b/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
index 4e09e8e200fcc54317b733cea090b137f6ad913b..48a3a8735f9d6844fe0e671d174f3966059f47b1 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
@@ -1,167 +1,176 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_voltage_volt
-  labels: {"psu": "2"}
-  description: Voltage of PSU 2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_psu_current_amp
-  labels: {"psu": "2"}
-  description: Current of PSU 2 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1"}
-  description: Speed of Fan 1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2"}
-  description: Speed of Fan 2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3"}
-  description: Speed of Fan 3 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4"}
-  description: Speed of Fan 4 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5"}
-  description: Speed of Fan 5 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6"}
-  description: Speed of Fan 6 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "extr"}
-  description: Speed of Fan Ext R reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "extl"}
-  description: Speed of Fan Ext L reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1"}
+    description: Speed of Fan 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2"}
+    description: Speed of Fan 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3"}
+    description: Speed of Fan 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4"}
+    description: Speed of Fan 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5"}
+    description: Speed of Fan 5 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6"}
+    description: Speed of Fan 6 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "extr"}
+    description: Speed of Fan Ext R reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "extl"}
+    description: Speed of Fan Ext L reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/graffiti_pdu.yaml b/input/grid5000/sites/nancy/clusters/graffiti/graffiti_pdu.yaml
index 914cd321b5d3cc0756937c102e0ab12c11f4b22b..d96a0fd008a8f5ef66819710cc7dd8b57d06e8d1 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/graffiti_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/graffiti_pdu.yaml
@@ -83,4 +83,3 @@ nodes:
         port: 21
       - uid: graffiti-pdu4
         port: 21
-
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
index 84352d2657c880379ff369ce5592abec5cdf935e..092fdcb1e1737bcda89330d66d7e6588bb7885d8 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully.yaml
@@ -8,7 +8,7 @@ queues:
   - production
 
 nodes:
-# Global node properties
+  # Global node properties
   graoully-[1-16]:
     processor:
       microarchitecture: Haswell
@@ -30,12 +30,12 @@ nodes:
         storage: HDD
     network_adapters:
       eth0:
-        enabled: true 
+        enabled: true
         mountable: true
         mounted: true
         bridged: true
       eth1:
-        enabled: false 
+        enabled: false
         mountable: false
         mounted: false
         bridged: false
@@ -45,22 +45,22 @@ nodes:
         mounted: false
         bridged: false
       eth3:
-        enabled: false 
+        enabled: false
         mountable: false
         mounted: false
         bridged: false
       eth4:
-        enabled: false 
+        enabled: false
         mountable: false
         mounted: false
         bridged: false
       eth5:
-        enabled: false 
+        enabled: false
         mountable: false
         mounted: false
         bridged: false
       ib0:
-        enabled: true 
+        enabled: true
         mountable: true
         mounted: true
         bridged: false
@@ -78,10 +78,9 @@ nodes:
   graoully-[5-]:
     supported_job_types:
       max_walltime: 604800
-  graoully-[3-4]: 
+  graoully-[3-4]:
     supported_job_types:
       max_walltime: 43200
   graoully-[1-2]:
     supported_job_types:
       max_walltime: 14400
-
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
index d3fd32ca6744083d9b57df074b961d8bae19d5b2..890a995e5591e23cbb624c74c80d8315af0cfa04 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
@@ -1,217 +1,224 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: pdu_outlet_power_watt
-  description: Power consumption of node reported by PDU, in watt
-  period: 1000
-  source:
-    protocol: pdu
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1a"}
-  description: Speed of Fan 1A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2a"}
-  description: Speed of Fan 2A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3a"}
-  description: Speed of Fan 3A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4a"}
-  description: Speed of Fan 4A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5a"}
-  description: Speed of Fan 5A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6a"}
-  description: Speed of Fan 6A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7a"}
-  description: Speed of Fan 7A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1b"}
-  description: Speed of Fan 1B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2b"}
-  description: Speed of Fan 2B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3b"}
-  description: Speed of Fan 3B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4b"}
-  description: Speed of Fan 4B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5b"}
-  description: Speed of Fan 5B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6b"}
-  description: Speed of Fan 6B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7b"}
-  description: Speed of Fan 7B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: pdu_outlet_power_watt
+    description: Power consumption of node reported by PDU, in watt
+    period: 1000
+    source:
+      protocol: pdu
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1a"}
+    description: Speed of Fan 1A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2a"}
+    description: Speed of Fan 2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3a"}
+    description: Speed of Fan 3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4a"}
+    description: Speed of Fan 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5a"}
+    description: Speed of Fan 5A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6a"}
+    description: Speed of Fan 6A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7a"}
+    description: Speed of Fan 7A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1b"}
+    description: Speed of Fan 1B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2b"}
+    description: Speed of Fan 2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3b"}
+    description: Speed of Fan 3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4b"}
+    description: Speed of Fan 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5b"}
+    description: Speed of Fan 5B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6b"}
+    description: Speed of Fan 6B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7b"}
+    description: Speed of Fan 7B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml
index 2604d26bf9bade3456dd45201ed3cb830d306c4e..e7f781c82a9398962a3a0ceb745a3a0eaadb2cb3 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml
@@ -1,6 +1,6 @@
 ---
 nodes:
-  graoully-[1-16]: 
+  graoully-[1-16]:
     monitoring:
       wattmeter: true
       metric: power
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
index 42c9a231b570d595b7cc4ab4764dfe49fe703404..c4d135315b5a3c969c33d565b8f9c4126332faa0 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
@@ -4,16 +4,15 @@ model: Dell PowerEdge R720
 created_at: 2015-05-12 17:00 GMT
 kavlan: true
 queues:
-- admin
-- production
+  - admin
+  - production
 
 nodes:
-
-# Global node properties
+  # Global node properties
   graphique-[1-6]:
     performance:
-     core_flops: 15.63e+9
-     node_flops: 195.20e+9
+      core_flops: 15.63e+9
+      node_flops: 195.20e+9
     supported_job_types:
       deploy: true
       besteffort: true
@@ -63,7 +62,7 @@ nodes:
       power:
         available: true
         via:
-          api: 
+          api:
             metric: pdu
 
   graphique-2:
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
index 3e8f4a66d3cdbf8d4e5ad8eecf2bad513a579bbe..2d30473df3e876e5a63dd2af5b8768509f66e6ed 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
@@ -1,158 +1,167 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_voltage_volt
-  labels: {"psu": "2"}
-  description: Voltage of PSU 2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_psu_current_amp
-  labels: {"psu": "2"}
-  description: Current of PSU 2 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1"}
-  description: Speed of Fan 1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2"}
-  description: Speed of Fan 2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3"}
-  description: Speed of Fan 3 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4"}
-  description: Speed of Fan 4 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5"}
-  description: Speed of Fan 5 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6"}
-  description: Speed of Fan 6 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1"}
+    description: Speed of Fan 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2"}
+    description: Speed of Fan 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3"}
+    description: Speed of Fan 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4"}
+    description: Speed of Fan 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5"}
+    description: Speed of Fan 5 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6"}
+    description: Speed of Fan 6 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
index 6b538e31edf61ca4ea528b292ad4130f80232454..da5bea5bc489c693a08e95ad5f83e12ebeb0ec19 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml
@@ -8,8 +8,7 @@ queues:
   - admin
 
 nodes:
-
-# Global node properties
+  # Global node properties
   graphite-[1-4]:
     performance:
       core_flops: 13.17e+9
@@ -56,7 +55,7 @@ nodes:
         switch: null
         switch_port: null
       ib0:
-        enabled: true 
+        enabled: true
         mountable: true
         mounted: true
         bridged: false
@@ -77,7 +76,7 @@ nodes:
       power:
         available: true
         via:
-          api: 
+          api:
             metric: pdu
 
 
@@ -88,7 +87,7 @@ nodes:
 
   graphite-2:
     mic:
-      ip: 172.16.68.6 
+      ip: 172.16.68.6
       mac: 4C:79:BA:5C:01:18
 
   graphite-3:
@@ -98,5 +97,5 @@ nodes:
 
   graphite-4:
     mic:
-      ip: 172.16.68.8 
+      ip: 172.16.68.8
       mac: 4C:79:BA:5C:01:0C
diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
index 3e8f4a66d3cdbf8d4e5ad8eecf2bad513a579bbe..2d30473df3e876e5a63dd2af5b8768509f66e6ed 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
@@ -1,158 +1,167 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_voltage_volt
-  labels: {"psu": "2"}
-  description: Voltage of PSU 2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_psu_current_amp
-  labels: {"psu": "2"}
-  description: Current of PSU 2 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1"}
-  description: Speed of Fan 1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2"}
-  description: Speed of Fan 2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3"}
-  description: Speed of Fan 3 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4"}
-  description: Speed of Fan 4 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5"}
-  description: Speed of Fan 5 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6"}
-  description: Speed of Fan 6 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1"}
+    description: Speed of Fan 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2"}
+    description: Speed of Fan 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3"}
+    description: Speed of Fan 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4"}
+    description: Speed of Fan 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5"}
+    description: Speed of Fan 5 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6"}
+    description: Speed of Fan 6 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite_pdu.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite_pdu.yaml
index f8da98add5982f6bbc73b0cc02a94d28ad00d57f..d5ff35aeb533706b1b18375228cefa98baaf60ad 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite_pdu.yaml
@@ -29,4 +29,3 @@ nodes:
         port: 4
       - uid: graoully-pdu2
         port: 4
-
diff --git a/input/grid5000/sites/nancy/clusters/grcinq/grcinq_metrics.yaml b/input/grid5000/sites/nancy/clusters/grcinq/grcinq_metrics.yaml
index e7564186599c399553c4f34fc455b01855d61f9d..4b09006dc1788e0b80435e75b1201280edcae2db 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/grcinq_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/grcinq_metrics.yaml
@@ -1,163 +1,165 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 11 #Inlet Temp
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "12vstandby"}
-  description: Voltage of 12V Standby reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5 #12V Standby
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "5vstandby"}
-  description: Voltage of 5V Standby reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6 #5V Standby
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "5v"}
-  description: Voltage of 5V reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 7 #5V
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "3.3vstandby"}
-  description: Voltage of 3.3V Standby reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 8 #3.3V Standby
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "3.3v"}
-  description: Voltage of 3.3V reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 9 #3.3V
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 12 #CPU1 Temp
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 13 #CPU2 Temp
-
-- name: bmc_temp_dimmzone_celsius
-  labels: {"zone": "1"}
-  description: Temperature of DIMM ZONE 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 14 #DIMM ZONE 1 Temp
-
-- name: bmc_temp_dimmzone_celsius
-  labels: {"zone": "2"}
-  description: Temperature of DIMM ZONE 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 15 #DIMM ZONE 2 Temp
-
-- name: bmc_temp_pch_celsius
-  description: Temperature of PCH reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 18 #PCH Temp
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "input"}
-  description: Voltage of Input reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 16 #Input Voltage
-
-- name: bmc_current_input_amp
-  description: Input Current reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 17 #Input Current
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1"}
-  description: Speed of FAN 1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 24 #FAN_1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2"}
-  description: Speed of FAN 2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 28 #FAN_2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3"}
-  description: Speed of FAN 3 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 29 #FAN_3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4"}
-  description: Speed of FAN 4 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 30 #FAN_4
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 11  # Inlet Temp
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "12vstandby"}
+    description: Voltage of 12V Standby reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5  # 12V Standby
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "5vstandby"}
+    description: Voltage of 5V Standby reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6  # 5V Standby
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "5v"}
+    description: Voltage of 5V reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 7  # 5V
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "3.3vstandby"}
+    description: Voltage of 3.3V Standby reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 8  # 3.3V Standby
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "3.3v"}
+    description: Voltage of 3.3V reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 9  # 3.3V
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 12  # CPU1 Temp
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 13  # CPU2 Temp
+
+  - name: bmc_temp_dimmzone_celsius
+    labels: {"zone": "1"}
+    description: Temperature of DIMM ZONE 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 14  # DIMM ZONE 1 Temp
+
+  - name: bmc_temp_dimmzone_celsius
+    labels: {"zone": "2"}
+    description: Temperature of DIMM ZONE 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 15  # DIMM ZONE 2 Temp
+
+  - name: bmc_temp_pch_celsius
+    description: Temperature of PCH reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 18  # PCH Temp
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "input"}
+    description: Voltage of Input reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 16  # Input Voltage
+
+  - name: bmc_current_input_amp
+    description: Input Current reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 17  # Input Current
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1"}
+    description: Speed of FAN 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 24  # FAN_1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2"}
+    description: Speed of FAN 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 28  # FAN_2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3"}
+    description: Speed of FAN 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 29  # FAN_3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4"}
+    description: Speed of FAN 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 30  # FAN_4
diff --git a/input/grid5000/sites/nancy/clusters/grele/grele.yaml b/input/grid5000/sites/nancy/clusters/grele/grele.yaml
index 16bfd32332eb8cb65a66fd298100098c7720abf6..5ba1b15c67463f8a81317927b5f66366400c4936 100644
--- a/input/grid5000/sites/nancy/clusters/grele/grele.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/grele.yaml
@@ -8,7 +8,7 @@ queues:
   - production
 
 nodes:
-# Global node properties
+  # Global node properties
   grele-[1-14]:
     supported_job_types:
       deploy: true
diff --git a/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml b/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
index 3e8f4a66d3cdbf8d4e5ad8eecf2bad513a579bbe..2d30473df3e876e5a63dd2af5b8768509f66e6ed 100644
--- a/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
@@ -1,158 +1,167 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_voltage_volt
-  labels: {"psu": "2"}
-  description: Voltage of PSU 2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_psu_current_amp
-  labels: {"psu": "2"}
-  description: Current of PSU 2 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1"}
-  description: Speed of Fan 1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2"}
-  description: Speed of Fan 2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3"}
-  description: Speed of Fan 3 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4"}
-  description: Speed of Fan 4 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5"}
-  description: Speed of Fan 5 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6"}
-  description: Speed of Fan 6 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1"}
+    description: Speed of Fan 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2"}
+    description: Speed of Fan 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3"}
+    description: Speed of Fan 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4"}
+    description: Speed of Fan 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5"}
+    description: Speed of Fan 5 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6"}
+    description: Speed of Fan 6 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/nancy/clusters/grele/grele_pdu.yaml b/input/grid5000/sites/nancy/clusters/grele/grele_pdu.yaml
index 92152bb7d9b0a206a8fda06626fc14e60f44cb1c..3494443b6cf849c3f9674c2f7410ecfdcee50441 100644
--- a/input/grid5000/sites/nancy/clusters/grele/grele_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/grele_pdu.yaml
@@ -10,43 +10,43 @@ nodes:
       - uid: grimani-pdu1
         port: 7
       - uid: grimani-pdu2
-        port: 7  
+        port: 7
   grele-2:
     pdu:
       - uid: grimani-pdu1
         port: 11
       - uid: grimani-pdu2
-        port: 11 
+        port: 11
   grele-3:
     pdu:
       - uid: grimani-pdu1
         port: 12
       - uid: grimani-pdu2
-        port: 12 
+        port: 12
   grele-4:
     pdu:
       - uid: grimani-pdu1
         port: 13
       - uid: grimani-pdu2
-        port: 13 
+        port: 13
   grele-5:
     pdu:
       - uid: grimani-pdu1
         port: 14
       - uid: grimani-pdu2
-        port: 14 
+        port: 14
   grele-6:
     pdu:
       - uid: grimani-pdu1
         port: 15
       - uid: grimani-pdu2
-        port: 15 
+        port: 15
   grele-7:
     pdu:
       - uid: grimani-pdu1
         port: 9
       - uid: grimani-pdu2
-        port: 9 
+        port: 9
   grele-8:
     pdu:
       - uid: grimani-pdu1
@@ -58,35 +58,34 @@ nodes:
       - uid: grimani-pdu1
         port: 19
       - uid: grimani-pdu2
-        port: 19 
+        port: 19
   grele-10:
     pdu:
       - uid: grimani-pdu1
         port: 20
       - uid: grimani-pdu2
-        port: 20 
+        port: 20
   grele-11:
     pdu:
       - uid: grimani-pdu1
         port: 21
       - uid: grimani-pdu2
-        port: 21 
+        port: 21
   grele-12:
     pdu:
       - uid: grimani-pdu1
         port: 22
       - uid: grimani-pdu2
-        port: 22 
+        port: 22
   grele-13:
     pdu:
       - uid: grimani-pdu1
         port: 23
       - uid: grimani-pdu2
-        port: 23 
+        port: 23
   grele-14:
     pdu:
       - uid: grimani-pdu1
         port: 17
       - uid: grimani-pdu2
-        port: 17 
-
+        port: 17
diff --git a/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml b/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml
index a73112c449118f63e750b7437ef2051e3325ad87..2cb45c1eb16e2ed5b1e47b5c70cbaaa6fd29c1da 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml
@@ -8,11 +8,11 @@ queues:
   - production
 
 nodes:
-# Global node properties
+  # Global node properties
   grimani-[1-6]:
     performance:
-     core_flops: 9760000000
-     node_flops: 124300000000
+      core_flops: 9760000000
+      node_flops: 124300000000
     supported_job_types:
       deploy: true
       besteffort: true
diff --git a/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml b/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
index 3e8f4a66d3cdbf8d4e5ad8eecf2bad513a579bbe..2d30473df3e876e5a63dd2af5b8768509f66e6ed 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
@@ -1,158 +1,167 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_voltage_volt
-  labels: {"psu": "2"}
-  description: Voltage of PSU 2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_psu_current_amp
-  labels: {"psu": "2"}
-  description: Current of PSU 2 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1"}
-  description: Speed of Fan 1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2"}
-  description: Speed of Fan 2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3"}
-  description: Speed of Fan 3 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4"}
-  description: Speed of Fan 4 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5"}
-  description: Speed of Fan 5 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6"}
-  description: Speed of Fan 6 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1"}
+    description: Speed of Fan 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2"}
+    description: Speed of Fan 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3"}
+    description: Speed of Fan 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4"}
+    description: Speed of Fan 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5"}
+    description: Speed of Fan 5 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6"}
+    description: Speed of Fan 6 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml b/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml
index e624cfad93a2c72d11072ee8edd3ab8c7dab8ca7..c2d484044ab8a2fd8abc8edd3329ea3c1cc8a869 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml
@@ -10,34 +10,34 @@ nodes:
       - uid: grimani-pdu1
         port: 1
       - uid: grimani-pdu2
-        port: 1  
+        port: 1
   grimani-2:
     pdu:
       - uid: grimani-pdu1
         port: 2
       - uid: grimani-pdu2
-        port: 2  
+        port: 2
   grimani-3:
     pdu:
       - uid: grimani-pdu1
         port: 3
       - uid: grimani-pdu2
-        port: 3  
+        port: 3
   grimani-4:
     pdu:
       - uid: grimani-pdu1
         port: 4
       - uid: grimani-pdu2
-        port: 4  
+        port: 4
   grimani-5:
     pdu:
       - uid: grimani-pdu1
         port: 5
       - uid: grimani-pdu2
-        port: 5  
+        port: 5
   grimani-6:
     pdu:
       - uid: grimani-pdu1
         port: 6
       - uid: grimani-pdu2
-        port: 6  
+        port: 6
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml b/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
index 40a4582a61705b639fd49c2682dbc7c90c0a4613..f8d4ce70c3ad1e908dd2b07f37d1cdd36f64350b 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml
@@ -8,7 +8,7 @@ queues:
   - default
 
 nodes:
-# Global node properties
+  # Global node properties
   grimoire-[1-8]:
     processor:
       microarchitecture: Haswell
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml b/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
index d3fd32ca6744083d9b57df074b961d8bae19d5b2..890a995e5591e23cbb624c74c80d8315af0cfa04 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
@@ -1,217 +1,224 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: pdu_outlet_power_watt
-  description: Power consumption of node reported by PDU, in watt
-  period: 1000
-  source:
-    protocol: pdu
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1a"}
-  description: Speed of Fan 1A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2a"}
-  description: Speed of Fan 2A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3a"}
-  description: Speed of Fan 3A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4a"}
-  description: Speed of Fan 4A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5a"}
-  description: Speed of Fan 5A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6a"}
-  description: Speed of Fan 6A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7a"}
-  description: Speed of Fan 7A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1b"}
-  description: Speed of Fan 1B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2b"}
-  description: Speed of Fan 2B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3b"}
-  description: Speed of Fan 3B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4b"}
-  description: Speed of Fan 4B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5b"}
-  description: Speed of Fan 5B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6b"}
-  description: Speed of Fan 6B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7b"}
-  description: Speed of Fan 7B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: pdu_outlet_power_watt
+    description: Power consumption of node reported by PDU, in watt
+    period: 1000
+    source:
+      protocol: pdu
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1a"}
+    description: Speed of Fan 1A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2a"}
+    description: Speed of Fan 2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3a"}
+    description: Speed of Fan 3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4a"}
+    description: Speed of Fan 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5a"}
+    description: Speed of Fan 5A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6a"}
+    description: Speed of Fan 6A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7a"}
+    description: Speed of Fan 7A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1b"}
+    description: Speed of Fan 1B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2b"}
+    description: Speed of Fan 2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3b"}
+    description: Speed of Fan 3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4b"}
+    description: Speed of Fan 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5b"}
+    description: Speed of Fan 5B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6b"}
+    description: Speed of Fan 6B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7b"}
+    description: Speed of Fan 7B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
index 8b86b62aad3ab1920b154d62743ac97ceb9774c3..3a556cc7208f29aff55866c111e9146b94d3314a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml
@@ -9,7 +9,7 @@ queues:
   - default
 
 nodes:
-# Global node properties
+  # Global node properties
   grisou-[1-51]:
     processor:
       microarchitecture: Haswell
@@ -33,15 +33,15 @@ nodes:
     sensors:
       power:
         available: true
-        via: 
+        via:
           api:
             metric: power
 
-# Nodes with 4 interfaces
+  # Nodes with 4 interfaces
   grisou-[1-48]:
     network_adapters:
       eth0:
-        enabled: true 
+        enabled: true
         mountable: true
         bridged: true
         mounted: true
@@ -66,7 +66,7 @@ nodes:
         bridged: false
         mounted: false
       eth5:
-        enabled: false 
+        enabled: false
         mountable: false
         bridged: false
         mounted: false
@@ -75,7 +75,7 @@ nodes:
         enabled: true
         mounted: false
         mountable: false
-# grisou-49
+
   grisou-49:
     network_adapters:
       eth0:
@@ -113,7 +113,7 @@ nodes:
         enabled: true
         mounted: false
         mountable: false
-# Node with infiniband
+  # Node with infiniband
   grisou-[50-51]:
     network_adapters:
       eth0:
@@ -161,4 +161,3 @@ nodes:
         mounted: true
         netmask: 255.255.255.0
         switch: sgraoullyib
-
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
index d3fd32ca6744083d9b57df074b961d8bae19d5b2..890a995e5591e23cbb624c74c80d8315af0cfa04 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
@@ -1,217 +1,224 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: pdu_outlet_power_watt
-  description: Power consumption of node reported by PDU, in watt
-  period: 1000
-  source:
-    protocol: pdu
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1a"}
-  description: Speed of Fan 1A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2a"}
-  description: Speed of Fan 2A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3a"}
-  description: Speed of Fan 3A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4a"}
-  description: Speed of Fan 4A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5a"}
-  description: Speed of Fan 5A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6a"}
-  description: Speed of Fan 6A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7a"}
-  description: Speed of Fan 7A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1b"}
-  description: Speed of Fan 1B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2b"}
-  description: Speed of Fan 2B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3b"}
-  description: Speed of Fan 3B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4b"}
-  description: Speed of Fan 4B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5b"}
-  description: Speed of Fan 5B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6b"}
-  description: Speed of Fan 6B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7b"}
-  description: Speed of Fan 7B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: pdu_outlet_power_watt
+    description: Power consumption of node reported by PDU, in watt
+    period: 1000
+    source:
+      protocol: pdu
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1a"}
+    description: Speed of Fan 1A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2a"}
+    description: Speed of Fan 2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3a"}
+    description: Speed of Fan 3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4a"}
+    description: Speed of Fan 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5a"}
+    description: Speed of Fan 5A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6a"}
+    description: Speed of Fan 6A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7a"}
+    description: Speed of Fan 7A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1b"}
+    description: Speed of Fan 1B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2b"}
+    description: Speed of Fan 2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3b"}
+    description: Speed of Fan 3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4b"}
+    description: Speed of Fan 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5b"}
+    description: Speed of Fan 5B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6b"}
+    description: Speed of Fan 6B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7b"}
+    description: Speed of Fan 7B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/nancy/clusters/gros/gros.yaml b/input/grid5000/sites/nancy/clusters/gros/gros.yaml
index 7652f5a8430806635e967161b2fd8846c533e8f6..ba2790e6120d17420024a4d23f67aac23a9f4dc9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/gros.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/gros.yaml
@@ -13,12 +13,12 @@ nodes:
     software:
       standard-environment: debian10-x64-std
     supported_job_types:
-       deploy: true
-       besteffort: true
-       max_walltime: 0
+      deploy: true
+      besteffort: true
+      max_walltime: 0
     performance:
-       core_flops: 26918000000
-       node_flops: 301830000000
+      core_flops: 26918000000
+      node_flops: 301830000000
     network_adapters:
       bmc:
         interface: Ethernet
@@ -39,9 +39,9 @@ nodes:
       sda:
         interface: SATA
         storage: SSD
-        #model: PERC H330 Mini
+        # model: PERC H330 Mini
       sdb:
         interface: SATA
         storage: SSD
-        #model: PERC H330 Mini
+        # model: PERC H330 Mini
         reservation: true
diff --git a/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml b/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
index e65dc3f70bc722c43be683274145807a27620aae..001e78903fc8e3612c2dd7f78eba9aef9cbfe927 100644
--- a/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
@@ -1,172 +1,179 @@
 ---
 metrics:
 
-- name: wattmetre_power_watt
-  description: Power consumption reported by wattmetre, in watt
-  period: 1000
-  optional_period: 20
-  source:
-    protocol: wattmetre
-
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4a"}
-  description: Speed of Fan 4A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4b"}
-  description: Speed of Fan 4B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5a"}
-  description: Speed of Fan 5A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5b"}
-  description: Speed of Fan 5B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6a"}
-  description: Speed of Fan 6A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6b"}
-  description: Speed of Fan 6B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7a"}
-  description: Speed of Fan 7A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7b"}
-  description: Speed of Fan 7B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "8a"}
-  description: Speed of Fan 8A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "8b"}
-  description: Speed of Fan 8B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+  - name: wattmetre_power_watt
+    description: Power consumption reported by wattmetre, in watt
+    period: 1000
+    optional_period: 20
+    source:
+      protocol: wattmetre
+
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4a"}
+    description: Speed of Fan 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4b"}
+    description: Speed of Fan 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5a"}
+    description: Speed of Fan 5A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5b"}
+    description: Speed of Fan 5B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6a"}
+    description: Speed of Fan 6A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6b"}
+    description: Speed of Fan 6B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7a"}
+    description: Speed of Fan 7A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7b"}
+    description: Speed of Fan 7B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "8a"}
+    description: Speed of Fan 8A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "8b"}
+    description: Speed of Fan 8B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
diff --git a/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml b/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml
index 26728d42ab715fc4acc2cb19bd3aa7c651901048..d071eb4c029d064a56d50e4f92279ed5cc751d1f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml
@@ -14,497 +14,497 @@ nodes:
             url: http://wattmetre.nancy.grid5000.fr/GetWatts-json.php
   gros-1:
     pdu:
-    - uid: gros-wattmetre1
-      port: 0
+      - uid: gros-wattmetre1
+        port: 0
   gros-2:
     pdu:
-    - uid: gros-wattmetre1
-      port: 1
+      - uid: gros-wattmetre1
+        port: 1
   gros-3:
     pdu:
-    - uid: gros-wattmetre1
-      port: 2
+      - uid: gros-wattmetre1
+        port: 2
   gros-4:
     pdu:
-    - uid: gros-wattmetre1
-      port: 3
+      - uid: gros-wattmetre1
+        port: 3
   gros-5:
     pdu:
-    - uid: gros-wattmetre1
-      port: 4
+      - uid: gros-wattmetre1
+        port: 4
   gros-6:
     pdu:
-    - uid: gros-wattmetre1
-      port: 5
+      - uid: gros-wattmetre1
+        port: 5
   gros-7:
     pdu:
-    - uid: gros-wattmetre1
-      port: 6
+      - uid: gros-wattmetre1
+        port: 6
   gros-8:
     pdu:
-    - uid: gros-wattmetre1
-      port: 7
+      - uid: gros-wattmetre1
+        port: 7
   gros-9:
     pdu:
-    - uid: gros-wattmetre1
-      port: 8
+      - uid: gros-wattmetre1
+        port: 8
   gros-10:
     pdu:
-    - uid: gros-wattmetre1
-      port: 9
+      - uid: gros-wattmetre1
+        port: 9
   gros-11:
     pdu:
-    - uid: gros-wattmetre1
-      port: 10
+      - uid: gros-wattmetre1
+        port: 10
   gros-12:
     pdu:
-    - uid: gros-wattmetre1
-      port: 11
+      - uid: gros-wattmetre1
+        port: 11
   gros-13:
     pdu:
-    - uid: gros-wattmetre1
-      port: 12
+      - uid: gros-wattmetre1
+        port: 12
   gros-14:
     pdu:
-    - uid: gros-wattmetre1
-      port: 13
+      - uid: gros-wattmetre1
+        port: 13
   gros-15:
     pdu:
-    - uid: gros-wattmetre1
-      port: 14
+      - uid: gros-wattmetre1
+        port: 14
   gros-16:
     pdu:
-    - uid: gros-wattmetre1
-      port: 15
+      - uid: gros-wattmetre1
+        port: 15
   gros-17:
     pdu:
-    - uid: gros-wattmetre1
-      port: 16
+      - uid: gros-wattmetre1
+        port: 16
   gros-18:
     pdu:
-    - uid: gros-wattmetre1
-      port: 17
+      - uid: gros-wattmetre1
+        port: 17
   gros-19:
     pdu:
-    - uid: gros-wattmetre1
-      port: 18
+      - uid: gros-wattmetre1
+        port: 18
   gros-20:
     pdu:
-    - uid: gros-wattmetre1
-      port: 19
+      - uid: gros-wattmetre1
+        port: 19
   gros-21:
     pdu:
-    - uid: gros-wattmetre1
-      port: 20
+      - uid: gros-wattmetre1
+        port: 20
   gros-22:
     pdu:
-    - uid: gros-wattmetre1
-      port: 21
+      - uid: gros-wattmetre1
+        port: 21
   gros-23:
     pdu:
-    - uid: gros-wattmetre1
-      port: 22
+      - uid: gros-wattmetre1
+        port: 22
   gros-24:
     pdu:
-    - uid: gros-wattmetre1
-      port: 23
+      - uid: gros-wattmetre1
+        port: 23
   gros-25:
     pdu:
-    - uid: gros-wattmetre1
-      port: 24
+      - uid: gros-wattmetre1
+        port: 24
   gros-26:
     pdu:
-    - uid: gros-wattmetre1
-      port: 25
+      - uid: gros-wattmetre1
+        port: 25
   gros-27:
     pdu:
-    - uid: gros-wattmetre1
-      port: 26
+      - uid: gros-wattmetre1
+        port: 26
   gros-28:
     pdu:
-    - uid: gros-wattmetre1
-      port: 27
+      - uid: gros-wattmetre1
+        port: 27
   gros-29:
     pdu:
-    - uid: gros-wattmetre1
-      port: 28
+      - uid: gros-wattmetre1
+        port: 28
   gros-30:
     pdu:
-    - uid: gros-wattmetre1
-      port: 29
+      - uid: gros-wattmetre1
+        port: 29
   gros-31:
     pdu:
-    - uid: gros-wattmetre1
-      port: 30
+      - uid: gros-wattmetre1
+        port: 30
   gros-32:
     pdu:
-    - uid: gros-wattmetre1
-      port: 31
+      - uid: gros-wattmetre1
+        port: 31
   gros-33:
     pdu:
-    - uid: gros-wattmetre1
-      port: 32
+      - uid: gros-wattmetre1
+        port: 32
   gros-34:
     pdu:
-    - uid: gros-wattmetre1
-      port: 33
+      - uid: gros-wattmetre1
+        port: 33
   gros-35:
     pdu:
-    - uid: gros-wattmetre1
-      port: 34
+      - uid: gros-wattmetre1
+        port: 34
   gros-36:
     pdu:
-    - uid: gros-wattmetre1
-      port: 35
+      - uid: gros-wattmetre1
+        port: 35
   gros-37:
     pdu:
-    - uid: gros-wattmetre1
-      port: 36
+      - uid: gros-wattmetre1
+        port: 36
   gros-38:
     pdu:
-    - uid: gros-wattmetre1
-      port: 37
+      - uid: gros-wattmetre1
+        port: 37
   gros-39:
     pdu:
-    - uid: gros-wattmetre1
-      port: 38
+      - uid: gros-wattmetre1
+        port: 38
   gros-40:
     pdu:
-    - uid: gros-wattmetre1
-      port: 39
+      - uid: gros-wattmetre1
+        port: 39
   gros-41:
     pdu:
-    - uid: gros-wattmetre2
-      port: 30
+      - uid: gros-wattmetre2
+        port: 30
   gros-42:
     pdu:
-    - uid: gros-wattmetre2
-      port: 31
+      - uid: gros-wattmetre2
+        port: 31
   gros-43:
     pdu:
-    - uid: gros-wattmetre2
-      port: 32
+      - uid: gros-wattmetre2
+        port: 32
   gros-44:
     pdu:
-    - uid: gros-wattmetre2
-      port: 33
+      - uid: gros-wattmetre2
+        port: 33
   gros-45:
     pdu:
-    - uid: gros-wattmetre2
-      port: 34
+      - uid: gros-wattmetre2
+        port: 34
   gros-46:
     pdu:
-    - uid: gros-wattmetre2
-      port: 35
+      - uid: gros-wattmetre2
+        port: 35
   gros-47:
     pdu:
-    - uid: gros-wattmetre2
-      port: 24
+      - uid: gros-wattmetre2
+        port: 24
   gros-48:
     pdu:
-    - uid: gros-wattmetre2
-      port: 25
+      - uid: gros-wattmetre2
+        port: 25
   gros-49:
     pdu:
-    - uid: gros-wattmetre2
-      port: 26
+      - uid: gros-wattmetre2
+        port: 26
   gros-50:
     pdu:
-    - uid: gros-wattmetre2
-      port: 27
+      - uid: gros-wattmetre2
+        port: 27
   gros-51:
     pdu:
-    - uid: gros-wattmetre2
-      port: 28
+      - uid: gros-wattmetre2
+        port: 28
   gros-52:
     pdu:
-    - uid: gros-wattmetre2
-      port: 29
+      - uid: gros-wattmetre2
+        port: 29
   gros-53:
     pdu:
-    - uid: gros-wattmetre2
-      port: 18
+      - uid: gros-wattmetre2
+        port: 18
   gros-54:
     pdu:
-    - uid: gros-wattmetre2
-      port: 19
+      - uid: gros-wattmetre2
+        port: 19
   gros-55:
     pdu:
-    - uid: gros-wattmetre2
-      port: 20
+      - uid: gros-wattmetre2
+        port: 20
   gros-56:
     pdu:
-    - uid: gros-wattmetre2
-      port: 21
+      - uid: gros-wattmetre2
+        port: 21
   gros-57:
     pdu:
-    - uid: gros-wattmetre2
-      port: 22
+      - uid: gros-wattmetre2
+        port: 22
   gros-58:
     pdu:
-    - uid: gros-wattmetre2
-      port: 23
+      - uid: gros-wattmetre2
+        port: 23
   gros-59:
     pdu:
-    - uid: gros-wattmetre2
-      port: 12
+      - uid: gros-wattmetre2
+        port: 12
   gros-60:
     pdu:
-    - uid: gros-wattmetre2
-      port: 13
+      - uid: gros-wattmetre2
+        port: 13
   gros-61:
     pdu:
-    - uid: gros-wattmetre2
-      port: 14
+      - uid: gros-wattmetre2
+        port: 14
   gros-62:
     pdu:
-    - uid: gros-wattmetre2
-      port: 15
+      - uid: gros-wattmetre2
+        port: 15
   gros-63:
     pdu:
-    - uid: gros-wattmetre2
-      port: 16
+      - uid: gros-wattmetre2
+        port: 16
   gros-64:
     pdu:
-    - uid: gros-wattmetre2
-      port: 17
+      - uid: gros-wattmetre2
+        port: 17
   gros-65:
     pdu:
-    - uid: gros-wattmetre2
-      port: 6
+      - uid: gros-wattmetre2
+        port: 6
   gros-66:
     pdu:
-    - uid: gros-wattmetre2
-      port: 7
+      - uid: gros-wattmetre2
+        port: 7
   gros-67:
     pdu:
-    - uid: gros-wattmetre2
-      port: 8
+      - uid: gros-wattmetre2
+        port: 8
   gros-68:
     pdu:
-    - uid: gros-wattmetre2
-      port: 9
+      - uid: gros-wattmetre2
+        port: 9
   gros-69:
     pdu:
-    - uid: gros-wattmetre2
-      port: 10
+      - uid: gros-wattmetre2
+        port: 10
   gros-70:
     pdu:
-    - uid: gros-wattmetre2
-      port: 11
+      - uid: gros-wattmetre2
+        port: 11
   gros-71:
     pdu:
-    - uid: gros-wattmetre2
-      port: 0
+      - uid: gros-wattmetre2
+        port: 0
   gros-72:
     pdu:
-    - uid: gros-wattmetre2
-      port: 1
+      - uid: gros-wattmetre2
+        port: 1
   gros-73:
     pdu:
-    - uid: gros-wattmetre2
-      port: 2
+      - uid: gros-wattmetre2
+        port: 2
   gros-74:
     pdu:
-    - uid: gros-wattmetre2
-      port: 3
+      - uid: gros-wattmetre2
+        port: 3
   gros-75:
     pdu:
-    - uid: gros-wattmetre2
-      port: 4
+      - uid: gros-wattmetre2
+        port: 4
   gros-76:
     pdu:
-    - uid: gros-wattmetre2
-      port: 5
+      - uid: gros-wattmetre2
+        port: 5
   gros-77:
     pdu:
-    - uid: gros-wattmetre3
-      port: 42
+      - uid: gros-wattmetre3
+        port: 42
   gros-78:
     pdu:
-    - uid: gros-wattmetre3
-      port: 43
+      - uid: gros-wattmetre3
+        port: 43
   gros-79:
     pdu:
-    - uid: gros-wattmetre3
-      port: 44
+      - uid: gros-wattmetre3
+        port: 44
   gros-80:
     pdu:
-    - uid: gros-wattmetre3
-      port: 45
+      - uid: gros-wattmetre3
+        port: 45
   gros-81:
     pdu:
-    - uid: gros-wattmetre3
-      port: 46
+      - uid: gros-wattmetre3
+        port: 46
   gros-82:
     pdu:
-    - uid: gros-wattmetre3
-      port: 47
+      - uid: gros-wattmetre3
+        port: 47
   gros-83:
     pdu:
-    - uid: gros-wattmetre3
-      port: 36
+      - uid: gros-wattmetre3
+        port: 36
   gros-84:
     pdu:
-    - uid: gros-wattmetre3
-      port: 37
+      - uid: gros-wattmetre3
+        port: 37
   gros-85:
     pdu:
-    - uid: gros-wattmetre3
-      port: 38
+      - uid: gros-wattmetre3
+        port: 38
   gros-86:
     pdu:
-    - uid: gros-wattmetre3
-      port: 39
+      - uid: gros-wattmetre3
+        port: 39
   gros-87:
     pdu:
-    - uid: gros-wattmetre3
-      port: 40
+      - uid: gros-wattmetre3
+        port: 40
   gros-88:
     pdu:
-    - uid: gros-wattmetre3
-      port: 41
+      - uid: gros-wattmetre3
+        port: 41
   gros-89:
     pdu:
-    - uid: gros-wattmetre3
-      port: 30
+      - uid: gros-wattmetre3
+        port: 30
   gros-90:
     pdu:
-    - uid: gros-wattmetre3
-      port: 31
+      - uid: gros-wattmetre3
+        port: 31
   gros-91:
     pdu:
-    - uid: gros-wattmetre3
-      port: 32
+      - uid: gros-wattmetre3
+        port: 32
   gros-92:
     pdu:
-    - uid: gros-wattmetre3
-      port: 33
+      - uid: gros-wattmetre3
+        port: 33
   gros-93:
     pdu:
-    - uid: gros-wattmetre3
-      port: 34
+      - uid: gros-wattmetre3
+        port: 34
   gros-94:
     pdu:
-    - uid: gros-wattmetre3
-      port: 35
+      - uid: gros-wattmetre3
+        port: 35
   gros-95:
     pdu:
-    - uid: gros-wattmetre3
-      port: 24
+      - uid: gros-wattmetre3
+        port: 24
   gros-96:
     pdu:
-    - uid: gros-wattmetre3
-      port: 25
+      - uid: gros-wattmetre3
+        port: 25
   gros-97:
     pdu:
-    - uid: gros-wattmetre3
-      port: 26
+      - uid: gros-wattmetre3
+        port: 26
   gros-98:
     pdu:
-    - uid: gros-wattmetre3
-      port: 27
+      - uid: gros-wattmetre3
+        port: 27
   gros-99:
     pdu:
-    - uid: gros-wattmetre3
-      port: 28
+      - uid: gros-wattmetre3
+        port: 28
   gros-100:
     pdu:
-    - uid: gros-wattmetre3
-      port: 29
+      - uid: gros-wattmetre3
+        port: 29
   gros-101:
     pdu:
-    - uid: gros-wattmetre3
-      port: 18
+      - uid: gros-wattmetre3
+        port: 18
   gros-102:
     pdu:
-    - uid: gros-wattmetre3
-      port: 19
+      - uid: gros-wattmetre3
+        port: 19
   gros-103:
     pdu:
-    - uid: gros-wattmetre3
-      port: 20
+      - uid: gros-wattmetre3
+        port: 20
   gros-104:
     pdu:
-    - uid: gros-wattmetre3
-      port: 21
+      - uid: gros-wattmetre3
+        port: 21
   gros-105:
     pdu:
-    - uid: gros-wattmetre3
-      port: 22
+      - uid: gros-wattmetre3
+        port: 22
   gros-106:
     pdu:
-    - uid: gros-wattmetre3
-      port: 23
+      - uid: gros-wattmetre3
+        port: 23
   gros-107:
     pdu:
-    - uid: gros-wattmetre3
-      port: 12
+      - uid: gros-wattmetre3
+        port: 12
   gros-108:
     pdu:
-    - uid: gros-wattmetre3
-      port: 13
+      - uid: gros-wattmetre3
+        port: 13
   gros-109:
     pdu:
-    - uid: gros-wattmetre3
-      port: 14
+      - uid: gros-wattmetre3
+        port: 14
   gros-110:
     pdu:
-    - uid: gros-wattmetre3
-      port: 15
+      - uid: gros-wattmetre3
+        port: 15
   gros-111:
     pdu:
-    - uid: gros-wattmetre3
-      port: 16
+      - uid: gros-wattmetre3
+        port: 16
   gros-112:
     pdu:
-    - uid: gros-wattmetre3
-      port: 17
+      - uid: gros-wattmetre3
+        port: 17
   gros-113:
     pdu:
-    - uid: gros-wattmetre3
-      port: 0
+      - uid: gros-wattmetre3
+        port: 0
   gros-114:
     pdu:
-    - uid: gros-wattmetre3
-      port: 1
+      - uid: gros-wattmetre3
+        port: 1
   gros-115:
     pdu:
-    - uid: gros-wattmetre3
-      port: 2
+      - uid: gros-wattmetre3
+        port: 2
   gros-116:
     pdu:
-    - uid: gros-wattmetre3
-      port: 3
+      - uid: gros-wattmetre3
+        port: 3
   gros-117:
     pdu:
-    - uid: gros-wattmetre3
-      port: 6
+      - uid: gros-wattmetre3
+        port: 6
   gros-118:
     pdu:
-    - uid: gros-wattmetre3
-      port: 7
+      - uid: gros-wattmetre3
+        port: 7
   gros-119:
     pdu:
-    - uid: gros-wattmetre3
-      port: 8
+      - uid: gros-wattmetre3
+        port: 8
   gros-120:
     pdu:
-    - uid: gros-wattmetre3
-      port: 9
+      - uid: gros-wattmetre3
+        port: 9
   gros-121:
     pdu:
-    - uid: gros-wattmetre3
-      port: 10
+      - uid: gros-wattmetre3
+        port: 10
   gros-122:
     pdu:
-    - uid: gros-wattmetre3
-      port: 11
+      - uid: gros-wattmetre3
+        port: 11
   gros-123:
     pdu:
-    - uid: gros-wattmetre3
-      port: 4
+      - uid: gros-wattmetre3
+        port: 4
   gros-124:
     pdu:
-    - uid: gros-wattmetre3
-      port: 5
+      - uid: gros-wattmetre3
+        port: 5
diff --git a/input/grid5000/sites/nancy/clusters/grue/grue.yaml b/input/grid5000/sites/nancy/clusters/grue/grue.yaml
index d4e338e2bb432bdd6b4494fb6f53935e6a2485be..e4d2981e0f519e9b9a680c403b4e90025b915049 100644
--- a/input/grid5000/sites/nancy/clusters/grue/grue.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/grue.yaml
@@ -1,63 +1,64 @@
- model: Dell PowerEdge R7425
- created_at: 2019-11-25
- kavlan: true
- queues:
-   - production 
-   - admin
- nodes:
-   grue-[1-5]:
-     supported_job_types:
-       deploy: true
-       besteffort: true           
-     performance:
+---
+model: Dell PowerEdge R7425
+created_at: 2019-11-25
+kavlan: true
+queues:
+  - production
+  - admin
+nodes:
+  grue-[1-5]:
+    supported_job_types:
+      deploy: true
+      besteffort: true
+    performance:
       core_flops: 13438000000
       node_flops: 430760000000
-     processor:
-       microarchitecture: Zen
-       clock_speed: 2400000000
-     software:
-       standard-environment: debian10-x64-std
-     network_adapters:
-       bmc:
-         interface: Ethernet
-         enabled: true 
-         mountable: false
-         mounted: false
-       eth0:
-         enabled: true
-         mountable: true
-         mounted: true
-       eth1:
-         enabled: false
-         mountable: false
-         mounted: false
-       eth2:
-         enabled: false
-         mountable: false
-         mounted: false
-       eth3:
-         enabled: false
-         mountable: false
-         mounted: false
-     storage_devices:
-       sda:
-         interface: SAS
-         storage: SSD
-     gpu_devices:
-       nvidia0:
-         cores_affinity: 0 16 8 24 4 20 12 28
-       nvidia1:
-         cores_affinity: 2 18 10 26 6 22 14 30
-       nvidia2:
-         cores_affinity: 1 17 9 25 7 23 15 31
-       nvidia3:
-         cores_affinity: 3 19 11 27 5 21 13 29
-   grue-[1-2]:
-     supported_job_types:
-        max_walltime: 86400 
-   grue-[3-4]:
-     supported_job_types:
-        max_walltime: 172800
-   grue-[5-]:
-     supported_job_types:
-        max_walltime: 604800     
+    processor:
+      microarchitecture: Zen
+      clock_speed: 2400000000
+    software:
+      standard-environment: debian10-x64-std
+    network_adapters:
+      bmc:
+        interface: Ethernet
+        enabled: true
+        mountable: false
+        mounted: false
+      eth0:
+        enabled: true
+        mountable: true
+        mounted: true
+      eth1:
+        enabled: false
+        mountable: false
+        mounted: false
+      eth2:
+        enabled: false
+        mountable: false
+        mounted: false
+      eth3:
+        enabled: false
+        mountable: false
+        mounted: false
+    storage_devices:
+      sda:
+        interface: SAS
+        storage: SSD
+    gpu_devices:
+      nvidia0:
+        cores_affinity: 0 16 8 24 4 20 12 28
+      nvidia1:
+        cores_affinity: 2 18 10 26 6 22 14 30
+      nvidia2:
+        cores_affinity: 1 17 9 25 7 23 15 31
+      nvidia3:
+        cores_affinity: 3 19 11 27 5 21 13 29
+  grue-[1-2]:
+    supported_job_types:
+      max_walltime: 86400
+  grue-[3-4]:
+    supported_job_types:
+      max_walltime: 172800
+  grue-[5-]:
+    supported_job_types:
+      max_walltime: 604800
diff --git a/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml b/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
index 5f2ff52f8d75efa6427162f285300f516da65161..5551eff2d2608d7445a1f47dec92cdeabf4b280b 100644
--- a/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
@@ -1,198 +1,207 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_voltage_volt
-  labels: {"psu": "2"}
-  description: Voltage of PSU 2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_psu_current_amp
-  labels: {"psu": "2"}
-  description: Current of PSU 2 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1"}
-  description: Speed of Fan 1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2"}
-  description: Speed of Fan 2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3"}
-  description: Speed of Fan 3 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4"}
-  description: Speed of Fan 4 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5"}
-  description: Speed of Fan 5 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6"}
-  description: Speed of Fan 6 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_gpu_temp_celsius
-  labels: {"gpu": "1"}
-  description: Temperature of GPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
-
-- name: bmc_gpu_temp_celsius
-  labels: {"gpu": "2"}
-  description: Temperature of GPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.5
-
-- name: bmc_gpu_temp_celsius
-  labels: {"gpu": "5"}
-  description: Temperature of GPU 5 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.6
-
-- name: bmc_gpu_temp_celsius
-  labels: {"gpu": "8"}
-  description: Temperature of GPU 8 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.7
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.8
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1"}
+    description: Speed of Fan 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2"}
+    description: Speed of Fan 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3"}
+    description: Speed of Fan 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4"}
+    description: Speed of Fan 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5"}
+    description: Speed of Fan 5 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6"}
+    description: Speed of Fan 6 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_gpu_temp_celsius
+    labels: {"gpu": "1"}
+    description: Temperature of GPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+
+  - name: bmc_gpu_temp_celsius
+    labels: {"gpu": "2"}
+    description: Temperature of GPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.5
+
+  - name: bmc_gpu_temp_celsius
+    labels: {"gpu": "5"}
+    description: Temperature of GPU 5 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.6
+
+  - name: bmc_gpu_temp_celsius
+    labels: {"gpu": "8"}
+    description: Temperature of GPU 8 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.7
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.8
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml b/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
index 3b5100f4de30b562de9b722b295ed9b76cf5e117..17650f97efb2ac1de322e639fe7be2380530ab4f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
@@ -1,167 +1,176 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_voltage_volt
-  labels: {"psu": "2"}
-  description: Voltage of PSU 2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_psu_current_amp
-  labels: {"psu": "2"}
-  description: Current of PSU 2 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1a"}
-  description: Speed of Fan 1A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1b"}
-  description: Speed of Fan 1B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2a"}
-  description: Speed of Fan 2A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2b"}
-  description: Speed of Fan 2B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3a"}
-  description: Speed of Fan 3A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3b"}
-  description: Speed of Fan 3B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4a"}
-  description: Speed of Fan 4A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4b"}
-  description: Speed of Fan 4B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1a"}
+    description: Speed of Fan 1A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1b"}
+    description: Speed of Fan 1B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2a"}
+    description: Speed of Fan 2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2b"}
+    description: Speed of Fan 2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3a"}
+    description: Speed of Fan 3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3b"}
+    description: Speed of Fan 3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4a"}
+    description: Speed of Fan 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4b"}
+    description: Speed of Fan 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
diff --git a/input/grid5000/sites/nancy/nancy.yaml b/input/grid5000/sites/nancy/nancy.yaml
index 6434d6471b7c1e1a33d3ba507064d62a87118cb1..eacc6e9ab1eb15b857613e6cc1c2175831b5cec1 100644
--- a/input/grid5000/sites/nancy/nancy.yaml
+++ b/input/grid5000/sites/nancy/nancy.yaml
@@ -65,4 +65,3 @@ kavlans:
   14:
     network: 10.19.192.0/18
     gateway: 10.19.255.254
-
diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
index 8b41f78c46a7a48c3688544b39b9294802395fb0..bf57505ac94430ac410feefdd4359c64ba1b7859 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -28,18 +28,18 @@ gw:
     wattmeter: multiple
     metric: power
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 3000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 3000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 3000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 3000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   vlans:
     "vlan100":
       administrative: yes
diff --git a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
index 2cf4f7ad4582f1c0364f970e285ff60d84c636ca..82d995d25e70051aabbbad4076eda8ecd45d6405 100644
--- a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
+++ b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
@@ -18,18 +18,18 @@ sgraoullyib:
     wattmeter: true
     metric: power
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   ip: 172.17.79.223
   linecards:
     12:
diff --git a/input/grid5000/sites/nancy/networks/sgrcinq.yaml b/input/grid5000/sites/nancy/networks/sgrcinq.yaml
index 9c5ba1d26b7a6045c248a875bf2ff04166418e55..20f992e526c9576116e6423bf15f8274753c640d 100644
--- a/input/grid5000/sites/nancy/networks/sgrcinq.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrcinq.yaml
@@ -2,85 +2,85 @@
 sgrcinq:
   role: production
   model: Cisco WS-C2960X-48TD-L
-  warranty: "2028-11-28" # see bug 9837
+  warranty: "2028-11-28"  # see bug 9837
   kind: switch
   site: nancy
   snmp_community: public
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   ip: 172.17.79.230
   backplane_bps: 100000000000
   linecards:
     0:
-       snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
-       kavlan_pattern: "Gi1/%LINECARD%/%PORT%"
-       kind: node
-       rate: 1000000000
-       ports:
-         1: grcinq-3
-         2: grcinq-4
-         3: grcinq-7
-         4: grcinq-8
-         5: grcinq-11
-         6: grcinq-12
-         7: grcinq-15
-         8: grcinq-16
-         9: grcinq-19
-         10: grcinq-20
-         11: grcinq-23
-         12: grcinq-24
-         13: grcinq-27
-         14: grcinq-28
-         15: grcinq-31
-         16: grcinq-32
-         17: grcinq-35
-         18: grcinq-36
-         19: grcinq-39
-         20: grcinq-40
-         21: grcinq-43
-         22: grcinq-44
-         23: grcinq-47
-         25: grcinq-45
-         26: grcinq-46
-         27: grcinq-41
-         28: grcinq-42
-         29: grcinq-37
-         30: grcinq-38
-         31: grcinq-33
-         32: grcinq-34
-         33: grcinq-29
-         34: grcinq-30
-         35: grcinq-25
-         36: grcinq-26
-         37: grcinq-21
-         38: grcinq-22
-         39: grcinq-17
-         40: grcinq-18
-         41: grcinq-13
-         42: grcinq-14
-         43: grcinq-9
-         44: grcinq-10
-         45: grcinq-5
-         46: grcinq-6
-         47: grcinq-1
-         48: grcinq-2
+      snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
+      kavlan_pattern: "Gi1/%LINECARD%/%PORT%"
+      kind: node
+      rate: 1000000000
+      ports:
+        1: grcinq-3
+        2: grcinq-4
+        3: grcinq-7
+        4: grcinq-8
+        5: grcinq-11
+        6: grcinq-12
+        7: grcinq-15
+        8: grcinq-16
+        9: grcinq-19
+        10: grcinq-20
+        11: grcinq-23
+        12: grcinq-24
+        13: grcinq-27
+        14: grcinq-28
+        15: grcinq-31
+        16: grcinq-32
+        17: grcinq-35
+        18: grcinq-36
+        19: grcinq-39
+        20: grcinq-40
+        21: grcinq-43
+        22: grcinq-44
+        23: grcinq-47
+        25: grcinq-45
+        26: grcinq-46
+        27: grcinq-41
+        28: grcinq-42
+        29: grcinq-37
+        30: grcinq-38
+        31: grcinq-33
+        32: grcinq-34
+        33: grcinq-29
+        34: grcinq-30
+        35: grcinq-25
+        36: grcinq-26
+        37: grcinq-21
+        38: grcinq-22
+        39: grcinq-17
+        40: grcinq-18
+        41: grcinq-13
+        42: grcinq-14
+        43: grcinq-9
+        44: grcinq-10
+        45: grcinq-5
+        46: grcinq-6
+        47: grcinq-1
+        48: grcinq-2
     1:
-        snmp_pattern: "TenGigabitEthernet1/0/%PORT%"
-        kavlan_pattern: "TenGigabitEthernet1/0/%PORT%"
-        kind: other
-        rate: 10000000000
-        ports:
-          1:
-            uid: sgrvingt
-            kind: switch
+      snmp_pattern: "TenGigabitEthernet1/0/%PORT%"
+      kavlan_pattern: "TenGigabitEthernet1/0/%PORT%"
+      kind: other
+      rate: 10000000000
+      ports:
+        1:
+          uid: sgrvingt
+          kind: switch
diff --git a/input/grid5000/sites/nancy/networks/sgrele-opf.yaml b/input/grid5000/sites/nancy/networks/sgrele-opf.yaml
index f4f2d5ffd24af164347578d619d28afa2608b6d8..95fd29c54252e45d83947e8f756d53d8f4cd8232 100644
--- a/input/grid5000/sites/nancy/networks/sgrele-opf.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrele-opf.yaml
@@ -1,5 +1,5 @@
 ---
-#Information in this file can be incorrect #TODO
+# Information in this file can be incorrect #TODO
 sgrele-opf:
   role: hpc
   model: Omni-Path
diff --git a/input/grid5000/sites/nancy/networks/sgrisou1.yaml b/input/grid5000/sites/nancy/networks/sgrisou1.yaml
index 44c1ceef183cdc49a2a3f14aa93e6fe690e1717d..615b09d4f913a36b93b19ab43911e4e372dc53b6 100644
--- a/input/grid5000/sites/nancy/networks/sgrisou1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrisou1.yaml
@@ -18,18 +18,18 @@ sgrisou1:
     wattmeter: true
     metric: power
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   ip: 172.17.79.206
   backplane_bps: 260000000000
   linecards:
diff --git a/input/grid5000/sites/nancy/networks/sgros1.yaml b/input/grid5000/sites/nancy/networks/sgros1.yaml
index 6e4848ff1916652837c94070e1986d4b0a60a2df..b266cd92252c734c8137e28b8a6a4f95e3562dc7 100644
--- a/input/grid5000/sites/nancy/networks/sgros1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros1.yaml
@@ -9,18 +9,18 @@ sgros1:
   ip: 172.17.79.208
   backplane_bps: 6400000000000
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 3000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 3000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 3000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 3000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       snmp_pattern: "ethernet1/1/%PORT%:1"
@@ -44,305 +44,305 @@ sgros1:
         3: gros-119
         4: gros-120
     5:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-113
-         2: gros-114
-         3: gros-115
-         4: gros-116
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-113
+        2: gros-114
+        3: gros-115
+        4: gros-116
     7:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-109
-         2: gros-110
-         3: gros-111
-         4: gros-112
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-109
+        2: gros-110
+        3: gros-111
+        4: gros-112
     9:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-105
-         2: gros-106
-         3: gros-107
-         4: gros-108
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-105
+        2: gros-106
+        3: gros-107
+        4: gros-108
     11:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-101
-         2: gros-102
-         3: gros-103
-         4: gros-104
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-101
+        2: gros-102
+        3: gros-103
+        4: gros-104
     13:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-97
-         2: gros-98
-         3: gros-99
-         4: gros-100
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-97
+        2: gros-98
+        3: gros-99
+        4: gros-100
     15:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-61
-         2: gros-62
-         3: gros-63
-         4: gros-64
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-61
+        2: gros-62
+        3: gros-63
+        4: gros-64
     17:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-65
-         2: gros-66
-         3: gros-67
-         4: gros-68
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-65
+        2: gros-66
+        3: gros-67
+        4: gros-68
     19:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-69
-         2: gros-70
-         3: gros-71
-         4: gros-72
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-69
+        2: gros-70
+        3: gros-71
+        4: gros-72
     21:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-73
-         2: gros-74
-         3: gros-75
-         4: gros-76
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-73
+        2: gros-74
+        3: gros-75
+        4: gros-76
     23:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-25
-         2: gros-26
-         3: gros-27
-         4: gros-28
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-25
+        2: gros-26
+        3: gros-27
+        4: gros-28
     25:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-29
-         2: gros-30
-         3: gros-31
-         4: gros-32
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-29
+        2: gros-30
+        3: gros-31
+        4: gros-32
     27:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-33
-         2: gros-34
-         3: gros-35
-         4: gros-36
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-33
+        2: gros-34
+        3: gros-35
+        4: gros-36
     29:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-37
-         2: gros-38
-         3: gros-39
-         4: gros-40
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-37
+        2: gros-38
+        3: gros-39
+        4: gros-40
     31:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-5
-         2: gros-6
-         3: gros-7
-         4: gros-8
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-5
+        2: gros-6
+        3: gros-7
+        4: gros-8
     33:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-121
-         2: gros-122
-         3: gros-123
-         4: gros-124
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-121
+        2: gros-122
+        3: gros-123
+        4: gros-124
     35:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-77
-         2: gros-78
-         3: gros-79
-         4: gros-80
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-77
+        2: gros-78
+        3: gros-79
+        4: gros-80
     37:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-81
-         2: gros-82
-         3: gros-83
-         4: gros-84
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-81
+        2: gros-82
+        3: gros-83
+        4: gros-84
     39:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-85
-         2: gros-86
-         3: gros-87
-         4: gros-88
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-85
+        2: gros-86
+        3: gros-87
+        4: gros-88
     41:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-89
-         2: gros-90
-         3: gros-91
-         4: gros-92
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-89
+        2: gros-90
+        3: gros-91
+        4: gros-92
     43:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-93
-         2: gros-94
-         3: gros-95
-         4: gros-96
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-93
+        2: gros-94
+        3: gros-95
+        4: gros-96
     45:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-57
-         2: gros-58
-         3: gros-59
-         4: gros-60
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-57
+        2: gros-58
+        3: gros-59
+        4: gros-60
     47:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-53
-         2: gros-54
-         3: gros-55
-         4: gros-56
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-53
+        2: gros-54
+        3: gros-55
+        4: gros-56
     49:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-49
-         2: gros-50
-         3: gros-51
-         4: gros-52
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-49
+        2: gros-50
+        3: gros-51
+        4: gros-52
     51:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-45
-         2: gros-46
-         3: gros-47
-         4: gros-48
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-45
+        2: gros-46
+        3: gros-47
+        4: gros-48
     53:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-41
-         2: gros-42
-         3: gros-43
-         4: gros-44
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-41
+        2: gros-42
+        3: gros-43
+        4: gros-44
     55:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-21
-         2: gros-22
-         3: gros-23
-         4: gros-24
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-21
+        2: gros-22
+        3: gros-23
+        4: gros-24
     57:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-17
-         2: gros-18
-         3: gros-19
-         4: gros-20
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-17
+        2: gros-18
+        3: gros-19
+        4: gros-20
     59:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-13
-         2: gros-14
-         3: gros-15
-         4: gros-16
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-13
+        2: gros-14
+        3: gros-15
+        4: gros-16
     61:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-9
-         2: gros-10
-         3: gros-11
-         4: gros-12
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-9
+        2: gros-10
+        3: gros-11
+        4: gros-12
     63:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-1
-         2: gros-2
-         3: gros-3
-         4: gros-4
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-1
+        2: gros-2
+        3: gros-3
+        4: gros-4
   channels:
     port-channel1:
       port: port-channel2
diff --git a/input/grid5000/sites/nancy/networks/sgros2.yaml b/input/grid5000/sites/nancy/networks/sgros2.yaml
index 971d0eb533e36cc4a074d52c91a980f22df736c0..26f143e526a57e5bba649e9d72c7ac87c139d101 100644
--- a/input/grid5000/sites/nancy/networks/sgros2.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros2.yaml
@@ -7,18 +7,18 @@ sgros2:
   site: nancy
   snmp_community: public
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 3000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 3000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 3000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 3000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   ip: 172.17.79.209
   backplane_bps: 6400000000000
   linecards:
@@ -34,315 +34,315 @@ sgros2:
           uid: port-channel1
           kind: channel
     3:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-117-eth1
-         2: gros-118-eth1
-         3: gros-119-eth1
-         4: gros-120-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-117-eth1
+        2: gros-118-eth1
+        3: gros-119-eth1
+        4: gros-120-eth1
     5:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-113-eth1
-         2: gros-114-eth1
-         3: gros-115-eth1
-         4: gros-116-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-113-eth1
+        2: gros-114-eth1
+        3: gros-115-eth1
+        4: gros-116-eth1
     7:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-109-eth1
-         2: gros-110-eth1
-         3: gros-111-eth1
-         4: gros-112-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-109-eth1
+        2: gros-110-eth1
+        3: gros-111-eth1
+        4: gros-112-eth1
     9:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-105-eth1
-         2: gros-106-eth1
-         3: gros-107-eth1
-         4: gros-108-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-105-eth1
+        2: gros-106-eth1
+        3: gros-107-eth1
+        4: gros-108-eth1
     11:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-101-eth1
-         2: gros-102-eth1
-         3: gros-103-eth1
-         4: gros-104-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-101-eth1
+        2: gros-102-eth1
+        3: gros-103-eth1
+        4: gros-104-eth1
     13:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-97-eth1
-         2: gros-98-eth1
-         3: gros-99-eth1
-         4: gros-100-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-97-eth1
+        2: gros-98-eth1
+        3: gros-99-eth1
+        4: gros-100-eth1
     15:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-61-eth1
-         2: gros-62-eth1
-         3: gros-63-eth1
-         4: gros-64-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-61-eth1
+        2: gros-62-eth1
+        3: gros-63-eth1
+        4: gros-64-eth1
     17:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-65-eth1
-         2: gros-66-eth1
-         3: gros-67-eth1
-         4: gros-68-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-65-eth1
+        2: gros-66-eth1
+        3: gros-67-eth1
+        4: gros-68-eth1
     19:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-69-eth1
-         2: gros-70-eth1
-         3: gros-71-eth1
-         4: gros-72-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-69-eth1
+        2: gros-70-eth1
+        3: gros-71-eth1
+        4: gros-72-eth1
     21:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-73-eth1
-         2: gros-74-eth1
-         3: gros-75-eth1
-         4: gros-76-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-73-eth1
+        2: gros-74-eth1
+        3: gros-75-eth1
+        4: gros-76-eth1
     23:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-25-eth1
-         2: gros-26-eth1
-         3: gros-27-eth1
-         4: gros-28-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-25-eth1
+        2: gros-26-eth1
+        3: gros-27-eth1
+        4: gros-28-eth1
     25:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-29-eth1
-         2: gros-30-eth1
-         3: gros-31-eth1
-         4: gros-32-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-29-eth1
+        2: gros-30-eth1
+        3: gros-31-eth1
+        4: gros-32-eth1
     27:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-33-eth1
-         2: gros-34-eth1
-         3: gros-35-eth1
-         4: gros-36-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-33-eth1
+        2: gros-34-eth1
+        3: gros-35-eth1
+        4: gros-36-eth1
     29:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-37-eth1
-         2: gros-38-eth1
-         3: gros-39-eth1
-         4: gros-40-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-37-eth1
+        2: gros-38-eth1
+        3: gros-39-eth1
+        4: gros-40-eth1
     31:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-5-eth1
-         2: gros-6-eth1
-         3: gros-7-eth1
-         4: gros-8-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-5-eth1
+        2: gros-6-eth1
+        3: gros-7-eth1
+        4: gros-8-eth1
     33:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-121-eth1
-         2: gros-122-eth1
-         3: gros-123-eth1
-         4: gros-124-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-121-eth1
+        2: gros-122-eth1
+        3: gros-123-eth1
+        4: gros-124-eth1
     35:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-77-eth1
-         2: gros-78-eth1
-         3: gros-79-eth1
-         4: gros-80-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-77-eth1
+        2: gros-78-eth1
+        3: gros-79-eth1
+        4: gros-80-eth1
     37:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-81-eth1
-         2: gros-82-eth1
-         3: gros-83-eth1
-         4: gros-84-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-81-eth1
+        2: gros-82-eth1
+        3: gros-83-eth1
+        4: gros-84-eth1
     39:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-85-eth1
-         2: gros-86-eth1
-         3: gros-87-eth1
-         4: gros-88-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-85-eth1
+        2: gros-86-eth1
+        3: gros-87-eth1
+        4: gros-88-eth1
     41:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-89-eth1
-         2: gros-90-eth1
-         3: gros-91-eth1
-         4: gros-92-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-89-eth1
+        2: gros-90-eth1
+        3: gros-91-eth1
+        4: gros-92-eth1
     43:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-93-eth1
-         2: gros-94-eth1
-         3: gros-95-eth1
-         4: gros-96-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-93-eth1
+        2: gros-94-eth1
+        3: gros-95-eth1
+        4: gros-96-eth1
     45:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-57-eth1
-         2: gros-58-eth1
-         3: gros-59-eth1
-         4: gros-60-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-57-eth1
+        2: gros-58-eth1
+        3: gros-59-eth1
+        4: gros-60-eth1
     47:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-53-eth1
-         2: gros-54-eth1
-         3: gros-55-eth1
-         4: gros-56-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-53-eth1
+        2: gros-54-eth1
+        3: gros-55-eth1
+        4: gros-56-eth1
     49:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-49-eth1
-         2: gros-50-eth1
-         3: gros-51-eth1
-         4: gros-52-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-49-eth1
+        2: gros-50-eth1
+        3: gros-51-eth1
+        4: gros-52-eth1
     51:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-45-eth1
-         2: gros-46-eth1
-         3: gros-47-eth1
-         4: gros-48-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-45-eth1
+        2: gros-46-eth1
+        3: gros-47-eth1
+        4: gros-48-eth1
     53:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-41-eth1
-         2: gros-42-eth1
-         3: gros-43-eth1
-         4: gros-44-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-41-eth1
+        2: gros-42-eth1
+        3: gros-43-eth1
+        4: gros-44-eth1
     55:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-21-eth1
-         2: gros-22-eth1
-         3: gros-23-eth1
-         4: gros-24-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-21-eth1
+        2: gros-22-eth1
+        3: gros-23-eth1
+        4: gros-24-eth1
     57:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-17-eth1
-         2: gros-18-eth1
-         3: gros-19-eth1
-         4: gros-20-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-17-eth1
+        2: gros-18-eth1
+        3: gros-19-eth1
+        4: gros-20-eth1
     59:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-13-eth1
-         2: gros-14-eth1
-         3: gros-15-eth1
-         4: gros-16-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-13-eth1
+        2: gros-14-eth1
+        3: gros-15-eth1
+        4: gros-16-eth1
     61:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-9-eth1
-         2: gros-10-eth1
-         3: gros-11-eth1
-         4: gros-12-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-9-eth1
+        2: gros-10-eth1
+        3: gros-11-eth1
+        4: gros-12-eth1
     63:
-       snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
-       kind: node
-       rate: 25000000000
-       ports:
-         1: gros-1-eth1
-         2: gros-2-eth1
-         3: gros-3-eth1
-         4: gros-4-eth1
+      snmp_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
+      kind: node
+      rate: 25000000000
+      ports:
+        1: gros-1-eth1
+        2: gros-2-eth1
+        3: gros-3-eth1
+        4: gros-4-eth1
   channels:
     port-channel1:
       port: port-channel3
diff --git a/input/grid5000/sites/nancy/networks/sgrvingt.yaml b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
index 9d728956a33e911147451d8625cd5d3bd4ce194d..a84475724b9dd4c474a731086341601a321fcf6d 100644
--- a/input/grid5000/sites/nancy/networks/sgrvingt.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
@@ -7,145 +7,145 @@ sgrvingt:
   site: nancy
   snmp_community: public
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   ip: 172.17.79.207
   backplane_bps: 1440000000000
   linecards:
     1:
-       snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
-       kavlan_pattern: "TenGigabitEthernet%LINECARD%/%PORT%"
-       kind: node
-       rate: 10000000000
-       ports:
-         1: grvingt-3
-         2: grvingt-4
-         3: grvingt-7
-         4: grvingt-8
-         5: grvingt-11
-         6: grvingt-12
-         7: grvingt-15
-         8: grvingt-16
-         9: grvingt-19
-         10: grvingt-20
-         11: grvingt-23
-         12: grvingt-24
-         13: grvingt-27
-         14: grvingt-28
-         15: grvingt-31
-         16: grvingt-32
-         17: grvingt-35
-         18: grvingt-36
-         19: grvingt-39
-         20: grvingt-40
-         21: grvingt-38
-         22: grvingt-37
-         23: grvingt-33
-         24: grvingt-34
-         25: grvingt-29
-         26: grvingt-30
-         27: grvingt-25
-         28: grvingt-26
-         29: grvingt-21
-         30: grvingt-22
-         31: grvingt-17
-         32: grvingt-18
-         33: grvingt-13
-         34: grvingt-14
-         35: grvingt-9
-         36: grvingt-10
-         37: grvingt-5
-         38: grvingt-6
-         39: grvingt-1
-         40: grvingt-2
-         41:
-           uid: grcinq-srv-3
-           kind: server
-         42:
-           uid: grcinq-srv-2
-           kind: server
-         43:
-           uid: grvingt-srv
-           kind: server
-         44:
-           uid: wurst
-           kind: server
-         45:
-           uid: sgrcinq
-           kind: switch
-         46:
-           uid: grcinq-srv-1
-           kind: server
-         48:
-           uid: gw
-           kind: router
+      snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
+      kavlan_pattern: "TenGigabitEthernet%LINECARD%/%PORT%"
+      kind: node
+      rate: 10000000000
+      ports:
+        1: grvingt-3
+        2: grvingt-4
+        3: grvingt-7
+        4: grvingt-8
+        5: grvingt-11
+        6: grvingt-12
+        7: grvingt-15
+        8: grvingt-16
+        9: grvingt-19
+        10: grvingt-20
+        11: grvingt-23
+        12: grvingt-24
+        13: grvingt-27
+        14: grvingt-28
+        15: grvingt-31
+        16: grvingt-32
+        17: grvingt-35
+        18: grvingt-36
+        19: grvingt-39
+        20: grvingt-40
+        21: grvingt-38
+        22: grvingt-37
+        23: grvingt-33
+        24: grvingt-34
+        25: grvingt-29
+        26: grvingt-30
+        27: grvingt-25
+        28: grvingt-26
+        29: grvingt-21
+        30: grvingt-22
+        31: grvingt-17
+        32: grvingt-18
+        33: grvingt-13
+        34: grvingt-14
+        35: grvingt-9
+        36: grvingt-10
+        37: grvingt-5
+        38: grvingt-6
+        39: grvingt-1
+        40: grvingt-2
+        41:
+          uid: grcinq-srv-3
+          kind: server
+        42:
+          uid: grcinq-srv-2
+          kind: server
+        43:
+          uid: grvingt-srv
+          kind: server
+        44:
+          uid: wurst
+          kind: server
+        45:
+          uid: sgrcinq
+          kind: switch
+        46:
+          uid: grcinq-srv-1
+          kind: server
+        48:
+          uid: gw
+          kind: router
     49:
-        snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
-        kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
-        kind: node
-        rate: 10000000000
-        ports:
-          1: grvingt-44
-          2: grvingt-43
-          3: grvingt-48
-          4: grvingt-47
+      snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
+      kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
+      kind: node
+      rate: 10000000000
+      ports:
+        1: grvingt-44
+        2: grvingt-43
+        3: grvingt-48
+        4: grvingt-47
     50:
-        snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
-        kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
-        kind: node
-        rate: 10000000000
-        ports:
-          1: grvingt-58
-          2: grvingt-57
-          3: grvingt-62
-          4: grvingt-61
+      snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
+      kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
+      kind: node
+      rate: 10000000000
+      ports:
+        1: grvingt-58
+        2: grvingt-57
+        3: grvingt-62
+        4: grvingt-61
     51:
-        snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
-        kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
-        kind: node
-        rate: 10000000000
-        ports:
-          1: grvingt-52
-          2: grvingt-51
-          3: grvingt-56
-          4: grvingt-55
+      snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
+      kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
+      kind: node
+      rate: 10000000000
+      ports:
+        1: grvingt-52
+        2: grvingt-51
+        3: grvingt-56
+        4: grvingt-55
     52:
-        snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
-        kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
-        kind: node
-        rate: 10000000000
-        ports:
-          1: grvingt-50
-          2: grvingt-49
-          3: grvingt-54
-          4: grvingt-53
+      snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
+      kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
+      kind: node
+      rate: 10000000000
+      ports:
+        1: grvingt-50
+        2: grvingt-49
+        3: grvingt-54
+        4: grvingt-53
     53:
-        snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
-        kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
-        kind: node
-        rate: 10000000000
-        ports:
-          1: grvingt-60
-          2: grvingt-59
-          3: grvingt-64
-          4: grvingt-63
+      snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
+      kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
+      kind: node
+      rate: 10000000000
+      ports:
+        1: grvingt-60
+        2: grvingt-59
+        3: grvingt-64
+        4: grvingt-63
     54:
-        snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
-        kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
-        kind: node
-        rate: 10000000000
-        ports:
-          1: grvingt-42
-          2: grvingt-41
-          3: grvingt-46
-          4: grvingt-45
+      snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
+      kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
+      kind: node
+      rate: 10000000000
+      ports:
+        1: grvingt-42
+        2: grvingt-41
+        3: grvingt-46
+        4: grvingt-45
diff --git a/input/grid5000/sites/nancy/pdus.yaml b/input/grid5000/sites/nancy/pdus.yaml
index 64d8ca65608b7d2846e89e8dc93eb522dcd540f6..edc18bfcb134fb9e952a15cb66a2eb56333d7035 100644
--- a/input/grid5000/sites/nancy/pdus.yaml
+++ b/input/grid5000/sites/nancy/pdus.yaml
@@ -1,128 +1,129 @@
+---
 pdus:
   grvingt-pdu[1-2]:
     vendor: APC
     model: AP8886
     sensors:
-     - power:
-        per_outlets: false
-        snmp:
-          available: true
-          total_oids:
-            - iso.3.6.1.4.1.318.1.1.12.1.16.0
-          unit: W
-        resolution: 1
+      - power:
+          per_outlets: false
+          snmp:
+            available: true
+            total_oids:
+              - iso.3.6.1.4.1.318.1.1.12.1.16.0
+            unit: W
+          resolution: 1
 
   graoully-pdu[1-2]:
     vendor: APC
     model: AP8653
     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%
+      - 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%
     sensors:
-     - power:
-        per_outlets: true
-        snmp:
-          available: true
-          total_oids:
-            - iso.3.6.1.4.1.318.1.1.12.1.16.0
-          unit: W
-          outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
-        resolution: 1
-  
+      - power:
+          per_outlets: true
+          snmp:
+            available: true
+            total_oids:
+              - iso.3.6.1.4.1.318.1.1.12.1.16.0
+            unit: W
+            outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
+          resolution: 1
+
   grimoire-pdu[1-2]:
     vendor: APC
     model: AP8653
     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%
+      - 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%
     sensors:
-     - power:
-        per_outlets: true
-        snmp:
-          available: true
-          total_oids:
-            - iso.3.6.1.4.1.318.1.1.12.1.16.0
-          unit: W
-          outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
-        resolution: 1
-  
+      - power:
+          per_outlets: true
+          snmp:
+            available: true
+            total_oids:
+              - iso.3.6.1.4.1.318.1.1.12.1.16.0
+            unit: W
+            outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
+          resolution: 1
+
   grisou-pdu[1-2]:
     vendor: APC
     model: AP8653
     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%
+      - 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%
     sensors:
-     - power:
-        per_outlets: true
-        snmp:
-          available: true
-          total_oids:
-            - iso.3.6.1.4.1.318.1.1.12.1.16.0
-          unit: W
-          outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
-        resolution: 1
+      - power:
+          per_outlets: true
+          snmp:
+            available: true
+            total_oids:
+              - iso.3.6.1.4.1.318.1.1.12.1.16.0
+            unit: W
+            outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
+          resolution: 1
 
   grimani-pdu[1-2]:
     vendor: APC
     model: AP8653
     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%
+      - 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%
     sensors:
-     - power:
-        per_outlets: true
-        snmp:
-          available: true
-          total_oids:
-            - iso.3.6.1.4.1.318.1.1.12.1.16.0
-          unit: W
-          outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
-        resolution: 1
-  
+      - power:
+          per_outlets: true
+          snmp:
+            available: true
+            total_oids:
+              - iso.3.6.1.4.1.318.1.1.12.1.16.0
+            unit: W
+            outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
+          resolution: 1
+
   graffiti-pdu[1-4]:
     vendor: APC
     model: AP8653
     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%
+      - 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%
     sensors:
-     - power:
-        per_outlets: true
-        snmp:
-          available: true
-          total_oids:
-            - iso.3.6.1.4.1.318.1.1.12.1.16.0
-          unit: W
-          outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
-        resolution: 1
-  
+      - power:
+          per_outlets: true
+          snmp:
+            available: true
+            total_oids:
+              - iso.3.6.1.4.1.318.1.1.12.1.16.0
+            unit: W
+            outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
+          resolution: 1
+
   graoully-pdu1:
     ip: 172.17.79.243
     mac: 00:C0:B7:ED:63:AE
 
   graoully-pdu2:
-    ip:  172.17.79.244 
+    ip: 172.17.79.244
     mac: 00:C0:B7:85:13:9C
 
   grimoire-pdu1:
@@ -144,7 +145,7 @@ pdus:
   grimani-pdu1:
     ip: 172.17.79.218
     mac: 00:C0:B7:F2:27:D9
-    
+
   grimani-pdu2:
     ip: 172.17.79.219
     mac: 00:C0:B7:F2:27:DE
@@ -177,22 +178,22 @@ pdus:
     vendor: APC
     model: AP8653
     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%
+      - 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%
     sensors:
-     - power:
-        per_outlets: true
-        snmp:
-          available: true
-          total_oids:
-            - iso.3.6.1.4.1.318.1.1.12.1.16.0
-          unit: W
-          outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
-        resolution: 1
+      - power:
+          per_outlets: true
+          snmp:
+            available: true
+            total_oids:
+              - iso.3.6.1.4.1.318.1.1.12.1.16.0
+            unit: W
+            outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
+          resolution: 1
 
   gros-pdu1:
     ip: 172.17.79.222
@@ -233,12 +234,12 @@ pdus:
             www:
               url: "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
     metrics:
-    - name: wattmetre_power_watt
-      description: Power consumption per outlet reported by wattmetre, in watt
-      period: 1000
-      optional_period: 20
-      source:
-        protocol: wattmetre
+      - name: wattmetre_power_watt
+        description: Power consumption per outlet reported by wattmetre, in watt
+        period: 1000
+        optional_period: 20
+        source:
+          protocol: wattmetre
 
   gros-wattmetre2:
     vendor: OmegaWatt
@@ -254,12 +255,12 @@ pdus:
             www:
               url: "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
     metrics:
-    - name: wattmetre_power_watt
-      description: Power consumption per outlet reported by wattmetre, in watt
-      period: 1000
-      optional_period: 20
-      source:
-        protocol: wattmetre
+      - name: wattmetre_power_watt
+        description: Power consumption per outlet reported by wattmetre, in watt
+        period: 1000
+        optional_period: 20
+        source:
+          protocol: wattmetre
 
   gros-wattmetre3:
     vendor: OmegaWatt
@@ -275,9 +276,9 @@ pdus:
             www:
               url: "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php"
     metrics:
-    - name: wattmetre_power_watt
-      description: Power consumption per outlet reported by wattmetre, in watt
-      period: 1000
-      optional_period: 20
-      source:
-        protocol: wattmetre
+      - name: wattmetre_power_watt
+        description: Power consumption per outlet reported by wattmetre, in watt
+        period: 1000
+        optional_period: 20
+        source:
+          protocol: wattmetre
diff --git a/input/grid5000/sites/nancy/servers/servers.yaml b/input/grid5000/sites/nancy/servers/servers.yaml
index 93386aea854811b97f6fe2a872ca1ae060d0de3c..a3cc45d04236c227111481e79545dfb39a94f6a0 100644
--- a/input/grid5000/sites/nancy/servers/servers.yaml
+++ b/input/grid5000/sites/nancy/servers/servers.yaml
@@ -194,8 +194,8 @@ grcinq-srv-1:
       mac: 90:B1:1C:3C:66:B3
     ib0:
       ip: 172.18.75.225
-    ib1: 
-      ip: 172.18.76.225          
+    ib1:
+      ip: 172.18.76.225
 
 grcinq-srv-2:
   kind: physical
diff --git a/input/grid5000/sites/nancy/servers/virtual.yaml b/input/grid5000/sites/nancy/servers/virtual.yaml
index 2545d4423c54e592c6c98fb3d361af3193712728..176a37b6177dbbfe70b2f85cc80eb077374a219c 100644
--- a/input/grid5000/sites/nancy/servers/virtual.yaml
+++ b/input/grid5000/sites/nancy/servers/virtual.yaml
@@ -1,3 +1,4 @@
+---
 fnancy:
   kind: virtual
   alias: [frontend, oar-api]
@@ -100,9 +101,9 @@ kwollect:
   network_adapters: {default: {ip: 172.16.79.134}}
 grcinq-puppet:
   kind: virtual
-  network_adapters: 
-    default: 
-      ip: 172.16.79.132 
+  network_adapters:
+    default:
+      ip: 172.16.79.132
       mac: 52:54:00:dc:57:63
 sgrcinq1-ib-bmc:
   kind: virtual
diff --git a/input/grid5000/sites/nantes/clusters/econome/econome_metrics.yaml b/input/grid5000/sites/nantes/clusters/econome/econome_metrics.yaml
index c685e742e813f6a6c7b2c84994356e67efd37ade..d852dbf7fca1248060687932146a3c289cf247d4 100644
--- a/input/grid5000/sites/nantes/clusters/econome/econome_metrics.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/econome_metrics.yaml
@@ -1,163 +1,165 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 11 #Inlet Temp
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "12vstandby"}
-  description: Voltage of 12V Standby reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5 #12V Standby
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "5vstandby"}
-  description: Voltage of 5V Standby reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6 #5V Standby
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "5v"}
-  description: Voltage of 5V reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 7 #5V
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "3.3vstandby"}
-  description: Voltage of 3.3V Standby reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 8 #3.3V Standby
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "3.3v"}
-  description: Voltage of 3.3V reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 9 #3.3V
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 12 #CPU1 Temp
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 13 #CPU2 Temp
-
-- name: bmc_temp_dimmzone_celsius
-  labels: {"zone": "1"}
-  description: Temperature of DIMM ZONE 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 14 #DIMM ZONE 1 Temp
-
-- name: bmc_temp_dimmzone_celsius
-  labels: {"zone": "2"}
-  description: Temperature of DIMM ZONE 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 15 #DIMM ZONE 2 Temp
-
-- name: bmc_temp_pch_celsius
-  description: Temperature of PCH reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 18 #PCH Temp
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "input"}
-  description: Input voltage reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 16 #Input Voltage
-
-- name: bmc_current_input_amp
-  description: Input current reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 17 #Input Current
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1"}
-  description: Speed of fan 1 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 21 #FAN_1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2"}
-  description: Speed of fan 2 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 24 #FAN_2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3"}
-  description: Speed of fan 3 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 28 #FAN_3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4"}
-  description: Speed of fan 4 reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 29 #FAN_4
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 11  # Inlet Temp
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "12vstandby"}
+    description: Voltage of 12V Standby reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5  # 12V Standby
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "5vstandby"}
+    description: Voltage of 5V Standby reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6  # 5V Standby
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "5v"}
+    description: Voltage of 5V reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 7  # 5V
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "3.3vstandby"}
+    description: Voltage of 3.3V Standby reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 8  # 3.3V Standby
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "3.3v"}
+    description: Voltage of 3.3V reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 9  # 3.3V
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 12  # CPU1 Temp
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 13  # CPU2 Temp
+
+  - name: bmc_temp_dimmzone_celsius
+    labels: {"zone": "1"}
+    description: Temperature of DIMM ZONE 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 14  # DIMM ZONE 1 Temp
+
+  - name: bmc_temp_dimmzone_celsius
+    labels: {"zone": "2"}
+    description: Temperature of DIMM ZONE 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 15  # DIMM ZONE 2 Temp
+
+  - name: bmc_temp_pch_celsius
+    description: Temperature of PCH reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 18  # PCH Temp
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "input"}
+    description: Input voltage reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 16  # Input Voltage
+
+  - name: bmc_current_input_amp
+    description: Input current reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 17  # Input Current
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1"}
+    description: Speed of fan 1 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 21  # FAN_1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2"}
+    description: Speed of fan 2 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 24  # FAN_2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3"}
+    description: Speed of fan 3 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 28  # FAN_3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4"}
+    description: Speed of fan 4 reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 29  # FAN_4
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml b/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml
index 2fd494a2d465da3b2ca47de8771429cad8317507..2a9c1984e1003738ed121d9f96d4c84de8ea6f90 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/ecotype.yaml
@@ -15,7 +15,7 @@ nodes:
     software:
       standard-environment: debian10-x64-std
     performance:
-      core_flops:  13180000000
+      core_flops: 13180000000
       node_flops: 275300000000
     supported_job_types:
       deploy: true
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml b/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
index 1c6de56ae2cf56045d7550247174908220e76f08..1d74b6174c3fedc0460b1096ffe05ab5dfdee10c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
@@ -1,230 +1,239 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_voltage_volt
-  labels: {"psu": "2"}
-  description: Voltage of PSU 2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_psu_current_amp
-  labels: {"psu": "2"}
-  description: Current of PSU 2 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1a"}
-  description: Speed of Fan 1A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2a"}
-  description: Speed of Fan 2A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3a"}
-  description: Speed of Fan 3A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4a"}
-  description: Speed of Fan 4A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5a"}
-  description: Speed of Fan 5A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6a"}
-  description: Speed of Fan 6A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7a"}
-  description: Speed of Fan 7A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1b"}
-  description: Speed of Fan 1B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2b"}
-  description: Speed of Fan 2B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3b"}
-  description: Speed of Fan 3B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4b"}
-  description: Speed of Fan 4B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5b"}
-  description: Speed of Fan 5B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6b"}
-  description: Speed of Fan 6B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7b"}
-  description: Speed of Fan 7B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_voltage_volt
+    labels: {"psu": "2"}
+    description: Voltage of PSU 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.2
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_psu_current_amp
+    labels: {"psu": "2"}
+    description: Current of PSU 2 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1a"}
+    description: Speed of Fan 1A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2a"}
+    description: Speed of Fan 2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3a"}
+    description: Speed of Fan 3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4a"}
+    description: Speed of Fan 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5a"}
+    description: Speed of Fan 5A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6a"}
+    description: Speed of Fan 6A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7a"}
+    description: Speed of Fan 7A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1b"}
+    description: Speed of Fan 1B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2b"}
+    description: Speed of Fan 2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3b"}
+    description: Speed of Fan 3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4b"}
+    description: Speed of Fan 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5b"}
+    description: Speed of Fan 5B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6b"}
+    description: Speed of Fan 6B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7b"}
+    description: Speed of Fan 7B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/nantes/nantes.yaml b/input/grid5000/sites/nantes/nantes.yaml
index d7ea4ce13ac3aa87d57bda4e5d170ba10b64fa44..e4d2a811dda91c5324e524ccec671716f118c4b0 100644
--- a/input/grid5000/sites/nantes/nantes.yaml
+++ b/input/grid5000/sites/nantes/nantes.yaml
@@ -14,9 +14,6 @@ kavlan_ip_range: 10.40.0.0/14
 virt_ip_range: 10.176.0.0/14
 renater_ip: 192.168.4.22
 production: true
-#queues:
-#  - default
-#  - admin
 frontend_ip: 172.16.207.100
 
 g5ksubnet:
@@ -67,5 +64,3 @@ kavlans:
   21:
     network: 10.47.192.0/18
     gateway: 10.47.255.254
-
-
diff --git a/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml b/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
index 70350af10168e8514ef6900b97406d28936318e2..ee6a66fb189f0c258013a4020cf863c3ecdf85bf 100644
--- a/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
+++ b/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
@@ -9,18 +9,18 @@ ecotype-prod1:
   warranty: 2022-06-01
   backplane_bps: 1280000000000
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml b/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
index 9699191e60e024aeff323f2fe59a8c58358e9555..287316dfadf94126504652f8d2a44adb94d79c85 100644
--- a/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
+++ b/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
@@ -9,18 +9,18 @@ ecotype-prod2:
   warranty: 2022-06-01
   backplane_bps: 1280000000000
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/nantes/networks/gw-nantes.yaml b/input/grid5000/sites/nantes/networks/gw-nantes.yaml
index d5cc3a547c8bfc01138259c0ded93fa14f4b7cf9..f3f1a1038a0d5ca540b5ddf590d0162c421a2172 100644
--- a/input/grid5000/sites/nantes/networks/gw-nantes.yaml
+++ b/input/grid5000/sites/nantes/networks/gw-nantes.yaml
@@ -10,18 +10,18 @@ gw:
   snmp_community: public
   warranty: 2017-10-01
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   vlans:
     "vlan100":
       administrative: yes
diff --git a/input/grid5000/sites/nantes/servers/servers.yaml b/input/grid5000/sites/nantes/servers/servers.yaml
index 1903eef9b0a4de301581bc2d378574822c3eecf3..68fceb19e05aaf5106820dae723d12ebe019e713 100644
--- a/input/grid5000/sites/nantes/servers/servers.yaml
+++ b/input/grid5000/sites/nantes/servers/servers.yaml
@@ -1,3 +1,4 @@
+---
 srv:
   kind: physical
   alias: [adminfront, af]
diff --git a/input/grid5000/sites/nantes/servers/virtual.yaml b/input/grid5000/sites/nantes/servers/virtual.yaml
index 7c068bc5c29504bfdf0470c003bd3f4181961a55..57b31230305310b4a8740f6326d2aaedd120a532 100644
--- a/input/grid5000/sites/nantes/servers/virtual.yaml
+++ b/input/grid5000/sites/nantes/servers/virtual.yaml
@@ -1,3 +1,4 @@
+---
 api-proxy:
   kind: virtual
   network_adapters:
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/paranoia_metrics.yaml b/input/grid5000/sites/rennes/clusters/paranoia/paranoia_metrics.yaml
index c99d93ddfd0d70c298c20ca9f9a42199ebb2fd65..0952251335aa7e0ace39178c8c16faaf871deb6b 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/paranoia_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/paranoia_metrics.yaml
@@ -1,14 +1,16 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
 
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
diff --git a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
index 46a68f76a4d898c00e04f3caf448a9d21cd67029..eba2e8af7ce85a2489d980e3ac4a2dc19084d93e 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml
@@ -19,11 +19,11 @@ nodes:
       temperature:
         available: true
         via:
-          api: 
-            metric: ambient_temp 
+          api:
+            metric: ambient_temp
           ipmi:
-            sensors: 
-              ambient: /MB/T_AMB  
+            sensors:
+              ambient: /MB/T_AMB
     processor:
       microarchitecture: Nehalem
       clock_speed: 2950000000
diff --git a/input/grid5000/sites/rennes/clusters/parapide/parapide_metrics.yaml b/input/grid5000/sites/rennes/clusters/parapide/parapide_metrics.yaml
index c99d93ddfd0d70c298c20ca9f9a42199ebb2fd65..0952251335aa7e0ace39178c8c16faaf871deb6b 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/parapide_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/parapide_metrics.yaml
@@ -1,14 +1,16 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
 
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
index 07e0eeccae60f2f03e05023755f030190fcda8dc..f686549905ae814ba69aac67d6051b4961554750 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml
@@ -74,10 +74,10 @@ nodes:
         available: true
         via:
           api:
-            metric: ambient_temp 
+            metric: ambient_temp
           ipmi:
-            sensors: 
-              ambient: Inlet Ambient  
+            sensors:
+              ambient: Inlet Ambient
 
   parapluie-10:
     status: retired
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/parapluie_metrics.yaml b/input/grid5000/sites/rennes/clusters/parapluie/parapluie_metrics.yaml
index 1117bf539961b53ecc0ac99ab7f0fcd8c9ecfbe5..d998ff2b7ab10083c5a2c225d47a2408d45d5e20 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie_metrics.yaml
@@ -1,578 +1,580 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "pvcore1"}
-  description: Voltage of PVCORE1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 2720 #PVCORE1
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "pvnbcpu1"}
-  description: Voltage of PVNB CPU1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 2784 #PVNB CPU1
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p1v5ddr3cpu1"}
-  description: Voltage of P1V5 DDR3 CPU1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 2848 #P1V5 DDR3 CPU1
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "pvcore2"}
-  description: Voltage of PVCORE2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 2912 #PVCORE2
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "pvnbcpu2"}
-  description: Voltage of PVNB CPU2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 2976 #PVNB CPU2
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p1v5ddr3cpu2"}
-  description: Voltage of P1V5 DDR3 CPU2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 3040 #P1V5 DDR3 CPU2
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p12v"}
-  description: Voltage of P12V reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 3104 #P12V
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p5v"}
-  description: Voltage of P5V reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 3168 #P5V
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p5vstby"}
-  description: Voltage of P5V STBY reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 3232 #P5V STBY
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p3v3"}
-  description: Voltage of P3V3 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 3296 #P3V3
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p3v3stby"}
-  description: Voltage of P3V3 STBY reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 3360 #P3V3 STBY
-
-- name: bmc_voltage_volt
-  labels: {"voltage": "p1v1sr5670"}
-  description: Voltage of P1V1 SR5670 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 3424 #P1V1 SR5670
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "psufan1inlet"}
-  description: Speed of PSU Fan 1 Inlet reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 3536 #Fan1 Inlet
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "psufan1outlet"}
-  description: Speed of PSU Fan 1 Outlet reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 3648 #Fan1 Outlet
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "psufan2inlet"}
-  description: Speed of PSU Fan 2 Inlet reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 3760 #Fan2 Inlet
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "psufan2outlet"}
-  description: Speed of PSU Fan 2 Outlet reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 3872 #Fan2 Outlet
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "psufan3inlet"}
-  description: Speed of PSU Fan 3 Inlet reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 3984 #Fan3 Inlet
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "psufan3outlet"}
-  description: Speed of PSU Fan 3 Outlet reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 4096 #Fan3 Outlet
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "psufan4inlet"}
-  description: Speed of PSU Fan 4 Inlet reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 4208 #Fan4 Inlet
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "psufan4outlet"}
-  description: Speed of PSU Fan 4 Outlet reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 4320 #Fan4 Outlet
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "psufan5inlet"}
-  description: Speed of PSU Fan 5 Inlet reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 4384 #Fan5 Inlet
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "psufan5outlet"}
-  description: Speed of PSU Fan 5 Outlet reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 4448 #Fan5 Outlet
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "psufan6inlet"}
-  description: Speed of PSU Fan 6 Inlet reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 4512 #Fan6 Inlet
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "psufan6outlet"}
-  description: Speed of PSU Fan 6 Outlet reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 4576 #Fan6 Outlet
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "psufan7inlet"}
-  description: Speed of PSU Fan 7 Inlet reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 4640 #Fan7 Inlet
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "psufan7outlet"}
-  description: Speed of PSU Fan 7 Outlet reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 4704 #Fan7 Outlet
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu1dimm1"}
-  description: Temperature of CPU1 DIMM1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 4816 #CPU1 DIMM1
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu1dimm2"}
-  description: Temperature of CPU1 DIMM2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 4880 #CPU1 DIMM2
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu1dimm3"}
-  description: Temperature of CPU1 DIMM3 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 4944 #CPU1 DIMM3
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu1dimm4"}
-  description: Temperature of CPU1 DIMM4 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5008 #CPU1 DIMM4
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu1dimm5"}
-  description: Temperature of CPU1 DIMM5 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5072 #CPU1 DIMM5
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu1dimm6"}
-  description: Temperature of CPU1 DIMM6 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5136 #CPU1 DIMM6
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu1dimm7"}
-  description: Temperature of CPU1 DIMM7 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5200 #CPU1 DIMM7
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu1dimm8"}
-  description: Temperature of CPU1 DIMM8 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5264 #CPU1 DIMM8
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu1dimm9"}
-  description: Temperature of CPU1 DIMM9 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5328 #CPU1 DIMM9
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu1dimm10"}
-  description: Temperature of CPU1 DIMM10 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5392 #CPU1 DIMM10
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu1dimm11"}
-  description: Temperature of CPU1 DIMM11 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5456 #CPU1 DIMM11
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu1dimm12"}
-  description: Temperature of CPU1 DIMM12 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5520 #CPU1 DIMM12
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu2dimm1"}
-  description: Temperature of CPU2 DIMM1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5584 #CPU2 DIMM1
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu2dimm2"}
-  description: Temperature of CPU2 DIMM2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5648 #CPU2 DIMM2
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu2dimm3"}
-  description: Temperature of CPU2 DIMM3 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5712 #CPU2 DIMM3
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu2dimm4"}
-  description: Temperature of CPU2 DIMM4 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5776 #CPU2 DIMM4
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu2dimm5"}
-  description: Temperature of CPU2 DIMM5 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5840 #CPU2 DIMM5
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu2dimm6"}
-  description: Temperature of CPU2 DIMM6 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5904 #CPU2 DIMM6
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu2dimm7"}
-  description: Temperature of CPU2 DIMM7 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 5968 #CPU2 DIMM7
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu2dimm8"}
-  description: Temperature of CPU2 DIMM8 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6032 #CPU2 DIMM8
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu2dimm9"}
-  description: Temperature of CPU2 DIMM9 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6096 #CPU2 DIMM9
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu2dimm10"}
-  description: Temperature of CPU2 DIMM10 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6160 #CPU2 DIMM10
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu2dimm11"}
-  description: Temperature of CPU2 DIMM11 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6224 #CPU2 DIMM11
-
-- name: bmc_temp_dimm_celsius
-  labels: {"dimm": "cpu2dimm12"}
-  description: Temperature of CPU2 DIMM12 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6288 #CPU2 DIMM12
-
-- name: bmc_temp_inletambient_celsius
-  description: Temperature of Inlet Ambient reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6400 #Inlet Ambient
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6464 #CPU1
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6528 #CPU2
-
-- name: bmc_temp_pcioutlet_celsius
-  description: Temperature of PCI Outlet reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6592 #PCI Outlet
-
-- name: bmc_temp_sr5670outlet_celsius
-  description: Temperature of SR5670 Outlet reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6656 #SR5670 Outlet
-
-- name: bmc_temp_rearboard_celsius
-  description: Temperature of Rear Board reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6720 #Rear Board
-
-- name: bmc_temp_pcimid_celsius
-  description: Temperature of PCI Mid reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6784 #PCI Mid
-
-- name: bmc_temp_pciinlet_celsius
-  description: Temperature of PCI Inlet reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6848 #PCI Inlet
-
-- name: bmc_temp_rearboard2_celsius
-  description: Temperature of Rear Board2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6912 #Rear Board2
-
-- name: bmc_temp_cpuinlet_celsius
-  description: Temperature of CPU Inlet reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 6976 #CPU Inlet
-
-- name: bmc_temp_psinletambient_celsius
-  description: Temperature of PS Inlet Ambient reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 7040 #PS Inlet Ambient
-
-- name: bmc_temp_iocontroller_celsius
-  description: Temperature of IO Controller reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 7104 #IO Controller
-
-- name: bmc_temp_pci16_riser_celsius
-  description: Temperature of PCI16_RISER reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 7168 #PCI16_RISER
-
-- name: bmc_temp_pci4_riser_celsius
-  description: Temperature of PCI4_RISER reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 7232 #PCI4_RISER
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "pvcore1"}
+    description: Voltage of PVCORE1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 2720  # PVCORE1
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "pvnbcpu1"}
+    description: Voltage of PVNB CPU1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 2784  # PVNB CPU1
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p1v5ddr3cpu1"}
+    description: Voltage of P1V5 DDR3 CPU1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 2848  # P1V5 DDR3 CPU1
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "pvcore2"}
+    description: Voltage of PVCORE2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 2912  # PVCORE2
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "pvnbcpu2"}
+    description: Voltage of PVNB CPU2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 2976  # PVNB CPU2
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p1v5ddr3cpu2"}
+    description: Voltage of P1V5 DDR3 CPU2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 3040  # P1V5 DDR3 CPU2
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p12v"}
+    description: Voltage of P12V reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 3104  # P12V
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p5v"}
+    description: Voltage of P5V reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 3168  # P5V
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p5vstby"}
+    description: Voltage of P5V STBY reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 3232  # P5V STBY
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p3v3"}
+    description: Voltage of P3V3 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 3296  # P3V3
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p3v3stby"}
+    description: Voltage of P3V3 STBY reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 3360  # P3V3 STBY
+
+  - name: bmc_voltage_volt
+    labels: {"voltage": "p1v1sr5670"}
+    description: Voltage of P1V1 SR5670 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 3424  # P1V1 SR5670
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "psufan1inlet"}
+    description: Speed of PSU Fan 1 Inlet reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 3536  # Fan1 Inlet
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "psufan1outlet"}
+    description: Speed of PSU Fan 1 Outlet reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 3648  # Fan1 Outlet
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "psufan2inlet"}
+    description: Speed of PSU Fan 2 Inlet reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 3760  # Fan2 Inlet
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "psufan2outlet"}
+    description: Speed of PSU Fan 2 Outlet reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 3872  # Fan2 Outlet
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "psufan3inlet"}
+    description: Speed of PSU Fan 3 Inlet reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 3984  # Fan3 Inlet
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "psufan3outlet"}
+    description: Speed of PSU Fan 3 Outlet reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 4096  # Fan3 Outlet
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "psufan4inlet"}
+    description: Speed of PSU Fan 4 Inlet reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 4208  # Fan4 Inlet
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "psufan4outlet"}
+    description: Speed of PSU Fan 4 Outlet reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 4320  # Fan4 Outlet
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "psufan5inlet"}
+    description: Speed of PSU Fan 5 Inlet reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 4384  # Fan5 Inlet
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "psufan5outlet"}
+    description: Speed of PSU Fan 5 Outlet reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 4448  # Fan5 Outlet
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "psufan6inlet"}
+    description: Speed of PSU Fan 6 Inlet reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 4512  # Fan6 Inlet
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "psufan6outlet"}
+    description: Speed of PSU Fan 6 Outlet reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 4576  # Fan6 Outlet
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "psufan7inlet"}
+    description: Speed of PSU Fan 7 Inlet reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 4640  # Fan7 Inlet
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "psufan7outlet"}
+    description: Speed of PSU Fan 7 Outlet reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 4704  # Fan7 Outlet
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu1dimm1"}
+    description: Temperature of CPU1 DIMM1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 4816  # CPU1 DIMM1
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu1dimm2"}
+    description: Temperature of CPU1 DIMM2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 4880  # CPU1 DIMM2
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu1dimm3"}
+    description: Temperature of CPU1 DIMM3 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 4944  # CPU1 DIMM3
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu1dimm4"}
+    description: Temperature of CPU1 DIMM4 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5008  # CPU1 DIMM4
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu1dimm5"}
+    description: Temperature of CPU1 DIMM5 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5072  # CPU1 DIMM5
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu1dimm6"}
+    description: Temperature of CPU1 DIMM6 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5136  # CPU1 DIMM6
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu1dimm7"}
+    description: Temperature of CPU1 DIMM7 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5200  # CPU1 DIMM7
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu1dimm8"}
+    description: Temperature of CPU1 DIMM8 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5264  # CPU1 DIMM8
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu1dimm9"}
+    description: Temperature of CPU1 DIMM9 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5328  # CPU1 DIMM9
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu1dimm10"}
+    description: Temperature of CPU1 DIMM10 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5392  # CPU1 DIMM10
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu1dimm11"}
+    description: Temperature of CPU1 DIMM11 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5456  # CPU1 DIMM11
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu1dimm12"}
+    description: Temperature of CPU1 DIMM12 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5520  # CPU1 DIMM12
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu2dimm1"}
+    description: Temperature of CPU2 DIMM1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5584  # CPU2 DIMM1
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu2dimm2"}
+    description: Temperature of CPU2 DIMM2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5648  # CPU2 DIMM2
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu2dimm3"}
+    description: Temperature of CPU2 DIMM3 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5712  # CPU2 DIMM3
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu2dimm4"}
+    description: Temperature of CPU2 DIMM4 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5776  # CPU2 DIMM4
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu2dimm5"}
+    description: Temperature of CPU2 DIMM5 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5840  # CPU2 DIMM5
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu2dimm6"}
+    description: Temperature of CPU2 DIMM6 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5904  # CPU2 DIMM6
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu2dimm7"}
+    description: Temperature of CPU2 DIMM7 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 5968  # CPU2 DIMM7
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu2dimm8"}
+    description: Temperature of CPU2 DIMM8 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6032  # CPU2 DIMM8
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu2dimm9"}
+    description: Temperature of CPU2 DIMM9 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6096  # CPU2 DIMM9
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu2dimm10"}
+    description: Temperature of CPU2 DIMM10 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6160  # CPU2 DIMM10
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu2dimm11"}
+    description: Temperature of CPU2 DIMM11 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6224  # CPU2 DIMM11
+
+  - name: bmc_temp_dimm_celsius
+    labels: {"dimm": "cpu2dimm12"}
+    description: Temperature of CPU2 DIMM12 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6288  # CPU2 DIMM12
+
+  - name: bmc_temp_inletambient_celsius
+    description: Temperature of Inlet Ambient reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6400  # Inlet Ambient
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6464  # CPU1
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6528  # CPU2
+
+  - name: bmc_temp_pcioutlet_celsius
+    description: Temperature of PCI Outlet reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6592  # PCI Outlet
+
+  - name: bmc_temp_sr5670outlet_celsius
+    description: Temperature of SR5670 Outlet reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6656  # SR5670 Outlet
+
+  - name: bmc_temp_rearboard_celsius
+    description: Temperature of Rear Board reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6720  # Rear Board
+
+  - name: bmc_temp_pcimid_celsius
+    description: Temperature of PCI Mid reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6784  # PCI Mid
+
+  - name: bmc_temp_pciinlet_celsius
+    description: Temperature of PCI Inlet reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6848  # PCI Inlet
+
+  - name: bmc_temp_rearboard2_celsius
+    description: Temperature of Rear Board2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6912  # Rear Board2
+
+  - name: bmc_temp_cpuinlet_celsius
+    description: Temperature of CPU Inlet reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 6976  # CPU Inlet
+
+  - name: bmc_temp_psinletambient_celsius
+    description: Temperature of PS Inlet Ambient reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 7040  # PS Inlet Ambient
+
+  - name: bmc_temp_iocontroller_celsius
+    description: Temperature of IO Controller reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 7104  # IO Controller
+
+  - name: bmc_temp_pci16_riser_celsius
+    description: Temperature of PCI16_RISER reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 7168  # PCI16_RISER
+
+  - name: bmc_temp_pci4_riser_celsius
+    description: Temperature of PCI4_RISER reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 7232  # PCI4_RISER
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
index d3fd32ca6744083d9b57df074b961d8bae19d5b2..890a995e5591e23cbb624c74c80d8315af0cfa04 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
@@ -1,217 +1,224 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: pdu_outlet_power_watt
-  description: Power consumption of node reported by PDU, in watt
-  period: 1000
-  source:
-    protocol: pdu
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1a"}
-  description: Speed of Fan 1A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2a"}
-  description: Speed of Fan 2A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3a"}
-  description: Speed of Fan 3A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4a"}
-  description: Speed of Fan 4A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5a"}
-  description: Speed of Fan 5A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6a"}
-  description: Speed of Fan 6A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7a"}
-  description: Speed of Fan 7A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1b"}
-  description: Speed of Fan 1B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2b"}
-  description: Speed of Fan 2B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3b"}
-  description: Speed of Fan 3B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4b"}
-  description: Speed of Fan 4B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5b"}
-  description: Speed of Fan 5B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6b"}
-  description: Speed of Fan 6B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7b"}
-  description: Speed of Fan 7B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: pdu_outlet_power_watt
+    description: Power consumption of node reported by PDU, in watt
+    period: 1000
+    source:
+      protocol: pdu
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1a"}
+    description: Speed of Fan 1A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2a"}
+    description: Speed of Fan 2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3a"}
+    description: Speed of Fan 3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4a"}
+    description: Speed of Fan 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5a"}
+    description: Speed of Fan 5A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6a"}
+    description: Speed of Fan 6A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7a"}
+    description: Speed of Fan 7A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1b"}
+    description: Speed of Fan 1B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2b"}
+    description: Speed of Fan 2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3b"}
+    description: Speed of Fan 3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4b"}
+    description: Speed of Fan 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5b"}
+    description: Speed of Fan 5B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6b"}
+    description: Speed of Fan 6B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7b"}
+    description: Speed of Fan 7B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml b/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
index 30c04e9815eefc477ef60dbeba31242ffb2fb4ed..329c4ba8cdbf5bc34261562a67eecbebf6615c16 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml
@@ -54,4 +54,3 @@ nodes:
         enabled: true
         mounted: false
         mountable: false
-
diff --git a/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml b/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
index d3fd32ca6744083d9b57df074b961d8bae19d5b2..890a995e5591e23cbb624c74c80d8315af0cfa04 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
@@ -1,217 +1,224 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
-
-- name: pdu_outlet_power_watt
-  description: Power consumption of node reported by PDU, in watt
-  period: 1000
-  source:
-    protocol: pdu
-
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
-
-- name: bmc_node_power_watt
-  description: Power consumption of node reported by BMC, in watt
-  period: 5000
-  source:
-    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_psu_voltage_volt
-  labels: {"psu": "1"}
-  description: Voltage of PSU 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
-
-- name: bmc_psu_current_amp
-  labels: {"psu": "1"}
-  description: Current of PSU 1 reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    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_watthour_total
-  description: Cumulated power consumption of node reported by BMC, in watt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1a"}
-  description: Speed of Fan 1A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2a"}
-  description: Speed of Fan 2A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3a"}
-  description: Speed of Fan 3A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4a"}
-  description: Speed of Fan 4A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5a"}
-  description: Speed of Fan 5A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6a"}
-  description: Speed of Fan 6A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7a"}
-  description: Speed of Fan 7A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "1b"}
-  description: Speed of Fan 1B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "2b"}
-  description: Speed of Fan 2B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "3b"}
-  description: Speed of Fan 3B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "4b"}
-  description: Speed of Fan 4B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "5b"}
-  description: Speed of Fan 5B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "6b"}
-  description: Speed of Fan 6B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
-
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "7b"}
-  description: Speed of Fan 7B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
-
-- name: bmc_temp_exhaust_celsius
-  description: Temperature of exhausted air reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of CPU 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
-
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of CPU 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  scale_factor: 0.1
-  source:
-    protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
+
+  - name: pdu_outlet_power_watt
+    description: Power consumption of node reported by PDU, in watt
+    period: 1000
+    source:
+      protocol: pdu
+
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.1
+
+  - name: bmc_node_power_watt
+    description: Power consumption of node reported by BMC, in watt
+    period: 5000
+    source:
+      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_psu_voltage_volt
+    labels: {"psu": "1"}
+    description: Voltage of PSU 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.12.1.16.1.1
+
+  - name: bmc_psu_current_amp
+    labels: {"psu": "1"}
+    description: Current of PSU 1 reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      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_watthour_total
+    description: Cumulated power consumption of node reported by BMC, in watt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.600.60.1.7.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1a"}
+    description: Speed of Fan 1A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.1
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2a"}
+    description: Speed of Fan 2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.2
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3a"}
+    description: Speed of Fan 3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4a"}
+    description: Speed of Fan 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.4
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5a"}
+    description: Speed of Fan 5A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.5
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6a"}
+    description: Speed of Fan 6A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.6
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7a"}
+    description: Speed of Fan 7A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.7
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "1b"}
+    description: Speed of Fan 1B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.8
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "2b"}
+    description: Speed of Fan 2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.9
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "3b"}
+    description: Speed of Fan 3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "4b"}
+    description: Speed of Fan 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "5b"}
+    description: Speed of Fan 5B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "6b"}
+    description: Speed of Fan 6B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.13
+
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "7b"}
+    description: Speed of Fan 7B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.14
+
+  - name: bmc_temp_exhaust_celsius
+    description: Temperature of exhausted air reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of CPU 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3
+
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of CPU 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    scale_factor: 0.1
+    source:
+      protocol: snmp
+      id: 1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4
diff --git a/input/grid5000/sites/rennes/networks/bigdata-sw.yaml b/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
index 060cce46a769ada14336dc65e76e82311fc844ce..ec87d5777fbf6f61ab30023fb899909d3276e57e 100644
--- a/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
+++ b/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
@@ -9,18 +9,18 @@ bigdata-sw:
   ip: 172.17.111.203
   backplane_bps: 1280000000000
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     0:
       snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/rennes/networks/c6509.yaml b/input/grid5000/sites/rennes/networks/c6509.yaml
index 9d4a71058416f979dc941f299e3dfaf996e5685e..c555237a18e308818c9edf2247f28f65b47cb2e8 100644
--- a/input/grid5000/sites/rennes/networks/c6509.yaml
+++ b/input/grid5000/sites/rennes/networks/c6509.yaml
@@ -9,18 +9,18 @@ c6509:
   ip: 172.17.111.207
   backplane_bps: 720000000000
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       kind: virtual
diff --git a/input/grid5000/sites/rennes/networks/gw-rennes.yaml b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
index 551b94b862b541311e3d0512a4e6f0f24f1c9791..0bbd2126cc46bfa5e674f89df025e48060783a52 100644
--- a/input/grid5000/sites/rennes/networks/gw-rennes.yaml
+++ b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
@@ -13,18 +13,18 @@ gw:
     - gw-rennes
   backplane_bps: 1440000000000
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   vlans:
     "vlan100":
       administrative: yes
diff --git a/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
index 8741c1a0aa16d26b2b8288a978e93574d507232d..6b41934f9cde5216857d8c7c5e4fb27057594f43 100644
--- a/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
+++ b/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
@@ -9,18 +9,18 @@ paravance-sw-1:
   ip: 172.17.111.206
   backplane_bps: 1440000000000
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
index bb29cd7661ab5f695fcd3fb0d98ebb00d31d670f..bc54e162fa94ea58e5d52f764625a74414acfb21 100644
--- a/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
+++ b/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
@@ -9,18 +9,18 @@ paravance-sw-2:
   ip: 172.17.111.205
   backplane_bps: 1440000000000
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/rennes/pdus.yaml b/input/grid5000/sites/rennes/pdus.yaml
index 13e562ffbe7621e5f7a9c1e4257bb7cb601aa467..59dee2cb9ae9df7c5b474ac5e0e8a6d8128d43a7 100644
--- a/input/grid5000/sites/rennes/pdus.yaml
+++ b/input/grid5000/sites/rennes/pdus.yaml
@@ -1,82 +1,83 @@
+---
 pdus:
 
   parapluie-pdu-[1-4]:
     vendor: Eaton Corporation
     model: ''
     sensors:
-     - power:
-        per_outlets: true
-        snmp:
-          available: true
-          total_oids:
-            - iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1
-            - iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2
-          unit: W
-          outlet_prefix_oid: iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0
-        resolution: 60
+      - power:
+          per_outlets: true
+          snmp:
+            available: true
+            total_oids:
+              - iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1
+              - iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2
+            unit: W
+            outlet_prefix_oid: iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0
+          resolution: 60
 
   paravance-pdu-[2-8]:
     vendor: APC
     model: AP8659
     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%
+      - 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%
     sensors:
-     - power:
-        per_outlets: true
-        snmp:
-          available: true
-          total_oids:
-            - iso.3.6.1.4.1.318.1.1.12.1.16.0
-          unit: W
-          outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
-        resolution: 1
+      - power:
+          per_outlets: true
+          snmp:
+            available: true
+            total_oids:
+              - iso.3.6.1.4.1.318.1.1.12.1.16.0
+            unit: W
+            outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
+          resolution: 1
 
   parasilo-pdu-[1-1]:
     vendor: APC
     model: AP8659
     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%
+      - 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%
     sensors:
-     - power:
-        per_outlets: false
-        snmp:
-          available: true
-          total_oids:
-            - iso.3.6.1.4.1.318.1.1.12.1.16.0
-          unit: W
-          outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
-        resolution: 1
+      - power:
+          per_outlets: false
+          snmp:
+            available: true
+            total_oids:
+              - iso.3.6.1.4.1.318.1.1.12.1.16.0
+            unit: W
+            outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
+          resolution: 1
 
   parasilo-pdu-[2-4]:
     vendor: APC
     model: AP8659
     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%
+      - 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%
     sensors:
-     - power:
-        per_outlets: true
-        snmp:
-          available: true
-          total_oids:
-            - iso.3.6.1.4.1.318.1.1.12.1.16.0
-          unit: W
-          outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
-        resolution: 1
+      - power:
+          per_outlets: true
+          snmp:
+            available: true
+            total_oids:
+              - iso.3.6.1.4.1.318.1.1.12.1.16.0
+            unit: W
+            outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7
+          resolution: 1
 
   parapluie-pdu-1:
     ip: 172.17.99.201
diff --git a/input/grid5000/sites/rennes/rennes.yaml b/input/grid5000/sites/rennes/rennes.yaml
index 7f2ada9950beb23b48b2744c944e4349ce14b12e..35f818520bf17fa37948a24f5a49c60a5144bb64 100644
--- a/input/grid5000/sites/rennes/rennes.yaml
+++ b/input/grid5000/sites/rennes/rennes.yaml
@@ -1,3 +1,4 @@
+---
 name: Rennes
 location: Rennes, France
 web: http://www.irisa.fr
@@ -62,4 +63,3 @@ kavlans:
   16:
     network: 10.27.192.0/18
     gateway: 10.27.255.254
-
diff --git a/input/grid5000/sites/rennes/servers/virtual.yaml b/input/grid5000/sites/rennes/servers/virtual.yaml
index b6af106bb27e13131b314bd9a89a10bdbba63582..3fb0b38354b896582cc2b5c031f614e2959768d6 100644
--- a/input/grid5000/sites/rennes/servers/virtual.yaml
+++ b/input/grid5000/sites/rennes/servers/virtual.yaml
@@ -144,4 +144,3 @@ infra-k8s-master1:
 kwollect:
   kind: virtual
   network_adapters: {default: {ip: 172.16.111.112}}
-
diff --git a/input/grid5000/sites/sophia/clusters/suno/suno_metrics.yaml b/input/grid5000/sites/sophia/clusters/suno/suno_metrics.yaml
index dfa26b24895445e28eb6d2d1631076cd0c164767..c5a8f913f0622a1246faae0d380b1317111e0c1e 100644
--- a/input/grid5000/sites/sophia/clusters/suno/suno_metrics.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/suno_metrics.yaml
@@ -1,93 +1,95 @@
 ---
 metrics:
 
-- name: network_ifacein_bytes_total
-  description: Input byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
+  - name: network_ifacein_bytes_total
+    description: >-
+      Input byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
 
-- name: network_ifaceout_bytes_total
-  description: Output byte counter for the network device port connected to the node
-  period: 1000
-  source:
-    protocol: network_equipment
+  - name: network_ifaceout_bytes_total
+    description: >-
+      Output byte counter for the network device port connected to the node
+    period: 1000
+    source:
+      protocol: network_equipment
 
-- name: bmc_temp_ambiant_celsius
-  description: Front node ambiant temperature reported by BMC, in celsius
-  period: 5000
-  source:
-    protocol: ipmisensor
-    id: 10 #Inlet Temp
+  - name: bmc_temp_ambiant_celsius
+    description: Front node ambiant temperature reported by BMC, in celsius
+    period: 5000
+    source:
+      protocol: ipmisensor
+      id: 10  # Inlet Temp
 
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod1a"}
-  description: Speed of FAN MOD 1A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 33 #FAN MOD 1A RPM
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod1a"}
+    description: Speed of FAN MOD 1A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 33  # FAN MOD 1A RPM
 
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod1b"}
-  description: Speed of FAN MOD 1B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 34 #FAN MOD 1B RPM
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod1b"}
+    description: Speed of FAN MOD 1B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 34  # FAN MOD 1B RPM
 
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod2a"}
-  description: Speed of FAN MOD 2A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 35 #FAN MOD 2A RPM
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod2a"}
+    description: Speed of FAN MOD 2A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 35  # FAN MOD 2A RPM
 
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod2b"}
-  description: Speed of FAN MOD 2B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 36 #FAN MOD 2B RPM
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod2b"}
+    description: Speed of FAN MOD 2B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 36  # FAN MOD 2B RPM
 
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod3a"}
-  description: Speed of FAN MOD 3A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 37 #FAN MOD 3A RPM
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod3a"}
+    description: Speed of FAN MOD 3A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 37  # FAN MOD 3A RPM
 
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod3b"}
-  description: Speed of FAN MOD 3B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 38 #FAN MOD 3B RPM
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod3b"}
+    description: Speed of FAN MOD 3B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 38  # FAN MOD 3B RPM
 
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod4a"}
-  description: Speed of FAN MOD 4A reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 39 #FAN MOD 4A RPM
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod4a"}
+    description: Speed of FAN MOD 4A reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 39  # FAN MOD 4A RPM
 
-- name: bmc_fan_speed_rpm
-  labels: {"fan": "mod4b"}
-  description: Speed of FAN MOD 4B reported by BMC, in rpm
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 40 #FAN MOD 4B RPM
+  - name: bmc_fan_speed_rpm
+    labels: {"fan": "mod4b"}
+    description: Speed of FAN MOD 4B reported by BMC, in rpm
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 40  # FAN MOD 4B RPM
diff --git a/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml b/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml
index 7fda8e66fd3a6bea26e6f26f64b003f57a070092..92a23198112bc12141f2cbe033f5526bde5e7a8d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml
@@ -3,8 +3,8 @@ model: Dell PowerEdge C6100
 created_at: 2011-01-04
 kavlan: true
 queues:
-    - default
-    - admin
+  - default
+  - admin
 
 nodes:
   uvb-[1-44]:
diff --git a/input/grid5000/sites/sophia/clusters/uvb/uvb_metrics.yaml b/input/grid5000/sites/sophia/clusters/uvb/uvb_metrics.yaml
index d002c3e61c93d5c68d47e8a2cb342674148cd0f2..51afcd45883443040f3d71ef665379f04de02caa 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/uvb_metrics.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/uvb_metrics.yaml
@@ -1,100 +1,100 @@
 ---
 metrics:
 
-- name: bmc_voltage_volt
-  labels: {"voltage": "ps12v"}
-  description: Voltage of PS 12V reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 14 #PS 12V
+  - name: bmc_voltage_volt
+    labels: {"voltage": "ps12v"}
+    description: Voltage of PS 12V reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 14  # PS 12V
 
-- name: bmc_voltage_volt
-  labels: {"voltage": "ps5v"}
-  description: Voltage of PS 5V reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 15 #PS 5V
+  - name: bmc_voltage_volt
+    labels: {"voltage": "ps5v"}
+    description: Voltage of PS 5V reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 15  # PS 5V
 
-- name: bmc_temp_mlb_celsius
-  labels: {"id": "2"}
-  description: Temperature of MLB TEMP 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 16 #MLB TEMP 2
+  - name: bmc_temp_mlb_celsius
+    labels: {"id": "2"}
+    description: Temperature of MLB TEMP 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 16  # MLB TEMP 2
 
-- name: bmc_temp_mlb_celsius
-  labels: {"id": "3"}
-  description: Temperature of MLB TEMP 3 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 17 #MLB TEMP 3
+  - name: bmc_temp_mlb_celsius
+    labels: {"id": "3"}
+    description: Temperature of MLB TEMP 3 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 17  # MLB TEMP 3
 
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "1"}
-  description: Temperature of Processor 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 18 #Processor 1 Temp
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "1"}
+    description: Temperature of Processor 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 18  # Processor 1 Temp
 
-- name: bmc_temp_mlb_celsius
-  labels: {"id": "1"}
-  description: Temperature of MLB TEMP 1 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 19 #MLB TEMP 1
+  - name: bmc_temp_mlb_celsius
+    labels: {"id": "1"}
+    description: Temperature of MLB TEMP 1 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 19  # MLB TEMP 1
 
-- name: bmc_cpu_temp_celsius
-  labels: {"cpu": "2"}
-  description: Temperature of Processor 2 reported by BMC, in celsius
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 20 #Processor 2 Temp
+  - name: bmc_cpu_temp_celsius
+    labels: {"cpu": "2"}
+    description: Temperature of Processor 2 reported by BMC, in celsius
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 20  # Processor 2 Temp
 
-- name: bmc_voltage_volt
-  labels: {"voltage": "stby3.3v"}
-  description: Voltage of STBY 3.3V reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 21 #STBY 3.3V
+  - name: bmc_voltage_volt
+    labels: {"voltage": "stby3.3v"}
+    description: Voltage of STBY 3.3V reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 21  # STBY 3.3V
 
-- name: bmc_current_ps_amp
-  description: PS Current reported by BMC, in amp
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 22 #PS Current
+  - name: bmc_current_ps_amp
+    description: PS Current reported by BMC, in amp
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 22  # PS Current
 
-- name: bmc_voltage_volt
-  labels: {"voltage": "vcore1"}
-  description: Voltage of VCORE 1 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 26 #VCORE 1
+  - name: bmc_voltage_volt
+    labels: {"voltage": "vcore1"}
+    description: Voltage of VCORE 1 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 26  # VCORE 1
 
-- name: bmc_voltage_volt
-  labels: {"voltage": "vcore2"}
-  description: Voltage of VCORE 2 reported by BMC, in volt
-  period: 0
-  optional_period: 5000
-  source:
-    protocol: ipmisensor
-    id: 27 #VCORE 2
+  - name: bmc_voltage_volt
+    labels: {"voltage": "vcore2"}
+    description: Voltage of VCORE 2 reported by BMC, in volt
+    period: 0
+    optional_period: 5000
+    source:
+      protocol: ipmisensor
+      id: 27  # VCORE 2
diff --git a/input/grid5000/sites/sophia/clusters/uvb/uvb_retired.yaml b/input/grid5000/sites/sophia/clusters/uvb/uvb_retired.yaml
index bcdd0e1e89df7863a0689a542b9a45bf30a47705..6285f80a56c0f11b73378fe6806aefe6e948132f 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/uvb_retired.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/uvb_retired.yaml
@@ -1,3 +1,4 @@
+---
 nodes:
   uvb-13:
     status: retired
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index 7dcf04c2c0b7e879f6679c784747ef2e88e82e31..e22fa41f105ccbd83b5c823fd1ce1b4c6b446683 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -7,18 +7,18 @@ gw:
   site: sophia
   snmp_community: public
   metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifacein_bytes_total
+      description: Input byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+    - name: network_ifaceout_bytes_total
+      description: Output byte counter for the network device port
+      period: 1000
+      source:
+        protocol: snmp
+        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   alias:
     - gw-sophia
   ip: 172.16.143.254
@@ -211,16 +211,3 @@ gw:
         24:
           uid: srv-stock-eth1
           kind: server
-  metrics:
-  - name: network_ifacein_bytes_total
-    description: Input byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
-  - name: network_ifaceout_bytes_total
-    description: Output byte counter for the network device port
-    period: 1000
-    source:
-      protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
diff --git a/input/grid5000/sites/sophia/servers/physical.yaml b/input/grid5000/sites/sophia/servers/physical.yaml
index 6d2746c6ea164f1d3f431b4bcb9e0113bd376e96..705ee6bbf3f401a89195a5a7ab1979d81f11a57d 100644
--- a/input/grid5000/sites/sophia/servers/physical.yaml
+++ b/input/grid5000/sites/sophia/servers/physical.yaml
@@ -1,3 +1,4 @@
+---
 srv:
   kind: physical
   alias:
diff --git a/input/grid5000/sites/sophia/servers/virtual.yaml b/input/grid5000/sites/sophia/servers/virtual.yaml
index b09c1f1348d619e0b9ab5977fa8305b9d7c56a46..c99c54590d2dd47fd6adfaa51011a5e5ceba85e3 100644
--- a/input/grid5000/sites/sophia/servers/virtual.yaml
+++ b/input/grid5000/sites/sophia/servers/virtual.yaml
@@ -1,3 +1,4 @@
+---
 nat:
   kind: virtual
   alias: [access]
diff --git a/input/grid5000/sites/sophia/sophia.yaml b/input/grid5000/sites/sophia/sophia.yaml
index 961dd3106a5c74b2e410e7ec2cc937d6d7865211..d288c5bca89fd64c2e75080bb7c326f7db900f84 100644
--- a/input/grid5000/sites/sophia/sophia.yaml
+++ b/input/grid5000/sites/sophia/sophia.yaml
@@ -1,3 +1,4 @@
+---
 name: Sophia-Antipolis
 location: Sophia-Antipolis, France
 web: http://www.grid5000.fr/mediawiki/index.php/Sophia:Home
diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index c78204e2deeddd198338e98ed85a0f2f37b279c8..df6d63b58ea8410fbc8f8f93d745236cc38d0e40 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -1,6 +1,7 @@
 ---
 vlans:
-    # VLANs base address and type (from https://www.grid5000.fr/w/Grid5000:Network )
+    # VLANs base address and type
+    # (from https://www.grid5000.fr/w/Grid5000:Network )
     base:
         1:
             address: 192.168.192.0
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index c02b421284dd5def3bcd6dadf924f5a8db02e472..39e096e3557a39899e0e1144220045e3e3995c66 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -181,7 +181,7 @@ yeti:
   eno3: eth2
   eno4: eth3
 
-#Manual entries for nodes which mapping is different from cluster default
+# Manual entries for nodes which mapping is different from cluster default
 granduc-12:
   eno1: eth0
   eno2: eth1
diff --git a/lib/refrepo/valid/input/schemas/schema-cluster.yaml b/lib/refrepo/valid/input/schemas/schema-cluster.yaml
index 79cef9d320528c65fdaca84e72ab72cd38f3167e..258d16fb1e0364299a444c84255372928b3d7428 100644
--- a/lib/refrepo/valid/input/schemas/schema-cluster.yaml
+++ b/lib/refrepo/valid/input/schemas/schema-cluster.yaml
@@ -1,7 +1,7 @@
 ---
 nodes: required_hash
 model: string
-created_at: required # string or date ?
+created_at: required  # string or date ?
 exotic: optional_boolean
 kavlan: boolean
 queues: array
diff --git a/lib/refrepo/valid/input/schemas/schema-global.yaml b/lib/refrepo/valid/input/schemas/schema-global.yaml
index aae26041e60158d6583f85c8b0dccde0d6dab9d9..4cc20597fe2f0a0898fc0ec46ddb66686d518471 100644
--- a/lib/refrepo/valid/input/schemas/schema-global.yaml
+++ b/lib/refrepo/valid/input/schemas/schema-global.yaml
@@ -1,3 +1,4 @@
+---
 uid: string
 sites: required_hash
 network_equipments: optional_hash
diff --git a/lib/refrepo/valid/input/schemas/schema-network_equipments.yaml b/lib/refrepo/valid/input/schemas/schema-network_equipments.yaml
index d7cd0b6ad3f69924a83388a45c47870be2b7e622..f09706e051fd51f4df11e4409a5dddf1cb5c9f1c 100644
--- a/lib/refrepo/valid/input/schemas/schema-network_equipments.yaml
+++ b/lib/refrepo/valid/input/schemas/schema-network_equipments.yaml
@@ -10,7 +10,7 @@ kind:
   - switch
 serial: optional_string
 site: string
-alias : optional_array
+alias: optional_array
 backplane_bps: optional_integer
 mtu: optional_integer
 snmp_community: string
@@ -23,9 +23,9 @@ sensors:
         available: boolean
         resolution: optional_integer
         via: optional
-          #   pdu:
-          #       uid: string
-          #       port: integer
+        #   pdu:
+        #       uid: string
+        #       port: integer
 monitoring:
   <optional_hash>:
     wattmeter: optional
@@ -48,7 +48,8 @@ linecards:
     backplane_bps: optional_integer
     port: optional_string
     ports:
-      <multi>: linecard_port #custom linecard port validation (see lib/custom-validators.rb)
+      # custom linecard port validation (see lib/custom-validators.rb)
+      <multi>: linecard_port
 channels:
   <optional_hash>:
     <multi>:
diff --git a/lib/refrepo/valid/input/schemas/schema-node.yaml b/lib/refrepo/valid/input/schemas/schema-node.yaml
index 5505094e23b65aa733bd0a94616b6fcceb83b8ce..ec8c98a7d68609ce38f672e20757f43d9ebf7007 100644
--- a/lib/refrepo/valid/input/schemas/schema-node.yaml
+++ b/lib/refrepo/valid/input/schemas/schema-node.yaml
@@ -7,8 +7,8 @@ architecture:
   cpu_core_numbering: string
 bios:
   release_date: string
-  vendor: optional ## optional_string or null
-  version: required # string ?
+  vendor: optional  # optional_string or null
+  version: required  # string ?
   configuration:
     <optional_hash>:
       cstate_c1e: optional_boolean
@@ -19,7 +19,7 @@ bmc_version: string
 chassis:
   manufacturer: string
   name: string
-  serial: optional # required # string ?
+  serial: optional  # required # string ?
 exotic: optional_boolean
 gpu_devices: optional_hash
 kavlan:
@@ -45,14 +45,14 @@ network_adapters:
     mountable: boolean
     kavlan: optional_boolean
     mounted: boolean
-    bridged: optional_boolean # boolean ?
+    bridged: optional_boolean  # boolean ?
     management: boolean
-    rate: optional ## numeric # integer ?
-    vendor: optional ## optional_string
+    rate: optional  # numeric # integer ?
+    vendor: optional  # optional_string
     model: optional_string
     driver: optional_string
     ip: optional_ip_address
-    netmask: optional #Create optional_netmask format ?
+    netmask: optional  # Create optional_netmask format ?
     mac: optional_string
     ib_switch_card: optional_string
     ib_switch_card_pos: optional_string
@@ -79,8 +79,8 @@ pdu:
     port: required
     measure: optional_string
 performance:
-  core_flops: numeric # integer ?
-  node_flops: numeric # integer ?
+  core_flops: numeric  # integer ?
+  node_flops: numeric  # integer ?
 processor:
   cache_l1: optional_integer
   cache_l1d: integer
@@ -93,7 +93,7 @@ processor:
   model: string
   other_description: string
   vendor: string
-  version: required # string or numeric ?
+  version: required  # string or numeric ?
   ht_capable: boolean
   microarchitecture: string
 sensors: optional_hash
@@ -109,12 +109,12 @@ storage_devices:
     unstable_device_name: optional_boolean
     interface: string
     symlink: optional_string
-    storage: 
+    storage:
       - SSD
       - HDD
     model: string
     firmware_version: optional
-    rev: optional # unused but kept for shema compatibility
+    rev: optional  # unused but kept for shema compatibility
     size: integer
     raid: optional
     timeread: optional_numeric
@@ -125,5 +125,5 @@ supported_job_types:
   deploy: boolean
   max_walltime: integer
   queues: optional_array
-  virtual: optional # optional_boolean # string
+  virtual: optional  # optional_boolean # string
 addressing_plan: optional