[Management] Refined log display to display more relevant info.

Currently extracts the status for the 3 probe operations.

Author: davidv1992

nts-pool-management/assets/components.css

@@ -301,6 +301,20 @@ table {
     }
 }
 
+table.birowed {
+    tbody {
+        tr:nth-child(4n + 1),
+        tr:nth-child(4n + 4) {
+            background-color: var(--white);
+        }
+
+        tr:nth-child(4n + 2),
+        tr:nth-child(4n + 3) {
+            background-color: transparent;
+        }
+    }
+}
+
 table.autowidth {
     width: auto;
 
@@ -319,34 +333,6 @@ table.autowidth {
     background-color: var(--white);
 }
 
-.grid-table {
-    display: grid;
-    grid-template-columns: 1fr 3fr 1fr 1fr;
-    justify-content: space-around;
-
-    .sample {
-        grid-column-start: 1;
-        grid-column-end: 5;
-
-        white-space: pre;
-        white-space: nowrap;
-        overflow-x: auto;
-        margin-bottom: var(--space-sm);
-        padding: var(--space-sm);
-        font-family: monospace;
-    }
-
-    .grid-table-header {
-        font-weight: var(--bold);
-
-        margin-bottom: var(--space-sm);
-    }
-
-    div:not(.grid-table-header) {
-        background-color: var(--white);
-    }
-}
-
 .nowrap {
     white-space: nowrap;
 }

nts-pool-management/src/routes/management.rs

@@ -6,8 +6,10 @@ use axum::{
     extract::{Path, Query, State},
     response::{IntoResponse, Redirect},
 };
+use chrono::{DateTime, Utc};
 use nts_pool_shared::IpVersion;
 use serde::Deserialize;
+use serde_json::Value;
 
 use crate::{
     AppState,
@@ -17,9 +19,7 @@ use crate::{
     error::AppError,
     models::{
         monitor::MonitorId,
-        time_source::{
-            self, LogRow, NewTimeSourceForm, TimeSource, TimeSourceId, UpdateTimeSourceForm,
-        },
+        time_source::{self, NewTimeSourceForm, TimeSource, TimeSourceId, UpdateTimeSourceForm},
     },
     templates::{HtmlTemplate, filters},
 };
@@ -49,12 +49,21 @@ struct ScoreTableData {
     ipv6: f64,
 }
 
+struct DisplayLogRow {
+    time: DateTime<Utc>,
+    ke_status: String,
+    ntp_from_ke_status: String,
+    ntp_from_ntp_status: String,
+    score: f64,
+    raw_sample: Value,
+}
+
 #[derive(Template)]
 #[template(path = "management/time_source_details.html.j2")]
 struct TimeSourceInfoTemplate {
     app: AppContext,
     ts: TimeSource,
-    log: Vec<LogRow>,
+    log: Vec<DisplayLogRow>,
     scores: Vec<ScoreTableData>,
     monitors: Vec<String>,
     cur_monitor: Option<MonitorId>,
@@ -67,6 +76,29 @@ pub struct LogSelection {
     protocol: Option<IpVersion>,
 }
 
+fn extract_keyexchange_status(ke: &Value) -> Option<String> {
+    ke.get("description")
+        .and_then(|ke_status| ke_status.as_str())
+        .and_then(|ke_status| {
+            if !ke_status.is_empty() {
+                Some(ke_status.to_owned())
+            } else {
+                None
+            }
+        })
+        .or_else(|| {
+            ke.get("status")
+                .and_then(|ke_status| ke_status.as_str())
+                .map(|ke_status| ke_status.to_owned())
+        })
+}
+
+fn extract_ntp_status(ntp: &Value) -> Option<String> {
+    ntp.get("status")
+        .and_then(|ntp_status| ntp_status.as_str())
+        .map(|ntp_status| ntp_status.to_owned())
+}
+
 pub async fn time_source_info(
     Path(time_source_id): Path<TimeSourceId>,
     app: AppContext,
@@ -85,7 +117,7 @@ pub async fn time_source_info(
         }
     }
     let monitors: Vec<String> = scoremap.iter().map(|v| v.0.clone()).collect();
-    let log = if let Some(cur_monitor) = cur_monitor {
+    let logs = if let Some(cur_monitor) = cur_monitor {
         time_source::logs(&state.db, time_source_id, cur_monitor, cur_protocol, 0, 200).await?
     } else {
         vec![]
@@ -102,7 +134,35 @@ pub async fn time_source_info(
                 ipv6: v.1.1,
             })
             .collect(),
-        log,
+        log: logs
+            .into_iter()
+            .map(|v| DisplayLogRow {
+                time: v
+                    .sample
+                    .get("keyexchange")
+                    .and_then(|ke| ke.get("exchange_start"))
+                    .and_then(|start| start.as_i64())
+                    .and_then(|start| DateTime::from_timestamp(start, 0))
+                    .unwrap_or(v.received_at),
+                ke_status: v
+                    .sample
+                    .get("keyexchange")
+                    .and_then(extract_keyexchange_status)
+                    .unwrap_or_default(),
+                ntp_from_ke_status: v
+                    .sample
+                    .get("ntp_with_ke_cookie")
+                    .and_then(extract_ntp_status)
+                    .unwrap_or_default(),
+                ntp_from_ntp_status: v
+                    .sample
+                    .get("ntp_with_ntp_cookie")
+                    .and_then(extract_ntp_status)
+                    .unwrap_or_default(),
+                score: v.score,
+                raw_sample: v.sample,
+            })
+            .collect(),
         monitors,
         cur_monitor,
         cur_protocol,

nts-pool-management/templates/management/time_source_details.html.j2

@@ -40,19 +40,27 @@
       </select>
       <button type="submit">apply</button>
       </form>
-      <div class="grid-table">
-        <div class="grid-table-header">Received at</div>
-        <div class="grid-table-header">Monitor</div>
-        <div class="grid-table-header">Protocol</div>
-        <div class="grid-table-header">New score</div>
+      <table class="birowed">
+        <tr>
+          <th>Time</th>
+          <th>Key exchange</th>
+          <th>Ntp (cookie from KE)</th>
+          <th>Ntp (cookie from NTP)</th>
+          <th>New score</th>
+        </tr>
         {% for row in log %}
-          <div title="{{ row.received_at }}">{{ row.received_at.format("%Y-%m-%d %H:%M") }}</div>
-          <div>{{ row.monitor }}</div>
-          <div>{{ row.protocol }}</div>
-          <div title="{{ row.score }}">{{ row.score | fmt("{:.1}") }}</div>
-          <div class="sample">{{ row.sample }}</div>
+        <tr>
+          <td rowspan=2>{{ row.time.format("%Y-%m-%d %H:%M") }}</td>
+          <td>{{ row.ke_status }}</td>
+          <td>{{ row.ntp_from_ke_status }}</td>
+          <td>{{ row.ntp_from_ntp_status }}</td>
+          <td>{{ row.score | fmt("{:.1}") }}</td>
+        </tr>
+        <tr>
+          <td colspan=4><details name="samples"><summary>raw sample</summary><code-block>{{ row.raw_sample | fmt("{:#}") }}</code-block></details></td>
+        </tr>
         {% endfor %}
-      </div>
+      </table>
   {% else %}
     No monitoring logs available.
   {% endif %}