Skip to content

Metric definitions view show all base dimensions and measures#1426

Merged
scholtzan merged 1 commit intomainfrom
fix-metric-definition-base-fields
Apr 6, 2026
Merged

Metric definitions view show all base dimensions and measures#1426
scholtzan merged 1 commit intomainfrom
fix-metric-definition-base-fields

Conversation

@scholtzan
Copy link
Copy Markdown
Contributor

Follow-up to https://mozilla.slack.com/archives/C01J4BPCYGM/p1775143079870409?thread_ts=1773687661.403829&cid=C01J4BPCYGM

Some measures and base fields disappeared from the metric definition explores.

@scholtzan scholtzan merged commit 57a167f into main Apr 6, 2026
11 checks passed
@scholtzan scholtzan deleted the fix-metric-definition-base-fields branch April 6, 2026 22:49
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 6, 2026

Integration report for "this commit"

lookml.diff

Click to expand!
Only in /tmp/workspace/looker-hub/firefox_ios: dashboards
Only in /tmp/workspace/looker-hub/marketing: datagroups
Only in /tmp/workspace/looker-hub/search_private/datagroups: search_term_data_validation_reports_last_updated.datagroup.lkml
Only in /tmp/workspace/looker-hub/search_private/datagroups: search_term_sanitization_job_metadata_daily_last_updated.datagroup.lkml
Only in /tmp/workspace/looker-hub/: user_journey
diff -x '.*' -bur --no-dereference --new-file /tmp/workspace/looker-hub/firefox_desktop/views/metric_definitions_desktop_new_profiles.view.lkml /tmp/workspace/generated-lookml/firefox_desktop/views/metric_definitions_desktop_new_profiles.view.lkml
--- /tmp/workspace/looker-hub/firefox_desktop/views/metric_definitions_desktop_new_profiles.view.lkml	2026-04-06 22:57:38.901555592 +0000
+++ /tmp/workspace/generated-lookml/firefox_desktop/views/metric_definitions_desktop_new_profiles.view.lkml	2026-04-06 22:57:34.747351515 +0000
@@ -19,6 +19,30 @@
 countries_region_name,
 countries_sponsored_tiles_available_on_newtab,
 countries_subregion_name,
+desktop_new_profiles_app_version,
+desktop_new_profiles_attributed,
+desktop_new_profiles_attribution_campaign,
+desktop_new_profiles_attribution_content,
+desktop_new_profiles_attribution_dlsource,
+desktop_new_profiles_attribution_medium,
+desktop_new_profiles_attribution_source,
+desktop_new_profiles_attribution_ua,
+desktop_new_profiles_channel,
+desktop_new_profiles_city,
+desktop_new_profiles_country,
+desktop_new_profiles_distribution_id,
+desktop_new_profiles_first_seen,
+desktop_new_profiles_is_dau,
+desktop_new_profiles_is_desktop,
+desktop_new_profiles_locale,
+desktop_new_profiles_new_profiles,
+desktop_new_profiles_normalized_os,
+desktop_new_profiles_normalized_os_version,
+desktop_new_profiles_os,
+desktop_new_profiles_os_version,
+desktop_new_profiles_paid_vs_organic,
+desktop_new_profiles_windows_build_number,
+desktop_new_profiles_windows_version,
 
                 NULL AS client_id,
                 {% if aggregate_metrics_by._parameter_value == 'day' %}
@@ -61,6 +85,30 @@
 countries.region_name AS countries_region_name,
 countries.sponsored_tiles_available_on_newtab AS countries_sponsored_tiles_available_on_newtab,
 countries.subregion_name AS countries_subregion_name,
