diff --git a/sql/moz-fx-data-shared-prod/search_derived/desktop_search_aggregates_for_searchreport_v1/metadata.yaml b/sql/moz-fx-data-shared-prod/search_derived/desktop_search_aggregates_for_searchreport_v1/metadata.yaml index d17fb84a64..8349f45200 100644 --- a/sql/moz-fx-data-shared-prod/search_derived/desktop_search_aggregates_for_searchreport_v1/metadata.yaml +++ b/sql/moz-fx-data-shared-prod/search_derived/desktop_search_aggregates_for_searchreport_v1/metadata.yaml @@ -13,6 +13,7 @@ labels: dag: bqetl_search_dashboard owner1: cmorales owner2: xluo + shredder_mitigation: true scheduling: dag_name: bqetl_search_dashboard depends_on_past: false diff --git a/sql/moz-fx-data-shared-prod/search_derived/desktop_search_aggregates_for_searchreport_v1/query.sql b/sql/moz-fx-data-shared-prod/search_derived/desktop_search_aggregates_for_searchreport_v1/query.sql index 435c06e8e8..cd6bd9451e 100644 --- a/sql/moz-fx-data-shared-prod/search_derived/desktop_search_aggregates_for_searchreport_v1/query.sql +++ b/sql/moz-fx-data-shared-prod/search_derived/desktop_search_aggregates_for_searchreport_v1/query.sql @@ -46,9 +46,9 @@ FROM WHERE submission_date = @submission_date GROUP BY - 1, - 2, - 3, - 4, - 5, - 6 + submission_date, + geo, + locale, + normalized_engine, + os, + app_version diff --git a/sql/moz-fx-data-shared-prod/search_derived/desktop_search_aggregates_for_searchreport_v1/schema.yaml b/sql/moz-fx-data-shared-prod/search_derived/desktop_search_aggregates_for_searchreport_v1/schema.yaml index 84a466585c..3b005b65b8 100644 --- a/sql/moz-fx-data-shared-prod/search_derived/desktop_search_aggregates_for_searchreport_v1/schema.yaml +++ b/sql/moz-fx-data-shared-prod/search_derived/desktop_search_aggregates_for_searchreport_v1/schema.yaml @@ -2,45 +2,60 @@ fields: - name: submission_date type: DATE mode: NULLABLE + description: Submission Date - name: geo type: STRING mode: NULLABLE + description: Geo - name: locale type: STRING mode: NULLABLE + description: Locale - name: engine type: STRING mode: NULLABLE + description: Engine - name: os type: STRING mode: NULLABLE + description: Operating System - name: app_version type: STRING mode: NULLABLE + description: App Version - name: dcc type: INTEGER mode: NULLABLE + description: DCC - name: sap type: INTEGER mode: NULLABLE + description: SAP - name: tagged_sap type: INTEGER mode: NULLABLE + description: Tagged SAP - name: tagged_follow_on type: INTEGER mode: NULLABLE + description: Tagged Follow On - name: search_with_ads type: INTEGER mode: NULLABLE + description: Searches with Ads - name: ad_click type: INTEGER mode: NULLABLE + description: Ad Clicks - name: organic type: INTEGER mode: NULLABLE + description: Organic Searches - name: ad_click_organic type: INTEGER mode: NULLABLE + description: Organic Ad Clicks - name: search_with_ads_organic type: INTEGER mode: NULLABLE + description: Organic Searches with Ads diff --git a/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_for_searchreport_v1/metadata.yaml b/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_for_searchreport_v1/metadata.yaml index ce0bd6be3e..490abfc5e5 100644 --- a/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_for_searchreport_v1/metadata.yaml +++ b/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_for_searchreport_v1/metadata.yaml @@ -14,6 +14,7 @@ labels: dag: bqetl_search_dashboard owner1: cmorales owner2: xluo + shredder_mitigation: true scheduling: dag_name: bqetl_search_dashboard depends_on_past: false diff --git a/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_for_searchreport_v1/query.sql b/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_for_searchreport_v1/query.sql index 176766aac1..84a305c0e7 100644 --- a/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_for_searchreport_v1/query.sql +++ b/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_for_searchreport_v1/query.sql @@ -44,7 +44,7 @@ WHERE normalized_app_name IN ('Fenix', 'Fennec', 'Firefox Preview', 'Focus') AND submission_date = @submission_date GROUP BY - 1, - 2, - 3, - 4 + submission_date, + country, + product, + normalized_engine diff --git a/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_for_searchreport_v1/schema.yaml b/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_for_searchreport_v1/schema.yaml index 85f2085aa2..c8f318f4d8 100644 --- a/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_for_searchreport_v1/schema.yaml +++ b/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_for_searchreport_v1/schema.yaml @@ -2,36 +2,48 @@ fields: - name: submission_date type: DATE mode: NULLABLE + description: Submission Date - name: country type: STRING mode: NULLABLE + description: Country - name: product type: STRING mode: NULLABLE + description: Product - name: normalized_engine type: STRING mode: NULLABLE + description: Normalized Engine - name: clients type: INTEGER mode: NULLABLE + description: Clients - name: search_clients type: INTEGER mode: NULLABLE + description: Search Clients - name: sap type: INTEGER mode: NULLABLE + description: SAP - name: tagged_sap type: INTEGER mode: NULLABLE + description: Tagged SAP - name: tagged_follow_on type: INTEGER mode: NULLABLE + description: Tagged Follow On - name: ad_click type: INTEGER mode: NULLABLE + description: Ad Click - name: search_with_ads type: INTEGER mode: NULLABLE + description: Search with Ads - name: organic type: INTEGER mode: NULLABLE + description: Organic diff --git a/sql/moz-fx-data-shared-prod/telemetry_derived/smoot_usage_fxa_compressed_v2/metadata.yaml b/sql/moz-fx-data-shared-prod/telemetry_derived/smoot_usage_fxa_compressed_v2/metadata.yaml index 42855027e0..c7efd9891e 100644 --- a/sql/moz-fx-data-shared-prod/telemetry_derived/smoot_usage_fxa_compressed_v2/metadata.yaml +++ b/sql/moz-fx-data-shared-prod/telemetry_derived/smoot_usage_fxa_compressed_v2/metadata.yaml @@ -1,12 +1,15 @@ ---- friendly_name: Smoot Usage FxA Compressed -description: Compressed usage metrics for FxA users. +description: |- + Compressed usage metrics for FxA users. owners: - - jklukas@mozilla.com +- jklukas@mozilla.com labels: application: desktop incremental: true schedule: daily + shredder_mitigation: true + dag: bqetl_gud + owner1: jklukas scheduling: dag_name: bqetl_gud bigquery: @@ -14,7 +17,10 @@ bigquery: type: day field: submission_date require_partition_filter: false + expiration_days: null + range_partitioning: null clustering: fields: - - usage - - id_bucket + - usage + - id_bucket +references: {} diff --git a/sql/moz-fx-data-shared-prod/telemetry_derived/smoot_usage_fxa_compressed_v2/schema.yaml b/sql/moz-fx-data-shared-prod/telemetry_derived/smoot_usage_fxa_compressed_v2/schema.yaml new file mode 100644 index 0000000000..9641bd354c --- /dev/null +++ b/sql/moz-fx-data-shared-prod/telemetry_derived/smoot_usage_fxa_compressed_v2/schema.yaml @@ -0,0 +1,101 @@ +fields: +- mode: NULLABLE + name: submission_date + type: DATE + description: Submission Date +- mode: NULLABLE + name: usage + type: STRING + description: Usage +- mode: NULLABLE + name: id_bucket + type: INTEGER + description: ID Bucket +- mode: NULLABLE + name: country + type: STRING + description: Country +- mode: NULLABLE + name: locale + type: STRING + description: Locale +- mode: NULLABLE + name: os + type: STRING + description: Operating System +- mode: NULLABLE + name: channel + type: STRING + description: Channel +- mode: NULLABLE + name: attributed + type: BOOLEAN + description: Attributed +- name: metrics + type: RECORD + mode: NULLABLE + description: Metrics + fields: + - name: day_0 + type: RECORD + mode: NULLABLE + description: Day 0 + fields: + - name: dau + type: INTEGER + mode: NULLABLE + description: DAU - Daily Active Users + - name: wau + type: INTEGER + mode: NULLABLE + description: WAU - Weekly Active Users + - name: mau + type: INTEGER + mode: NULLABLE + description: MAU - Monthly Active Users + - name: active_days_in_week + type: INTEGER + mode: NULLABLE + description: Active Days in Week + - name: day_6 + type: RECORD + mode: NULLABLE + description: Day 6 + fields: + - name: new_profiles + type: INTEGER + mode: NULLABLE + description: New Profiles + - name: day_13 + type: RECORD + mode: NULLABLE + description: Day 13 + fields: + - name: new_profiles + type: INTEGER + mode: NULLABLE + description: New Profiles + - name: active_in_week_0 + type: INTEGER + mode: NULLABLE + description: Active in Week 0 + - name: active_in_week_1 + type: INTEGER + mode: NULLABLE + description: Active in Week 1 + - name: active_in_weeks_0_and_1 + type: INTEGER + mode: NULLABLE + description: Active in Weeks 0 and 1 + - name: new_profile_active_in_week_0 + type: INTEGER + mode: NULLABLE + description: New Profile Active in Week 0 + - name: new_profile_active_in_week_1 + type: INTEGER + mode: NULLABLE + description: New Profile Active in Week 1 + - name: new_profile_active_in_weeks_0_and_1 + type: INTEGER + mode: NULLABLE + description: New Profile Active in Weeks 0 and 1 diff --git a/sql/moz-fx-data-shared-prod/telemetry_derived/smoot_usage_new_profiles_compressed_v2/metadata.yaml b/sql/moz-fx-data-shared-prod/telemetry_derived/smoot_usage_new_profiles_compressed_v2/metadata.yaml index 7f73929fc5..cd9d60f6e0 100644 --- a/sql/moz-fx-data-shared-prod/telemetry_derived/smoot_usage_new_profiles_compressed_v2/metadata.yaml +++ b/sql/moz-fx-data-shared-prod/telemetry_derived/smoot_usage_new_profiles_compressed_v2/metadata.yaml @@ -5,6 +5,7 @@ owners: - jklukas@mozilla.com labels: incremental: true + shredder_mitigation: true scheduling: dag_name: bqetl_gud bigquery: diff --git a/sql/moz-fx-data-shared-prod/telemetry_derived/smoot_usage_new_profiles_compressed_v2/schema.yaml b/sql/moz-fx-data-shared-prod/telemetry_derived/smoot_usage_new_profiles_compressed_v2/schema.yaml index 7a0105079c..a837caec1a 100644 --- a/sql/moz-fx-data-shared-prod/telemetry_derived/smoot_usage_new_profiles_compressed_v2/schema.yaml +++ b/sql/moz-fx-data-shared-prod/telemetry_derived/smoot_usage_new_profiles_compressed_v2/schema.yaml @@ -2,27 +2,36 @@ fields: - mode: NULLABLE name: submission_date type: DATE + description: Submission Date - mode: NULLABLE name: usage type: STRING + description: Usage - mode: NULLABLE name: id_bucket type: INTEGER + description: ID Bucket - mode: NULLABLE name: country type: STRING + description: Country - mode: NULLABLE name: locale type: STRING + description: Locale - mode: NULLABLE name: os type: STRING + description: Operating System - mode: NULLABLE name: channel type: STRING + description: Channel - mode: NULLABLE name: attributed type: BOOLEAN + description: Attributed - mode: NULLABLE name: new_profiles type: INTEGER + description: New Profiles