From 94cf24f5297ff0e0c7f126ecdae5d339338440cb Mon Sep 17 00:00:00 2001 From: Cristhian Garcia Date: Fri, 5 Apr 2024 11:16:16 -0500 Subject: [PATCH] fix: set correct schema for all datasets (cherry picked from commit d07d8465df60e99533dbc9f85efeb392e3a76701) --- .../openedx-assets/assets/datasets/ab_user.yaml | 4 ++-- .../openedx-assets/assets/datasets/course_blocks.yaml | 2 +- .../openedx-assets/assets/datasets/course_names.yaml | 2 +- .../openedx-assets/assets/datasets/course_overviews.yaml | 2 +- .../openedx-assets/assets/datasets/dashboards.yaml | 2 +- .../openedx-assets/assets/datasets/dim_course_problems.yaml | 2 +- .../openedx-assets/assets/datasets/dim_course_videos.yaml | 2 +- .../openedx-assets/assets/datasets/fact_course_grades.yaml | 2 +- .../openedx-assets/assets/datasets/fact_enrollments.yaml | 2 +- .../assets/datasets/fact_enrollments_by_day.yaml | 2 +- .../assets/datasets/fact_forum_interactions.yaml | 2 +- .../assets/datasets/fact_learner_problem_course_summary.yaml | 2 +- .../assets/datasets/fact_learner_problem_summary.yaml | 2 +- .../assets/datasets/fact_pageview_engagement.yaml | 2 +- .../openedx-assets/assets/datasets/fact_problem_grades.yaml | 2 +- .../assets/datasets/fact_problem_responses.yaml | 2 +- .../openedx-assets/assets/datasets/fact_transcript_usage.yaml | 2 +- .../openedx-assets/assets/datasets/fact_video_engagement.yaml | 2 +- .../openedx-assets/assets/datasets/fact_video_plays.yaml | 2 +- .../assets/datasets/fact_watched_video_segments.yaml | 2 +- .../openedx-assets/assets/datasets/hints_per_success.yaml | 2 +- .../openedx-assets/assets/datasets/indexed_events.yaml | 2 +- .../openedx-assets/assets/datasets/posts_per_user.yaml | 2 +- .../openedx-assets/assets/datasets/query_log.yaml | 2 +- .../openedx-assets/assets/datasets/slices.yaml | 4 ++-- .../assets/datasets/slowest_clickhouse_queries.yaml | 2 +- .../openedx-assets/assets/datasets/superset_action_log.yaml | 2 +- .../openedx-assets/assets/datasets/user_pii.yaml | 4 ++-- .../assets/datasets/xapi_events_all_parsed.yaml | 2 +- .../templates/openedx-assets/queries/indexed_events.sql | 2 +- 30 files changed, 33 insertions(+), 33 deletions(-) diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/ab_user.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/ab_user.yaml index 4bd745612..783ca674f 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/ab_user.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/ab_user.yaml @@ -190,8 +190,8 @@ metrics: normalize_columns: false offset: 0 params: null -schema: superset -sql: select * from superset.ab_user +schema: {{ SUPERSET_DB_NAME }} +sql: select * from ab_user table_name: ab_user template_params: null uuid: 304a5d6d-c589-483a-8e8d-3fadbccef648 diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_blocks.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_blocks.yaml index 1d00523cd..69dfd6934 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_blocks.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_blocks.yaml @@ -127,7 +127,7 @@ metrics: warning_text: null offset: 0 params: null -schema: main +schema: {{ASPECTS_EVENT_SINK_DATABASE}} sql: "select * from {{ASPECTS_EVENT_SINK_DATABASE}}.{{ ASPECTS_EVENT_SINK_NODES_TABLE }}" table_name: "{{ ASPECTS_EVENT_SINK_NODES_TABLE }}" template_params: null diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_names.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_names.yaml index b31d9f161..0f5b62bd1 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_names.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_names.yaml @@ -70,7 +70,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ASPECTS_EVENT_SINK_DATABASE}} sql: select * from {{ ASPECTS_EVENT_SINK_DATABASE }}.course_names table_name: course_names template_params: null diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_overviews.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_overviews.yaml index 88dff1c2b..3bd9afa12 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_overviews.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_overviews.yaml @@ -177,7 +177,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ ASPECTS_EVENT_SINK_DATABASE }} sql: select * from {{ ASPECTS_EVENT_SINK_DATABASE }}.course_overviews table_name: course_overviews template_params: null diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dashboards.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dashboards.yaml index fbb536a3b..e87e4d03a 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dashboards.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dashboards.yaml @@ -226,7 +226,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: superset +schema: {{ SUPERSET_DB_NAME }} sql: 'select * from dashboards' table_name: dashboards template_params: null diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dim_course_problems.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dim_course_problems.yaml index 510f20d04..8b2e28f67 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dim_course_problems.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dim_course_problems.yaml @@ -106,7 +106,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/dim_course_problems.sql' %}{% endfilter %} table_name: dim_course_problems diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dim_course_videos.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dim_course_videos.yaml index 27711de91..4ba84705b 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dim_course_videos.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/dim_course_videos.yaml @@ -106,7 +106,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/dim_course_videos.sql' %}{% endfilter %} table_name: dim_course_videos diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_course_grades.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_course_grades.yaml index faf55e872..f07091bf3 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_course_grades.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_course_grades.yaml @@ -151,7 +151,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_course_grades.sql' %}{% endfilter %} table_name: fact_course_grades diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_enrollments.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_enrollments.yaml index e5ae955c3..f69a2f902 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_enrollments.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_enrollments.yaml @@ -118,7 +118,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_enrollments.sql' %}{% endfilter %} table_name: fact_enrollments diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_enrollments_by_day.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_enrollments_by_day.yaml index 49b1fa9e6..c81c96997 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_enrollments_by_day.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_enrollments_by_day.yaml @@ -118,7 +118,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_enrollments_by_day.sql' %}{% endfilter %} table_name: fact_enrollments_by_day diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_forum_interactions.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_forum_interactions.yaml index b11ddfe4c..c74d9c6b4 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_forum_interactions.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_forum_interactions.yaml @@ -130,7 +130,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_forum_interactions.sql' %}{% endfilter %} table_name: fact_forum_interactions diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_learner_problem_course_summary.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_learner_problem_course_summary.yaml index 2e0bb351d..df158dc19 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_learner_problem_course_summary.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_learner_problem_course_summary.yaml @@ -154,7 +154,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_learner_problem_course_summary.sql' %}{% endfilter %} table_name: fact_learner_problem_course_summary diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_learner_problem_summary.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_learner_problem_summary.yaml index 3351a9b24..08163658e 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_learner_problem_summary.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_learner_problem_summary.yaml @@ -163,7 +163,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_learner_problem_summary.sql' %}{% endfilter %} table_name: fact_learner_problem_summary diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_pageview_engagement.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_pageview_engagement.yaml index 601ef56b8..e361cfd82 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_pageview_engagement.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_pageview_engagement.yaml @@ -106,7 +106,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_pageview_engagement.sql' %}{% endfilter %} table_name: fact_pageview_engagement diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_grades.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_grades.yaml index 35694bfb2..e77a59b14 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_grades.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_grades.yaml @@ -163,7 +163,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_problem_grades.sql' %}{% endfilter %} table_name: fact_problem_grades diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_responses.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_responses.yaml index e3c551b6f..d62901ef3 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_responses.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_problem_responses.yaml @@ -175,7 +175,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_problem_responses.sql' %}{% endfilter %} table_name: fact_problem_responses diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_transcript_usage.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_transcript_usage.yaml index cd3cfd492..71e8ddba0 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_transcript_usage.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_transcript_usage.yaml @@ -138,7 +138,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_transcript_usage.sql' %}{% endfilter %} table_name: fact_transcript_usage diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_engagement.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_engagement.yaml index f57c0980c..1e0af1f04 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_engagement.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_engagement.yaml @@ -106,7 +106,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_video_engagement.sql' %}{% endfilter %} table_name: fact_video_engagement diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_plays.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_plays.yaml index f9691cbd1..f6975c097 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_plays.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_video_plays.yaml @@ -199,7 +199,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_video_plays.sql' %}{% endfilter %} table_name: fact_video_plays diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_watched_video_segments.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_watched_video_segments.yaml index 829d0c18b..6f0796a34 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_watched_video_segments.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/fact_watched_video_segments.yaml @@ -149,7 +149,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/fact_watched_video_segments.sql' %}{% endfilter %} table_name: fact_watched_video_segments diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/hints_per_success.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/hints_per_success.yaml index e377255f2..271afd617 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/hints_per_success.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/hints_per_success.yaml @@ -127,7 +127,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/hints_per_success.sql' %}{% endfilter %} table_name: hints_per_success diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/indexed_events.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/indexed_events.yaml index dad6fbbf2..5dbf2a996 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/indexed_events.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/indexed_events.yaml @@ -129,7 +129,7 @@ metrics: normalize_columns: false offset: 0 params: null -schema: main +schema: {{ ASPECTS_XAPI_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/indexed_events.sql' %}{% endfilter %} table_name: indexed_events diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/posts_per_user.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/posts_per_user.yaml index 706d2a50f..9b6987615 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/posts_per_user.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/posts_per_user.yaml @@ -103,7 +103,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ DBT_PROFILE_TARGET_DATABASE }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/posts_per_user.sql' %}{% endfilter %} table_name: posts_per_user diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/query_log.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/query_log.yaml index 6ed95e148..caeb932f7 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/query_log.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/query_log.yaml @@ -106,7 +106,7 @@ metrics: normalize_columns: false offset: 0 params: null -schema: main +schema: system sql: | SELECT query_duration_ms, diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/slices.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/slices.yaml index 53a57da57..312811a05 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/slices.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/slices.yaml @@ -273,8 +273,8 @@ metrics: normalize_columns: true offset: 0 params: null -schema: superset -sql: select * from superset.slices +schema: {{ SUPERSET_DB_NAME }} +sql: select * from slices table_name: slices template_params: null uuid: aaf1ae12-73c1-4b88-b07d-7a8988333018 diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/slowest_clickhouse_queries.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/slowest_clickhouse_queries.yaml index c39ba8b7d..ec4fb0e12 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/slowest_clickhouse_queries.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/slowest_clickhouse_queries.yaml @@ -81,7 +81,7 @@ metrics: normalize_columns: false offset: 0 params: null -schema: main +schema: system sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/slowest_clickhouse_queries.sql' %}{% endfilter %} table_name: slowest_clickhouse_queries diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/superset_action_log.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/superset_action_log.yaml index 988a65138..77c0642ef 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/superset_action_log.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/superset_action_log.yaml @@ -190,7 +190,7 @@ metrics: normalize_columns: false offset: 0 params: null -schema: superset +schema: {{ SUPERSET_DB_NAME }} sql: |- {% filter indent(width=2) %}{% include 'openedx-assets/queries/superset_action_log.sql' %}{% endfilter %} table_name: superset_action_log diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/user_pii.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/user_pii.yaml index 651d520b2..b0e01efc2 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/user_pii.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/user_pii.yaml @@ -5,8 +5,8 @@ description: null default_endpoint: null offset: 0 cache_timeout: null -schema: main -sql: 'select * from event_sink.user_pii' +schema: {{ ASPECTS_EVENT_SINK_DATABASE }} +sql: 'select * from {{ ASPECTS_EVENT_SINK_DATABASE }}.user_pii' params: null template_params: null filter_select_enabled: true diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/xapi_events_all_parsed.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/xapi_events_all_parsed.yaml index 48cb503eb..8fb2ac3b0 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/xapi_events_all_parsed.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/xapi_events_all_parsed.yaml @@ -183,7 +183,7 @@ metrics: normalize_columns: true offset: 0 params: null -schema: main +schema: {{ ASPECTS_XAPI_DATABASE }} sql: SELECT * FROM {{ASPECTS_XAPI_DATABASE}}.xapi_events_all_parsed table_name: xapi_events_all_parsed template_params: null diff --git a/tutoraspects/templates/openedx-assets/queries/indexed_events.sql b/tutoraspects/templates/openedx-assets/queries/indexed_events.sql index ef5c2d476..0556335d1 100644 --- a/tutoraspects/templates/openedx-assets/queries/indexed_events.sql +++ b/tutoraspects/templates/openedx-assets/queries/indexed_events.sql @@ -22,6 +22,6 @@ SELECT emission_time FROM events JOIN - event_sink.course_names courses + {{ ASPECTS_EVENT_SINK_DATABASE }}.course_names courses ON (events.course_key = courses.course_key)