Merge branch 'gruss' into 'master'

[nancy/gruss] Add storage information and gruss-pdu

See merge request !302

data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.json

@@ -179,6 +179,16 @@
     "pstate_governor": "performance",
     "turboboost_enabled": true
   },
+  "pdu": [
+    {
+      "port": 24,
+      "uid": "gruss-pdu1"
+    },
+    {
+      "port": 24,
+      "uid": "gruss-pdu2"
+    }
+  ],
   "performance": {
     "core_flops": 38400000000,
     "node_flops": 1843200000000

data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json

@@ -179,6 +179,16 @@
     "pstate_governor": "performance",
     "turboboost_enabled": true
   },
+  "pdu": [
+    {
+      "port": 16,
+      "uid": "gruss-pdu1"
+    },
+    {
+      "port": 16,
+      "uid": "gruss-pdu2"
+    }
+  ],
   "performance": {
     "core_flops": 38400000000,
     "node_flops": 1843200000000
@@ -210,7 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
       "firmware_version": "DD02",
       "id": "disk0",
-      "interface": "SAS",
+      "interface": "SATA",
       "model": "HFS1T9G32FEH-BA1",
       "size": 1920383410176,
       "storage": "SSD",

data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json

@@ -179,6 +179,16 @@
     "pstate_governor": "performance",
     "turboboost_enabled": true
   },
+  "pdu": [
+    {
+      "port": 8,
+      "uid": "gruss-pdu1"
+    },
+    {
+      "port": 8,
+      "uid": "gruss-pdu2"
+    }
+  ],
   "performance": {
     "core_flops": 38400000000,
     "node_flops": 1843200000000
@@ -210,7 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
       "firmware_version": "DD02",
       "id": "disk0",
-      "interface": "SAS",
+      "interface": "SATA",
       "model": "HFS1T9G32FEH-BA1",
       "size": 1920383410176,
       "storage": "SSD",

data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json

@@ -179,6 +179,16 @@
     "pstate_governor": "performance",
     "turboboost_enabled": true
   },
+  "pdu": [
+    {
+      "port": 1,
+      "uid": "gruss-pdu1"
+    },
+    {
+      "port": 1,
+      "uid": "gruss-pdu2"
+    }
+  ],
   "performance": {
     "core_flops": 38400000000,
     "node_flops": 1843200000000
@@ -210,7 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
       "firmware_version": "DD02",
       "id": "disk0",
-      "interface": "SAS",
+      "interface": "SATA",
       "model": "HFS1T9G32FEH-BA1",
       "size": 1920383410176,
       "storage": "SSD",

data/grid5000/sites/nancy/pdus/gruss-pdu1.json

+{
+  "ip": "172.17.79.213",
+  "mac": "28:29:86:48:77:a8",
+  "metrics": [
+    {
+      "description": "Power consumption per outlet reported by PDU, in watt",
+      "name": "pdu_outlet_power_watt",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%",
+        "protocol": "snmp"
+      }
+    }
+  ],
+  "model": "AP8653",
+  "ports": {
+    "1": "gruss-4",
+    "16": "gruss-2",
+    "24": "gruss-1",
+    "8": "gruss-3"
+  },
+  "type": "pdu",
+  "uid": "gruss-pdu1",
+  "vendor": "APC"
+}
\ No newline at end of file

data/grid5000/sites/nancy/pdus/gruss-pdu2.json

+{
+  "ip": "172.17.79.214",
+  "mac": "28:29:86:48:77:a1",
+  "metrics": [
+    {
+      "description": "Power consumption per outlet reported by PDU, in watt",
+      "name": "pdu_outlet_power_watt",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%",
+        "protocol": "snmp"
+      }
+    }
+  ],
+  "model": "AP8653",
+  "ports": {
+    "1": "gruss-4",
+    "16": "gruss-2",
+    "24": "gruss-1",
+    "8": "gruss-3"
+  },
+  "type": "pdu",
+  "uid": "gruss-pdu2",
+  "vendor": "APC"
+}
\ No newline at end of file

input/grid5000/disks.yaml

@@ -25,8 +25,6 @@ disk_vendor_model_mapping:
       - unknown
 
   SAS:
-    Sk Hynix: 
-      - HFS1T9G32FEH-BA1
     Hitachi:
       - HUS726040ALS210
     Seagate:
@@ -87,6 +85,8 @@ disk_vendor_model_mapping:
       - WDC WD2502ABYS-1
       - WDC WD2003FYYS-1
       - WDC WD1003FBYX-1
+    Sk Hynix:
+      - HFS1T9G32FEH-BA1
     Unknown:
       - unknown
 

input/grid5000/sites/nancy/clusters/gruss/gruss.yaml

@@ -37,6 +37,12 @@ nodes:
         enabled: false
         mountable: false
         mounted: false
+  gruss-[2-4]:
+    storage_devices:
+      pci-0000:01:00.0-scsi-0:0:0:0:
+        interface: SATA
+        id: disk0
+  gruss-1:
     storage_devices:
       pci-0000:01:00.0-scsi-0:0:0:0:
         interface: SAS

input/grid5000/sites/nancy/clusters/gruss/gruss_pdu.yaml

+nodes:
+  gruss-1:
+    pdu:
+      - uid: gruss-pdu1
+        port: 24
+      - uid: gruss-pdu2
+        port: 24
+  gruss-2:
+    pdu:
+      - uid: gruss-pdu1
+        port: 16
+      - uid: gruss-pdu2
+        port: 16
+  gruss-3:
+    pdu:
+      - uid: gruss-pdu1
+        port: 8
+      - uid: gruss-pdu2
+        port: 8
+  gruss-4:
+    pdu:
+      - uid: gruss-pdu1
+        port: 1
+      - uid: gruss-pdu2
+        port: 1
\ No newline at end of file

input/grid5000/sites/nancy/pdus.yaml

@@ -205,3 +205,19 @@ pdus:
         optional_period: 20
         source:
           protocol: wattmetre
+  gruss-pdu1:
+    ip: 172.17.79.213
+    mac: 28:29:86:48:77:a8
+  gruss-pdu2:
+    ip: 172.17.79.214
+    mac: 28:29:86:48:77:a1
+  gruss-pdu[1-2]:
+    vendor: APC
+    model: AP8653
+    metrics:
+      - name: pdu_outlet_power_watt
+        description: Power consumption per outlet reported by PDU, in watt
+        period: 1000
+        source:
+          protocol: snmp
+          id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT%