diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json
index b7ea107dfaccb27e860c9999e43812e3e01db04a..80fe60c8ba873c1d7dfe7d9a3f6905f193cad5c4 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json
index c258bdf06c2e3576e78e1c391a15d6ffda664d39..5085185c90c6a40bd594f4e5c2af57e8bd03c30d 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json
index 514adf5dcacca51fdf6cae7586f0ead7c4a5ef98..0bde96e901efb70c1c47fc4559e3b12acde96f0d 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json
index 73ffb5eb820152229bd684af9e1a8dba81bc00e6..cb541d652b090549d1b62f17f4a6667ad4ed53e6 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json
index 744cf4fe9bd80fdbbaadcc724f62efe9c8bcd995..07ba450c7c47a00e4e27cbbfea589ebfdda95d7f 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": null
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json
index 693a2f35e27bef1567079a017990027ba2174595..8c8d3865c311727d263dac6205f7c1164b97da2b 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json
index 3db09751cd3a90871fd8b049b634d426ff9297d3..3239e3e515cd87cb7d88ff8715ee2571ea2e1f37 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json
index f17f5d4a791ec97a5b918fbf19989bd35ea38c97..43a5046b44a30fcd036a72499094b35a927aa106 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json
index 36e75fe032230f5d39ac343f1656763b37bb7498..61eee6e04a14b53a48c657a962a3c2a44dcd2774 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json
index 18060da849921ca344d757490654ee7fd59bdfcb..befacb243f006112191c54bfe9e5a77bccef0587 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json
index 881a27daec87829e4c79b5dc30484d1176c520ec..376332980e2db67a292d1faf33066ff899e4e49b 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json
index d9f8992275d81533f2de76fa69322a50c503ec61..32c9fa42098fcd3e862a85428a3ef36fa759ba14 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json
index c62d785b37fffa4c2de35ec5c0f5c7994d7e813e..56081c63fe43f837748bf8739e839765ef03eb06 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json
index 7bca3ae22414df950ec0759ea06366d9b4ca9a81..af7ea51bfb3c8f82e918590a90530c698311ddfc 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json
index 1b9d57cf063b894e9d4f230ebb9beae14e1902a5..f217e2c801ace0de52186647fd9a1f2e71fa5925 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json
index c0c72197ab1fde98d6aadc5dd7be706bfdcf8ba1..7677971f6c364439bc30c9ea673496c973a67ae4 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json
index 7ca80742d5107ee6b04ef0a35793f2bcbe3f69ef..e3dc270826b40577b582090f95c24994ce90b5ed 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json
index 069a002ca1b157030c98c4cc8022a706a365f6bf..0dbf1d3f904907c744ce40f4194e765ca311f903 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json
index d8d5b8f823857017113cd0df2b29ec1336ed5d38..008ee1e9fabfc2c29ed5a69d0386dc2335025dd1 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json
index 6e5aad6313d60edabe08f9d7f1abc82b521dee64..a18d2e90e003006e1e73721620e1266894a58c53 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json
index 66ef043455ae505a4969c5785b09cc3adf7fde42..d8472ef18b93cfcdabc496561b8c4b6682b05dc8 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json
index 3a60906e45073759eaeb8bcefbedfb0cd5ebe316..e962312fe763921c75b2ca337c3ee775639d4cb2 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json
index c7312ef7e60141b20611a7d624c2ea87ccf93f30..aec55840d53894ff270431794a0cf875cddbe25d 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json
index 7fd0727a2ade27d4b3d213f933f5b01fae5a9c39..120d8a1fc99de06ca3547651cf968ed72dc28787 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json
index 2f9fb62e1510e87da669e31b0f2d068825ec49b9..39dfcf205bf25081b8a27ae7c09904b788db1d3d 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json
index d2abe1fe14bfb6a5e7851b8ccc37a6e7f654e011..d10eb268ec5164893782001e62359de2d8e338a8 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json
index 8df20a313a438999d11c24bc5c3e057798a21689..fa9d8837b7d43c024a0e821b6bb2ed4d521193b2 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json
index cd208d99643572c5fe5824048116b3a8c390e43a..d91b548d44306194786c9f056a4f5947dda93994 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json
index 58b6c04d054103da119e5ba637afa392918b2ba9..b59e8bbdeef3134c9f73edf13731f2a824654ee2 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json
index 1d8f538aa53c1fc5e9b78108a50eac29d2c5d156..512bfe69e8c2edc67f4a75fcd77194d0a4c262e9 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json
index 0b8bed22b4fa18ec5b446924993d45ac6e8f4699..2520d76457a364b48e28e8b951be192ec0be9b6c 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json
index 834a4188521bc82f9c10d73dff98a5439e3a9808..9386988331348b3fc90be22ef401f0756fb1aff0 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json
index c7cd14b21fd15a1e35197c413c5e1063895e932e..b87296f2db572e7f96d5e2db5a8c9b5a3d872199 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-7"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json
index 4d8f6132333d6feb49313ec37914a6a4f34c6411..68f7f29ccd2c3fba1dd926289cde9d42b33c23d8 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json
index e3ec82ecded8ee5d8cf22542b569a8dbfa717cb4..73dee8e151ac4eb8939f5fe228e5588f943ef28c 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-7"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json
index bb34d8baff721ad46e6e8b24bfbfe40274ff9f81..492b18bc86b079a0740c1c128fd3b4bbd9c9a089 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json
index 0ce745aae2ec62c24763b313da8971e3bba0d53c..2477acccb5e4b73153db7452803e074c4ca20071 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-5"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json
index 98a37ae2a179d4d447b719fa8ec3b1e9a06257fe..e436a757d3213071ab022f0a0521aa7ffc7a5a1e 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json
index 90a321a9d19277a9265b24b5c650d5e32ddfd0b0..0f787a44753991201e2029942bc469b53c83cee1 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-5"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json
index dfb4b310d257f9afb2ce5b50af114b7c7e8317f6..d8972b72de3e1ed4840a6e1743b1ee5f79596448 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-5"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json
index a34632f10f5d1b17bcdf1904c366592674b854d7..d5a6fd33be9865a2ff20bd75821fa39207370375 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-5"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json
index 26b99f8fe9ad705cef9c31ff0aa4b91148ad074a..e6b3361ca341c0a431c8562e1c973195a3db8cf5 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-5"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json
index 11f0ad4877f27e28a53de8dc2b8183bff0d52ff0..e240c3f93b53eb3642a6cd0fbd19afe7f61adcde 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-5"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json
index c2671cb72e1dd0343f20327fc07745540b869ace..f91c0786df021f327e5bd0e8e7dddb3004d7b589 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-5"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json
index 43e04ccfeff3fe12bf7d5acc10fe457e110be4fe..1e9b3695bb73c55d9689c7323721bae36623d988 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json
index f2fd85bd93cd9be8f97c9d3077e2b9d5eff26a59..b568c6af0fadf2d62204a94a4b0f346ea084cb5c 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-5"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json
index 632b4f0c9571f355aab87e56e9074ee49980de35..e62888da0135a1bacf762adacb50b241602358fd 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json
index f1e264a49aa6e0731d654a8527c8f7ea5efc9453..92cc0e4ed8a16026b8994c9ea6030169a69722ee 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json
index 243f228c98909d531b549eacbce3fc5b11b5e4d0..30bb4ef711625fc8f7e890f9c7259f8d7b2f1bac 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json
index cf5beec9c5b953948779cf2f37e82a32e18fffcf..c495a4ea3827c9d929dd3e1a48c3c293a62588f1 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json
index 462fdbcee07cf2bb26b294230abe869476320d6e..6a60b0ce32ff0061fefa6497656b1aba9f44a06a 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json
index ce33227a32c3f69069f10db45574a40ca1b2dadf..636753a576373d51756944baba67633156415d1a 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json
index 88a3eb2e0d672d07e7a5d26aeea02d110419b380..7fbd61278c2209a5e0c8b4a233350c40c49c28bb 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json
index ef8439f5e067046297e1732017e17d5bbcdde853..9c7d7c0a41e8363e78c088117b8b0d9f27244da9 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json
index 88867b3fbc06abc0a7d290d2a2e3877c48b56828..bc6ca4d6894d64fc897cce3dccbc92caf10be53f 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-7"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json
index c68f41387030b9914a164ac923d10494309c8faf..417451c41ef05bd72870b1786946636d0805df6f 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json
index 33a8c6ad8309b170017c6738ccb4048867cc6895..9448970856c18cd2869ba41b0d8863753ef84503 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-7"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json
index 4fcb914f28098361f5b0ef761cdd2e3ce41ff681..fff51fc06b91693a4acc79ae92ae49988f53d4ee 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-7"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json
index 380e54a8eb26a413355eef37e9661d5c089357e0..37078f7593bc170b8d086868960fd1605839e6fe 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-7"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json
index 5975b1374cbf5faea01c61df18da7089600a13c0..a7b203502ad2ead84fc6f02f899fa9576d411a97 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-7"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json
index c3c30d14585259fa7c0312f3c47ea38de5f8b680..6caa7f20e49bed4c2eba65c5c2e672763a097256 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-7"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json
index fdf16782a29005692396878129c4e7a85140e2b2..eb5cc0c1de0073a8bae1c5d83e18dddef295496f 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json
index 6b0da7f12660fc9c7bda7821dfe5862ed2a7e514..d66b0ae6e15214008485ece142fd6cfc2a08ae69 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json
index c9b135eb15a79db324be21369b36b72d8c766106..c9cb20de1f1d55a97b4b40b21e6e16d9be46a303 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json
@@ -16,10 +16,6 @@
     "ram_size": 34359738368,
     "virtual_size": null
   },
