diff --git a/data/grid5000/sites/sophia/clusters/esterel33/esterel33.json b/data/grid5000/sites/sophia/clusters/esterel33/esterel33.json new file mode 100644 index 0000000000000000000000000000000000000000..b0e1e706f393f460e9bdc15f5562f53575844321 --- /dev/null +++ b/data/grid5000/sites/sophia/clusters/esterel33/esterel33.json @@ -0,0 +1,66 @@ +{ + "boot_type": "bios", + "created_at": "Mon, 28 Apr 2025 00:00:00 GMT", + "exotic": false, + "kavlan": false, + "manufactured_at": "2021-05-13", + "metrics": [ + { + "description": "Default subset of metrics from Prometheus Node Exporter", + "name": "prom_default_metrics", + "optional_period": 15000, + "period": 0, + "source": { + "id": [ + "node_boot_time_seconds", + "node_cpu_scaling_frequency_hertz", + "node_cpu_seconds_total", + "node_filesystem_free_bytes", + "node_filesystem_size_bytes", + "node_load1", + "node_load15", + "node_load5", + "node_memory_Buffers_bytes", + "node_memory_Cached_bytes", + "node_memory_MemAvailable_bytes", + "node_memory_MemFree_bytes", + "node_memory_MemTotal_bytes", + "node_memory_Shmem_bytes", + "node_memory_SwapFree_bytes", + "node_memory_SwapTotal_bytes", + "node_network_receive_bytes_total", + "node_network_receive_packets_total", + "node_network_transmit_bytes_total", + "node_network_transmit_packets_total", + "node_procs_blocked", + "node_procs_running", + "kwollect_custom" + ], + "port": 9100, + "protocol": "prometheus" + } + }, + { + "description": "All metrics from Prometheus Node Exporter", + "name": "prom_all_metrics", + "optional_period": 15000, + "period": 0, + "source": { + "port": 9100, + "protocol": "prometheus" + } + } + ], + "model": "Dell PowerEdge R7525", + "nodes_count": 1, + "nodes_description": "2 CPUs AMD EPYC 7282, 16 cores/CPU, 3 GPUs A40, 256GB RAM, 446GB SSD, 2679GB SSD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand", + "priority": 202205, + "queues": [ + "admin", + "testing" + ], + "redfish": true, + "type": "cluster", + "uid": "esterel33", + "warranty_end": "2028-05-15" +} \ No newline at end of file diff --git a/data/grid5000/sites/sophia/clusters/esterel33/nodes/esterel33-1.json b/data/grid5000/sites/sophia/clusters/esterel33/nodes/esterel33-1.json new file mode 100644 index 0000000000000000000000000000000000000000..21d4bf97826606a92346381251ed39334eab5648 --- /dev/null +++ b/data/grid5000/sites/sophia/clusters/esterel33/nodes/esterel33-1.json @@ -0,0 +1,312 @@ +{ + "architecture": { + "cpu_core_numbering": "contiguous", + "nb_cores": 32, + "nb_procs": 2, + "nb_threads": 64, + "platform_type": "x86_64" + }, + "bios": { + "release_date": "09/12/2023", + "vendor": "Dell Inc.", + "version": "2.13.3" + }, + "bmc_version": "7.00.60.00", + "chassis": { + "manufactured_at": "2021-05-13", + "manufacturer": "Dell Inc.", + "name": "PowerEdge R7525", + "serial": "BZLF4F3", + "warranty_end": "2028-05-15" + }, + "exotic": false, + "gpu_devices": { + "nvidia0": { + "compute_capability": "8.6", + "cores": 10752, + "cpu_affinity": 0, + "device": "/dev/nvidia0", + "memory": 48305799168, + "microarchitecture": "Ampere", + "model": "A40", + "performance": { + "fp-16": 37420000000000, + "fp-32": 37420000000000, + "fp-64": 584600000000 + }, + "power_default_limit": "300.00 W", + "vbios_version": "94.02.5C.00.03", + "vendor": "Nvidia" + }, + "nvidia1": { + "compute_capability": "8.6", + "cores": 10752, + "cpu_affinity": 1, + "device": "/dev/nvidia1", + "memory": 48305799168, + "microarchitecture": "Ampere", + "model": "A40", + "performance": { + "fp-16": 37420000000000, + "fp-32": 37420000000000, + "fp-64": 584600000000 + }, + "power_default_limit": "300.00 W", + "vbios_version": "94.02.5C.00.03", + "vendor": "Nvidia" + }, + "nvidia2": { + "compute_capability": "8.6", + "cores": 10752, + "cpu_affinity": 1, + "device": "/dev/nvidia2", + "memory": 48305799168, + "microarchitecture": "Ampere", + "model": "A40", + "performance": { + "fp-16": 37420000000000, + "fp-32": 37420000000000, + "fp-64": 584600000000 + }, + "power_default_limit": "300.00 W", + "vbios_version": "94.02.5C.00.03", + "vendor": "Nvidia" + } + }, + "main_memory": { + "ram_size": 274877906944 + }, + "management_tools": { + "bmc_vendor_tool": "racadm", + "ipmitool": { + "retries": 5 + } + }, + "memory_devices": [ + { + "device": "dimm_a1", + "size": 17179869184, + "technology": "dram" + }, + { + "device": "dimm_a2", + "size": 17179869184, + "technology": "dram" + }, + { + "device": "dimm_a3", + "size": 17179869184, + "technology": "dram" + }, + { + "device": "dimm_a4", + "size": 17179869184, + "technology": "dram" + }, + { + "device": "dimm_a5", + "size": 17179869184, + "technology": "dram" + }, + { + "device": "dimm_a6", + "size": 17179869184, + "technology": "dram" + }, + { + "device": "dimm_a7", + "size": 17179869184, + "technology": "dram" + }, + { + "device": "dimm_a8", + "size": 17179869184, + "technology": "dram" + }, + { + "device": "dimm_b1", + "size": 17179869184, + "technology": "dram" + }, + { + "device": "dimm_b2", + "size": 17179869184, + "technology": "dram" + }, + { + "device": "dimm_b3", + "size": 17179869184, + "technology": "dram" + }, + { + "device": "dimm_b4", + "size": 17179869184, + "technology": "dram" + }, + { + "device": "dimm_b5", + "size": 17179869184, + "technology": "dram" + }, + { + "device": "dimm_b6", + "size": 17179869184, + "technology": "dram" + }, + { + "device": "dimm_b7", + "size": 17179869184, + "technology": "dram" + }, + { + "device": "dimm_b8", + "size": 17179869184, + "technology": "dram" + } + ], + "network_adapters": [ + { + "device": "eth0", + "driver": "tg3", + "enabled": true, + "firmware_version": "FFV22.71.3 bc 5720-v1.39", + "interface": "Ethernet", + "ip": "172.16.131.46", + "ip6": "2001:660:4406:800:4::2e", + "kavlan": false, + "mac": "70:b5:e8:ef:f8:0a", + "management": false, + "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe", + "mountable": true, + "mounted": true, + "name": "enp1s0f0np0", + "network_address": "esterel33-1.sophia.grid5000.fr", + "rate": 1000000000, + "sriov": false, + "sriov_totalvfs": 0, + "switch": "sw-6", + "switch_port": "1/1/4", + "vendor": "Broadcom Inc. and subsidiaries" + }, + { + "device": "eth1", + "driver": "tg3", + "enabled": false, + "firmware_version": "FFV22.71.3 bc 5720-v1.39", + "interface": "Ethernet", + "kavlan": false, + "mac": "70:b5:e8:ef:f8:0b", + "management": false, + "model": "NetXtreme BCM5720 2-port Gigabit Ethernet PCIe", + "mountable": false, + "mounted": false, + "name": "eno2", + "sriov": false, + "sriov_totalvfs": 0, + "vendor": "Broadcom Inc. and subsidiaries" + }, + { + "device": "ib0", + "driver": "mlx5_core", + "enabled": true, + "firmware_version": "16.28.1002", + "guid": "0xb8cef60300298a60", + "interface": "InfiniBand", + "ip": "172.18.131.46", + "kavlan": false, + "mac": "b8:ce:f6:03:00:29:8a:60", + "management": false, + "model": "MT27800 Family [ConnectX-5]", + "mountable": true, + "mounted": true, + "name": "ib0", + "netmask": "255.255.240.0", + "network_address": "esterel33-1-ib0.sophia.grid5000.fr", + "rate": 40000000000, + "vendor": "Mellanox Technologies" + }, + { + "device": "bmc", + "enabled": true, + "interface": "Ethernet", + "ip": "172.17.131.46", + "kavlan": false, + "mac": "b0:7b:25:d0:f8:f2", + "management": true, + "mountable": false, + "mounted": false, + "network_address": "esterel33-1-bmc.sophia.grid5000.fr" + } + ], + "nodeset": "esterel33", + "operating_system": { + "cstate_driver": "acpi_idle", + "cstate_governor": "menu", + "ht_enabled": true, + "pstate_driver": "acpi-cpufreq", + "pstate_governor": "performance", + "turboboost_enabled": true + }, + "performance": { + "core_flops": 44800000000, + "node_flops": 1433600000000 + }, + "processor": { + "cache_l1": null, + "cache_l1d": 32768, + "cache_l1i": 32768, + "cache_l2": 524288, + "cache_l3": 16777216, + "clock_speed": 2800000000, + "ht_capable": true, + "instruction_set": "x86-64", + "microarchitecture": "Zen 2", + "microcode": "0x830107c", + "model": "AMD EPYC", + "other_description": "AMD EPYC 7282 16-Core Processor", + "vendor": "AMD", + "version": 7282 + }, + "redfish": true, + "software": { + "forced-deployment-timestamp": 202007300948, + "postinstall-version": "1.2025042314", + "standard-environment": "debian11-x64-std" + }, + "storage_devices": [ + { + "by_id": "/dev/disk/by-id/wwn-0x6b07b250ca1c2b002901bc6db7e3e98b", + "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0", + "firmware_version": 5.16, + "id": "disk0", + "interface": "SATA", + "model": "PERC H745 Frnt", + "size": 479559942144, + "storage": "SSD", + "vendor": "Dell" + }, + { + "by_id": "/dev/disk/by-id/wwn-0x6b07b250ca1c2b002901c64fa1d24fbf", + "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:1:0", + "firmware_version": 5.16, + "id": "disk1", + "interface": "SATA", + "model": "PERC H745 Frnt", + "size": 2877359652864, + "storage": "SSD", + "vendor": "Dell" + } + ], + "supported_job_types": { + "besteffort": true, + "deploy": true, + "max_walltime": 0, + "queues": [ + "admin", + "testing" + ], + "virtual": "amd-v" + }, + "type": "node", + "uid": "esterel33-1" +} \ No newline at end of file diff --git a/data/grid5000/sites/sophia/network_equipments/sw-6.json b/data/grid5000/sites/sophia/network_equipments/sw-6.json index 91d19636a88356e71707c01b0479e3643ec9706f..f27af7503668b77ac75d10dd94d06212f9fd4775 100644 --- a/data/grid5000/sites/sophia/network_equipments/sw-6.json +++ b/data/grid5000/sites/sophia/network_equipments/sw-6.json @@ -29,6 +29,10 @@ "uid": "esterel4-1" }, { + "kind": "node", + "port": "eth0", + "snmp_name": "1/1/4", + "uid": "esterel33-1" }, { }, diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-6.json b/data/grid5000/sites/sophia/network_equipments/swadmin-6.json index 133f09c6cb5bf1c64d95b9d053e818e336df8a55..b27ca2535902baf6b56b986a8bf7273b7dcf1078 100644 --- a/data/grid5000/sites/sophia/network_equipments/swadmin-6.json +++ b/data/grid5000/sites/sophia/network_equipments/swadmin-6.json @@ -66,6 +66,9 @@ "uid": "esterel4-1-bmc" }, { + "kind": "other", + "snmp_name": "1/1/12", + "uid": "esterel33-1-bmc" }, { }, diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml index c226383a1901720b12810982af6903abfb5af186..499e08d66a9efba858ad2a34a84b8dfe5038d2c9 100644 --- a/input/grid5000/dell-product-data.yaml +++ b/input/grid5000/dell-product-data.yaml @@ -2304,6 +2304,12 @@ sites: chassis: manufactured_at: 2020-08-09 warranty_end: 2027-08-10 + esterel33: + nodes: + esterel33-1: + chassis: + manufactured_at: 2021-05-13 + warranty_end: 2028-05-15 esterel4: nodes: esterel4-1: diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml index db463772c3af7c47ec10c93181c9426364322ca1..6616350c5f04fb7ddf8b14ceb533e17157d33e39 100644 --- a/input/grid5000/ipv4.yaml +++ b/input/grid5000/ipv4.yaml @@ -207,6 +207,7 @@ ipv4: sophia esterel32 eth0 0 0 3 44 sophia esterel32 ib0 0 0 3 44 sophia esterel33 eth0 0 0 3 45 + sophia esterel33 ib0 0 0 3 45 sophia esterel34 eth0 0 0 3 46 sophia esterel35 eth0 0 0 3 47 sophia esterel36 eth0 0 0 3 49 diff --git a/input/grid5000/sites/sophia/clusters/esterel33/esterel33.yaml b/input/grid5000/sites/sophia/clusters/esterel33/esterel33.yaml new file mode 100644 index 0000000000000000000000000000000000000000..34b86f03e8becf794c360984c36a9df1298a8365 --- /dev/null +++ b/input/grid5000/sites/sophia/clusters/esterel33/esterel33.yaml @@ -0,0 +1,44 @@ +--- +model: Dell PowerEdge R7525 +created_at: 2025-04-28 +kavlan: false +boot_type: bios +exotic: false +queues: + - admin + - testing +nodes: + esterel33-1: + supported_job_types: + deploy: true + besteffort: true + max_walltime: 0 + processor: + microarchitecture: Zen 2 + clock_speed: 2_800_000_000 + network_adapters: + bmc: + interface: Ethernet + enabled: true + mountable: false + mounted: false + eth0: + enabled: true + mountable: true + mounted: true + eth1: + enabled: false + mountable: false + mounted: false + storage_devices: + pci-0000:01:00.0-scsi-0:2:0:0: + id: disk0 + interface: SATA + pci-0000:01:00.0-scsi-0:2:1:0: + id: disk1 + interface: SATA + software: + standard-environment: debian11-x64-std + management_tools: + bmc_vendor_tool: racadm + nodeset: esterel33 diff --git a/input/grid5000/sites/sophia/clusters/esterel33/esterel33_ib.yaml b/input/grid5000/sites/sophia/clusters/esterel33/esterel33_ib.yaml new file mode 100644 index 0000000000000000000000000000000000000000..60d42d9677d4aa3f7d0f22ea3a0d864fd04a3fc7 --- /dev/null +++ b/input/grid5000/sites/sophia/clusters/esterel33/esterel33_ib.yaml @@ -0,0 +1,9 @@ +--- +nodes: + esterel33-1: + network_adapters: + ib0: + enabled: true + mountable: true + mounted: true + netmask: 255.255.240.0 \ No newline at end of file diff --git a/input/grid5000/sites/sophia/clusters/esterel33/esterel33_metrics.yaml b/input/grid5000/sites/sophia/clusters/esterel33/esterel33_metrics.yaml new file mode 100644 index 0000000000000000000000000000000000000000..729e9beb582834908e55a7537bd5ace8abbd1f3d --- /dev/null +++ b/input/grid5000/sites/sophia/clusters/esterel33/esterel33_metrics.yaml @@ -0,0 +1,40 @@ +--- +metrics: + - name: prom_default_metrics + description: Default subset of metrics from Prometheus Node Exporter + period: 0 + optional_period: 15000 + source: + protocol: prometheus + port: 9100 + id: + - node_boot_time_seconds + - node_cpu_scaling_frequency_hertz + - node_cpu_seconds_total + - node_filesystem_free_bytes + - node_filesystem_size_bytes + - node_load1 + - node_load15 + - node_load5 + - node_memory_Buffers_bytes + - node_memory_Cached_bytes + - node_memory_MemAvailable_bytes + - node_memory_MemFree_bytes + - node_memory_MemTotal_bytes + - node_memory_Shmem_bytes + - node_memory_SwapFree_bytes + - node_memory_SwapTotal_bytes + - node_network_receive_bytes_total + - node_network_receive_packets_total + - node_network_transmit_bytes_total + - node_network_transmit_packets_total + - node_procs_blocked + - node_procs_running + - kwollect_custom + - name: prom_all_metrics + description: All metrics from Prometheus Node Exporter + period: 0 + optional_period: 15000 + source: + protocol: prometheus + port: 9100 diff --git a/input/grid5000/sites/sophia/clusters/esterel33/nodes/esterel33-1.yaml b/input/grid5000/sites/sophia/clusters/esterel33/nodes/esterel33-1.yaml new file mode 100644 index 0000000000000000000000000000000000000000..a7dde2470cb9270465d2db5214ee28e8d773bc37 --- /dev/null +++ b/input/grid5000/sites/sophia/clusters/esterel33/nodes/esterel33-1.yaml @@ -0,0 +1,171 @@ +# Generated by g5k-checks (g5k-checks -m api) +--- +esterel33-1: + architecture: + cpu_core_numbering: contiguous + nb_cores: 32 + nb_procs: 2 + nb_threads: 64 + platform_type: x86_64 + bios: + release_date: '09/12/2023' + vendor: Dell Inc. + version: 2.13.3 + bmc_version: 7.00.60.00 + chassis: + manufacturer: Dell Inc. + name: PowerEdge R7525 + serial: BZLF4F3 + gpu_devices: + nvidia0: + cpu_affinity: 0 + device: "/dev/nvidia0" + memory: 48305799168 + model: A40 + power_default_limit: 300.00 W + vbios_version: 94.02.5C.00.03 + vendor: Nvidia + nvidia1: + cpu_affinity: 1 + device: "/dev/nvidia1" + memory: 48305799168 + model: A40 + power_default_limit: 300.00 W + vbios_version: 94.02.5C.00.03 + vendor: Nvidia + nvidia2: + cpu_affinity: 1 + device: "/dev/nvidia2" + memory: 48305799168 + model: A40 + power_default_limit: 300.00 W + vbios_version: 94.02.5C.00.03 + vendor: Nvidia + main_memory: + ram_size: 274877906944 + memory_devices: + dimm_a1: + size: 17179869184 + technology: dram + dimm_a2: + size: 17179869184 + technology: dram + dimm_a3: + size: 17179869184 + technology: dram + dimm_a4: + size: 17179869184 + technology: dram + dimm_a5: + size: 17179869184 + technology: dram + dimm_a6: + size: 17179869184 + technology: dram + dimm_a7: + size: 17179869184 + technology: dram + dimm_a8: + size: 17179869184 + technology: dram + dimm_b1: + size: 17179869184 + technology: dram + dimm_b2: + size: 17179869184 + technology: dram + dimm_b3: + size: 17179869184 + technology: dram + dimm_b4: + size: 17179869184 + technology: dram + dimm_b5: + size: 17179869184 + technology: dram + dimm_b6: + size: 17179869184 + technology: dram + dimm_b7: + size: 17179869184 + technology: dram + dimm_b8: + size: 17179869184 + technology: dram + network_adapters: + bmc: + ip: 172.17.131.46 + mac: b0:7b:25:d0:f8:f2 + management: true + eth0: + driver: tg3 + firmware_version: FFV22.71.3 bc 5720-v1.39 + interface: Ethernet + ip: 172.16.131.46 + mac: 70:b5:e8:ef:f8:0a + management: false + model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe + name: enp1s0f0np0 + rate: 1000000000 + sriov: false + sriov_totalvfs: 0 + vendor: Broadcom Inc. and subsidiaries + eth1: + driver: tg3 + firmware_version: FFV22.71.3 bc 5720-v1.39 + interface: Ethernet + mac: 70:b5:e8:ef:f8:0b + management: false + model: NetXtreme BCM5720 2-port Gigabit Ethernet PCIe + name: eno2 + sriov: false + sriov_totalvfs: 0 + vendor: Broadcom Inc. and subsidiaries + ib0: + driver: mlx5_core + firmware_version: 16.28.1002 + guid: '0xb8cef60300298a60' + interface: InfiniBand + ip: 172.18.131.46 + mac: b8:ce:f6:03:00:29:8a:60 + management: false + model: MT27800 Family [ConnectX-5] + name: ib0 + rate: 40000000000 + vendor: Mellanox Technologies + operating_system: + cstate_driver: acpi_idle + cstate_governor: menu + ht_enabled: true + pstate_driver: acpi-cpufreq + pstate_governor: performance + turboboost_enabled: true + processor: + cache_l1d: 32768 + cache_l1i: 32768 + cache_l2: 524288 + cache_l3: 16777216 + ht_capable: true + instruction_set: x86-64 + microcode: '0x830107c' + model: AMD EPYC + other_description: AMD EPYC 7282 16-Core Processor + vendor: AMD + version: 7282 + storage_devices: + pci-0000:01:00.0-scsi-0:2:0:0: + by_id: "/dev/disk/by-id/wwn-0x6b07b250ca1c2b002901bc6db7e3e98b" + by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0" + firmware_version: 5.16 + model: PERC H745 Frnt + size: 479559942144 + storage: SSD + pci-0000:01:00.0-scsi-0:2:1:0: + by_id: "/dev/disk/by-id/wwn-0x6b07b250ca1c2b002901c64fa1d24fbf" + by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:1:0" + firmware_version: 5.16 + model: PERC H745 Frnt + size: 2877359652864 + storage: SSD + supported_job_types: + virtual: amd-v diff --git a/input/grid5000/sites/sophia/networks/sw-6.yaml b/input/grid5000/sites/sophia/networks/sw-6.yaml index 5406515179c8d961f6aae30d913b1deddf0bf087..50d9ca48e2b805122f4bf4d9344df90de58577b8 100644 --- a/input/grid5000/sites/sophia/networks/sw-6.yaml +++ b/input/grid5000/sites/sophia/networks/sw-6.yaml @@ -20,6 +20,8 @@ sw-6: uid: esterel3-1 3: uid: esterel4-1 + 4: + uid: esterel33-1 13: uid: esterel1-1 14: diff --git a/input/grid5000/sites/sophia/networks/swadmin-6.yaml b/input/grid5000/sites/sophia/networks/swadmin-6.yaml index 8d7dc83a388c4f0bae6010f0862a3fcea28e0f43..9be717f3973b82590ae20cd33133a370dbe6d81d 100644 --- a/input/grid5000/sites/sophia/networks/swadmin-6.yaml +++ b/input/grid5000/sites/sophia/networks/swadmin-6.yaml @@ -47,6 +47,9 @@ swadmin-6: 11: uid: esterel4-1-bmc kind: other + 12: + uid: esterel33-1-bmc + kind: other 25: uid: sw-6 kind: switch diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml index 241ab261db185c1493807e881ed141e5a521d8aa..96dc770868669b47c7cbaffbdbedbd9366ad42cf 100644 --- a/lib/refrepo/net_names_mapping.yaml +++ b/lib/refrepo/net_names_mapping.yaml @@ -484,6 +484,10 @@ esterel32: eno2np1: eth1 enp137s0d1: eth2 ibp137s0: ib0 +esterel33: + enp1s0f0np0: eth0 + eno2: eth1 + ibp65s0: ib0 esterel41: enp1s0f0np0: eth0 ens15f1: eth1