+desktop_new_profiles.app_version AS desktop_new_profiles_app_version,
+desktop_new_profiles.attributed AS desktop_new_profiles_attributed,
+desktop_new_profiles.attribution_campaign AS desktop_new_profiles_attribution_campaign,
+desktop_new_profiles.attribution_content AS desktop_new_profiles_attribution_content,
+desktop_new_profiles.attribution_dlsource AS desktop_new_profiles_attribution_dlsource,
+desktop_new_profiles.attribution_medium AS desktop_new_profiles_attribution_medium,
+desktop_new_profiles.attribution_source AS desktop_new_profiles_attribution_source,
+desktop_new_profiles.attribution_ua AS desktop_new_profiles_attribution_ua,
+desktop_new_profiles.channel AS desktop_new_profiles_channel,
+desktop_new_profiles.city AS desktop_new_profiles_city,
+desktop_new_profiles.country AS desktop_new_profiles_country,
+desktop_new_profiles.distribution_id AS desktop_new_profiles_distribution_id,
+desktop_new_profiles.first_seen_date AS desktop_new_profiles_first_seen,
+desktop_new_profiles.is_dau AS desktop_new_profiles_is_dau,
+desktop_new_profiles.is_desktop AS desktop_new_profiles_is_desktop,
+desktop_new_profiles.locale AS desktop_new_profiles_locale,
+desktop_new_profiles.new_profiles AS desktop_new_profiles_new_profiles,
+desktop_new_profiles.normalized_os AS desktop_new_profiles_normalized_os,
+desktop_new_profiles.normalized_os_version AS desktop_new_profiles_normalized_os_version,
+desktop_new_profiles.os AS desktop_new_profiles_os,
+desktop_new_profiles.os_version AS desktop_new_profiles_os_version,
+desktop_new_profiles.paid_vs_organic AS desktop_new_profiles_paid_vs_organic,
+desktop_new_profiles.windows_build_number AS desktop_new_profiles_windows_build_number,
+desktop_new_profiles.windows_version AS desktop_new_profiles_windows_version,
 
                     FROM
                     (
@@ -134,6 +182,30 @@
 countries_region_name,
 countries_sponsored_tiles_available_on_newtab,
 countries_subregion_name,
+desktop_new_profiles_app_version,
+desktop_new_profiles_attributed,
+desktop_new_profiles_attribution_campaign,
+desktop_new_profiles_attribution_content,
+desktop_new_profiles_attribution_dlsource,
+desktop_new_profiles_attribution_medium,
+desktop_new_profiles_attribution_source,
+desktop_new_profiles_attribution_ua,
+desktop_new_profiles_channel,
+desktop_new_profiles_city,
+desktop_new_profiles_country,
+desktop_new_profiles_distribution_id,
+desktop_new_profiles_first_seen,
+desktop_new_profiles_is_dau,
+desktop_new_profiles_is_desktop,
+desktop_new_profiles_locale,
+desktop_new_profiles_new_profiles,
+desktop_new_profiles_normalized_os,
+desktop_new_profiles_normalized_os_version,
+desktop_new_profiles_os,
+desktop_new_profiles_os_version,
+desktop_new_profiles_paid_vs_organic,
+desktop_new_profiles_windows_build_number,
+desktop_new_profiles_windows_version,
 
                 client_id,
                 analysis_basis ;;
@@ -226,6 +298,168 @@
     group_label: "Base Fields"
   }
 
