diff --git a/data/grid5000/sites/rennes/clusters/abacus1/abacus1.json b/data/grid5000/sites/rennes/clusters/abacus1/abacus1.json
index 01b851414530b20a688f36c581fbf7b7c93d43c3..d743000c93bac0ec34edd7b67ea07c5f4d6ee024 100644
--- a/data/grid5000/sites/rennes/clusters/abacus1/abacus1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus1/abacus1.json
@@ -4,7 +4,51 @@
"exotic": false,
"kavlan": false,
"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 R730",
"queues": [
diff --git a/data/grid5000/sites/rennes/clusters/abacus16/abacus16.json b/data/grid5000/sites/rennes/clusters/abacus16/abacus16.json
index 549212ddf426957915e79dd3d53a49906c6887a3..5c603ec0c935caef8601713544157459e23beca5 100644
--- a/data/grid5000/sites/rennes/clusters/abacus16/abacus16.json
+++ b/data/grid5000/sites/rennes/clusters/abacus16/abacus16.json
@@ -410,7 +410,7 @@
"model": "Dell PowerEdge C4140",
"queues": [
"admin",
- "testing"
+ "production"
],
"type": "cluster",
"uid": "abacus16"
diff --git a/data/grid5000/sites/rennes/clusters/abacus16/nodes/abacus16-1.json b/data/grid5000/sites/rennes/clusters/abacus16/nodes/abacus16-1.json
index 53e34d35781e654ef4a0a554e5393857aacd0f8e..ba5b83ae40b928ef12b80025d34c22b197e26292 100644
--- a/data/grid5000/sites/rennes/clusters/abacus16/nodes/abacus16-1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus16/nodes/abacus16-1.json
@@ -262,10 +262,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/rennes/clusters/abacus9/abacus9.json b/data/grid5000/sites/rennes/clusters/abacus9/abacus9.json
index 9794e8a44241b3eb4959265ea0d1f63d8a3c6ac1..0482402a0a1b7f537edb3edecf6383886ecb0d84 100644
--- a/data/grid5000/sites/rennes/clusters/abacus9/abacus9.json
+++ b/data/grid5000/sites/rennes/clusters/abacus9/abacus9.json
@@ -53,7 +53,7 @@
"model": "Dell PowerEdge C4140",
"queues": [
"admin",
- "testing"
+ "production"
],
"type": "cluster",
"uid": "abacus9"
diff --git a/data/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.json b/data/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.json
index dea5108636931c2d098c0bf767d5bc8245b75e68..c338008e454ae729de5d837ea2e6e62bc5053b4e 100644
--- a/data/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.json
+++ b/data/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.json
@@ -7,9 +7,9 @@
"platform_type": "x86_64"
},
"bios": {
- "release_date": "09/17/2020",
+ "release_date": "06/04/2023",
"vendor": "Dell Inc.",
- "version": "2.9.3"
+ "version": "2.19.1"
},
"bmc_version": "6.10.80.00",
"chassis": {
@@ -262,10 +262,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/input/grid5000/sites/rennes/clusters/abacus1/abacus1_metrics.yaml b/input/grid5000/sites/rennes/clusters/abacus1/abacus1_metrics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1b7527d9fcc26e8892353ae61510b49c2fe579ba
--- /dev/null
+++ b/input/grid5000/sites/rennes/clusters/abacus1/abacus1_metrics.yaml
@@ -0,0 +1,41 @@
+---
+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/rennes/clusters/abacus16/abacus16.yaml b/input/grid5000/sites/rennes/clusters/abacus16/abacus16.yaml
index 4d41f6d796b742d6f39b4e4d3642ed5fc895d7f8..dd27efe6849019ca067d03006c0cc3fc21741394 100644
--- a/input/grid5000/sites/rennes/clusters/abacus16/abacus16.yaml
+++ b/input/grid5000/sites/rennes/clusters/abacus16/abacus16.yaml
@@ -5,13 +5,13 @@ boot_type: bios
exotic: false
queues:
- admin
- - testing
+ - production
nodes:
abacus16-1:
supported_job_types:
deploy: true
besteffort: true
- max_walltime: 0
+ max_walltime: 604800
processor:
microarchitecture: Cascade Lake-SP
clock_speed: 2200000000
diff --git a/input/grid5000/sites/rennes/clusters/abacus9/abacus9.yaml b/input/grid5000/sites/rennes/clusters/abacus9/abacus9.yaml
index 873dc9924a626b25246210139d1d21fbc9219c8c..6df4a7012549db00daddd7972c22081621ceae5e 100644
--- a/input/grid5000/sites/rennes/clusters/abacus9/abacus9.yaml
+++ b/input/grid5000/sites/rennes/clusters/abacus9/abacus9.yaml
@@ -5,13 +5,13 @@ boot_type: bios
exotic: false
queues:
- admin
- - testing
+ - production
nodes:
abacus9-1:
supported_job_types:
deploy: true
besteffort: true
- max_walltime: 0
+ max_walltime: 604800
processor:
microarchitecture: Skylake
clock_speed: 2200000000
diff --git a/input/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.yaml b/input/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.yaml
index e1aa32092e2b4a0497af1a79506a512166e7b941..7bd1b2f3fd2944479363296487a3d819632da40c 100644
--- a/input/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/abacus9/nodes/abacus9-1.yaml
@@ -8,9 +8,9 @@ abacus9-1:
nb_threads: 40
platform_type: x86_64
bios:
- release_date: '09/17/2020'
+ release_date: 06/04/2023
vendor: Dell Inc.
- version: 2.9.3
+ version: 2.19.1
bmc_version: 6.10.80.00
chassis:
manufacturer: Dell Inc.