From ccb1e0a23a6a003bf87ce8ff29f8e188ab61c7db Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Fri, 3 Feb 2023 12:04:57 +0100 Subject: [PATCH 1/3] feat(alerts): user series-name for notifications message --- api/chalicelib/core/alerts_listener.py | 9 ++++++--- api/chalicelib/core/alerts_processor.py | 2 +- ee/api/chalicelib/core/alerts_listener.py | 9 ++++++--- ee/api/chalicelib/core/alerts_processor.py | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/api/chalicelib/core/alerts_listener.py b/api/chalicelib/core/alerts_listener.py index 0fa193964..1a0a75a28 100644 --- a/api/chalicelib/core/alerts_listener.py +++ b/api/chalicelib/core/alerts_listener.py @@ -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 diff --git a/api/chalicelib/core/alerts_processor.py b/api/chalicelib/core/alerts_processor.py index 76ae5c615..8049b2f39 100644 --- a/api/chalicelib/core/alerts_processor.py +++ b/api/chalicelib/core/alerts_processor.py @@ -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, diff --git a/ee/api/chalicelib/core/alerts_listener.py b/ee/api/chalicelib/core/alerts_listener.py index 6a97daf93..ebd9afa56 100644 --- a/ee/api/chalicelib/core/alerts_listener.py +++ b/ee/api/chalicelib/core/alerts_listener.py @@ -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 diff --git a/ee/api/chalicelib/core/alerts_processor.py b/ee/api/chalicelib/core/alerts_processor.py index 326d17ffc..69a0f7f5f 100644 --- a/ee/api/chalicelib/core/alerts_processor.py +++ b/ee/api/chalicelib/core/alerts_processor.py @@ -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, From f6262c763bedafd6d8ea8a3e2b7ec403e7874030 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Fri, 3 Feb 2023 11:42:56 +0100 Subject: [PATCH 2/3] change(ui) - removed an extra semicolon --- frontend/app/components/Login/Login.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app/components/Login/Login.js b/frontend/app/components/Login/Login.js index 067f6aaac..6cc17d8b0 100644 --- a/frontend/app/components/Login/Login.js +++ b/frontend/app/components/Login/Login.js @@ -73,7 +73,7 @@ class Login extends React.Component {
- ; +
From 0a65b8752384f920c9aceb5259d5b064346ba50c Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Fri, 3 Feb 2023 11:43:32 +0100 Subject: [PATCH 3/3] change(ui) - removed log --- frontend/app/components/Login/Login.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app/components/Login/Login.js b/frontend/app/components/Login/Login.js index 6cc17d8b0..ae43b0308 100644 --- a/frontend/app/components/Login/Login.js +++ b/frontend/app/components/Login/Login.js @@ -65,7 +65,7 @@ class Login extends React.Component { render() { const { errors, loading, authDetails } = this.props; const { CAPTCHA_ENABLED } = this.state; - console.log(authDetails) + return (