-  "monitoring": {
-    "temperature": true,
-    "wattmeter": false
-  },
   "network_adapters": [
     {
       "device": "bmc",
@@ -94,6 +90,29 @@
     "vendor": "Intel",
     "version": "L5420"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "paradent-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Thermistor2 TEMP"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
index e5730f752f4510d161bd9ec642f95c16a23ede0c..b3c0a63bf57bbf2432d47f0b81e87575a23adbaa 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
index 23f940476a46e11c941c1e18ff3d21b2965b1d42..b0b943c7a87f37a0c48425cf77c204528eff8c21 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
index 84cb1f562f77c3793c92d96dac08dfee59b92beb..554e5a400d9d5c05f1f3e28125147d9c0040816d 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
index c499a1c8ca1f9f1040e6c8dffaa8ebe764c8d348..77178fdbd7c7ceeab2da8799b88835044017fbfc 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
index ec142bf97acc16a6d00d87d79af6b42147702ab8..85b43d8495636f3e31f8b6410f3d5a296a8f47ca 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json
index 9a52263c55b4a75e474b180be78ea997316b260e..7394903b324952bcb1b67ff0a617cf2651d54fff 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
index d360a147f5803a3104a98cc8840d8e85f2826270..29fcb403d4a59a7657b5fa0ae88177f1f9576248 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
index 42773108a43f503914d74d039986fb01ad1287dd..b73c3119f6c2c48f7c49cd6bc56825d1eb8fdc6c 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json
index f603ae800732278ca800f1ba6c6040d0b92f8ddc..c4ff2025eecab080aa31c1d85ce5a4b028c0f1d6 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
index 8c46546acf0950ff2922babc51b0c3aff1eb26c2..a56fadb6417dc9391b1a64626d5fe58e7f70a2b1 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
index 9e13316bab85234bac6b987264b3b67b67339159..8185317ad47edacb250efe539ce116c4fc778a86 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
index 7b121ebb99dd41b3be52efaedd6c16304e803e9e..14ef5c79415480b429ec8e3aee5d73242e5e0f04 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
index 6b8081ec8a325961b5235af0142ecf4fb6ff7337..1c950bb2c65524464cefb51cad5e0fca81ad2565 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
index b266cb75bbadd5991a97c9c09940d0b551ea35be..fe4cb19883bbe623d9828ee66a359d03228ae988 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json
index 81c17e9dab0441fefbff0881300025b963a28e5e..40d742fc05c7c8e9c21b2e3c7df76757a7647ff5 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json
index 595d080f418a8642c4150f103988812bfdbae06f..ede0e73dac785453ad7349ebdccd4a302c1a696e 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
index 6df52f25576b5a3d110bc7c8def400953c878cff..ac2111582e855bab5b26bdac77a5798ffd2c2149 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
index 50365166ecdaaf832a7a6672f7afa98b207a5c63..ee85f2aa7c52c56cc19f053b443586ea15450f32 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
index 69a3bfaeddda30a0c1707939122bbda88893d96f..c68fc974c878703885b7e1552b587e2ccbcceaf0 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
index 888456b791ee8d72cefacb0e93db077f9d3865fc..b0f7b647692c9754feba2714d60bcef333aef9b2 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
index 73c2dc17b4c905675948c5d61585988558d11f91..fbf80dedddb38e516689276d9e68f929c7a9ea36 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
index b63e2164c6876b0dc9e1507678a5dc927a9ebe88..c194e71712e538edfbba2d2aa85ccf8f6d142009 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
index 798627c68afcb9881f9ec767f4410894137fa443..9406ce4d0acfadd0c24479b949c5781e8354f86e 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
index 340d1c97b3eadffed76ea99a0b0742dbbe963580..d5b2689a75097821b8c59602527431600b17cc29 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
index e104d35ec9f819175e19b4a4d2f31da3979402b4..1cefd8b09fa2ac1fd3c6d8db3b53ef8647f5c67b 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
@@ -106,6 +106,29 @@
     "vendor": "Intel",
     "version": "X5570"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "pdu": {
+          "uid": "parapide-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "/MB/T_AMB"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
index 89971b075866f8456ec040a5d1c62a8642c78015..c9845bd26afa49b79724da7161c6fb02e8d4389b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
index ca5e4af7e1600e0cbc26dddf82db787862c9601b..cd398931c869328300cf7fa9e0a55963fe4f49af 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
index 65104e875b9051a08c7c0716567a84acba098938..a5ebd06fdc4744da3bbf3603931e6e616131c613 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
index 7cfcece0daa08d3eacd6bc5420494d762591693e..92dacbac99e216221c1b18a1be75b486c42f874d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
index 42ba65a921cbdedffc5956d3baf4a81783dffb7e..1dd51471176e929a056d46f125e0af2bf887bddc 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
index f5abff6d17fa45b258c8a56fb3cd45e671fd3efe..66a54fffaf4cac176262349bf75ab81bb8f0b5e3 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
index 2decce957c41f7dfe325a3753869df8f00355327..644805841be084e51e05fc99005f5dc4da95b971 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
index 27a916516654b36ffd8e62194ddb39dd4c02b83d..acd55dac31717bf2669a2231dee20d51911f25a0 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
index 53d3f414c8604c942e608061513329cb37e64df4..d41b9b3b56398e7b243e8f0857128221bf6cd9e6 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
index b1cab57a6a870f3e65bb9df6201952bde1cf6309..c42b6595517ccd952eeff99be0c47f9bfca23cd0 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
index 2519f637bdd2e5e1bed1ddf7f7e76c6e298b21f9..f64c8292c99e9700d29ed2992a4e6c12e1ec6d6d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
index b2cbfcf4832ae3d3647e84f0ffc18a02577b07a1..65089519d9398acc9def28acfaef5b16d1a43bf7 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
index a08de877dfae42704e4279994d1c39bab382c0a3..8100e4d2da57295f5b831decfa188456f9c99a02 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-2"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
index 0c91fdd97a5231af37be99dd61e823aba87d85bc..f74aab7291dbbf0220a4ce597b77dbfbd6b25723 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
index 9f694ceb6dacf53a43661048a7afc0f26d71869c..17036a5326bf9f07298214b8fb7484dd406b0317 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
index 1a7dd10d03d49e7afc6fab0ca7bdc99a6073db26..4f61ec93c442021e624fafc59dfa8ded28fb96b1 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
index b7c7d1432b3ba0ba072f3b7462ab4003329a996c..88f95dc6c536df07f878a1329fb2f34b10d2cd31 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
index eb4993f20c804cccf9c5ea4739aa07b9ef1386b1..93528923efbdd687bf34b67953609ccce5eceb1d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
index c4e18da46b574ac92062452d53e379c54363ef6e..e548ab1098d9b36bfa9ac5a220c78474f06d55dc 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-6"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
index 97e48725e7f1a0ef310d57b79d5a70f67b9a8af8..b50f15fdfeaf92640f7e3bd362bc230caa6bc163 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-5"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
index dcac4d89ad4f91f7816a60440be0a1b171afbe84..7aee1dcefbd493ef28eb68175b332faccd53afb6 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-5"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
index 7d2e00dd09b5f5cdfde82c5e273201d2446218f6..ef54cfa5bd9799517b40d2701d01ae7998d75d97 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-5"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
index ffde43e1967fc30e3cbf4da7e4775b9d598b93f0..2b2d7c9e21779a638e422be53fb6173dbc34d0ab 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
index 67c27162df9ec0048ceb022a15400a1fda4987f5..2c9902e48c01309c3eb6922aa57fb15ee294cd6f 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-5"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
index 24b8d7baeebc875e3afe11b1226e43ea11728a63..74e7c091cf7df69d2ba1f0a3c306300edd5acb5b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-5"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
index 797df4d5eaad9bc7f75a45b3cc5468138b59a28a..17a82e4d0bf44e805601aefec1f6efd26a4b0565 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-5"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
index b291e6580a44fbb35d2ca9548f57f8c1bc15eed0..057ae0f263c16068ca604ff030df795c0a1adb0d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-5"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
index ed693dd37789b7b0a1ce72cac73b5588536107a2..e36ab775020c18ca890e8e71f8f89072cdf85af8 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
index 0d62a5aaf55e2eefba5efa8763bf7cf8976be50e..6c55c75b5204bed817e2a23994388e3c0ffbc3bf 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
index 86a95ac619c70765420e479ccb763f9cf8a585f5..e586b8f968cfc90979f5895a7e9b532c36e368f3 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
index d8498318bd8c44de7f1b4f56d49b2b9a75bf9669..ba1b81975cc055c164f866bdac39a35d65a32b12 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
index b8502d2340d1329a5641196dacc1316ea896c91b..3d1bd63ed830d6b3c23cb6cde0bec1aca84043f7 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
index 2c022149dc9eb4406ec2f6af606e556e18b8a13e..9fe9391097156b5e751edb1b7492c3c0dfee42a9 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
index 879581c0d7c77d66bfffe7f70256499013a4c7c2..363063367efbea5f7d11892e767b20aa91336bc9 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
index 353d4951764fed568b045e2c5c44a816ba580f3d..0dc3c13f262e6bb1e5a6cd4e59c5fb003a7e1599 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-4"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
index 0082be4e93f0fd71046dfe6f91e8ec33f3ee4c24..0eea1b5f94c8520ffee70b0ab4fb71c4191e7e07 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
index 319c58ea4c06f4bed994d5fee6e377085c2d99e5..b601be466ac7489fdd96c8f58459850d68fb4912 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
index bfdd3c1612c4393ead92b7309e2ae01a3eeeb33f..37e82277249b83684d95a7c7eb7479f668fc3c98 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-1"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
index ffaa13ceacc12eef9488785361176a20b1c5556f..856ff2d6fc48bad70c9b5b2bf7cc4e4b6e427d6d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
index 249a627f25a1a59a3c3c372085c533b393210dc2..961f263728238a4124cb1f472b53483105aadb7a 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
@@ -120,6 +120,32 @@
     "vendor": "AMD",
     "version": "6164 HE"
   },
+  "sensors": {
+    "power": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "shared_pdu"
+        },
+        "pdu": {
+          "uid": "parapluie-pdu-3"
+        }
+      }
+    },
+    "temperature": {
+      "available": true,
+      "via": {
+        "ganglia": {
+          "metric": "ambient_temp"
+        },
+        "impi": {
+          "sensors": {
+            "ambient": "Inlet Ambient"
+          }
+        }
+      }
+    }
+  },
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/rennes/rennes.json b/data/grid5000/sites/rennes/rennes.json
index 99ad5e450bdd3136f0f401dc599ebc33ba09d176..a7c71ffc17fa558da828b6e900f34a0d1b0c6296 100755
--- a/data/grid5000/sites/rennes/rennes.json
+++ b/data/grid5000/sites/rennes/rennes.json
@@ -1,4 +1,17 @@
 {
+  "compilation_server": false,
+  "description": "Grid5000 Rennes site",
+  "email_contact": "rennes-staff@lists.grid5000.fr",
+  "kavlan_ip_range": "10.24.0.0/14",
+  "latitude": 48.1,
+  "location": "Rennes, France",
+  "longitude": -1.6667,
+  "name": "Rennes",
+  "security_contact": "rennes-staff@lists.grid5000.fr",
+  "sys_admin_contact": "rennes-staff@lists.grid5000.fr",
   "type": "site",
-  "uid": "rennes"
+  "uid": "rennes",
+  "user_support_contact": "rennes-staff@lists.grid5000.fr",
+  "virt_ip_range": "10.156.0.0/14",
+  "web": "http://www.irisa.fr"
 }
