diff --git a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.json b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.json index bb44af69fa79b395d112219f3f7582cacd3d7615..49ac8754df0e5f6490f8c471ad2968d196c2eda3 100644 --- a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-1.json +++ b/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 diff --git a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json index d259ec6a950cbb11b1a8809632f1db2b9a1f34a1..10eb0852be5ab5018cbca46923c3f4ad65345141 100644 --- a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json +++ b/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", diff --git a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json index 6a519259eee65fac4c22d6c1ce24b29d01c8298f..598efba960267a9053d6a54374a687cd31133397 100644 --- a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json +++ b/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", diff --git a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json index ebb68d8b85eea3e186ed67006b6a6639ebad15d1..cd4f8d592d4bb98bae6d7e36956fce0e382b7241 100644 --- a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json +++ b/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", diff --git a/data/grid5000/sites/nancy/pdus/gruss-pdu1.json b/data/grid5000/sites/nancy/pdus/gruss-pdu1.json new file mode 100644 index 0000000000000000000000000000000000000000..e41b991ec005a2dfb066425e27e213322803205c --- /dev/null +++ b/data/grid5000/sites/nancy/pdus/gruss-pdu1.json @@ -0,0 +1,25 @@ +{ + "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 diff --git a/data/grid5000/sites/nancy/pdus/gruss-pdu2.json b/data/grid5000/sites/nancy/pdus/gruss-pdu2.json new file mode 100644 index 0000000000000000000000000000000000000000..b64f3abda60197802c6af31c41eedd49bb4ab2cb --- /dev/null +++ b/data/grid5000/sites/nancy/pdus/gruss-pdu2.json @@ -0,0 +1,25 @@ +{ + "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 diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml index 395eec398845b342a3c58a8402565df9432a7ab2..7e05ab261f518ade2442dc7c614de7100191171c 100644 --- a/input/grid5000/disks.yaml +++ b/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 diff --git a/input/grid5000/sites/nancy/clusters/gruss/gruss.yaml b/input/grid5000/sites/nancy/clusters/gruss/gruss.yaml index 4d281000a379d6ce36b15500a3e515886984488d..cd928bc9519ee9f6f7aab4de2cf16a9ac0fac318 100644 --- a/input/grid5000/sites/nancy/clusters/gruss/gruss.yaml +++ b/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 diff --git a/input/grid5000/sites/nancy/clusters/gruss/gruss_pdu.yaml b/input/grid5000/sites/nancy/clusters/gruss/gruss_pdu.yaml new file mode 100644 index 0000000000000000000000000000000000000000..abca4a96f7763748b2f7b2c47047de541252498d --- /dev/null +++ b/input/grid5000/sites/nancy/clusters/gruss/gruss_pdu.yaml @@ -0,0 +1,25 @@ +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 diff --git a/input/grid5000/sites/nancy/pdus.yaml b/input/grid5000/sites/nancy/pdus.yaml index 242457d799630896bee384d74aa91b263f936493..88c987e49103365d793e7413a5efbeefa1f0111c 100644 --- a/input/grid5000/sites/nancy/pdus.yaml +++ b/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%