diff --git a/api/chalicelib/core/metrics.py b/api/chalicelib/core/metrics.py index 23eeb3410..5d987e485 100644 --- a/api/chalicelib/core/metrics.py +++ b/api/chalicelib/core/metrics.py @@ -765,8 +765,8 @@ def get_missing_resources_trend(project_id, startTimestamp=TimeUTC.now(delta_day pg_sub_query_chart = __get_constraints(project_id=project_id, time_constraint=True, chart=True, data=args) pg_sub_query.append("resources.success = FALSE") pg_sub_query_chart.append("resources.success = FALSE") - pg_sub_query.append("resources.type != 'fetch'") - pg_sub_query_chart.append("resources.type != 'fetch'") + pg_sub_query.append("resources.type = 'img'") + pg_sub_query_chart.append("resources.type = 'img'") with pg_client.PostgresClient() as cur: pg_query = f"""SELECT diff --git a/ee/api/chalicelib/core/metrics.py b/ee/api/chalicelib/core/metrics.py index 92adacd62..a5e0f3ac1 100644 --- a/ee/api/chalicelib/core/metrics.py +++ b/ee/api/chalicelib/core/metrics.py @@ -783,7 +783,7 @@ def get_missing_resources_trend(project_id, startTimestamp=TimeUTC.now(delta_day step_size = __get_step_size(startTimestamp, endTimestamp, density) ch_sub_query = __get_basic_constraints(table_name="resources", data=args) ch_sub_query.append("resources.success = 0") - ch_sub_query.append("resources.type != 'fetch'") + ch_sub_query.append("resources.type = 'img'") meta_condition = __get_meta_constraint(args) ch_sub_query += meta_condition diff --git a/ee/api/chalicelib/core/metrics_new.py b/ee/api/chalicelib/core/metrics_new.py index e6b12bf56..fb0119056 100644 --- a/ee/api/chalicelib/core/metrics_new.py +++ b/ee/api/chalicelib/core/metrics_new.py @@ -792,19 +792,17 @@ def search(text, resource_type, project_id, performance=False, pages_only=False, def get_missing_resources_trend(project_id, startTimestamp=TimeUTC.now(delta_days=-1), endTimestamp=TimeUTC.now(), density=7, **args): - raise Exception("not supported widget") step_size = __get_step_size(startTimestamp, endTimestamp, density) - ch_sub_query = __get_basic_constraints(table_name="events", data=args) - ch_sub_query.append("events.event_type='RESOURCE'") - ch_sub_query.append("events.success = 0") - ch_sub_query.append("events.type != 'fetch'") + ch_sub_query = __get_basic_constraints(table_name="resources", data=args) + ch_sub_query.append("resources.success = 0") + ch_sub_query.append("resources.type = 'img'") meta_condition = __get_meta_constraint(args) ch_sub_query += meta_condition with ch_client.ClickHouseClient() as ch: - ch_query = f"""SELECT events.url_path AS key, - COUNT(events.session_id) AS doc_count - FROM {sessions_helper.get_main_events_table(startTimestamp)} AS events + ch_query = f"""SELECT resources.url_path AS key, + COUNT(resources.session_id) AS doc_count + FROM {sessions_helper.get_main_resources_table(startTimestamp)} AS resources WHERE {" AND ".join(ch_sub_query)} GROUP BY url_path ORDER BY doc_count DESC @@ -818,10 +816,10 @@ def get_missing_resources_trend(project_id, startTimestamp=TimeUTC.now(delta_day if len(rows) == 0: return [] ch_sub_query.append("events.url_path = %(value)s") - ch_query = f"""SELECT toUnixTimestamp(toStartOfInterval(events.datetime, INTERVAL %(step_size)s second ))*1000 AS timestamp, - COUNT(events.session_id) AS doc_count, - toUnixTimestamp(MAX(events.datetime))*1000 AS max_datatime - FROM {sessions_helper.get_main_events_table(startTimestamp)} AS events + ch_query = f"""SELECT toUnixTimestamp(toStartOfInterval(resources.datetime, INTERVAL %(step_size)s second ))*1000 AS timestamp, + COUNT(resources.session_id) AS doc_count, + toUnixTimestamp(MAX(resources.datetime))*1000 AS max_datatime + FROM {sessions_helper.get_main_resources_table(startTimestamp)} AS resources WHERE {" AND ".join(ch_sub_query)} GROUP BY timestamp ORDER BY timestamp;"""