From c3607e81360b274fef49932b1c9f187b43d00f7a Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Mon, 28 Nov 2022 12:53:52 +0100 Subject: [PATCH] feat(chalice): changed custom_metrics --- api/chalicelib/core/custom_metrics.py | 2 +- ee/api/chalicelib/core/custom_metrics.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/chalicelib/core/custom_metrics.py b/api/chalicelib/core/custom_metrics.py index 46b66b907..691b8e1ba 100644 --- a/api/chalicelib/core/custom_metrics.py +++ b/api/chalicelib/core/custom_metrics.py @@ -445,7 +445,7 @@ def get_with_template(metric_id, project_id, user_id, include_dashboard=True): ) AS connected_dashboards ON (TRUE)""" cur.execute( cur.mogrify( - f"""SELECT * + f"""SELECT *, default_config AS config FROM metrics LEFT JOIN LATERAL (SELECT COALESCE(jsonb_agg(metric_series.* ORDER BY index),'[]'::jsonb) AS series FROM metric_series diff --git a/ee/api/chalicelib/core/custom_metrics.py b/ee/api/chalicelib/core/custom_metrics.py index e871a5646..3fef819b3 100644 --- a/ee/api/chalicelib/core/custom_metrics.py +++ b/ee/api/chalicelib/core/custom_metrics.py @@ -407,7 +407,7 @@ def get(metric_id, project_id, user_id, flatten=True): with pg_client.PostgresClient() as cur: cur.execute( cur.mogrify( - """SELECT * + """SELECT *, default_config AS config FROM metrics LEFT JOIN LATERAL (SELECT COALESCE(jsonb_agg(metric_series.* ORDER BY index),'[]'::jsonb) AS series FROM metric_series @@ -458,7 +458,7 @@ def get_with_template(metric_id, project_id, user_id, include_dashboard=True): ) AS connected_dashboards ON (TRUE)""" cur.execute( cur.mogrify( - f"""SELECT * + f"""SELECT *, default_config AS config FROM metrics LEFT JOIN LATERAL (SELECT COALESCE(jsonb_agg(metric_series.* ORDER BY index),'[]'::jsonb) AS series FROM metric_series