feat(api): alerts/triggers endpoint

api/chalicelib/core/alerts.py

@@ -1,11 +1,12 @@
 import json
+import logging
 import time
 
 import schemas
 from chalicelib.core import notifications, slack, webhook
 from chalicelib.utils import pg_client, helper, email_helper
 from chalicelib.utils.TimeUTC import TimeUTC
-import logging
+
 
 def get(id):
     with pg_client.PostgresClient() as cur:
@@ -157,3 +158,13 @@ def delete(project_id, alert_id):
                         {"alert_id": alert_id, "project_id": project_id})
         )
     return {"data": {"state": "success"}}
+
+
+def get_predefined_values():
+    values = [e.value for e in schemas.AlertColumn]
+    values = [{"name": v, "value": v,
+               "unit": "count" if v.endswith(".count") else "ms",
+               "predefined": True,
+               "metricId": None,
+               "seriesId": None} for v in values]
+    return values

api/chalicelib/core/custom_metrics.py

@@ -205,17 +205,18 @@ def get_series_for_alert(project_id, user_id):
     with pg_client.PostgresClient() as cur:
         cur.execute(
             cur.mogrify(
-                """SELECT metric_id, 
-                        series_id, 
-                        metrics.name AS metric_name, 
-                        metric_series.name AS series_name, 
-                        index AS series_index
+                """SELECT series_id AS value,
+                       metrics.name || '.' || (COALESCE(metric_series.name, 'series ' || index)) || '.count' AS name,
+                       'count' AS unit,
+                       FALSE AS predefined,
+                       metric_id,
+                       series_id
                     FROM metric_series
                              INNER JOIN metrics USING (metric_id)
                     WHERE metrics.deleted_at ISNULL
                       AND metrics.project_id = %(project_id)s
                       AND (user_id = %(user_id)s OR is_public)
-                    ORDER BY metric_name, series_index, series_name;""",
+                    ORDER BY name;""",
                 {"project_id": project_id, "user_id": user_id}
             )
         )

api/routers/core.py

@@ -621,6 +621,12 @@ def get_all_alerts(projectId: int, context: schemas.CurrentContext = Depends(OR_
     return {"data": alerts.get_all(projectId)}
 
 
+@app.get('/{projectId}/alerts/triggers', tags=["alerts", "customMetrics"])
+def get_alerts_triggers(projectId: int, context: schemas.CurrentContext = Depends(OR_context)):
+    return {"data": alerts.get_predefined_values() \
+                    + custom_metrics.get_series_for_alert(project_id=projectId, user_id=context.user_id)}
+
+
 @app.get('/{projectId}/alerts/{alertId}', tags=["alerts"])
 def get_alert(projectId: int, alertId: int, context: schemas.CurrentContext = Depends(OR_context)):
     return {"data": alerts.get(alertId)}
@@ -1072,11 +1078,6 @@ def get_custom_metric_chart(projectId: int, data: schemas.CustomMetricChartPaylo
                                               data=data)}
 
 
-@app.get('/{projectId}/custom_metrics/series', tags=["customMetrics"])
-def get_series_for_alert(projectId: int, context: schemas.CurrentContext = Depends(OR_context)):
-    return {"data": custom_metrics.get_series_for_alert(project_id=projectId, user_id=context.user_id)}
-
-
 @app.post('/{projectId}/custom_metrics', tags=["customMetrics"])
 @app.put('/{projectId}/custom_metrics', tags=["customMetrics"])
 def add_custom_metric(projectId: int, data: schemas.CreateCustomMetricsSchema = Body(...),