diff --git a/api/chalicelib/core/metrics.py b/api/chalicelib/core/metrics.py index abed83cbb..87b870bbe 100644 --- a/api/chalicelib/core/metrics.py +++ b/api/chalicelib/core/metrics.py @@ -1500,7 +1500,7 @@ def get_crashes(project_id, startTimestamp=TimeUTC.now(delta_days=-1), pg_sub_query_chart.append("m_issues.type = 'crash'") with pg_client.PostgresClient() as cur: pg_query = f"""SELECT generated_timestamp AS timestamp, - COUNT(sessions) AS count + COUNT(sessions) AS value FROM generate_series(%(startTimestamp)s, %(endTimestamp)s, %(step_size)s) AS generated_timestamp LEFT JOIN LATERAL ( SELECT sessions.session_id @@ -1558,7 +1558,7 @@ def get_crashes(project_id, startTimestamp=TimeUTC.now(delta_days=-1), versions.append({v["version"]: v["count"] / (r["total"] / 100)}) r["versions"] = versions - return {"chart": rows, "browsers": browsers} + return {"chart": rows, "browsers": browsers,"unit": schemas.TemplatePredefinedUnits.count} def __get_neutral(rows, add_All_if_empty=True): diff --git a/ee/api/chalicelib/core/metrics.py b/ee/api/chalicelib/core/metrics.py index 9bbfe13ef..640394b3c 100644 --- a/ee/api/chalicelib/core/metrics.py +++ b/ee/api/chalicelib/core/metrics.py @@ -1460,7 +1460,7 @@ def get_crashes(project_id, startTimestamp=TimeUTC.now(delta_days=-1), with ch_client.ClickHouseClient() as ch: ch_query = f"""SELECT toUnixTimestamp(toStartOfInterval(sessions.datetime, INTERVAL %(step_size)s second)) * 1000 AS timestamp, - COUNT(sessions.session_id) AS count + COUNT(sessions.session_id) AS value FROM sessions {"INNER JOIN sessions_metadata USING(session_id)" if len(meta_condition) > 0 else ""} WHERE {" AND ".join(ch_sub_query_chart)} GROUP BY timestamp @@ -1514,8 +1514,9 @@ def get_crashes(project_id, startTimestamp=TimeUTC.now(delta_days=-1), result = {"chart": __complete_missing_steps(rows=rows, start_time=startTimestamp, end_time=endTimestamp, density=density, - neutral={"count": 0}), - "browsers": browsers} + neutral={"value": 0}), + "browsers": browsers, + "unit": schemas.TemplatePredefinedUnits.count} return result