From 8f420ce2fe217dd7f462bd3f028dd7262f224241 Mon Sep 17 00:00:00 2001
From: caubet_m <marc.caubet@psi.ch>
Date: Wed, 2 Sep 2026 16:39:20 +0200
Subject: [PATCH] Update monitoring

---
 docs/css/custom-nav.css                 | 37 +++++++++++++++++++++++++
 docs/merlin7/08-monitoring/dashboard.md | 37 +++++++++++++++++++------
 2 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/docs/css/custom-nav.css b/docs/css/custom-nav.css
index 0162261..cf0df37 100644
--- a/docs/css/custom-nav.css
+++ b/docs/css/custom-nav.css
@@ -23,3 +23,40 @@
     padding: 6px 10px;
     margin-top: 10px;
 }
+
+/* Grafana iframes */
+.grafana-page {
+  width: 100%;
+}
+
+.grafana-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 0;
+  width: 100%;
+}
+
+.grafana-grid iframe {
+  display: block;
+  width: 100%;
+  height: 400px;
+  border: 0;
+  margin: 0;
+  padding: 0;
+}
+
+.grafana-grid .grafana-full {
+  grid-column: 1 / -1;
+  height: 600px;
+}
+
+/* Stack them vertically on narrower screens */
+@media (max-width: 900px) {
+  .grafana-grid {
+    grid-template-columns: 1fr;
+  }
+
+  .grafana-grid .grafana-full {
+    grid-column: auto;
+  }
+}
diff --git a/docs/merlin7/08-monitoring/dashboard.md b/docs/merlin7/08-monitoring/dashboard.md
index f4e2634..beb34b9 100644
--- a/docs/merlin7/08-monitoring/dashboard.md
+++ b/docs/merlin7/08-monitoring/dashboard.md
@@ -1,17 +1,38 @@
-# Monitoring
-
-<iframe src="https://grafana.psi.ch/d-solo/de7rpsq1merlin7slurm1/merlin7-slurm-native-openmetrics?orgId=4&from=1788329588352&to=1788351188352&timezone=browser&var-slurm_cluster=merlin7&theme=dark&panelId=panel-126" width="450" height="200" frameborder="0" loading="lazy"></iframe>
+# Grafana
 
 ## General Monitoring
 
 The following pages contain basic monitoring for Slurm and computing nodes.
-Currently, monitoring is based on Grafana + InfluxDB. In the future it will
-be moved to a different service based on ElasticSearch + LogStash + Kibana.
 
-In the meantime, the following monitoring pages are available in a best effort
-support:
+Monitoring is based on Grafana and is a service maintained by the Linux Team
+for the AWI department.
 
-### Merlin6 Monitoring Pages
+Special thanks to all people involved in building up the monitoring system,
+which allow us to monitor the cluster and share information with our users.
+
+### Merlin7 Monitoring Pages
 
 * Slurm monitoring:
     * [Merlin7 Slurm Live Status](https://grafana.psi.ch/d/03bf2d39-1c0b-44f9-9c10-72ef164f29b6/slurm-dashboard-for-users?orgId=4&from=now-24h&to=now&timezone=browser&refresh=15s)
+
+### Live monitoring (WIP)
+
+This section is **Work In Progress** and may show nothing at the moment.
+Please be patient.
+
+<div class="grafana-page">
+  <div class="grafana-grid">
+    <iframe
+      src="https://grafana.psi.ch/d-solo/de7rpsq1merlin7slurm1/merlin7-slurm-native-openmetrics?orgId=4&from=1788337081995&to=1788358681995&timezone=browser&var-slurm_cluster=merlin7&panelId=panel-5">
+    </iframe>
+
+    <iframe
+      src="https://grafana.psi.ch/d-solo/de7rpsq1merlin7slurm1/merlin7-slurm-native-openmetrics?orgId=4&from=1788337081995&to=1788358681995&timezone=browser&var-slurm_cluster=merlin7&panelId=panel-6">
+    </iframe>
+
+    <iframe
+      class="grafana-full"
+      src="https://grafana.psi.ch/d-solo/de7rpsq1merlin7slurm1/merlin7-slurm-native-openmetrics?orgId=4&from=1788329588352&to=1788351188352&timezone=browser&var-slurm_cluster=merlin7&theme=dark&panelId=panel-126">
+    </iframe>
+  </div>
+</div>