[Management] Implement filtering of monitoring logs.

Author: davidv1992

…54885eecc9e86f1c7fbc442fab80db3d4b2.json …8526c402b598ad4ac3043581eb4e0b0ced6.jsonnts-pool-management/.sqlx/query-ed2041e8d00e1549407b85e23ed6754885eecc9e86f1c7fbc442fab80db3d4b2.json renamed to nts-pool-management/.sqlx/query-171a166b3904d3adc72871e46be498526c402b598ad4ac3043581eb4e0b0ced6.json nts-pool-management/.sqlx/query-ed2041e8d00e1549407b85e23ed6754885eecc9e86f1c7fbc442fab80db3d4b2.json renamed to nts-pool-management/.sqlx/query-171a166b3904d3adc72871e46be498526c402b598ad4ac3043581eb4e0b0ced6.json

@@ -273,6 +273,8 @@ impl std::fmt::Display for LogRow {
 pub async fn logs(
     conn: impl DbConnLike<'_>,
     time_source_id: TimeSourceId,
+    monitor_id: MonitorId,
+    protocol: IpVersion,
     offset: i64,
     limit: i64,
 ) -> Result<Vec<LogRow>, sqlx::Error> {
@@ -281,12 +283,14 @@ pub async fn logs(
         r#"
             SELECT score, protocol as "protocol: IpVersion", monitor_id as monitor, raw_sample AS sample, received_at
             FROM monitor_samples
-            WHERE time_source_id = $1
+            WHERE time_source_id = $1 AND protocol = $2 AND monitor_id = $3
             ORDER BY monitor_samples.received_at DESC
-            OFFSET $2
-            LIMIT $3
+            OFFSET $4
+            LIMIT $5
         "#,
         time_source_id as _,
+        protocol as _,
+        monitor_id as _,
         offset,
         limit,
     )

nts-pool-management/src/models/time_source.rs

@@ -3,19 +3,23 @@ use std::collections::HashMap;
 use askama::Template;
 use axum::{
     Form,
-    extract::{Path, State},
+    extract::{Path, Query, State},
     response::{IntoResponse, Redirect},
 };
 use nts_pool_shared::IpVersion;
+use serde::Deserialize;
 
 use crate::{
     AppState,
     auth::{self, AuthorizedUser},
     context::AppContext,
     cookies::CookieService,
     error::AppError,
-    models::time_source::{
-        self, LogRow, NewTimeSourceForm, TimeSource, TimeSourceId, UpdateTimeSourceForm,
+    models::{
+        monitor::MonitorId,
+        time_source::{
+            self, LogRow, NewTimeSourceForm, TimeSource, TimeSourceId, UpdateTimeSourceForm,
+        },
     },
     templates::{HtmlTemplate, filters},
 };
@@ -52,23 +56,40 @@ struct TimeSourceInfoTemplate {
     ts: TimeSource,
     log: Vec<LogRow>,
     scores: Vec<ScoreTableData>,
+    monitors: Vec<String>,
+    cur_monitor: Option<MonitorId>,
+    cur_protocol: IpVersion,
+}
+
+#[derive(Deserialize)]
+pub struct LogSelection {
+    monitor: Option<MonitorId>,
+    protocol: Option<IpVersion>,
 }
 
 pub async fn time_source_info(
     Path(time_source_id): Path<TimeSourceId>,
     app: AppContext,
     State(state): State<AppState>,
+    Query(log_choice): Query<LogSelection>,
 ) -> Result<impl IntoResponse, AppError> {
     let ts = time_source::details(&state.db, time_source_id).await?;
-    let log = time_source::logs(&state.db, time_source_id, 0, 200).await?;
     let scores = time_source::scores(&state.db, time_source_id).await?;
+    let cur_monitor = log_choice.monitor.or_else(|| scores.first().map(|v| v.id));
+    let cur_protocol = log_choice.protocol.unwrap_or(IpVersion::Ipv4);
     let mut scoremap: HashMap<String, (f64, f64)> = HashMap::new();
     for score in scores {
         match score.protocol {
             IpVersion::Ipv4 => scoremap.entry(score.id.to_string()).or_default().0 = score.score,
             IpVersion::Ipv6 => scoremap.entry(score.id.to_string()).or_default().1 = score.score,
         }
     }
+    let monitors: Vec<String> = scoremap.iter().map(|v| v.0.clone()).collect();
+    let log = if let Some(cur_monitor) = cur_monitor {
+        time_source::logs(&state.db, time_source_id, cur_monitor, cur_protocol, 0, 200).await?
+    } else {
+        vec![]
+    };
 
     Ok(HtmlTemplate(TimeSourceInfoTemplate {
         app,
@@ -82,6 +103,9 @@ pub async fn time_source_info(
             })
             .collect(),
         log,
+        monitors,
+        cur_monitor,
+        cur_protocol,
     }))
 }
 

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

@@ -27,7 +27,19 @@
 
 <section>
 <h2>Logs</h2>
-{% if !log.is_empty() %}
+{% if let Some(cur_monitor) = cur_monitor %}
+      <form method="get">
+      Monitor: <select name="monitor">
+      {% for mon in monitors %}
+        <option value="{{mon}}" {% if &cur_monitor.to_string() == mon %} selected {% endif %}>{{ mon }}</option>
+      {% endfor %}
+      </select>
+      <select name="protocol">
+        <option value="Ipv4" {% if cur_protocol == IpVersion::Ipv4 %} selected {% endif %}>IPv4</option>
+        <option value="Ipv6" {% if cur_protocol == IpVersion::Ipv6 %} selected {% endif %}>IPv6</option>
+      </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>