diff --git a/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json new file mode 100644 index 0000000000000000000000000000000000000000..147ee11b5449ab9c00c6d369d1d91a21912ae645 --- /dev/null +++ b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json @@ -0,0 +1,66 @@ +{ + "boot_type": "bios", + "created_at": "Tue, 25 Mar 2025 00:00:00 GMT", + "exotic": false, + "kavlan": false, + "manufactured_at": "2016-06-06", + "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 T630", + "nodes_count": 1, + "nodes_description": "2 CPUs Intel Xeon E5-2630 v4, 10 cores/CPU, 4 GPUs GeForce GTX TITAN X, 48GB RAM, 1862GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand", + "priority": 201706, + "queues": [ + "admin", + "testing" + ], + "redfish": true, + "type": "cluster", + "uid": "esterel3", + "warranty_end": "2021-06-06" +} \ No newline at end of file diff --git a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json new file mode 100644 index 0000000000000000000000000000000000000000..5936ae1353803172434a3caac2d1c326bb176cc9 --- /dev/null +++ b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json @@ -0,0 +1,268 @@ +{ + "architecture": { + "cpu_core_numbering": "round-robin", + "nb_cores": 20, + "nb_procs": 2, + "nb_threads": 40, + "platform_type": "x86_64" + }, + "bios": { + "release_date": "10/18/2023", + "vendor": "Dell Inc.", + "version": "2.18.2" + }, + "bmc_version": "2.85.85.85", + "chassis": { + "manufactured_at": "2016-06-06", + "manufacturer": "Dell Inc.", + "name": "PowerEdge T630", + "serial": "DPSDDD2", + "warranty_end": "2021-06-06" + }, + "exotic": false, + "gpu_devices": { + "nvidia0": { + "compute_capability": "5.2", + "cores": 3072, + "cpu_affinity": 0, + "device": "/dev/nvidia0", + "memory": 12884901888, + "microarchitecture": "Maxwell", + "model": "GeForce GTX TITAN X", + "performance": { + "fp-16": 0, + "fp-32": 66050000000000, + "fp-64": 206500000000 + }, + "power_default_limit": "250.00 W", + "vbios_version": "84.00.45.00.03", + "vendor": "Nvidia" + }, + "nvidia1": { + "compute_capability": "5.2", + "cores": 3072, + "cpu_affinity": 0, + "device": "/dev/nvidia1", + "memory": 12884901888, + "microarchitecture": "Maxwell", + "model": "GeForce GTX TITAN X", + "performance": { + "fp-16": 0, + "fp-32": 66050000000000, + "fp-64": 206500000000 + }, + "power_default_limit": "250.00 W", + "vbios_version": "84.00.45.00.03", + "vendor": "Nvidia" + }, + "nvidia2": { + "compute_capability": "5.2", + "cores": 3072, + "cpu_affinity": 1, + "device": "/dev/nvidia2", + "memory": 12884901888, + "microarchitecture": "Maxwell", + "model": "GeForce GTX TITAN X", + "performance": { + "fp-16": 0, + "fp-32": 66050000000000, + "fp-64": 206500000000 + }, + "power_default_limit": "250.00 W", + "vbios_version": "84.00.45.00.03", + "vendor": "Nvidia" + }, + "nvidia3": { + "compute_capability": "5.2", + "cores": 3072, + "cpu_affinity": 1, + "device": "/dev/nvidia3", + "memory": 12884901888, + "microarchitecture": "Maxwell", + "model": "GeForce GTX TITAN X", + "performance": { + "fp-16": 0, + "fp-32": 66050000000000, + "fp-64": 206500000000 + }, + "power_default_limit": "250.00 W", + "vbios_version": "84.00.45.00.03", + "vendor": "Nvidia" + } + }, + "main_memory": { + "ram_size": 51539607552 + }, + "management_tools": { + "bmc_vendor_tool": "racadm", + "ipmitool": { + "retries": 5 + } + }, + "memory_devices": [ + { + "device": "dimm_a1", + "size": 8589934592, + "technology": "dram" + }, + { + "device": "dimm_a2", + "size": 8589934592, + "technology": "dram" + }, + { + "device": "dimm_a3", + "size": 8589934592, + "technology": "dram" + }, + { + "device": "dimm_b1", + "size": 8589934592, + "technology": "dram" + }, + { + "device": "dimm_b2", + "size": 8589934592, + "technology": "dram" + }, + { + "device": "dimm_b3", + "size": 8589934592, + "technology": "dram" + } + ], + "network_adapters": [ + { + "device": "eth0", + "driver": "igb", + "enabled": true, + "firmware_version": "1.67, 0x80000fae, 19.5.12", + "interface": "Ethernet", + "ip": "172.16.131.3", + "ip6": "2001:660:4406:800:4::3", + "kavlan": false, + "mac": "14:18:77:72:09:4c", + "management": false, + "model": "I350 Gigabit Network Connection", + "mountable": true, + "mounted": true, + "name": "enp1s0f0np0", + "network_address": "esterel3-1.sophia.grid5000.fr", + "rate": 1000000000, + "sriov": false, + "sriov_totalvfs": 0, + "switch": "sw-6", + "switch_port": "1/1/2", + "vendor": "Intel" + }, + { + "device": "eth1", + "driver": "igb", + "enabled": false, + "firmware_version": "1.67, 0x80000fae, 19.5.12", + "interface": "Ethernet", + "kavlan": false, + "mac": "14:18:77:72:09:4d", + "management": false, + "model": "I350 Gigabit Network Connection", + "mountable": false, + "mounted": false, + "name": "eno2", + "sriov": false, + "sriov_totalvfs": 0, + "vendor": "Intel" + }, + { + "device": "ib0", + "driver": "mlx4_core", + "enabled": true, + "firmware_version": "2.35.5100", + "guid": "0xe41d2d030050bc51", + "interface": "InfiniBand", + "ip": "172.18.131.3", + "kavlan": false, + "mac": "e4:1d:2d:03:00:50:bc:51", + "management": false, + "model": "MT27500 Family [ConnectX-3]", + "mountable": true, + "mounted": true, + "name": "ib0", + "netmask": "255.255.240.0", + "network_address": "esterel3-1-ib0.sophia.grid5000.fr", + "rate": 40000000000, + "vendor": "Mellanox Technologies" + }, + { + "device": "bmc", + "enabled": true, + "interface": "Ethernet", + "ip": "172.17.131.3", + "kavlan": false, + "mac": "14:18:77:72:09:4e", + "management": true, + "mountable": false, + "mounted": false, + "network_address": "esterel3-1-bmc.sophia.grid5000.fr" + } + ], + "nodeset": "esterel3", + "operating_system": { + "cstate_driver": "intel_idle", + "cstate_governor": "menu", + "ht_enabled": true, + "pstate_driver": "intel_cpufreq", + "pstate_governor": "performance", + "turboboost_enabled": true + }, + "performance": { + "core_flops": 35200000000, + "node_flops": 704000000000 + }, + "processor": { + "cache_l1": null, + "cache_l1d": 32768, + "cache_l1i": 32768, + "cache_l2": 262144, + "cache_l3": 26214400, + "clock_speed": 2200000000, + "ht_capable": true, + "instruction_set": "x86-64", + "microarchitecture": "Broadwell", + "microcode": "0xb000040", + "model": "Intel Xeon", + "other_description": "Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz", + "vendor": "Intel", + "version": "E5-2630 v4" + }, + "redfish": true, + "software": { + "forced-deployment-timestamp": 202007300948, + "postinstall-version": "1.2025032008", + "standard-environment": "debian11-x64-std" + }, + "storage_devices": [ + { + "by_id": "/dev/disk/by-id/wwn-0x61866da05411b8001ef5b7930c395ada", + "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0", + "firmware_version": 4.3, + "id": "disk0", + "interface": "SAS", + "model": "PERC H730 Adp", + "size": 1999307276288, + "storage": "HDD", + "vendor": "Dell" + } + ], + "supported_job_types": { + "besteffort": true, + "deploy": true, + "max_walltime": 0, + "queues": [ + "admin", + "testing" + ], + "virtual": "ivt" + }, + "type": "node", + "uid": "esterel3-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 7a20eec66cec0e82d8ac074df2f769cf58f98055..9d88f2891c76502a624ca38764949150bdb179fa 100644 --- a/data/grid5000/sites/sophia/network_equipments/sw-6.json +++ b/data/grid5000/sites/sophia/network_equipments/sw-6.json @@ -17,6 +17,10 @@ "uid": "esterel2-1" }, { + "kind": "node", + "port": "eth0", + "snmp_name": "1/1/2", + "uid": "esterel3-1" }, { "kind": "node", diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-6.json b/data/grid5000/sites/sophia/network_equipments/swadmin-6.json index 40fc0278b2eaab3151b47895bbb017ae9cc8efba..7447263a27a0d26fdc5e3fd5402afbb6ed44b0df 100644 --- a/data/grid5000/sites/sophia/network_equipments/swadmin-6.json +++ b/data/grid5000/sites/sophia/network_equipments/swadmin-6.json @@ -53,6 +53,9 @@ "uid": "esterel2-1-bmc" }, { + "kind": "other", + "snmp_name": "1/1/10", + "uid": "esterel3-1-bmc" }, { "kind": "other", diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml index f110944974920733a6b13274ddb4336583a2eac4..8365f2e7455b190a1b8f97fa1827416b7a8e91e7 100644 --- a/input/grid5000/dell-product-data.yaml +++ b/input/grid5000/dell-product-data.yaml @@ -2244,6 +2244,12 @@ sites: chassis: manufactured_at: 2020-10-30 warranty_end: 2027-10-31 + esterel3: + nodes: + esterel3-1: + chassis: + manufactured_at: 2016-06-06 + warranty_end: 2021-06-06 esterel4: nodes: esterel4-1: diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml index bf76b1af44ded3e7abfc549561498bb0aeeb4153..1e8210b4134a0c89acc9c0e532533857b0ba7fb0 100644 --- a/input/grid5000/ipv4.yaml +++ b/input/grid5000/ipv4.yaml @@ -159,6 +159,7 @@ ipv4: sophia esterel2 eth0 0 0 3 1 sophia esterel2 ib0 0 0 3 1 sophia esterel3 eth0 0 0 3 2 + sophia esterel3 ib0 0 0 3 2 sophia esterel4 eth0 0 0 3 3 sophia esterel4 ib0 0 0 3 3 sophia esterel5 eth0 0 0 3 4 diff --git a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml new file mode 100644 index 0000000000000000000000000000000000000000..90a02fbb166029bd68cc9f7d826d21cb2955b07d --- /dev/null +++ b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml @@ -0,0 +1,41 @@ +--- +model: Dell PowerEdge T630 +created_at: 2025-03-25 +kavlan: false +boot_type: bios +exotic: false +queues: + - admin + - testing +nodes: + esterel3-1: + supported_job_types: + deploy: true + besteffort: true + max_walltime: 0 + processor: + microarchitecture: Broadwell + clock_speed: 2_200_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:03:00.0-scsi-0:2:0:0: + id: disk0 + interface: SAS + software: + standard-environment: debian11-x64-std + management_tools: + bmc_vendor_tool: racadm + nodeset: esterel3 diff --git a/input/grid5000/sites/sophia/clusters/esterel3/esterel3_ib.yaml b/input/grid5000/sites/sophia/clusters/esterel3/esterel3_ib.yaml new file mode 100644 index 0000000000000000000000000000000000000000..33f292f988c31e44947e80658d7d8194e9aadffe --- /dev/null +++ b/input/grid5000/sites/sophia/clusters/esterel3/esterel3_ib.yaml @@ -0,0 +1,9 @@ +--- +nodes: + esterel3-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/esterel3/esterel3_metrics.yaml b/input/grid5000/sites/sophia/clusters/esterel3/esterel3_metrics.yaml new file mode 100644 index 0000000000000000000000000000000000000000..729e9beb582834908e55a7537bd5ace8abbd1f3d --- /dev/null +++ b/input/grid5000/sites/sophia/clusters/esterel3/esterel3_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/esterel3/nodes/esterel3-1.yaml b/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml new file mode 100644 index 0000000000000000000000000000000000000000..9ead050b211493a92c02503c09c5f7eed4eff64c --- /dev/null +++ b/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml @@ -0,0 +1,142 @@ +# Generated by g5k-checks (g5k-checks -m api) +--- +esterel3-1: + architecture: + cpu_core_numbering: round-robin + nb_cores: 20 + nb_procs: 2 + nb_threads: 40 + platform_type: x86_64 + bios: + release_date: 10/18/2023 + vendor: Dell Inc. + version: 2.18.2 + bmc_version: 2.85.85.85 + chassis: + manufacturer: Dell Inc. + name: PowerEdge T630 + serial: DPSDDD2 + gpu_devices: + nvidia0: + cpu_affinity: 0 + device: "/dev/nvidia0" + memory: 12884901888 + model: GeForce GTX TITAN X + power_default_limit: 250.00 W + vbios_version: 84.00.45.00.03 + vendor: Nvidia + nvidia1: + cpu_affinity: 0 + device: "/dev/nvidia1" + memory: 12884901888 + model: GeForce GTX TITAN X + power_default_limit: 250.00 W + vbios_version: 84.00.45.00.03 + vendor: Nvidia + nvidia2: + cpu_affinity: 1 + device: "/dev/nvidia2" + memory: 12884901888 + model: GeForce GTX TITAN X + power_default_limit: 250.00 W + vbios_version: 84.00.45.00.03 + vendor: Nvidia + nvidia3: + cpu_affinity: 1 + device: "/dev/nvidia3" + memory: 12884901888 + model: GeForce GTX TITAN X + power_default_limit: 250.00 W + vbios_version: 84.00.45.00.03 + vendor: Nvidia + main_memory: + ram_size: 51539607552 + memory_devices: + dimm_a1: + size: 8589934592 + technology: dram + dimm_a2: + size: 8589934592 + technology: dram + dimm_a3: + size: 8589934592 + technology: dram + dimm_b1: + size: 8589934592 + technology: dram + dimm_b2: + size: 8589934592 + technology: dram + dimm_b3: + size: 8589934592 + technology: dram + network_adapters: + bmc: + ip: 172.17.131.3 + mac: 14:18:77:72:09:4e + management: true + eth0: + driver: igb + firmware_version: 1.67, 0x80000fae, 19.5.12 + interface: Ethernet + ip: 172.16.131.3 + mac: 14:18:77:72:09:4c + management: false + model: I350 Gigabit Network Connection + name: enp1s0f0np0 + rate: 1000000000 + sriov: false + sriov_totalvfs: 0 + vendor: Intel + eth1: + driver: igb + firmware_version: 1.67, 0x80000fae, 19.5.12 + interface: Ethernet + mac: 14:18:77:72:09:4d + management: false + model: I350 Gigabit Network Connection + name: eno2 + sriov: false + sriov_totalvfs: 0 + vendor: Intel + ib0: + driver: mlx4_core + firmware_version: 2.35.5100 + guid: '0xe41d2d030050bc51' + interface: InfiniBand + ip: 172.18.131.3 + mac: e4:1d:2d:03:00:50:bc:51 + management: false + model: MT27500 Family [ConnectX-3] + name: ib0 + rate: 40000000000 + vendor: Mellanox Technologies + operating_system: + cstate_driver: intel_idle + cstate_governor: menu + ht_enabled: true + pstate_driver: intel_cpufreq + pstate_governor: performance + turboboost_enabled: true + processor: + cache_l1d: 32768 + cache_l1i: 32768 + cache_l2: 262144 + cache_l3: 26214400 + ht_capable: true + instruction_set: x86-64 + microcode: '0xb000040' + model: Intel Xeon + other_description: Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz + vendor: Intel + version: E5-2630 v4 + storage_devices: + pci-0000:03:00.0-scsi-0:2:0:0: + by_id: "/dev/disk/by-id/wwn-0x61866da05411b8001ef5b7930c395ada" + by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0" + firmware_version: 4.3 + model: PERC H730 Adp + size: 1999307276288 + storage: HDD + supported_job_types: + virtual: ivt diff --git a/input/grid5000/sites/sophia/networks/sw-6.yaml b/input/grid5000/sites/sophia/networks/sw-6.yaml index d31f048f0f5d0f1a684b1bc85da9fe3f1760f3f0..8fa11090a97a8c99cdce009cf63caed88a919061 100644 --- a/input/grid5000/sites/sophia/networks/sw-6.yaml +++ b/input/grid5000/sites/sophia/networks/sw-6.yaml @@ -16,6 +16,8 @@ sw-6: ports: 1: uid: esterel2-1 + 2: + uid: esterel3-1 3: uid: esterel4-1 13: diff --git a/input/grid5000/sites/sophia/networks/swadmin-6.yaml b/input/grid5000/sites/sophia/networks/swadmin-6.yaml index 1404c71e74674f1bcf14abd7baffa100492c3eb9..855dc203b31dd301fddbdbf8f88590ab89ed9447 100644 --- a/input/grid5000/sites/sophia/networks/swadmin-6.yaml +++ b/input/grid5000/sites/sophia/networks/swadmin-6.yaml @@ -38,6 +38,9 @@ swadmin-6: 9: uid: esterel2-1-bmc kind: other + 10: + uid: esterel3-1-bmc + kind: other 11: uid: esterel4-1-bmc kind: other diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml index c96999dac0533b7f99795ec129a19fd97c4bd967..145cebec70dd1cab8889161bb0ee9de68bdeff7c 100644 --- a/lib/refrepo/net_names_mapping.yaml +++ b/lib/refrepo/net_names_mapping.yaml @@ -398,6 +398,10 @@ esterel1: eno3: eth2 eno4: eth3 ibp131s0: ib0 +esterel3: + enp1s0f0np0: eth0 + eno2: eth1 + ibp130s0: ib0 esterel4: enp1s0f0np0: eth0 eno2: eth1