+  dimension: app_version {
+    sql: ${TABLE}.desktop_new_profiles_app_version ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: attributed {
+    sql: ${TABLE}.desktop_new_profiles_attributed ;;
+    type: yesno
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: attribution_campaign {
+    sql: ${TABLE}.desktop_new_profiles_attribution_campaign ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: attribution_content {
+    sql: ${TABLE}.desktop_new_profiles_attribution_content ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: attribution_dlsource {
+    sql: ${TABLE}.desktop_new_profiles_attribution_dlsource ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: attribution_medium {
+    sql: ${TABLE}.desktop_new_profiles_attribution_medium ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: attribution_source {
+    sql: ${TABLE}.desktop_new_profiles_attribution_source ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: attribution_ua {
+    sql: ${TABLE}.desktop_new_profiles_attribution_ua ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: channel {
+    sql: ${TABLE}.desktop_new_profiles_channel ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: city {
+    sql: ${TABLE}.desktop_new_profiles_city ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: country {
+    sql: ${TABLE}.desktop_new_profiles_country ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    map_layer_name: countries
+    group_label: "Base Fields"
+  }
+
+  dimension: distribution_id {
+    sql: ${TABLE}.desktop_new_profiles_distribution_id ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: is_dau {
+    sql: ${TABLE}.desktop_new_profiles_is_dau ;;
+    type: yesno
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: is_desktop {
+    sql: ${TABLE}.desktop_new_profiles_is_desktop ;;
+    type: yesno
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: locale {
+    sql: ${TABLE}.desktop_new_profiles_locale ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: new_profiles {
+    sql: ${TABLE}.desktop_new_profiles_new_profiles ;;
+    type: number
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: normalized_os {
+    sql: ${TABLE}.desktop_new_profiles_normalized_os ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: normalized_os_version {
+    sql: ${TABLE}.desktop_new_profiles_normalized_os_version ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: os {
+    sql: ${TABLE}.desktop_new_profiles_os ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: os_version {
+    sql: ${TABLE}.desktop_new_profiles_os_version ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: paid_vs_organic {
+    sql: ${TABLE}.desktop_new_profiles_paid_vs_organic ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: windows_build_number {
+    sql: ${TABLE}.desktop_new_profiles_windows_build_number ;;
+    type: number
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
+  dimension: windows_version {
+    sql: ${TABLE}.desktop_new_profiles_windows_version ;;
+    type: string
+    suggest_persist_for: "24 hours"
+    group_label: "Base Fields"
+  }
+
   dimension_group: submission {
     type: time
     datatype: date
@@ -242,6 +476,22 @@
     ]
   }
 
+  dimension_group: first_seen {
+    sql: ${TABLE}.desktop_new_profiles_first_seen ;;
+    type: time
+    timeframes: [
+      raw,
+      date,
+      week,
+      month,
+      quarter,
+      year,
+    ]
+    convert_tz: no
+    datatype: date
+    group_label: "Base Fields"
+  }
+
   measure: new_profile_count_sum {
     type: sum
     sql: ${TABLE}.new_profile_count*1 ;;
@@ -259,7 +509,7 @@
                                                         metric_definitions_desktop_new_profiles.submission_quarter._is_selected or
                                                         metric_definitions_desktop_new_profiles.submission_year._is_selected %}
                                                     AVG(${new_profile_count_sum}) OVER (
-                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %} 1
+                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %}{% if metric_definitions_desktop_new_profiles.app_version._is_selected %}${TABLE}.desktop_new_profiles_app_version,{% endif %}{% if metric_definitions_desktop_new_profiles.attributed._is_selected %}${TABLE}.desktop_new_profiles_attributed,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_campaign._is_selected %}${TABLE}.desktop_new_profiles_attribution_campaign,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_content._is_selected %}${TABLE}.desktop_new_profiles_attribution_content,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_dlsource._is_selected %}${TABLE}.desktop_new_profiles_attribution_dlsource,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_medium._is_selected %}${TABLE}.desktop_new_profiles_attribution_medium,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_source._is_selected %}${TABLE}.desktop_new_profiles_attribution_source,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_ua._is_selected %}${TABLE}.desktop_new_profiles_attribution_ua,{% endif %}{% if metric_definitions_desktop_new_profiles.channel._is_selected %}${TABLE}.desktop_new_profiles_channel,{% endif %}{% if metric_definitions_desktop_new_profiles.city._is_selected %}${TABLE}.desktop_new_profiles_city,{% endif %}{% if metric_definitions_desktop_new_profiles.country._is_selected %}${TABLE}.desktop_new_profiles_country,{% endif %}{% if metric_definitions_desktop_new_profiles.distribution_id._is_selected %}${TABLE}.desktop_new_profiles_distribution_id,{% endif %}{% if metric_definitions_desktop_new_profiles.is_dau._is_selected %}${TABLE}.desktop_new_profiles_is_dau,{% endif %}{% if metric_definitions_desktop_new_profiles.is_desktop._is_selected %}${TABLE}.desktop_new_profiles_is_desktop,{% endif %}{% if metric_definitions_desktop_new_profiles.locale._is_selected %}${TABLE}.desktop_new_profiles_locale,{% endif %}{% if metric_definitions_desktop_new_profiles.new_profiles._is_selected %}${TABLE}.desktop_new_profiles_new_profiles,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os._is_selected %}${TABLE}.desktop_new_profiles_normalized_os,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os_version._is_selected %}${TABLE}.desktop_new_profiles_normalized_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.os._is_selected %}${TABLE}.desktop_new_profiles_os,{% endif %}{% if metric_definitions_desktop_new_profiles.os_version._is_selected %}${TABLE}.desktop_new_profiles_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.paid_vs_organic._is_selected %}${TABLE}.desktop_new_profiles_paid_vs_organic,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_build_number._is_selected %}${TABLE}.desktop_new_profiles_windows_build_number,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_version._is_selected %}${TABLE}.desktop_new_profiles_windows_version,{% endif %} 1
                                                         {% if date_groupby_position._parameter_value != "" %}
                                                         ORDER BY {% parameter date_groupby_position %}
                                                         {% elsif metric_definitions_desktop_new_profiles.submission_date._is_selected %}
@@ -286,7 +536,7 @@
                                                         metric_definitions_desktop_new_profiles.submission_quarter._is_selected or
                                                         metric_definitions_desktop_new_profiles.submission_year._is_selected %}
                                                     AVG(${new_profile_count_sum}) OVER (
-                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %} 1
+                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %}{% if metric_definitions_desktop_new_profiles.app_version._is_selected %}${TABLE}.desktop_new_profiles_app_version,{% endif %}{% if metric_definitions_desktop_new_profiles.attributed._is_selected %}${TABLE}.desktop_new_profiles_attributed,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_campaign._is_selected %}${TABLE}.desktop_new_profiles_attribution_campaign,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_content._is_selected %}${TABLE}.desktop_new_profiles_attribution_content,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_dlsource._is_selected %}${TABLE}.desktop_new_profiles_attribution_dlsource,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_medium._is_selected %}${TABLE}.desktop_new_profiles_attribution_medium,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_source._is_selected %}${TABLE}.desktop_new_profiles_attribution_source,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_ua._is_selected %}${TABLE}.desktop_new_profiles_attribution_ua,{% endif %}{% if metric_definitions_desktop_new_profiles.channel._is_selected %}${TABLE}.desktop_new_profiles_channel,{% endif %}{% if metric_definitions_desktop_new_profiles.city._is_selected %}${TABLE}.desktop_new_profiles_city,{% endif %}{% if metric_definitions_desktop_new_profiles.country._is_selected %}${TABLE}.desktop_new_profiles_country,{% endif %}{% if metric_definitions_desktop_new_profiles.distribution_id._is_selected %}${TABLE}.desktop_new_profiles_distribution_id,{% endif %}{% if metric_definitions_desktop_new_profiles.is_dau._is_selected %}${TABLE}.desktop_new_profiles_is_dau,{% endif %}{% if metric_definitions_desktop_new_profiles.is_desktop._is_selected %}${TABLE}.desktop_new_profiles_is_desktop,{% endif %}{% if metric_definitions_desktop_new_profiles.locale._is_selected %}${TABLE}.desktop_new_profiles_locale,{% endif %}{% if metric_definitions_desktop_new_profiles.new_profiles._is_selected %}${TABLE}.desktop_new_profiles_new_profiles,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os._is_selected %}${TABLE}.desktop_new_profiles_normalized_os,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os_version._is_selected %}${TABLE}.desktop_new_profiles_normalized_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.os._is_selected %}${TABLE}.desktop_new_profiles_os,{% endif %}{% if metric_definitions_desktop_new_profiles.os_version._is_selected %}${TABLE}.desktop_new_profiles_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.paid_vs_organic._is_selected %}${TABLE}.desktop_new_profiles_paid_vs_organic,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_build_number._is_selected %}${TABLE}.desktop_new_profiles_windows_build_number,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_version._is_selected %}${TABLE}.desktop_new_profiles_windows_version,{% endif %} 1
                                                         {% if date_groupby_position._parameter_value != "" %}
                                                         ORDER BY {% parameter date_groupby_position %}
                                                         {% elsif metric_definitions_desktop_new_profiles.submission_date._is_selected %}
