jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(alerts): user series-name for notifications message

Browse source
This commit is contained in:
Taha Yassine Kraiem 2023-02-03 12:04:57 +01:00
parent bc7ad49c63
commit ccb1e0a23a
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
api/chalicelib/core/alerts_listener.py
View file

@ -5,7 +5,7 @@ def get_all_alerts():
with pg_client.PostgresClient(long_query=True) as cur:
query = """SELECT -1 AS tenant_id,
alert_id,
project_id,
projects.project_id,
detection_method,
query,
options,
@ -13,10 +13,13 @@ def get_all_alerts():
alerts.name,
alerts.series_id,
filter,
change
change,
COALESCE(metrics.name || '.' || (COALESCE(metric_series.name, 'series ' || index)) || '.count',
query ->> 'left') AS series_name
FROM public.alerts
LEFT JOIN metric_series USING (series_id)
INNER JOIN projects USING (project_id)
LEFT JOIN metric_series USING (series_id)
LEFT JOIN metrics USING (metric_id)
WHERE alerts.deleted_at ISNULL
AND alerts.active
AND projects.active

2
api/chalicelib/core/alerts_processor.py
View file

@ -228,7 +228,7 @@ def generate_notification(alert, result):
"alertId": alert["alertId"],
"tenantId": alert["tenantId"],
"title": alert["name"],
"description": f"has been triggered, {alert['query']['left']} = {left} ({alert['query']['operator']} {right}).",
"description": f"has been triggered, {alert['seriesName']} = {left} ({alert['query']['operator']} {right}).",
"buttonText": "Check metrics for more details",
"buttonUrl": f"/{alert['projectId']}/metrics",
"imageUrl": None,

9
ee/api/chalicelib/core/alerts_listener.py
View file

@ -5,7 +5,7 @@ def get_all_alerts():
with pg_client.PostgresClient(long_query=True) as cur:
query = """SELECT tenant_id,
alert_id,
project_id,
projects.project_id,
detection_method,
query,
options,
@ -13,10 +13,13 @@ def get_all_alerts():
alerts.name,
alerts.series_id,
filter,
change
change,
COALESCE(metrics.name || '.' || (COALESCE(metric_series.name, 'series ' || index)) || '.count',
query ->> 'left') AS series_name
FROM public.alerts
LEFT JOIN metric_series USING (series_id)
INNER JOIN projects USING (project_id)
LEFT JOIN metric_series USING (series_id)
LEFT JOIN metrics USING (metric_id)
WHERE alerts.deleted_at ISNULL
AND alerts.active
AND projects.active

2
ee/api/chalicelib/core/alerts_processor.py
View file

@ -233,7 +233,7 @@ def generate_notification(alert, result):
"alertId": alert["alertId"],
"tenantId": alert["tenantId"],
"title": alert["name"],
"description": f"has been triggered, {alert['query']['left']} = {left} ({alert['query']['operator']} {right}).",
"description": f"has been triggered, {alert['seriesName']} = {left} ({alert['query']['operator']} {right}).",
"buttonText": "Check metrics for more details",
"buttonUrl": f"/{alert['projectId']}/metrics",
"imageUrl": None,