cm/cm-dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 261 Wiki Activity

Fix nginx sub-services flickering with persistent caching
All checks were successful
Build and Release / build-and-release (push) Successful in 1m19s
Details

Browse Source 
- Remove nginx_ prefix from site names in hierarchical structure
- Fix get_nginx_site_metrics to call correct internal method
- Implement same caching functionality as old working version
- Sites now stay visible continuously with 30s latency updates
- Preserve cached results between refresh cycles
This commit is contained in:
Christoffer Martinsson 2025-11-24 23:01:51 +01:00
parent 75ec190b93
commit 7f26991609
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
[[package]] [[package]]
name = "cm-dashboard" name = "cm-dashboard"
version = "0.1.145" version = "0.1.146"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
@ -301,7 +301,7 @@ dependencies = [
[[package]] [[package]]
name = "cm-dashboard-agent" name = "cm-dashboard-agent"
version = "0.1.145" version = "0.1.146"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -324,7 +324,7 @@ dependencies = [
[[package]] [[package]]
name = "cm-dashboard-shared" name = "cm-dashboard-shared"
version = "0.1.145" version = "0.1.146"
dependencies = [ dependencies = [
"chrono", "chrono",
"serde", "serde",

2
agent/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "cm-dashboard-agent" name = "cm-dashboard-agent"
version = "0.1.146" version = "0.1.147"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

8
agent/src/collectors/systemd.rs
View File

@ -101,7 +101,7 @@ impl SystemdCollector {
let mut sub_services = Vec::new(); let mut sub_services = Vec::new();
// Collect sub-services for specific services // Sub-service metrics for specific services (always include cached results)
if service_name.contains("nginx") && active_status == "active" { if service_name.contains("nginx") && active_status == "active" {
let nginx_sites = self.get_nginx_site_metrics(); let nginx_sites = self.get_nginx_site_metrics();
for (site_name, latency_ms) in nginx_sites { for (site_name, latency_ms) in nginx_sites {
@ -216,7 +216,7 @@ impl SystemdCollector {
Ok(state.monitored_services.clone()) Ok(state.monitored_services.clone())
} }
/// Get nginx site metrics, checking them if cache is expired /// Get nginx site metrics, checking them if cache is expired (like old working version)
fn get_nginx_site_metrics(&self) -> Vec<(String, f32)> { fn get_nginx_site_metrics(&self) -> Vec<(String, f32)> {
let mut state = self.state.write().unwrap(); let mut state = self.state.write().unwrap();
@ -574,11 +574,11 @@ impl SystemdCollector {
for (site_name, url) in &discovered_sites { for (site_name, url) in &discovered_sites {
match self.check_site_latency(url) { match self.check_site_latency(url) {
Ok(latency_ms) => { Ok(latency_ms) => {
sites.push((format!("nginx_{}", site_name), latency_ms)); sites.push((site_name.clone(), latency_ms));
} }
Err(_) => { Err(_) => {
// Site is unreachable - use -1.0 to indicate error // Site is unreachable - use -1.0 to indicate error
sites.push((format!("nginx_{}", site_name), -1.0)); sites.push((site_name.clone(), -1.0));
} }
} }
} }

2
dashboard/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "cm-dashboard" name = "cm-dashboard"
version = "0.1.146" version = "0.1.147"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

2
shared/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "cm-dashboard-shared" name = "cm-dashboard-shared"
version = "0.1.146" version = "0.1.147"
edition = "2021" edition = "2021"
[dependencies] [dependencies]