@@ -313,7 +563,7 @@
                                                         metric_definitions_desktop_new_profiles.submission_quarter._is_selected or
                                                         metric_definitions_desktop_new_profiles.submission_year._is_selected %}
                                                     AVG(${new_profile_count_sum}) OVER (
-                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %} 1
+                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %}{% if metric_definitions_desktop_new_profiles.app_version._is_selected %}${TABLE}.desktop_new_profiles_app_version,{% endif %}{% if metric_definitions_desktop_new_profiles.attributed._is_selected %}${TABLE}.desktop_new_profiles_attributed,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_campaign._is_selected %}${TABLE}.desktop_new_profiles_attribution_campaign,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_content._is_selected %}${TABLE}.desktop_new_profiles_attribution_content,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_dlsource._is_selected %}${TABLE}.desktop_new_profiles_attribution_dlsource,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_medium._is_selected %}${TABLE}.desktop_new_profiles_attribution_medium,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_source._is_selected %}${TABLE}.desktop_new_profiles_attribution_source,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_ua._is_selected %}${TABLE}.desktop_new_profiles_attribution_ua,{% endif %}{% if metric_definitions_desktop_new_profiles.channel._is_selected %}${TABLE}.desktop_new_profiles_channel,{% endif %}{% if metric_definitions_desktop_new_profiles.city._is_selected %}${TABLE}.desktop_new_profiles_city,{% endif %}{% if metric_definitions_desktop_new_profiles.country._is_selected %}${TABLE}.desktop_new_profiles_country,{% endif %}{% if metric_definitions_desktop_new_profiles.distribution_id._is_selected %}${TABLE}.desktop_new_profiles_distribution_id,{% endif %}{% if metric_definitions_desktop_new_profiles.is_dau._is_selected %}${TABLE}.desktop_new_profiles_is_dau,{% endif %}{% if metric_definitions_desktop_new_profiles.is_desktop._is_selected %}${TABLE}.desktop_new_profiles_is_desktop,{% endif %}{% if metric_definitions_desktop_new_profiles.locale._is_selected %}${TABLE}.desktop_new_profiles_locale,{% endif %}{% if metric_definitions_desktop_new_profiles.new_profiles._is_selected %}${TABLE}.desktop_new_profiles_new_profiles,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os._is_selected %}${TABLE}.desktop_new_profiles_normalized_os,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os_version._is_selected %}${TABLE}.desktop_new_profiles_normalized_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.os._is_selected %}${TABLE}.desktop_new_profiles_os,{% endif %}{% if metric_definitions_desktop_new_profiles.os_version._is_selected %}${TABLE}.desktop_new_profiles_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.paid_vs_organic._is_selected %}${TABLE}.desktop_new_profiles_paid_vs_organic,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_build_number._is_selected %}${TABLE}.desktop_new_profiles_windows_build_number,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_version._is_selected %}${TABLE}.desktop_new_profiles_windows_version,{% endif %} 1
                                                         {% if date_groupby_position._parameter_value != "" %}
                                                         ORDER BY {% parameter date_groupby_position %}
                                                         {% elsif metric_definitions_desktop_new_profiles.submission_date._is_selected %}
