Skip to content

feat: update all fields of duplicate and correlated alerts #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sbgap wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: update all fields of duplicate and correlated alerts #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 17 additions & 13 deletions alerta/database/backends/postgres/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@ def dedup_alert(self, alert, history):
update = """
UPDATE alerts
SET status=%(status)s, service=%(service)s, value=%(value)s, text=%(text)s,
timeout=%(timeout)s, raw_data=%(raw_data)s, repeat=%(repeat)s,
timeout=%(timeout)s, raw_data=%(raw_data)s, repeat=%(repeat)s, type=%(event_type)s,
last_receive_id=%(last_receive_id)s, last_receive_time=%(last_receive_time)s,
tags=%(tags)s, attributes=attributes || %(attributes)s,
tags=%(tags)s, attributes=%(attributes)s, "group"=%(group)s, origin=%(origin)s,
duplicate_count=duplicate_count + 1, {update_time}, history=(%(history)s || history)[1:{limit}]
WHERE environment=%(environment)s
AND resource=%(resource)s
Expand All @@ -291,8 +291,9 @@ def correlate_alert(self, alert, history):
text=%(text)s, create_time=%(create_time)s, timeout=%(timeout)s, raw_data=%(raw_data)s,
duplicate_count=%(duplicate_count)s, repeat=%(repeat)s, previous_severity=%(previous_severity)s,
trend_indication=%(trend_indication)s, receive_time=%(receive_time)s, last_receive_id=%(last_receive_id)s,
last_receive_time=%(last_receive_time)s, tags=%(tags)s,
attributes=attributes || %(attributes)s, {update_time}, history=(%(history)s || history)[1:{limit}]
last_receive_time=%(last_receive_time)s, tags=%(tags)s, "group"=%(group)s, origin=%(origin)s,
attributes=%(attributes)s, {update_time}, history=(%(history)s || history)[1:{limit}],
type=%(event_type)s, customer=%(customer)s
WHERE environment=%(environment)s
AND resource=%(resource)s
AND ((event=%(event)s AND severity!=%(severity)s) OR (event!=%(event)s AND %(event)s=ANY(correlate)))
Expand All @@ -319,9 +320,10 @@ def correlate_multiple_alerts(self, alerts):
%(environment{i})s, %(resource{i})s, %(event{i})s, %(severity{i})s,
%(status{i})s,%(service{i})s, %(value{i})s, %(text{i})s,
%(timeout{i})s, %(raw_data{i})s, %(last_receive_id{i})s, (%(last_receive_time{i})s)::timestamp without time zone,
%(tags{i})s, (%(attributes{i})s)::jsonb, (%(update_time{i})s)::timestamp without time zone,
%(tags{i})s::text[], (%(attributes{i})s)::jsonb, (%(update_time{i})s)::timestamp without time zone,
(%(history{i})s), %(customer{i})s, (%(create_time{i})s)::timestamp without time zone, %(previous_severity{i})s,
%(trend_indication{i})s, (%(receive_time{i})s)::timestamp without time zone, %(duplicate_count{i})s
%(trend_indication{i})s, (%(receive_time{i})s)::timestamp without time zone, %(duplicate_count{i})s,
%(origin{i})s, %(group{i})s, %(event_type{i})s
)
"""
)
Expand All @@ -331,17 +333,18 @@ def correlate_multiple_alerts(self, alerts):
SET event=al.event, severity=al.severity, status=al.status, service=al.service, value=al.value, text=al.text,
create_time=al.create_time, timeout=al.timeout, raw_data=al.raw_data, repeat=FALSE, previous_severity=al.previous_severity,
trend_indication=al.trend_indication, receive_time=al.receive_time, last_receive_id=al.last_receive_id, last_receive_time=al.last_receive_time,
tags=ARRAY(SELECT DISTINCT UNNEST(alerts.tags || al.tags)), attributes=alerts.attributes || al.attributes,
tags=al.tags, attributes=al.attributes,
duplicate_count=al.duplicate_count, update_time=COALESCE(al.update_time, alerts.update_time),
history=CASE WHEN al.history IS NULL THEN alerts.history ELSE (al.history || alerts.history)[1:{current_app.config['HISTORY_LIMIT']}] END
history=CASE WHEN al.history IS NULL THEN alerts.history ELSE (al.history || alerts.history)[1:{current_app.config['HISTORY_LIMIT']}] END,
origin=al.origin, "group"=al.group, type=al.type
FROM (VALUES
{",".join(alerts_values)}
) as al(
environment, resource, event, severity,
status, service, value, text,
timeout, raw_data, last_receive_id, last_receive_time,
tags, attributes, update_time, history, customer, create_time, previous_severity,
trend_indication, receive_time, duplicate_count
trend_indication, receive_time, duplicate_count, origin, "group", type
)
WHERE alerts.environment=al.environment
AND alerts.resource=al.resource
Expand All @@ -364,8 +367,8 @@ def dedup_multiple_alerts(self, alerts):
%(environment{i})s, %(resource{i})s, %(event{i})s, %(severity{i})s,
%(status{i})s,%(service{i})s,%(value{i})s, %(text{i})s,
%(timeout{i})s, %(raw_data{i})s, %(last_receive_id{i})s, (%(last_receive_time{i})s)::timestamp without time zone,
%(tags{i})s, (%(attributes{i})s)::jsonb, (%(update_time{i})s)::timestamp without time zone,
(%(history{i})s)::history, %(customer{i})s
%(tags{i})s::text[], (%(attributes{i})s)::jsonb, (%(update_time{i})s)::timestamp without time zone,
(%(history{i})s)::history, %(customer{i})s, %(group{i})s, %(origin{i})s, %(event_type{i})s
)
"""
)
Expand All @@ -375,7 +378,7 @@ def dedup_multiple_alerts(self, alerts):
SET status=al.status, service=al.service, value=al.value, text=al.text,
timeout=al.timeout, raw_data=al.raw_data, repeat=TRUE,
last_receive_id=al.last_receive_id, last_receive_time=al.last_receive_time,
tags=ARRAY(SELECT DISTINCT UNNEST(alerts.tags || al.tags)), attributes=alerts.attributes || al.attributes,
tags=al.tags, attributes=al.attributes, origin=al.origin, "group"=al.group, type=al.type,
duplicate_count=alerts.duplicate_count + 1, update_time=COALESCE(al.update_time, alerts.update_time),
history=CASE WHEN al.history IS NULL THEN alerts.history ELSE (al.history || alerts.history)[1:{current_app.config['HISTORY_LIMIT']}] END
FROM (VALUES
Expand All @@ -384,7 +387,8 @@ def dedup_multiple_alerts(self, alerts):
environment, resource, event, severity,
status, service, value, text,
timeout, raw_data, last_receive_id, last_receive_time,
tags, attributes, update_time, history, customer
tags, attributes, update_time, history, customer,
"group", origin, type
)
WHERE alerts.environment=al.environment
AND alerts.resource=al.resource
Expand Down
9 changes: 4 additions & 5 deletions tests/test_alerts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,12 +767,12 @@ def test_alert_attributes(self):
self.assertEqual(sorted(data['alert']['attributes']), sorted(
{'foo': 'abc def', 'baz': False, 'quux': ['q', 'u', 'u', 'x'], 'ip': '10.0.0.1'}))

# re-send duplicate alert with custom attributes ('quux' should not change)
# re-send duplicate alert with custom attributes ('quux' should change)
response = self.client.post('/alert', data=json.dumps(self.fatal_alert), headers=self.headers)
self.assertEqual(response.status_code, 201)
data = json.loads(response.data.decode('utf-8'))
self.assertEqual(sorted(data['alert']['attributes']), sorted(
{'foo': 'abc def', 'bar': 1234, 'baz': False, 'quux': ['q', 'u', 'u', 'x'], 'ip': '10.0.0.1'}))
{'foo': 'abc def', 'bar': 1234, 'baz': False, 'ip': '10.0.0.1'}))

# update custom attribute again (only 'quux' should change)
response = self.client.put('/alert/' + alert_id + '/attributes',
Expand All @@ -784,14 +784,13 @@ def test_alert_attributes(self):
self.assertEqual(sorted(data['alert']['attributes']), sorted(
{'foo': 'abc def', 'bar': 1234, 'baz': False, 'quux': [1, 'u', 'u', 4], 'ip': '10.0.0.1'}))

# send correlated alert with custom attributes (nothing should change)
# send correlated alert with custom attributes (attributes should be updated)
response = self.client.post('/alert', data=json.dumps(self.critical_alert), headers=self.headers)
self.assertEqual(response.status_code, 201)
response = self.client.get('/alert/' + alert_id)
self.assertEqual(response.status_code, 200)
data = json.loads(response.data.decode('utf-8'))
self.assertEqual(sorted(data['alert']['attributes']), sorted(
{'foo': 'abc def', 'bar': 1234, 'baz': False, 'quux': [1, 'u', 'u', 4], 'ip': '10.0.0.1'}))
self.assertEqual(sorted(data['alert']['attributes']), sorted({'ip': '10.0.0.1'}))

def test_history_limit(self):

Expand Down
4 changes: 2 additions & 2 deletions tests/test_builtins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,13 @@ def test_acked_by_plugin(self):
data = json.loads(response.data.decode('utf-8'))
self.assertEqual(data['alert']['attributes']['acked-by'], 'admin@alerta.io')

# clear alert
# clear alert (acked-by attribute is deleted)
response = self.client.post('/alert', json=self.ok_alert, headers=self.headers)
self.assertEqual(response.status_code, 201)
data = json.loads(response.data.decode('utf-8'))
self.assertEqual(data['alert']['severity'], 'ok')
self.assertEqual(data['alert']['status'], 'closed')
self.assertEqual(data['alert']['attributes']['acked-by'], 'admin@alerta.io')
self.assertNotIn('acked-by', data['alert']['attributes'])

# critical alert (unacked)
response = self.client.post('/alert', json=self.critical_alert, headers=self.headers)
Expand Down