\ No newline at end of file
diff --git a/generators/input/sites/rennes/clusters/paradent.rb b/generators/input/sites/rennes/clusters/paradent.rb
index 2213932dd06e7a789720ca70ec70f8436240fbdd..c328eae21cef3f95cde2cf6abd26c5fdd42ca473 100644
--- a/generators/input/sites/rennes/clusters/paradent.rb
+++ b/generators/input/sites/rennes/clusters/paradent.rb
@@ -6,12 +6,15 @@ site :rennes do |site_uid|
 
     64.times do |i|
       node "#{cluster_uid}-#{i+1}" do |node_uid|
+
         supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
+
         architecture({
           :smp_size       => 2,
           :smt_size       => 8,
           :platform_type  => "x86_64"
-          })
+        })
+
         processor({
           :vendor             => "Intel",
           :model              => "Intel Xeon",
@@ -24,16 +27,19 @@ site :rennes do |site_uid|
           :cache_l1d          => nil,
           :cache_l2           => nil
         })
+
         main_memory({
           :ram_size     => 32.GiB,
           :virtual_size => nil
         })
+
         operating_system({
           :name     => "Debian",
           :release  => "5.0",
           :version  => nil,
           :kernel   => "2.6.26"
         })
+
         storage_devices [{
           :interface  => 'SATA',
           :size       => 160.GB,
@@ -42,19 +48,20 @@ site :rennes do |site_uid|
           :model      => lookup('paradent', node_uid, 'block_device', 'sda', 'model'),
           :rev        => lookup('paradent', node_uid, 'block_device', 'sda', 'rev')
         }]