@@ -340,7 +590,7 @@
                                                 metric_definitions_desktop_new_profiles.submission_quarter._is_selected or
                                                 metric_definitions_desktop_new_profiles.submission_year._is_selected %}
                                             AVG(${new_profile_count_sum}) OVER (
-                                                PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %} 1
+                                                PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %}{% if metric_definitions_desktop_new_profiles.app_version._is_selected %}${TABLE}.desktop_new_profiles_app_version,{% endif %}{% if metric_definitions_desktop_new_profiles.attributed._is_selected %}${TABLE}.desktop_new_profiles_attributed,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_campaign._is_selected %}${TABLE}.desktop_new_profiles_attribution_campaign,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_content._is_selected %}${TABLE}.desktop_new_profiles_attribution_content,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_dlsource._is_selected %}${TABLE}.desktop_new_profiles_attribution_dlsource,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_medium._is_selected %}${TABLE}.desktop_new_profiles_attribution_medium,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_source._is_selected %}${TABLE}.desktop_new_profiles_attribution_source,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_ua._is_selected %}${TABLE}.desktop_new_profiles_attribution_ua,{% endif %}{% if metric_definitions_desktop_new_profiles.channel._is_selected %}${TABLE}.desktop_new_profiles_channel,{% endif %}{% if metric_definitions_desktop_new_profiles.city._is_selected %}${TABLE}.desktop_new_profiles_city,{% endif %}{% if metric_definitions_desktop_new_profiles.country._is_selected %}${TABLE}.desktop_new_profiles_country,{% endif %}{% if metric_definitions_desktop_new_profiles.distribution_id._is_selected %}${TABLE}.desktop_new_profiles_distribution_id,{% endif %}{% if metric_definitions_desktop_new_profiles.is_dau._is_selected %}${TABLE}.desktop_new_profiles_is_dau,{% endif %}{% if metric_definitions_desktop_new_profiles.is_desktop._is_selected %}${TABLE}.desktop_new_profiles_is_desktop,{% endif %}{% if metric_definitions_desktop_new_profiles.locale._is_selected %}${TABLE}.desktop_new_profiles_locale,{% endif %}{% if metric_definitions_desktop_new_profiles.new_profiles._is_selected %}${TABLE}.desktop_new_profiles_new_profiles,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os._is_selected %}${TABLE}.desktop_new_profiles_normalized_os,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os_version._is_selected %}${TABLE}.desktop_new_profiles_normalized_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.os._is_selected %}${TABLE}.desktop_new_profiles_os,{% endif %}{% if metric_definitions_desktop_new_profiles.os_version._is_selected %}${TABLE}.desktop_new_profiles_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.paid_vs_organic._is_selected %}${TABLE}.desktop_new_profiles_paid_vs_organic,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_build_number._is_selected %}${TABLE}.desktop_new_profiles_windows_build_number,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_version._is_selected %}${TABLE}.desktop_new_profiles_windows_version,{% endif %} 1
                                                 {% if date_groupby_position._parameter_value != "" %}
                                                 ORDER BY {% parameter date_groupby_position %}
                                                 {% elsif metric_definitions_desktop_new_profiles.submission_date._is_selected %}
@@ -373,7 +623,7 @@
                                                         metric_definitions_desktop_new_profiles.submission_quarter._is_selected or
                                                         metric_definitions_desktop_new_profiles.submission_year._is_selected %}
                                                     AVG(${new_profile_count_sum}) OVER (
-                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %} 1
+                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %}{% if metric_definitions_desktop_new_profiles.app_version._is_selected %}${TABLE}.desktop_new_profiles_app_version,{% endif %}{% if metric_definitions_desktop_new_profiles.attributed._is_selected %}${TABLE}.desktop_new_profiles_attributed,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_campaign._is_selected %}${TABLE}.desktop_new_profiles_attribution_campaign,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_content._is_selected %}${TABLE}.desktop_new_profiles_attribution_content,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_dlsource._is_selected %}${TABLE}.desktop_new_profiles_attribution_dlsource,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_medium._is_selected %}${TABLE}.desktop_new_profiles_attribution_medium,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_source._is_selected %}${TABLE}.desktop_new_profiles_attribution_source,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_ua._is_selected %}${TABLE}.desktop_new_profiles_attribution_ua,{% endif %}{% if metric_definitions_desktop_new_profiles.channel._is_selected %}${TABLE}.desktop_new_profiles_channel,{% endif %}{% if metric_definitions_desktop_new_profiles.city._is_selected %}${TABLE}.desktop_new_profiles_city,{% endif %}{% if metric_definitions_desktop_new_profiles.country._is_selected %}${TABLE}.desktop_new_profiles_country,{% endif %}{% if metric_definitions_desktop_new_profiles.distribution_id._is_selected %}${TABLE}.desktop_new_profiles_distribution_id,{% endif %}{% if metric_definitions_desktop_new_profiles.is_dau._is_selected %}${TABLE}.desktop_new_profiles_is_dau,{% endif %}{% if metric_definitions_desktop_new_profiles.is_desktop._is_selected %}${TABLE}.desktop_new_profiles_is_desktop,{% endif %}{% if metric_definitions_desktop_new_profiles.locale._is_selected %}${TABLE}.desktop_new_profiles_locale,{% endif %}{% if metric_definitions_desktop_new_profiles.new_profiles._is_selected %}${TABLE}.desktop_new_profiles_new_profiles,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os._is_selected %}${TABLE}.desktop_new_profiles_normalized_os,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os_version._is_selected %}${TABLE}.desktop_new_profiles_normalized_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.os._is_selected %}${TABLE}.desktop_new_profiles_os,{% endif %}{% if metric_definitions_desktop_new_profiles.os_version._is_selected %}${TABLE}.desktop_new_profiles_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.paid_vs_organic._is_selected %}${TABLE}.desktop_new_profiles_paid_vs_organic,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_build_number._is_selected %}${TABLE}.desktop_new_profiles_windows_build_number,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_version._is_selected %}${TABLE}.desktop_new_profiles_windows_version,{% endif %} 1
                                                         {% if date_groupby_position._parameter_value != "" %}
                                                         ORDER BY {% parameter date_groupby_position %}
                                                         {% elsif metric_definitions_desktop_new_profiles.submission_date._is_selected %}
