[rennes] Add sensors informations

086ccb62 · Pascal Morillon · 7bcfecfd · 086ccb62 · 086ccb62 · 086ccb62
Commit 086ccb62 authored Nov 29, 2012 by Pascal Morillon
--- 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",

--- 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",

--- 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",

--- 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",

--- 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",

--- 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",

--- 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",

--- 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",

--- 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",

--- 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",

--- 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",

--- 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",

--- 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",

--- 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",

--- 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 @@