Skip to content

Commit 6fc7cdf

Browse files
fix: list alert summary by user in home api (#1431)
1 parent bc2f780 commit 6fc7cdf

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

src/alerts/mod.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,10 +1335,10 @@ impl AlertManagerTrait for Alerts {
13351335
}
13361336

13371337
// TODO: add RBAC
1338-
pub async fn get_alerts_summary() -> Result<AlertsSummary, AlertError> {
1338+
pub async fn get_alerts_summary(key: &SessionKey) -> Result<AlertsSummary, AlertError> {
13391339
let guard = ALERTS.read().await;
13401340
let alerts = if let Some(alerts) = guard.as_ref() {
1341-
alerts.get_all_alerts().await
1341+
alerts.list_alerts_for_user(key.clone(), vec![]).await?
13421342
} else {
13431343
return Err(AlertError::CustomError("No AlertManager registered".into()));
13441344
};
@@ -1354,30 +1354,30 @@ pub async fn get_alerts_summary() -> Result<AlertsSummary, AlertError> {
13541354

13551355
// find total alerts for each state
13561356
// get title, id and state of each alert for that state
1357-
for (_, alert) in alerts.iter() {
1358-
match alert.get_state() {
1357+
for alert in alerts.iter() {
1358+
match alert.state {
13591359
AlertState::Triggered => {
13601360
triggered += 1;
13611361
triggered_alerts.push(AlertsInfo {
1362-
title: alert.get_title().to_string(),
1363-
id: *alert.get_id(),
1364-
severity: alert.get_severity().clone(),
1362+
title: alert.title.clone(),
1363+
id: alert.id,
1364+
severity: alert.severity.clone(),
13651365
});
13661366
}
13671367
AlertState::Disabled => {
13681368
disabled += 1;
13691369
disabled_alerts.push(AlertsInfo {
1370-
title: alert.get_title().to_string(),
1371-
id: *alert.get_id(),
1372-
severity: alert.get_severity().clone(),
1370+
title: alert.title.clone(),
1371+
id: alert.id,
1372+
severity: alert.severity.clone(),
13731373
});
13741374
}
13751375
AlertState::NotTriggered => {
13761376
not_triggered += 1;
13771377
not_triggered_alerts.push(AlertsInfo {
1378-
title: alert.get_title().to_string(),
1379-
id: *alert.get_id(),
1380-
severity: alert.get_severity().clone(),
1378+
title: alert.title.clone(),
1379+
id: alert.id,
1380+
severity: alert.severity.clone(),
13811381
});
13821382
}
13831383
}

src/prism/home/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ pub async fn generate_home_response(
103103
) -> Result<HomeResponse, PrismHomeError> {
104104
// Execute these operations concurrently
105105
let (stream_titles_result, alerts_summary_result) =
106-
tokio::join!(get_stream_titles(key), get_alerts_summary());
106+
tokio::join!(get_stream_titles(key), get_alerts_summary(key));
107107

108108
let stream_titles = stream_titles_result?;
109109
let alerts_summary = alerts_summary_result?;

src/users/dashboards.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,8 @@ impl Dashboards {
296296
user_id: &str,
297297
dashboard_id: Ulid,
298298
) -> Result<(), DashboardError> {
299-
let obj = self.ensure_dashboard_ownership(dashboard_id, user_id)
299+
let obj = self
300+
.ensure_dashboard_ownership(dashboard_id, user_id)
300301
.await?;
301302

302303
{

0 commit comments

Comments
 (0)