@@ -396,7 +646,7 @@
                                                         metric_definitions_desktop_new_profiles.submission_quarter._is_selected or
                                                         metric_definitions_desktop_new_profiles.submission_year._is_selected %}
                                                     AVG(${new_profile_count_sum}) OVER (
-                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %} 1
+                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %}{% if metric_definitions_desktop_new_profiles.app_version._is_selected %}${TABLE}.desktop_new_profiles_app_version,{% endif %}{% if metric_definitions_desktop_new_profiles.attributed._is_selected %}${TABLE}.desktop_new_profiles_attributed,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_campaign._is_selected %}${TABLE}.desktop_new_profiles_attribution_campaign,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_content._is_selected %}${TABLE}.desktop_new_profiles_attribution_content,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_dlsource._is_selected %}${TABLE}.desktop_new_profiles_attribution_dlsource,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_medium._is_selected %}${TABLE}.desktop_new_profiles_attribution_medium,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_source._is_selected %}${TABLE}.desktop_new_profiles_attribution_source,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_ua._is_selected %}${TABLE}.desktop_new_profiles_attribution_ua,{% endif %}{% if metric_definitions_desktop_new_profiles.channel._is_selected %}${TABLE}.desktop_new_profiles_channel,{% endif %}{% if metric_definitions_desktop_new_profiles.city._is_selected %}${TABLE}.desktop_new_profiles_city,{% endif %}{% if metric_definitions_desktop_new_profiles.country._is_selected %}${TABLE}.desktop_new_profiles_country,{% endif %}{% if metric_definitions_desktop_new_profiles.distribution_id._is_selected %}${TABLE}.desktop_new_profiles_distribution_id,{% endif %}{% if metric_definitions_desktop_new_profiles.is_dau._is_selected %}${TABLE}.desktop_new_profiles_is_dau,{% endif %}{% if metric_definitions_desktop_new_profiles.is_desktop._is_selected %}${TABLE}.desktop_new_profiles_is_desktop,{% endif %}{% if metric_definitions_desktop_new_profiles.locale._is_selected %}${TABLE}.desktop_new_profiles_locale,{% endif %}{% if metric_definitions_desktop_new_profiles.new_profiles._is_selected %}${TABLE}.desktop_new_profiles_new_profiles,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os._is_selected %}${TABLE}.desktop_new_profiles_normalized_os,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os_version._is_selected %}${TABLE}.desktop_new_profiles_normalized_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.os._is_selected %}${TABLE}.desktop_new_profiles_os,{% endif %}{% if metric_definitions_desktop_new_profiles.os_version._is_selected %}${TABLE}.desktop_new_profiles_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.paid_vs_organic._is_selected %}${TABLE}.desktop_new_profiles_paid_vs_organic,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_build_number._is_selected %}${TABLE}.desktop_new_profiles_windows_build_number,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_version._is_selected %}${TABLE}.desktop_new_profiles_windows_version,{% endif %} 1
                                                         {% if date_groupby_position._parameter_value != "" %}
                                                         ORDER BY {% parameter date_groupby_position %}
                                                         {% elsif metric_definitions_desktop_new_profiles.submission_date._is_selected %}
