From 086ccb623423297f3c85e84a130f40cd58e6ea32 Mon Sep 17 00:00:00 2001
From: Pascal Morillon <pascal.morillon@irisa.fr>
Date: Thu, 29 Nov 2012 16:07:22 +0100
Subject: [PATCH] [rennes] Add sensors informations

---
 .../clusters/paradent/nodes/paradent-1.json   |  27 +-
 .../clusters/paradent/nodes/paradent-10.json  |  27 +-
 .../clusters/paradent/nodes/paradent-11.json  |  27 +-
 .../clusters/paradent/nodes/paradent-12.json  |  27 +-
 .../clusters/paradent/nodes/paradent-13.json  |  27 +-
 .../clusters/paradent/nodes/paradent-14.json  |  27 +-
 .../clusters/paradent/nodes/paradent-15.json  |  27 +-
 .../clusters/paradent/nodes/paradent-16.json  |  27 +-
 .../clusters/paradent/nodes/paradent-17.json  |  27 +-
 .../clusters/paradent/nodes/paradent-18.json  |  27 +-
 .../clusters/paradent/nodes/paradent-19.json  |  27 +-
 .../clusters/paradent/nodes/paradent-2.json   |  27 +-
 .../clusters/paradent/nodes/paradent-20.json  |  27 +-
 .../clusters/paradent/nodes/paradent-21.json  |  27 +-
 .../clusters/paradent/nodes/paradent-22.json  |  27 +-
 .../clusters/paradent/nodes/paradent-23.json  |  27 +-
 .../clusters/paradent/nodes/paradent-24.json  |  27 +-
 .../clusters/paradent/nodes/paradent-25.json  |  27 +-
 .../clusters/paradent/nodes/paradent-26.json  |  27 +-
 .../clusters/paradent/nodes/paradent-27.json  |  27 +-
 .../clusters/paradent/nodes/paradent-28.json  |  27 +-
 .../clusters/paradent/nodes/paradent-29.json  |  27 +-
 .../clusters/paradent/nodes/paradent-3.json   |  27 +-
 .../clusters/paradent/nodes/paradent-30.json  |  27 +-
 .../clusters/paradent/nodes/paradent-31.json  |  27 +-
 .../clusters/paradent/nodes/paradent-32.json  |  27 +-
 .../clusters/paradent/nodes/paradent-33.json  |  27 +-
 .../clusters/paradent/nodes/paradent-34.json  |  27 +-
 .../clusters/paradent/nodes/paradent-35.json  |  27 +-
 .../clusters/paradent/nodes/paradent-36.json  |  27 +-
 .../clusters/paradent/nodes/paradent-37.json  |  27 +-
 .../clusters/paradent/nodes/paradent-38.json  |  27 +-
 .../clusters/paradent/nodes/paradent-39.json  |  27 +-
 .../clusters/paradent/nodes/paradent-4.json   |  27 +-
 .../clusters/paradent/nodes/paradent-40.json  |  27 +-
 .../clusters/paradent/nodes/paradent-41.json  |  27 +-
 .../clusters/paradent/nodes/paradent-42.json  |  27 +-
 .../clusters/paradent/nodes/paradent-43.json  |  27 +-
 .../clusters/paradent/nodes/paradent-44.json  |  27 +-
 .../clusters/paradent/nodes/paradent-45.json  |  27 +-
 .../clusters/paradent/nodes/paradent-46.json  |  27 +-
 .../clusters/paradent/nodes/paradent-47.json  |  27 +-
 .../clusters/paradent/nodes/paradent-48.json  |  27 +-
 .../clusters/paradent/nodes/paradent-49.json  |  27 +-
 .../clusters/paradent/nodes/paradent-5.json   |  27 +-
 .../clusters/paradent/nodes/paradent-50.json  |  27 +-
 .../clusters/paradent/nodes/paradent-51.json  |  27 +-
 .../clusters/paradent/nodes/paradent-52.json  |  27 +-
 .../clusters/paradent/nodes/paradent-53.json  |  27 +-
 .../clusters/paradent/nodes/paradent-54.json  |  27 +-
 .../clusters/paradent/nodes/paradent-55.json  |  27 +-
 .../clusters/paradent/nodes/paradent-56.json  |  27 +-
 .../clusters/paradent/nodes/paradent-57.json  |  27 +-
 .../clusters/paradent/nodes/paradent-58.json  |  27 +-
 .../clusters/paradent/nodes/paradent-59.json  |  27 +-
 .../clusters/paradent/nodes/paradent-6.json   |  27 +-
 .../clusters/paradent/nodes/paradent-60.json  |  27 +-
 .../clusters/paradent/nodes/paradent-61.json  |  27 +-
 .../clusters/paradent/nodes/paradent-62.json  |  27 +-
 .../clusters/paradent/nodes/paradent-63.json  |  27 +-
 .../clusters/paradent/nodes/paradent-64.json  |  27 +-
 .../clusters/paradent/nodes/paradent-7.json   |  27 +-
 .../clusters/paradent/nodes/paradent-8.json   |  27 +-
 .../clusters/paradent/nodes/paradent-9.json   |  27 +-
 .../clusters/parapide/nodes/parapide-1.json   |  23 ++
 .../clusters/parapide/nodes/parapide-10.json  |  23 ++
 .../clusters/parapide/nodes/parapide-11.json  |  23 ++
 .../clusters/parapide/nodes/parapide-12.json  |  23 ++
 .../clusters/parapide/nodes/parapide-13.json  |  23 ++
 .../clusters/parapide/nodes/parapide-14.json  |  23 ++
 .../clusters/parapide/nodes/parapide-15.json  |  23 ++
 .../clusters/parapide/nodes/parapide-16.json  |  23 ++
 .../clusters/parapide/nodes/parapide-17.json  |  23 ++
 .../clusters/parapide/nodes/parapide-18.json  |  23 ++
 .../clusters/parapide/nodes/parapide-19.json  |  23 ++
 .../clusters/parapide/nodes/parapide-2.json   |  23 ++
 .../clusters/parapide/nodes/parapide-20.json  |  23 ++
 .../clusters/parapide/nodes/parapide-21.json  |  23 ++
 .../clusters/parapide/nodes/parapide-22.json  |  23 ++
 .../clusters/parapide/nodes/parapide-23.json  |  23 ++
 .../clusters/parapide/nodes/parapide-24.json  |  23 ++
 .../clusters/parapide/nodes/parapide-25.json  |  23 ++
 .../clusters/parapide/nodes/parapide-3.json   |  23 ++
 .../clusters/parapide/nodes/parapide-4.json   |  23 ++
 .../clusters/parapide/nodes/parapide-5.json   |  23 ++
 .../clusters/parapide/nodes/parapide-6.json   |  23 ++
 .../clusters/parapide/nodes/parapide-7.json   |  23 ++
 .../clusters/parapide/nodes/parapide-8.json   |  23 ++
 .../clusters/parapide/nodes/parapide-9.json   |  23 ++
 .../clusters/parapluie/nodes/parapluie-1.json |  26 ++
 .../parapluie/nodes/parapluie-10.json         |  26 ++
 .../parapluie/nodes/parapluie-11.json         |  26 ++
 .../parapluie/nodes/parapluie-12.json         |  26 ++
 .../parapluie/nodes/parapluie-13.json         |  26 ++
 .../parapluie/nodes/parapluie-14.json         |  26 ++
 .../parapluie/nodes/parapluie-15.json         |  26 ++
 .../parapluie/nodes/parapluie-16.json         |  26 ++
 .../parapluie/nodes/parapluie-17.json         |  26 ++
 .../parapluie/nodes/parapluie-18.json         |  26 ++
 .../parapluie/nodes/parapluie-19.json         |  26 ++
 .../clusters/parapluie/nodes/parapluie-2.json |  26 ++
 .../parapluie/nodes/parapluie-20.json         |  26 ++
 .../parapluie/nodes/parapluie-21.json         |  26 ++
 .../parapluie/nodes/parapluie-22.json         |  26 ++
 .../parapluie/nodes/parapluie-23.json         |  26 ++
 .../parapluie/nodes/parapluie-24.json         |  26 ++
 .../parapluie/nodes/parapluie-25.json         |  26 ++
 .../parapluie/nodes/parapluie-26.json         |  26 ++
 .../parapluie/nodes/parapluie-27.json         |  26 ++
 .../parapluie/nodes/parapluie-28.json         |  26 ++
 .../parapluie/nodes/parapluie-29.json         |  26 ++
 .../clusters/parapluie/nodes/parapluie-3.json |  26 ++
 .../parapluie/nodes/parapluie-30.json         |  26 ++
 .../parapluie/nodes/parapluie-31.json         |  26 ++
 .../parapluie/nodes/parapluie-32.json         |  26 ++
 .../parapluie/nodes/parapluie-33.json         |  26 ++
 .../parapluie/nodes/parapluie-34.json         |  26 ++
 .../parapluie/nodes/parapluie-35.json         |  26 ++
 .../parapluie/nodes/parapluie-36.json         |  26 ++
 .../parapluie/nodes/parapluie-37.json         |  26 ++
 .../parapluie/nodes/parapluie-38.json         |  26 ++
 .../parapluie/nodes/parapluie-39.json         |  26 ++
 .../clusters/parapluie/nodes/parapluie-4.json |  26 ++
 .../parapluie/nodes/parapluie-40.json         |  26 ++
 .../clusters/parapluie/nodes/parapluie-5.json |  26 ++
 .../clusters/parapluie/nodes/parapluie-6.json |  26 ++
 .../clusters/parapluie/nodes/parapluie-7.json |  26 ++
 .../clusters/parapluie/nodes/parapluie-8.json |  26 ++
 .../clusters/parapluie/nodes/parapluie-9.json |  26 ++
 data/grid5000/sites/rennes/rennes.json        |  15 +-
 .../input/sites/rennes/clusters/paradent.rb   |  72 +++--
 .../input/sites/rennes/clusters/parapide.rb   |  75 +++--
 .../input/sites/rennes/clusters/parapluie.rb  | 296 ++++++++++--------
 133 files changed, 3357 insertions(+), 444 deletions(-)

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 b7ea107dfa..80fe60c8ba 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 c258bdf06c..5085185c90 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 514adf5dca..0bde96e901 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 73ffb5eb82..cb541d652b 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 744cf4fe9b..07ba450c7c 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 693a2f35e2..8c8d3865c3 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 3db09751cd..3239e3e515 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 f17f5d4a79..43a5046b44 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 36e75fe032..61eee6e04a 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 18060da849..befacb243f 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 881a27daec..376332980e 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 d9f8992275..32c9fa4209 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 c62d785b37..56081c63fe 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 7bca3ae224..af7ea51bfb 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 1b9d57cf06..f217e2c801 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 c0c72197ab..7677971f6c 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 7ca80742d5..e3dc270826 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 069a002ca1..0dbf1d3f90 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 d8d5b8f823..008ee1e9fa 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 6e5aad6313..a18d2e90e0 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 66ef043455..d8472ef18b 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 3a60906e45..e962312fe7 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 c7312ef7e6..aec55840d5 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 7fd0727a2a..120d8a1fc9 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 2f9fb62e15..39dfcf205b 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 d2abe1fe14..d10eb268ec 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 8df20a313a..fa9d8837b7 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 cd208d9964..d91b548d44 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 58b6c04d05..b59e8bbdee 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 1d8f538aa5..512bfe69e8 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 0b8bed22b4..2520d76457 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 834a418852..9386988331 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 c7cd14b21f..b87296f2db 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 4d8f613233..68f7f29ccd 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 e3ec82ecde..73dee8e151 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 bb34d8baff..492b18bc86 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 0ce745aae2..2477acccb5 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 98a37ae2a1..e436a757d3 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 90a321a9d1..0f787a4475 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 dfb4b310d2..d8972b72de 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 a34632f10f..d5a6fd33be 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 26b99f8fe9..e6b3361ca3 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 11f0ad4877..e240c3f93b 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 c2671cb72e..f91c0786df 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 43e04ccfef..1e9b3695bb 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 f2fd85bd93..b568c6af0f 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 632b4f0c95..e62888da01 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 f1e264a49a..92cc0e4ed8 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 243f228c98..30bb4ef711 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 cf5beec9c5..c495a4ea38 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 462fdbcee0..6a60b0ce32 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 ce33227a32..636753a576 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 88a3eb2e0d..7fbd61278c 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 ef8439f5e0..9c7d7c0a41 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 88867b3fbc..bc6ca4d689 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 c68f413870..417451c41e 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 33a8c6ad83..9448970856 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 4fcb914f28..fff51fc06b 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 380e54a8eb..37078f7593 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 5975b1374c..a7b203502a 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 c3c30d1458..6caa7f20e4 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 fdf16782a2..eb5cc0c1de 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 6b0da7f126..d66b0ae6e1 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 c9b135eb15..c9cb20de1f 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 e5730f752f..b3c0a63bf5 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 23f940476a..b0b943c7a8 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 84cb1f562f..554e5a400d 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 c499a1c8ca..77178fdbd7 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 ec142bf97a..85b43d8495 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 9a52263c55..7394903b32 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 d360a147f5..29fcb403d4 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 42773108a4..b73c3119f6 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 f603ae8007..c4ff2025ee 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 8c46546acf..a56fadb641 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 9e13316bab..8185317ad4 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 7b121ebb99..14ef5c7941 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 6b8081ec8a..1c950bb2c6 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 b266cb75bb..fe4cb19883 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 81c17e9dab..40d742fc05 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 595d080f41..ede0e73dac 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 6df52f2557..ac2111582e 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 50365166ec..ee85f2aa7c 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 69a3bfaedd..c68fc974c8 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 888456b791..b0f7b64769 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 73c2dc17b4..fbf80deddd 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 b63e2164c6..c194e71712 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 798627c68a..9406ce4d0a 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 340d1c97b3..d5b2689a75 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 e104d35ec9..1cefd8b09f 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 89971b0758..c9845bd26a 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 ca5e4af7e1..cd398931c8 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 65104e875b..a5ebd06fdc 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 7cfcece0da..92dacbac99 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 42ba65a921..1dd5147117 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 f5abff6d17..66a54fffaf 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 2decce957c..644805841b 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 27a9165166..acd55dac31 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 53d3f414c8..d41b9b3b56 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 b1cab57a6a..c42b659551 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 2519f637bd..f64c8292c9 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 b2cbfcf483..65089519d9 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 a08de877df..8100e4d2da 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 0c91fdd97a..f74aab7291 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 9f694ceb6d..17036a5326 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 1a7dd10d03..4f61ec93c4 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 b7c7d1432b..88f95dc6c5 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 eb4993f20c..93528923ef 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 c4e18da46b..e548ab1098 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 97e48725e7..b50f15fdfe 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 dcac4d89ad..7aee1dcefb 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 7d2e00dd09..ef54cfa5bd 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 ffde43e196..2b2d7c9e21 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 67c27162df..2c9902e48c 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 24b8d7baee..74e7c091cf 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 797df4d5ea..17a82e4d0b 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 b291e6580a..057ae0f263 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 ed693dd377..e36ab77502 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 0d62a5aaf5..6c55c75b52 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 86a95ac619..e586b8f968 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 d8498318bd..ba1b81975c 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 b8502d2340..3d1bd63ed8 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 2c022149dc..9fe9391097 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 879581c0d7..363063367e 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 353d495176..0dc3c13f26 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 0082be4e93..0eea1b5f94 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 319c58ea4c..b601be466a 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 bfdd3c1612..37e8227724 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 ffaa13ceac..856ff2d6fc 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 249a627f25..961f263728 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 99ad5e450b..a7c71ffc17 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 2213932dd0..c328eae21c 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 1b43c62335..90b2e4bad4 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 4dddf88210..e9f4338101 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
-- 
GitLab