Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/alerts/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1335,10 +1335,10 @@ impl AlertManagerTrait for Alerts {
}

// TODO: add RBAC
pub async fn get_alerts_summary() -> Result<AlertsSummary, AlertError> {
pub async fn get_alerts_summary(key: &SessionKey) -> Result<AlertsSummary, AlertError> {
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()));
};
Expand All @@ -1354,30 +1354,30 @@ pub async fn get_alerts_summary() -> Result<AlertsSummary, AlertError> {

// 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(),
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/prism/home/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ pub async fn generate_home_response(
) -> Result<HomeResponse, PrismHomeError> {
// 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?;
Expand Down
3 changes: 2 additions & 1 deletion src/users/dashboards.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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?;

{
Expand Down
Loading