@@ -419,7 +669,7 @@
                                                         metric_definitions_desktop_new_profiles.submission_quarter._is_selected or
                                                         metric_definitions_desktop_new_profiles.submission_year._is_selected %}
                                                     AVG(${new_profile_count_sum}) OVER (
-                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %} 1
+                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %}{% if metric_definitions_desktop_new_profiles.app_version._is_selected %}${TABLE}.desktop_new_profiles_app_version,{% endif %}{% if metric_definitions_desktop_new_profiles.attributed._is_selected %}${TABLE}.desktop_new_profiles_attributed,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_campaign._is_selected %}${TABLE}.desktop_new_profiles_attribution_campaign,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_content._is_selected %}${TABLE}.desktop_new_profiles_attribution_content,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_dlsource._is_selected %}${TABLE}.desktop_new_profiles_attribution_dlsource,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_medium._is_selected %}${TABLE}.desktop_new_profiles_attribution_medium,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_source._is_selected %}${TABLE}.desktop_new_profiles_attribution_source,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_ua._is_selected %}${TABLE}.desktop_new_profiles_attribution_ua,{% endif %}{% if metric_definitions_desktop_new_profiles.channel._is_selected %}${TABLE}.desktop_new_profiles_channel,{% endif %}{% if metric_definitions_desktop_new_profiles.city._is_selected %}${TABLE}.desktop_new_profiles_city,{% endif %}{% if metric_definitions_desktop_new_profiles.country._is_selected %}${TABLE}.desktop_new_profiles_country,{% endif %}{% if metric_definitions_desktop_new_profiles.distribution_id._is_selected %}${TABLE}.desktop_new_profiles_distribution_id,{% endif %}{% if metric_definitions_desktop_new_profiles.is_dau._is_selected %}${TABLE}.desktop_new_profiles_is_dau,{% endif %}{% if metric_definitions_desktop_new_profiles.is_desktop._is_selected %}${TABLE}.desktop_new_profiles_is_desktop,{% endif %}{% if metric_definitions_desktop_new_profiles.locale._is_selected %}${TABLE}.desktop_new_profiles_locale,{% endif %}{% if metric_definitions_desktop_new_profiles.new_profiles._is_selected %}${TABLE}.desktop_new_profiles_new_profiles,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os._is_selected %}${TABLE}.desktop_new_profiles_normalized_os,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os_version._is_selected %}${TABLE}.desktop_new_profiles_normalized_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.os._is_selected %}${TABLE}.desktop_new_profiles_os,{% endif %}{% if metric_definitions_desktop_new_profiles.os_version._is_selected %}${TABLE}.desktop_new_profiles_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.paid_vs_organic._is_selected %}${TABLE}.desktop_new_profiles_paid_vs_organic,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_build_number._is_selected %}${TABLE}.desktop_new_profiles_windows_build_number,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_version._is_selected %}${TABLE}.desktop_new_profiles_windows_version,{% endif %} 1
                                                         {% if date_groupby_position._parameter_value != "" %}
                                                         ORDER BY {% parameter date_groupby_position %}
                                                         {% elsif metric_definitions_desktop_new_profiles.submission_date._is_selected %}
@@ -442,7 +692,7 @@
                                                         metric_definitions_desktop_new_profiles.submission_quarter._is_selected or
                                                         metric_definitions_desktop_new_profiles.submission_year._is_selected %}
                                                     AVG(${new_profile_count_sum}) OVER (
-                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %} 1
+                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %}{% if metric_definitions_desktop_new_profiles.app_version._is_selected %}${TABLE}.desktop_new_profiles_app_version,{% endif %}{% if metric_definitions_desktop_new_profiles.attributed._is_selected %}${TABLE}.desktop_new_profiles_attributed,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_campaign._is_selected %}${TABLE}.desktop_new_profiles_attribution_campaign,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_content._is_selected %}${TABLE}.desktop_new_profiles_attribution_content,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_dlsource._is_selected %}${TABLE}.desktop_new_profiles_attribution_dlsource,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_medium._is_selected %}${TABLE}.desktop_new_profiles_attribution_medium,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_source._is_selected %}${TABLE}.desktop_new_profiles_attribution_source,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_ua._is_selected %}${TABLE}.desktop_new_profiles_attribution_ua,{% endif %}{% if metric_definitions_desktop_new_profiles.channel._is_selected %}${TABLE}.desktop_new_profiles_channel,{% endif %}{% if metric_definitions_desktop_new_profiles.city._is_selected %}${TABLE}.desktop_new_profiles_city,{% endif %}{% if metric_definitions_desktop_new_profiles.country._is_selected %}${TABLE}.desktop_new_profiles_country,{% endif %}{% if metric_definitions_desktop_new_profiles.distribution_id._is_selected %}${TABLE}.desktop_new_profiles_distribution_id,{% endif %}{% if metric_definitions_desktop_new_profiles.is_dau._is_selected %}${TABLE}.desktop_new_profiles_is_dau,{% endif %}{% if metric_definitions_desktop_new_profiles.is_desktop._is_selected %}${TABLE}.desktop_new_profiles_is_desktop,{% endif %}{% if metric_definitions_desktop_new_profiles.locale._is_selected %}${TABLE}.desktop_new_profiles_locale,{% endif %}{% if metric_definitions_desktop_new_profiles.new_profiles._is_selected %}${TABLE}.desktop_new_profiles_new_profiles,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os._is_selected %}${TABLE}.desktop_new_profiles_normalized_os,{% endif %}{% if metric_definitions_desktop_new_profiles.normalized_os_version._is_selected %}${TABLE}.desktop_new_profiles_normalized_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.os._is_selected %}${TABLE}.desktop_new_profiles_os,{% endif %}{% if metric_definitions_desktop_new_profiles.os_version._is_selected %}${TABLE}.desktop_new_profiles_os_version,{% endif %}{% if metric_definitions_desktop_new_profiles.paid_vs_organic._is_selected %}${TABLE}.desktop_new_profiles_paid_vs_organic,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_build_number._is_selected %}${TABLE}.desktop_new_profiles_windows_build_number,{% endif %}{% if metric_definitions_desktop_new_profiles.windows_version._is_selected %}${TABLE}.desktop_new_profiles_windows_version,{% endif %} 1
                                                         {% if date_groupby_position._parameter_value != "" %}
                                                         ORDER BY {% parameter date_groupby_position %}
                                                         {% elsif metric_definitions_desktop_new_profiles.submission_date._is_selected %}
