Skip to content

Commit

Permalink
Merge pull request #1118 from chaos-genius/fix/alert-report-inactive-…
Browse files Browse the repository at this point in the history
…alerts

fix(alert-report): ignore trig alerts of deleted/inactive alerts
  • Loading branch information
manassolanki committed Sep 8, 2022
2 parents f4832fd + 3f4659a commit 5a79298
Showing 1 changed file with 23 additions and 12 deletions.
35 changes: 23 additions & 12 deletions chaos_genius/alerts/base_alert_digests.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,29 @@ def check_and_send_digests(self):
)

for triggered_alert in triggered_alerts:
triggered_alert = preprocess_triggered_alert(
triggered_alert, self.alert_config_cache, self.kpi_cache
)

if getattr(
self.alert_config_cache[triggered_alert.alert_conf_id],
ALERT_ATTRIBUTES_MAPPER[self.frequency],
):
if triggered_alert.alert_channel == "slack":
slack_alerts.append(triggered_alert)
if triggered_alert.alert_channel == "email":
email_alerts.append(triggered_alert)
alert = self.alert_config_cache[triggered_alert.alert_conf_id]
if alert.active and alert.alert_status:
triggered_alert = preprocess_triggered_alert(
triggered_alert, self.alert_config_cache, self.kpi_cache
)

if getattr(
self.alert_config_cache[triggered_alert.alert_conf_id],
ALERT_ATTRIBUTES_MAPPER[self.frequency],
):
if triggered_alert.alert_channel == "slack":
slack_alerts.append(triggered_alert)
if triggered_alert.alert_channel == "email":
email_alerts.append(triggered_alert)
else:
logger.info(
(
"Alert %d is inactive/deleted. "
"Not including triggered alert %d in report."
),
triggered_alert.alert_conf_id,
triggered_alert.id,
)

if len(email_alerts) > 0:
report_data = AlertsReportData.from_triggered_alerts(
Expand Down

0 comments on commit 5a79298

Please sign in to comment.