diff --git a/data/grid5000/sites/nantes/pdus/cooling-Z1.json b/data/grid5000/sites/nantes/pdus/cooling-Z1.json
index 182882d592a13782cbe333ac14cd49aa845fbb13..14be4c56595f687fa42464e67153ceb235428212 100644
--- a/data/grid5000/sites/nantes/pdus/cooling-Z1.json
+++ b/data/grid5000/sites/nantes/pdus/cooling-Z1.json
@@ -3,36 +3,50 @@
   "mac": "00:c0:b7:f5:fa:63",
   "metrics": [
     {
-      "description": "Temperature in input of cooling system, in tenths of degrees Celsius",
-      "name": "cooling_input_temperature_tenth_celsius",
+      "description": "fan speed of cooling system, in percent",
+      "name": "cooling_fan_speed_percent",
       "period": 5000,
+      "scale_factor": 0.1,
+      "source": {
+        "id": "1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.5",
+        "protocol": "snmp"
+      }
+    },
+    {
+      "description": "Temperature in output of cooling system, in degrees Celsius",
+      "name": "cooling_supply_temperature_celsius",
+      "period": 5000,
+      "scale_factor": 0.1,
       "source": {
         "id": "1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.7",
         "protocol": "snmp"
       }
     },
     {
-      "description": "Temperature in output of cooling system, in tenths of degrees Celsius",
-      "name": "cooling_output_temperature_tenth_celsius",
+      "description": "Temperature in input of cooling system, in degrees Celsius",
+      "name": "cooling_return_temperature_celsius",
       "period": 5000,
+      "scale_factor": 0.1,
       "source": {
         "id": "1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.9",
         "protocol": "snmp"
       }
     },
     {
-      "description": "Power consumption of cooling system, in tenths of kilowatt",
-      "name": "cooling_power_watt",
+      "description": "Power consumption of cooling system, in kilowatt",
+      "name": "cooling_power_kilowatt",
       "period": 5000,
+      "scale_factor": 0.01,
       "source": {
         "id": "1.3.6.1.4.1.318.1.1.27.1.6.1.2.1.3.1.2",
         "protocol": "snmp"
       }
     },
     {
-      "description": "Sensor temperature reading, in tenths of degrees Celsius",
-      "name": "pdu_temperature_tenth_celsius",
+      "description": "Sensor temperature reading, in degrees Celsius",
+      "name": "pdu_temperature_celsius",
       "period": 5000,
+      "scale_factor": 0.1,
       "source": {
         "id": "1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.%PORT%",
         "protocol": "snmp"
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
index a9f7bc493550d0f6aae57f5f9a4b34cdbf29b1eb..15a8a7614f05b9e89f52528d694dc959be41ee45 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.11.json
@@ -12,9 +12,10 @@
       }
     },
     {
-      "description": "Sensor temperature reading, in tenths of degrees Celsius",
-      "name": "pdu_temperature_tenth_celsius",
+      "description": "Sensor temperature reading, in degrees Celsius",
+      "name": "pdu_temperature_celsius",
       "period": 5000,
+      "scale_factor": 0.1,
       "source": {
         "id": "1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1",
         "protocol": "snmp"
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
index a5a367549ce4f0236b7448552de9c6b4f71274f7..89c6cc2103dae34a578de85a289e03e8bfe0c210 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.21.json
@@ -12,9 +12,10 @@
       }
     },
     {
-      "description": "Sensor temperature reading, in tenths of degrees Celsius",
-      "name": "pdu_temperature_tenth_celsius",
+      "description": "Sensor temperature reading, in degrees Celsius",
+      "name": "pdu_temperature_celsius",
       "period": 5000,
+      "scale_factor": 0.1,
       "source": {
         "id": "1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1",
         "protocol": "snmp"
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
index 22e5d9056cca435d90907231e74167ae6fb2cfab..4a908760fc1e788bac9be9f8ceca4a8dd0a732bf 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.41.json
@@ -12,9 +12,10 @@
       }
     },
     {
-      "description": "Sensor temperature reading, in tenths of degrees Celsius",
-      "name": "pdu_temperature_tenth_celsius",
+      "description": "Sensor temperature reading, in degrees Celsius",
+      "name": "pdu_temperature_celsius",
       "period": 5000,
+      "scale_factor": 0.1,
       "source": {
         "id": "1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1",
         "protocol": "snmp"
diff --git a/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json b/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
index 33c0699aa615e258e827ad7c28faa9fa38e2527f..f995db521cd6cf29b49448f28c47f0d031ef8011 100644
--- a/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
+++ b/data/grid5000/sites/nantes/pdus/pdu-Z1.51.json
@@ -12,9 +12,10 @@
       }
     },
     {
-      "description": "Sensor temperature reading, in tenths of degrees Celsius",
-      "name": "pdu_temperature_tenth_celsius",
+      "description": "Sensor temperature reading, in degrees Celsius",
+      "name": "pdu_temperature_celsius",
       "period": 5000,
+      "scale_factor": 0.1,
       "source": {
         "id": "1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1",
         "protocol": "snmp"
diff --git a/input/grid5000/sites/nantes/pdus.yaml b/input/grid5000/sites/nantes/pdus.yaml
index 4e653d3da023848d2652b5008c975103278c2b35..2624c7fc5871d438f1942d03b05f1cc595204b45 100644
--- a/input/grid5000/sites/nantes/pdus.yaml
+++ b/input/grid5000/sites/nantes/pdus.yaml
@@ -36,9 +36,10 @@ pdus:
         source:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
-      - name: pdu_temperature_tenth_celsius
-        description: Sensor temperature reading, in tenths of degrees Celsius
+      - name: pdu_temperature_celsius
+        description: Sensor temperature reading, in degrees Celsius
         period: 5000
+        scale_factor: 0.1
         source:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1
@@ -95,9 +96,10 @@ pdus:
         source:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
-      - name: pdu_temperature_tenth_celsius
-        description: Sensor temperature reading, in tenths of degrees Celsius
+      - name: pdu_temperature_celsius
+        description: Sensor temperature reading, in degrees Celsius
         period: 5000
+        scale_factor: 0.1
         source:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1
@@ -154,9 +156,10 @@ pdus:
         source:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
-      - name: pdu_temperature_tenth_celsius
-        description: Sensor temperature reading, in tenths of degrees Celsius
+      - name: pdu_temperature_celsius
+        description: Sensor temperature reading, in degrees Celsius
         period: 5000
+        scale_factor: 0.1
         source:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1
@@ -212,9 +215,10 @@ pdus:
         source:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%
-      - name: pdu_temperature_tenth_celsius
-        description: Sensor temperature reading, in tenths of degrees Celsius
+      - name: pdu_temperature_celsius
+        description: Sensor temperature reading, in degrees Celsius
         period: 5000
+        scale_factor: 0.1
         source:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.1
@@ -239,27 +243,38 @@ pdus:
     vendor: APC
     model: 'ACRD602'
     metrics:
-      - name: cooling_input_temperature_tenth_celsius
-        description: Temperature in input of cooling system, in tenths of degrees Celsius
+      - name: cooling_fan_speed_percent
+        description: fan speed of cooling system, in percent
         period: 5000
+        scale_factor: 0.1
+        source:
+          protocol: snmp
+          id: 1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.5
+      - name: cooling_supply_temperature_celsius
+        description: Temperature in output of cooling system, in degrees Celsius
+        period: 5000
+        scale_factor: 0.1
         source:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.7
-      - name: cooling_output_temperature_tenth_celsius
-        description: Temperature in output of cooling system, in tenths of degrees Celsius
+      - name: cooling_return_temperature_celsius
+        description: Temperature in input of cooling system, in degrees Celsius
         period: 5000
+        scale_factor: 0.1
         source:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.9
-      - name: cooling_power_watt
-        description: Power consumption of cooling system, in tenths of kilowatt
+      - name: cooling_power_kilowatt
+        description: Power consumption of cooling system, in kilowatt
         period: 5000
+        scale_factor: 0.01
         source:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.27.1.6.1.2.1.3.1.2
-      - name: pdu_temperature_tenth_celsius
-        description: Sensor temperature reading, in tenths of degrees Celsius
+      - name: pdu_temperature_celsius
+        description: Sensor temperature reading, in degrees Celsius
         period: 5000
+        scale_factor: 0.1
         source:
           protocol: snmp
           id: 1.3.6.1.4.1.318.1.1.27.1.4.1.2.1.3.1.%PORT%