@@ -465,7 +715,7 @@
                                                         metric_definitions_desktop_new_profiles.submission_quarter._is_selected or
                                                         metric_definitions_desktop_new_profiles.submission_year._is_selected %}
                                                     AVG(${new_profile_count_sum}) OVER (
-                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %} 1
+                                                        PARTITION BY {% if metric_definitions_desktop_new_profiles.ads_value_tier._is_selected %}${TABLE}.countries_ads_value_tier,{% endif %}{% if metric_definitions_desktop_new_profiles.code._is_selected %}${TABLE}.countries_code,{% endif %}{% if metric_definitions_desktop_new_profiles.code_3._is_selected %}${TABLE}.countries_code_3,{% endif %}{% if metric_definitions_desktop_new_profiles.fx_region._is_selected %}${TABLE}.countries_fx_region,{% endif %}{% if metric_definitions_desktop_new_profiles.mozilla_vpn_available._is_selected %}${TABLE}.countries_mozilla_vpn_available,{% endif %}{% if metric_definitions_desktop_new_profiles.name._is_selected %}${TABLE}.countries_name,{% endif %}{% if metric_definitions_desktop_new_profiles.pocket_available_on_newtab._is_selected %}${TABLE}.countries_pocket_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.region_name._is_selected %}${TABLE}.countries_region_name,{% endif %}{% if metric_definitions_desktop_new_profiles.sponsored_tiles_available_on_newtab._is_selected %}${TABLE}.countries_sponsored_tiles_available_on_newtab,{% endif %}{% if metric_definitions_desktop_new_profiles.subregion_name._is_selected %}${TABLE}.countries_subregion_name,{% endif %}{% if metric_definitions_desktop_new_profiles.app_version._is_selected %}${TABLE}.desktop_new_profiles_app_version,{% endif %}{% if metric_definitions_desktop_new_profiles.attributed._is_selected %}${TABLE}.desktop_new_profiles_attributed,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_campaign._is_selected %}${TABLE}.desktop_new_profiles_attribution_campaign,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_content._is_selected %}${TABLE}.desktop_new_profiles_attribution_content,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_dlsource._is_selected %}${TABLE}.desktop_new_profiles_attribution_dlsource,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_medium._is_selected %}${TABLE}.desktop_new_profiles_attribution_medium,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_source._is_selected %}${TABLE}.desktop_new_profiles_attribution_source,{% endif %}{% if metric_definitions_desktop_new_profiles.attribution_ua._is_selected %}${TABLE}.desktop_new_profiles_attribution_ua,{% endif %}{% if metric_definitions_desktop_new_profiles.channel._is_selected %}${TABLE}.desktop_new_profiles_channel,{% endif %}{% if metric_definitions_desktop_new_profiles.city._is_selected %}${TABLE}.desktop_new_profiles_city,{% endif %}{% if metric_definitions_desktop_new_profiles.country._is_selected %}${TABLE}.desktop_new_profiles_country,{% endif %}{% if metric_definitions_desktop_new_profiles.distribution_id._is_selected %}${TABLE}.desktop_new_profiles_distribution_id,{% endif %}{% if metric_definitions_desktop_new_profiles.is_dau._is_selected %}${TABLE}.desktop_new_profiles_is_dau,{% endif %}{% if metric_definitions_desktop_new_profiles.is_desktop._is_selected %}${TABLE}.desktop_new_profiles_is_desktop,{% endif %}{% if metric_definitions_desktop_new_profiles.locale._is_selected %}${TABLE}.desktop_new_profiles_locale,{% endif %}{% if

⚠️ Only part of the diff is displayed.

Link to full diff

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant