From 570bcfbe72af98ad9532c6a62d36901c8f5e0c9d Mon Sep 17 00:00:00 2001 From: Herbert Wolverson Date: Mon, 15 May 2023 15:27:23 +0000 Subject: [PATCH] Remove needless console.log call --- .../long_term_stats/lts_node/src/web/wss/mod.rs | 16 +++++++++++++++- .../lts_node/src/web/wss/queries/mod.rs | 1 + .../src/web/wss/queries/throughput/mod.rs | 4 ++-- src/rust/long_term_stats/site_build/src/ap/ap.ts | 2 ++ .../site_build/src/ap/template.html | 10 ++++++++++ src/rust/long_term_stats/site_build/src/bus.ts | 10 ++++++++++ .../long_term_stats/site_build/src/site/site.ts | 3 +++ .../site_build/src/site/template.html | 10 ++++++++++ 8 files changed, 53 insertions(+), 3 deletions(-) diff --git a/src/rust/long_term_stats/lts_node/src/web/wss/mod.rs b/src/rust/long_term_stats/lts_node/src/web/wss/mod.rs index a86bed7d..e4050b0c 100644 --- a/src/rust/long_term_stats/lts_node/src/web/wss/mod.rs +++ b/src/rust/long_term_stats/lts_node/src/web/wss/mod.rs @@ -3,7 +3,7 @@ use crate::web::wss::queries::{ send_packets_for_node, send_perf_for_node, send_rtt_for_all_nodes, send_rtt_for_all_nodes_site, send_rtt_for_node, send_site_info, send_site_parents, send_throughput_for_all_nodes, send_throughput_for_all_nodes_by_site, send_throughput_for_node, site_heat_map, - site_tree::send_site_tree, send_throughput_for_all_nodes_by_circuit, send_rtt_for_all_nodes_circuit, + site_tree::send_site_tree, send_throughput_for_all_nodes_by_circuit, send_rtt_for_all_nodes_circuit, send_site_stack_map, }; use axum::{ extract::{ @@ -129,6 +129,20 @@ async fn handle_socket(mut socket: WebSocket, cnn: Pool) { log::info!("Throughput requested but no credentials provided"); } } + "throughputStackSite" => { + if let Some(credentials) = &credentials { + let _ = send_site_stack_map( + cnn.clone(), + &mut socket, + &credentials.license_key, + period, + json.get("site_id").unwrap().as_str().unwrap().to_string(), + ) + .await; + } else { + log::info!("Throughput requested but no credentials provided"); + } + } "throughputChartSingle" => { if let Some(credentials) = &credentials { let _ = send_throughput_for_node( diff --git a/src/rust/long_term_stats/lts_node/src/web/wss/queries/mod.rs b/src/rust/long_term_stats/lts_node/src/web/wss/queries/mod.rs index 1a4658cc..9d99297f 100644 --- a/src/rust/long_term_stats/lts_node/src/web/wss/queries/mod.rs +++ b/src/rust/long_term_stats/lts_node/src/web/wss/queries/mod.rs @@ -23,4 +23,5 @@ pub use site_parents::send_site_parents; pub use throughput::{ send_throughput_for_all_nodes, send_throughput_for_all_nodes_by_circuit, send_throughput_for_all_nodes_by_site, send_throughput_for_node, + send_site_stack_map, }; diff --git a/src/rust/long_term_stats/lts_node/src/web/wss/queries/throughput/mod.rs b/src/rust/long_term_stats/lts_node/src/web/wss/queries/throughput/mod.rs index b266e7f7..6242c928 100644 --- a/src/rust/long_term_stats/lts_node/src/web/wss/queries/throughput/mod.rs +++ b/src/rust/long_term_stats/lts_node/src/web/wss/queries/throughput/mod.rs @@ -1,15 +1,15 @@ use std::collections::HashMap; - +mod site_stack; use axum::extract::ws::{WebSocket, Message}; use futures::future::join_all; use influxdb2::{Client, models::Query}; use pgdb::sqlx::{Pool, Postgres}; use crate::submissions::get_org_details; use self::{throughput_host::{ThroughputHost, Throughput, ThroughputChart}, throughput_row::{ThroughputRow, ThroughputRowBySite, ThroughputRowByCircuit}}; - use super::time_period::InfluxTimePeriod; mod throughput_host; mod throughput_row; +pub use site_stack::send_site_stack_map; pub async fn send_throughput_for_all_nodes(cnn: Pool, socket: &mut WebSocket, key: &str, period: InfluxTimePeriod) -> anyhow::Result<()> { let nodes = get_throughput_for_all_nodes(cnn, key, period).await?; diff --git a/src/rust/long_term_stats/site_build/src/ap/ap.ts b/src/rust/long_term_stats/site_build/src/ap/ap.ts index 4c08f44d..0d887b92 100644 --- a/src/rust/long_term_stats/site_build/src/ap/ap.ts +++ b/src/rust/long_term_stats/site_build/src/ap/ap.ts @@ -8,6 +8,7 @@ import { RttChartSite } from '../components/rtt_site'; import { RttHistoSite } from '../components/rtt_histo_site'; import { SiteBreadcrumbs } from '../components/site_breadcrumbs'; import { SiteHeat } from '../components/site_heat'; +import { SiteStackChart } from '../components/site_stack'; export class AccessPointPage implements Page { menu: MenuPage; @@ -28,6 +29,7 @@ export class AccessPointPage implements Page { new RttHistoSite(), new SiteBreadcrumbs(siteId), new SiteHeat(siteId), + new SiteStackChart(siteId), ]; } diff --git a/src/rust/long_term_stats/site_build/src/ap/template.html b/src/rust/long_term_stats/site_build/src/ap/template.html index 294a1b42..bd3dfe74 100644 --- a/src/rust/long_term_stats/site_build/src/ap/template.html +++ b/src/rust/long_term_stats/site_build/src/ap/template.html @@ -38,6 +38,16 @@ +
+
+
+
+
+
+
+
+
+
diff --git a/src/rust/long_term_stats/site_build/src/bus.ts b/src/rust/long_term_stats/site_build/src/bus.ts index 3b14ecbc..5f4cd9ef 100644 --- a/src/rust/long_term_stats/site_build/src/bus.ts +++ b/src/rust/long_term_stats/site_build/src/bus.ts @@ -113,6 +113,16 @@ export class Bus { this.ws.send(json); } + requestThroughputStackSite(site_id: string) { + let request = { + msg: "throughputStackSite", + period: window.graphPeriod, + site_id: decodeURI(site_id), + }; + let json = JSON.stringify(request); + this.ws.send(json); + } + requestRttChart() { this.ws.send("{ \"msg\": \"rttChart\", \"period\": \"" + window.graphPeriod + "\" }"); } diff --git a/src/rust/long_term_stats/site_build/src/site/site.ts b/src/rust/long_term_stats/site_build/src/site/site.ts index 2c81b8c8..2c471980 100644 --- a/src/rust/long_term_stats/site_build/src/site/site.ts +++ b/src/rust/long_term_stats/site_build/src/site/site.ts @@ -8,6 +8,7 @@ import { RttChartSite } from '../components/rtt_site'; import { RttHistoSite } from '../components/rtt_histo_site'; import { SiteBreadcrumbs } from '../components/site_breadcrumbs'; import { SiteHeat } from '../components/site_heat'; +import { SiteStackChart } from '../components/site_stack'; export class SitePage implements Page { menu: MenuPage; @@ -28,6 +29,7 @@ export class SitePage implements Page { new RttHistoSite(), new SiteBreadcrumbs(siteId), new SiteHeat(siteId), + new SiteStackChart(siteId), ]; } @@ -35,6 +37,7 @@ export class SitePage implements Page { this.components.forEach(component => { component.wireup(); }); + window.bus.requestThroughputStackSite(this.siteId); } ontick(): void { diff --git a/src/rust/long_term_stats/site_build/src/site/template.html b/src/rust/long_term_stats/site_build/src/site/template.html index 294a1b42..bd3dfe74 100644 --- a/src/rust/long_term_stats/site_build/src/site/template.html +++ b/src/rust/long_term_stats/site_build/src/site/template.html @@ -38,6 +38,16 @@
+
+
+
+
+
+
+
+
+
+