+
         network_adapters [{
-           :interface        => 'Ethernet',
-           :rate             => 1.G,
-           :enabled          => true,
-           :management       => true,
-           :mountable        => false,
-           :mounted          => false,
-           :device           => "bmc",
-           :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-           :ip               => lookup('paradent', node_uid, 'network_interfaces', 'bmc', 'ip'),
-           :mac              => lookup('paradent', node_uid, 'network_interfaces', 'bmc', 'mac')
-         },
-         {
+          :interface        => 'Ethernet',
+          :rate             => 1.G,
+          :enabled          => true,
+          :management       => true,
+          :mountable        => false,
+          :mounted          => false,
+          :device           => "bmc",
+          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+          :ip               => lookup('paradent', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac              => lookup('paradent', node_uid, 'network_interfaces', 'bmc', 'mac')
+        },
+        {
           :interface        => 'Ethernet',
           :rate             => 1.G,
           :enabled          => true,
@@ -82,7 +89,7 @@ site :rennes do |site_uid|
           :version          => "80003ES2LAN",
           :mac        => lookup('paradent', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
-         {
+        {
           :interface        => 'Ethernet',
           :rate             => 100.M,
           :enabled          => true,
@@ -96,21 +103,34 @@ site :rennes do |site_uid|
           :vendor           => "Tyan",
           :version          => "M3296"
         }]
+
         bios({
-           :version      => lookup('paradent', node_uid, 'bios', 'version'),
-           :vendor       => lookup('paradent', node_uid, 'bios', 'vendor'),
-           :release_date => lookup('paradent', node_uid, 'bios', 'release_date')
-         })
-           gpu({
-            :gpu  => false
-             })
-             monitoring({
-          :wattmeter    => false,
-          :temperature  => true
+          :version      => lookup('paradent', node_uid, 'bios', 'version'),
+          :vendor       => lookup('paradent', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('paradent', node_uid, 'bios', 'release_date')
         })
-         #chassis({:serial_number => lookup('paradent', node_uid, 'chassis', 'serial_number')})
+
+        gpu({
+          :gpu  => false
+        })
+
+        sensors({
+          :power => {
+            :available => true,
+            :via => {
+              :pdu      => { :uid => lookup('paradent', node_uid, 'pdu', 'pdu_name') }
+            }
+          },
+          :temperature => {
+            :available => true,
+            :via => {
+              :ganglia  => { :metric => "ambient_temp" },
+              :impi     => { :sensors => { :ambient => "Thermistor2 TEMP" } }
+            }
+          }
+        })
+
       end
     end
   end
-
 end
diff --git a/generators/input/sites/rennes/clusters/parapide.rb b/generators/input/sites/rennes/clusters/parapide.rb
index 1b43c623350385fa5e5cfe7bf883f90a6d57e0a6..90b2e4bad492440fea7b4df858398c2687b49243 100644
--- a/generators/input/sites/rennes/clusters/parapide.rb
+++ b/generators/input/sites/rennes/clusters/parapide.rb
@@ -1,17 +1,20 @@
 site :rennes do |site_uid|
-  
+
   cluster :parapide do |cluster_uid|
     model "SUN FIRE X2270"
     created_at Time.parse("2010-01-25").httpdate
-    
+
     25.times do |i|
       node "#{cluster_uid}-#{i+1}" do |node_uid|
+
         supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
+
         architecture({
-          :smp_size       => 2, 
+          :smp_size       => 2,
           :smt_size       => 8,
           :platform_type  => "x86_64"
-          })
+        })
+
         processor({
           :vendor             => "Intel",
           :model              => "Intel Xeon",
@@ -24,16 +27,19 @@ site :rennes do |site_uid|
           :cache_l1d          => nil,
           :cache_l2           => nil
         })
+
         main_memory({
           :ram_size     => 24.GiB,
           :virtual_size => nil
         })
+
         operating_system({
           :name     => "Debian",
           :release  => "5.0",
           :version  => nil,
           :kernel   => "2.6.26"
         })
+
         storage_devices [{
           :interface  => 'SATA',
           :size       => 500.GB,
@@ -43,18 +49,18 @@ site :rennes do |site_uid|
           :rev        => lookup('parapide', node_uid, 'block_device', 'sda', 'rev')
         }]
         network_adapters [{
-           :interface        => 'Ethernet',
-           :rate             => 1.G,
-           :enabled          => true,
-           :management       => true,
-           :mountable        => false,
-           :mounted          => false,
-           :device           => "bmc",
-           :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-           :ip               => lookup('parapide', node_uid, 'network_interfaces', 'bmc', 'ip'),
-           :mac              => lookup('parapide', node_uid, 'network_interfaces', 'bmc', 'mac')
-         },
-         {
+          :interface        => 'Ethernet',
+          :rate             => 1.G,
+          :enabled          => true,
+          :management       => true,
+          :mountable        => false,
+          :mounted          => false,
+          :device           => "bmc",
+          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+          :ip               => lookup('parapide', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac              => lookup('parapide', node_uid, 'network_interfaces', 'bmc', 'mac')
+        },
+        {
           :interface        => 'Ethernet',
           :rate             => 1.G,
           :enabled          => true,
@@ -105,24 +111,41 @@ site :rennes do |site_uid|
           :version          => "MT25418",
           :mac              => lookup('parapide', node_uid, 'network_interfaces', 'ib1', 'guid')
         }]
+
         bios({
-           :version      => lookup('parapide', node_uid, 'bios', 'version'),
-           :vendor       => lookup('parapide', node_uid, 'bios', 'vendor'),
-           :release_date => lookup('parapide', node_uid, 'bios', 'release_date')
-         })
+          :version      => lookup('parapide', node_uid, 'bios', 'version'),
+          :vendor       => lookup('parapide', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('parapide', node_uid, 'bios', 'release_date')
+        })
 
-         gpu({
-            :gpu  => false
-             })
+        gpu({
+          :gpu  => false
+        })
 
         monitoring({
           :wattmeter    => false,
           :temperature  => true
         })
-         chassis({:serial_number => lookup('parapide', node_uid, 'chassis', 'serial_number')})
+
+        sensors({
+          :power => {
+            :available => true,
+            :via => {
+              :pdu      => { :uid => lookup('parapide', node_uid, 'pdu', 'pdu_name') },
+            }
+          },
+          :temperature => {
+            :available => true,
+            :via => {
+              :ganglia  => { :metric => "ambient_temp" },
+              :impi     => { :sensors => { :ambient => "/MB/T_AMB" } }
+            }
+          }
+        })
+
+        chassis({:serial_number => lookup('parapide', node_uid, 'chassis', 'serial_number')})
+
       end
     end
-    
   end
-  
 end
diff --git a/generators/input/sites/rennes/clusters/parapluie.rb b/generators/input/sites/rennes/clusters/parapluie.rb
index 4dddf882109b54e862acfc65d04d7a91148c50dc..e9f43381013c226a56e2ad4996ebd93268dedafb 100644
--- a/generators/input/sites/rennes/clusters/parapluie.rb
+++ b/generators/input/sites/rennes/clusters/parapluie.rb
@@ -1,141 +1,167 @@
 site :rennes do |site_uid|
-  
+
   cluster :parapluie do |cluster_uid|
-     model "HP ProLiant DL165 G7"
-     created_at Time.parse("2010-11-02").httpdate
+    model "HP ProLiant DL165 G7"
+    created_at Time.parse("2010-11-02").httpdate
+
+    40.times do |i|
+      node "#{cluster_uid}-#{i+1}" do |node_uid|
+
+        supported_job_types({:deploy => true, :besteffort => true, :virtual => "amd-v"})
+
+        architecture({
+          :smp_size       => 2,
+          :smt_size       => 24,
+          :platform_type  => "amd64"
+        })
+
+        processor({
+          :vendor             => "AMD",
+          :model              => "AMD Opteron",
+          :version            => "6164 HE",
+          :clock_speed        => 1.7.G,
+          :instruction_set    => "",
+          :other_description  => "",
+          :cache_l1           => nil,
+          :cache_l1i          => nil,
+          :cache_l1d          => nil,
+          :cache_l2           => nil
+        })
+
+        main_memory({
+          :ram_size     => 48.GiB,
+          :virtual_size => nil
+        })
+
+        operating_system({
+          :name     => "Debian",
+          :release  => "5.0",
+          :version  => nil,
+          :kernel   => "2.6.26"
+        })
+
+        storage_devices [{
+          :interface  => 'SATA',
+          :size       => 244198584.KiB,
+          :driver     => "ahci",
+          :device     => "sda",
+          :model      => lookup('parapluie', node_uid, 'block_devices', 'sda', 'model'),
+          :rev        => lookup('parapluie', node_uid, 'block_devices', 'sda', 'rev'),
+        }]
+
+        network_adapters [{
+          :interface        => 'Ethernet',
+          :rate             => 1.G,
+          :enabled          => true,
+          :management       => true,
+          :mountable        => false,
+          :mounted          => false,
+          :device           => "bmc",
+          :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+          :ip               => lookup('parapluie', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'bmc', 'mac')
+        },
+        {
+          :interface        => 'Ethernet',
+          :rate             => 1.G,
+          :enabled          => false,
+          :device           => "eth0",
+          :driver           => "igb",
+          :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'mac')
+        },
+        {
+          :interface        => 'Ethernet',
+          :rate             => 1.G,
+          :enabled          => true,
+          :mountable        => true,
+          :mounted          => true,
+          :bridged 	     => true,
+          :device           => "eth1",
+          :driver           => "igb",
+          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
+          :ip               => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'ip'),
+          :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'mac'),
+          :switch           => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'switch_name'),
+          :switch_port      => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
+          :vendor           => "Intel",
+          :version          => "82576"
+        },
+        {
+          :interface        => 'Ethernet',
+          :rate             => 1.G,
+          :enabled          => false,
+          :device           => "eth2",
+          :driver           => "igb",
+          :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'mac')
+        },
+        {
+          :interface        => 'Ethernet',
+          :rate             => 1.G,
+          :enabled          => false,
+          :device           => "eth3",
+          :driver           => "igb",
+          :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'mac')
+        },
+        {
+          :interface        => 'Infiniband',
+          :rate             => 10.G,
+          :enabled          => true,
+          :mountable        => true,
+          :mounted          => true,
+          :device           => "ib0",
+          :driver           => "mlx4_core",
+          :vendor           => "Mellanox",
+          :version          => "MT25418",
+          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
+          :ip               => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'ip'),
+          :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'guid')
+        },
+        {
+          :interface        => 'Infiniband',
+          :rate             => 10.G,
+          :enabled          => false,
+          :device           => "ib1",
+          :driver           => "mlx4_core",
+          :vendor           => "Mellanox",
+          :version          => "MT25418",
+          :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'guid')
+        }]
+
+        bios({
+          :version      => lookup('parapluie', node_uid, 'bios', 'version'),
+          :vendor       => lookup('parapluie', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('parapluie', node_uid, 'bios', 'release_date')
+        })
+
+        gpu({
+          :gpu  => false
+        })
+
+        monitoring({
+          :wattmeter    => false,
+          :temperature  => true,
+        })
 
-     40.times do |i|
-       node "#{cluster_uid}-#{i+1}" do |node_uid|
-         supported_job_types({:deploy => true, :besteffort => true, :virtual => "amd-v"})
-         architecture({
-           :smp_size       => 2, 
-           :smt_size       => 24,
-           :platform_type  => "amd64"
-           })
-         processor({
-           :vendor             => "AMD",
-           :model              => "AMD Opteron",
-           :version            => "6164 HE",
-           :clock_speed        => 1.7.G,
-           :instruction_set    => "",
-           :other_description  => "",
-           :cache_l1           => nil,
-           :cache_l1i          => nil,
-           :cache_l1d          => nil,
-           :cache_l2           => nil
-         })
-         main_memory({
-           :ram_size     => 48.GiB,
-           :virtual_size => nil
-         })
-         operating_system({
-           :name     => "Debian",
-           :release  => "5.0",
-           :version  => nil,
-           :kernel   => "2.6.26"
-         })
-         storage_devices [{
-           :interface  => 'SATA',
-           :size       => 244198584.KiB,
-           :driver     => "ahci",
-           :device     => "sda",
-           :model      => lookup('parapluie', node_uid, 'block_devices', 'sda', 'model'),
-           :rev        => lookup('parapluie', node_uid, 'block_devices', 'sda', 'rev'),
-         }]
-         network_adapters [{
-           :interface        => 'Ethernet',
-           :rate             => 1.G,
-           :enabled          => true,
-           :management       => true,
-           :mountable        => false,
-           :mounted          => false,
-           :device           => "bmc",
-           :network_address  => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-           :ip               => lookup('parapluie', node_uid, 'network_interfaces', 'bmc', 'ip'),
-           :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'bmc', 'mac')
-         },
-         {
-           :interface        => 'Ethernet',
-           :rate             => 1.G,
-           :enabled          => false,
-           :device           => "eth0",
-           :driver           => "igb",
-           :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth0', 'mac')
-         },
-         {
-           :interface        => 'Ethernet',
-           :rate             => 1.G,
-           :enabled          => true,
-           :mountable        => true,
-           :mounted          => true,
-           :bridged 	     => true,
-           :device           => "eth1",
-           :driver           => "igb",
-           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-           :ip               => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'ip'),
-           :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'mac'),
-           :switch           => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'switch_name'),
-           :switch_port      => lookup('parapluie', node_uid, 'network_interfaces', 'eth1', 'switch_port'),
-           :vendor           => "Intel",
-           :version          => "82576"
-         },
-         {
-           :interface        => 'Ethernet',
-           :rate             => 1.G,
-           :enabled          => false,
-           :device           => "eth2",
-           :driver           => "igb",
-           :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth2', 'mac')
-         },
-         {
-           :interface        => 'Ethernet',
-           :rate             => 1.G,
-           :enabled          => false,
-           :device           => "eth3",
-           :driver           => "igb",
-           :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'eth3', 'mac')
-         },
-         {
-           :interface        => 'Infiniband',
-           :rate             => 10.G,
-           :enabled          => true,
-           :mountable        => true,
-           :mounted          => true,
-           :device           => "ib0",
-           :driver           => "mlx4_core",
-           :vendor           => "Mellanox",
-           :version          => "MT25418",
-           :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-           :ip               => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'ip'),
-           :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'ib0', 'guid')
-         },
-         {
-           :interface        => 'Infiniband',
-           :rate             => 10.G,
-           :enabled          => false,
-           :device           => "ib1",
-           :driver           => "mlx4_core",
-           :vendor           => "Mellanox",
-           :version          => "MT25418",
-           :mac              => lookup('parapluie', node_uid, 'network_interfaces', 'ib1', 'guid')
-         }]
-         bios({
-           :version      => lookup('parapluie', node_uid, 'bios', 'version'),
-           :vendor       => lookup('parapluie', node_uid, 'bios', 'vendor'),
-           :release_date => lookup('parapluie', node_uid, 'bios', 'release_date')
-         })
-          gpu({
-           :gpu  => false
-           })
+        sensors({
+          :power => {
+            :available => true,
+            :via => {
+              :pdu      => { :uid => lookup('parapluie', node_uid, 'pdu', 'pdu_name') },
+              :ganglia  => { :metric => "shared_pdu" }
+            }
+          },
+          :temperature => {
+            :available => true,
+            :via => {
+              :ganglia  => { :metric => "ambient_temp" },
+              :impi     => { :sensors => { :ambient => "Inlet Ambient" } }
+            }
+          }
+        })
 
-          monitoring({
-            :wattmeter    => false,
-            :temperature  => true
-          })
-         chassis({:serial_number => lookup('parapluie', node_uid, 'chassis', 'serial_number')})
-       end
-     end
+        chassis({:serial_number => lookup('parapluie', node_uid, 'chassis', 'serial_number')})
 
-   end
-  
+      end
+    end
+  end
 end