diff --git a/src/alerts/mod.rs b/src/alerts/mod.rs index 5e2445e4c..7faefdcb9 100644 --- a/src/alerts/mod.rs +++ b/src/alerts/mod.rs @@ -1335,10 +1335,10 @@ impl AlertManagerTrait for Alerts { } // TODO: add RBAC -pub async fn get_alerts_summary() -> Result { +pub async fn get_alerts_summary(key: &SessionKey) -> Result { let guard = ALERTS.read().await; let alerts = if let Some(alerts) = guard.as_ref() { - alerts.get_all_alerts().await + alerts.list_alerts_for_user(key.clone(), vec![]).await? } else { return Err(AlertError::CustomError("No AlertManager registered".into())); }; @@ -1354,30 +1354,30 @@ pub async fn get_alerts_summary() -> Result { // find total alerts for each state // get title, id and state of each alert for that state - for (_, alert) in alerts.iter() { - match alert.get_state() { + for alert in alerts.iter() { + match alert.state { AlertState::Triggered => { triggered += 1; triggered_alerts.push(AlertsInfo { - title: alert.get_title().to_string(), - id: *alert.get_id(), - severity: alert.get_severity().clone(), + title: alert.title.clone(), + id: alert.id, + severity: alert.severity.clone(), }); } AlertState::Disabled => { disabled += 1; disabled_alerts.push(AlertsInfo { - title: alert.get_title().to_string(), - id: *alert.get_id(), - severity: alert.get_severity().clone(), + title: alert.title.clone(), + id: alert.id, + severity: alert.severity.clone(), }); } AlertState::NotTriggered => { not_triggered += 1; not_triggered_alerts.push(AlertsInfo { - title: alert.get_title().to_string(), - id: *alert.get_id(), - severity: alert.get_severity().clone(), + title: alert.title.clone(), + id: alert.id, + severity: alert.severity.clone(), }); } } diff --git a/src/prism/home/mod.rs b/src/prism/home/mod.rs index 636e07f86..af31933b8 100644 --- a/src/prism/home/mod.rs +++ b/src/prism/home/mod.rs @@ -103,7 +103,7 @@ pub async fn generate_home_response( ) -> Result { // Execute these operations concurrently let (stream_titles_result, alerts_summary_result) = - tokio::join!(get_stream_titles(key), get_alerts_summary()); + tokio::join!(get_stream_titles(key), get_alerts_summary(key)); let stream_titles = stream_titles_result?; let alerts_summary = alerts_summary_result?; diff --git a/src/users/dashboards.rs b/src/users/dashboards.rs index 80238a3f7..fbf83fda6 100644 --- a/src/users/dashboards.rs +++ b/src/users/dashboards.rs @@ -296,7 +296,8 @@ impl Dashboards { user_id: &str, dashboard_id: Ulid, ) -> Result<(), DashboardError> { - let obj = self.ensure_dashboard_ownership(dashboard_id, user_id) + let obj = self + .ensure_dashboard_ownership(dashboard_id, user_id) .await?; {