diff --git a/bqetl_project.yaml b/bqetl_project.yaml index f19b8236b6c..b1267013581 100644 --- a/bqetl_project.yaml +++ b/bqetl_project.yaml @@ -15,6 +15,7 @@ default: - moz-fx-data-pioneer-nonprod - moz-fx-data-pioneer-prod - moz-fx-data-glam-prod-fca7 + - moz-fx-glam-prod public_project: mozilla-public-data monitoring: @@ -199,6 +200,7 @@ dry_run: # Dataset sql/glam-fenix-dev:glam_etl was not found - sql/glam-fenix-dev/glam_etl/**/*.sql - sql/moz-fx-data-glam-prod-fca7/glam_etl/**/*.sql + - sql/moz-fx-glam-prod/glam_etl/**/*.sql # Source table does not have a verifiable schema - sql/moz-fx-data-shared-prod/monitoring_derived/outerbounds_cost_per_flow_run_v1/view.sql - sql/moz-fx-data-shared-prod/monitoring_derived/outerbounds_cost_per_flow_v1/view.sql diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_beta_aggregates/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_beta_aggregates/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_beta_aggregates/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_beta_aggregates/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/view.sql b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_beta_aggregates/view.sql similarity index 96% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/view.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_beta_aggregates/view.sql index c8e730237a4..3f98ddbd926 100644 --- a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates/view.sql +++ b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_beta_aggregates/view.sql @@ -1,5 +1,5 @@ CREATE OR REPLACE VIEW - `moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_beta_aggregates` AS ( + `moz-fx-glam-prod.glam_etl.glam_desktop_beta_aggregates` AS ( WITH base AS ( SELECT * EXCEPT (percentiles, non_norm_percentiles), @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW percentiles AS existing_percentiles, non_norm_percentiles AS existing_non_norm_percentiles FROM - `moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_beta_aggregates_v1` + `moz-fx-glam-prod.glam_etl.glam_desktop_beta_aggregates_v1` WHERE -- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51 ( diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_beta_aggregates_v1/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_beta_aggregates_v1/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_beta_aggregates_v1/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_beta_aggregates_v1/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/script.sql b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_beta_aggregates_v1/script.sql similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_beta_aggregates_v1/script.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_beta_aggregates_v1/script.sql diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_nightly_aggregates/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_nightly_aggregates/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_nightly_aggregates/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_nightly_aggregates/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/view.sql b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_nightly_aggregates/view.sql similarity index 95% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/view.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_nightly_aggregates/view.sql index f159ea864d3..40ea31b7493 100644 --- a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates/view.sql +++ b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_nightly_aggregates/view.sql @@ -1,5 +1,5 @@ CREATE OR REPLACE VIEW - `moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_nightly_aggregates` AS ( + `moz-fx-glam-prod.glam_etl.glam_desktop_nightly_aggregates` AS ( WITH base AS ( SELECT * EXCEPT (percentiles, non_norm_percentiles), @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW percentiles AS existing_percentiles, non_norm_percentiles AS existing_non_norm_percentiles FROM - `moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_nightly_aggregates_v1` + `moz-fx-glam-prod.glam_etl.glam_desktop_nightly_aggregates_v1` WHERE -- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51 ( diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_nightly_aggregates_v1/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_nightly_aggregates_v1/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_nightly_aggregates_v1/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_nightly_aggregates_v1/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/script.sql b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_nightly_aggregates_v1/script.sql similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_nightly_aggregates_v1/script.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_nightly_aggregates_v1/script.sql diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_release_aggregates/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_release_aggregates/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_release_aggregates/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_release_aggregates/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/view.sql b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_release_aggregates/view.sql similarity index 95% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/view.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_release_aggregates/view.sql index 44081ce3100..fb065f94811 100644 --- a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates/view.sql +++ b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_release_aggregates/view.sql @@ -1,5 +1,5 @@ CREATE OR REPLACE VIEW - `moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_release_aggregates` AS ( + `moz-fx-glam-prod.glam_etl.glam_desktop_release_aggregates` AS ( WITH base AS ( SELECT * EXCEPT (percentiles, non_norm_percentiles), @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW percentiles AS existing_percentiles, non_norm_percentiles AS existing_non_norm_percentiles FROM - `moz-fx-data-glam-prod-fca7.glam_etl.glam_desktop_release_aggregates_v1` + `moz-fx-glam-prod.glam_etl.glam_desktop_release_aggregates_v1` WHERE -- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51 ( diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_release_aggregates_v1/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_release_aggregates_v1/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_release_aggregates_v1/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_release_aggregates_v1/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/script.sql b/sql/moz-fx-glam-prod/glam_etl/glam_desktop_release_aggregates_v1/script.sql similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_desktop_release_aggregates_v1/script.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_desktop_release_aggregates_v1/script.sql diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_beta_aggregates/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_beta_aggregates/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_beta_aggregates/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_beta_aggregates/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/view.sql b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_beta_aggregates/view.sql similarity index 96% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/view.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_beta_aggregates/view.sql index 4a90c97c91d..902e3f2d0ee 100644 --- a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates/view.sql +++ b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_beta_aggregates/view.sql @@ -1,5 +1,5 @@ CREATE OR REPLACE VIEW - `moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_beta_aggregates` AS ( + `moz-fx-glam-prod.glam_etl.glam_fenix_beta_aggregates` AS ( WITH base AS ( SELECT * EXCEPT (percentiles, non_norm_percentiles), @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW percentiles AS existing_percentiles, non_norm_percentiles AS existing_non_norm_percentiles FROM - `moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_beta_aggregates_v1` + `moz-fx-glam-prod.glam_etl.glam_fenix_beta_aggregates_v1` WHERE -- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51 ( diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_beta_aggregates_v1/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_beta_aggregates_v1/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_beta_aggregates_v1/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_beta_aggregates_v1/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/script.sql b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_beta_aggregates_v1/script.sql similarity index 93% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/script.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_beta_aggregates_v1/script.sql index 1c51c6507d5..9c9ef9dc911 100644 --- a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_beta_aggregates_v1/script.sql +++ b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_beta_aggregates_v1/script.sql @@ -7,7 +7,7 @@ MERGE INTO SELECT * FROM - `moz-fx-data-glam-prod-fca7.glam_etl.org_mozilla_fenix_glam_beta__extract_probe_counts_v1` + `moz-fx-glam-prod.glam_etl.org_mozilla_fenix_glam_beta__extract_probe_counts_v1` ) S ON T.version = S.version AND T.ping_type = S.ping_type diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_nightly_aggregates/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_nightly_aggregates/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_nightly_aggregates/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_nightly_aggregates/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/view.sql b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_nightly_aggregates/view.sql similarity index 96% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/view.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_nightly_aggregates/view.sql index f4915cacd74..abce9725f47 100644 --- a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates/view.sql +++ b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_nightly_aggregates/view.sql @@ -1,5 +1,5 @@ CREATE OR REPLACE VIEW - `moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_nightly_aggregates` AS ( + `moz-fx-glam-prod.glam_etl.glam_fenix_nightly_aggregates` AS ( WITH base AS ( SELECT * EXCEPT (percentiles, non_norm_percentiles), @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW percentiles AS existing_percentiles, non_norm_percentiles AS existing_non_norm_percentiles FROM - `moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_nightly_aggregates_v1` + `moz-fx-glam-prod.glam_etl.glam_fenix_nightly_aggregates_v1` WHERE -- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51 ( diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_nightly_aggregates_v1/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_nightly_aggregates_v1/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_nightly_aggregates_v1/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_nightly_aggregates_v1/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/script.sql b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_nightly_aggregates_v1/script.sql similarity index 93% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/script.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_nightly_aggregates_v1/script.sql index 6ff4858d449..a05242977ca 100644 --- a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_nightly_aggregates_v1/script.sql +++ b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_nightly_aggregates_v1/script.sql @@ -7,7 +7,7 @@ MERGE INTO SELECT * FROM - `moz-fx-data-glam-prod-fca7.glam_etl.org_mozilla_fenix_glam_nightly__extract_probe_counts_v1` + `moz-fx-glam-prod.glam_etl.org_mozilla_fenix_glam_nightly__extract_probe_counts_v1` ) S ON T.version = S.version AND T.ping_type = S.ping_type diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_release_aggregates/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_release_aggregates/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_release_aggregates/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_release_aggregates/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_release_aggregates/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_release_aggregates/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_release_aggregates/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_release_aggregates/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_release_aggregates/view.sql b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_release_aggregates/view.sql similarity index 96% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_release_aggregates/view.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_release_aggregates/view.sql index 185aebc2183..80c43fd1733 100644 --- a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_release_aggregates/view.sql +++ b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_release_aggregates/view.sql @@ -1,5 +1,5 @@ CREATE OR REPLACE VIEW - `moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_release_aggregates` AS ( + `moz-fx-glam-prod.glam_etl.glam_fenix_release_aggregates` AS ( WITH base AS ( SELECT * EXCEPT (percentiles, non_norm_percentiles), @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW percentiles AS existing_percentiles, non_norm_percentiles AS existing_non_norm_percentiles FROM - `moz-fx-data-glam-prod-fca7.glam_etl.glam_fenix_release_aggregates_v1` + `moz-fx-glam-prod.glam_etl.glam_fenix_release_aggregates_v1` WHERE -- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51 ( diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_release_aggregates_v1/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_release_aggregates_v1/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_release_aggregates_v1/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_release_aggregates_v1/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_release_aggregates_v1/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_release_aggregates_v1/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_release_aggregates_v1/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_release_aggregates_v1/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_release_aggregates_v1/script.sql b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_release_aggregates_v1/script.sql similarity index 93% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_release_aggregates_v1/script.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_fenix_release_aggregates_v1/script.sql index 6ca15ed8833..af898b99382 100644 --- a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fenix_release_aggregates_v1/script.sql +++ b/sql/moz-fx-glam-prod/glam_etl/glam_fenix_release_aggregates_v1/script.sql @@ -7,7 +7,7 @@ MERGE INTO SELECT * FROM - `moz-fx-data-glam-prod-fca7.glam_etl.org_mozilla_fenix_glam_release__extract_probe_counts_v1` + `moz-fx-glam-prod.glam_etl.org_mozilla_fenix_glam_release__extract_probe_counts_v1` ) S ON T.version = S.version AND T.ping_type = S.ping_type diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_beta_aggregates/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fog_beta_aggregates/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_beta_aggregates/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_beta_aggregates/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_beta_aggregates/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fog_beta_aggregates/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_beta_aggregates/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_beta_aggregates/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_beta_aggregates/view.sql b/sql/moz-fx-glam-prod/glam_etl/glam_fog_beta_aggregates/view.sql similarity index 96% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_beta_aggregates/view.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_beta_aggregates/view.sql index e8ea55b63d9..c8b24152a97 100644 --- a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_beta_aggregates/view.sql +++ b/sql/moz-fx-glam-prod/glam_etl/glam_fog_beta_aggregates/view.sql @@ -1,5 +1,5 @@ CREATE OR REPLACE VIEW - `moz-fx-data-glam-prod-fca7.glam_etl.glam_fog_beta_aggregates` AS ( + `moz-fx-glam-prod.glam_etl.glam_fog_beta_aggregates` AS ( WITH base AS ( SELECT * EXCEPT (percentiles, non_norm_percentiles), @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW percentiles AS existing_percentiles, non_norm_percentiles AS existing_non_norm_percentiles FROM - `moz-fx-data-glam-prod-fca7.glam_etl.glam_fog_beta_aggregates_v1` + `moz-fx-glam-prod.glam_etl.glam_fog_beta_aggregates_v1` WHERE -- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51 ( diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_beta_aggregates_v1/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fog_beta_aggregates_v1/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_beta_aggregates_v1/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_beta_aggregates_v1/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_beta_aggregates_v1/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fog_beta_aggregates_v1/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_beta_aggregates_v1/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_beta_aggregates_v1/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_beta_aggregates_v1/script.sql b/sql/moz-fx-glam-prod/glam_etl/glam_fog_beta_aggregates_v1/script.sql similarity index 93% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_beta_aggregates_v1/script.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_beta_aggregates_v1/script.sql index baeddf9165a..6a39719b331 100644 --- a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_beta_aggregates_v1/script.sql +++ b/sql/moz-fx-glam-prod/glam_etl/glam_fog_beta_aggregates_v1/script.sql @@ -7,7 +7,7 @@ MERGE INTO SELECT * FROM - `moz-fx-data-glam-prod-fca7.glam_etl.firefox_desktop_glam_beta__extract_probe_counts_v1` + `moz-fx-glam-prod.glam_etl.firefox_desktop_glam_beta__extract_probe_counts_v1` ) S ON T.version = S.version AND T.ping_type = S.ping_type diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_nightly_aggregates/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fog_nightly_aggregates/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_nightly_aggregates/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_nightly_aggregates/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_nightly_aggregates/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fog_nightly_aggregates/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_nightly_aggregates/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_nightly_aggregates/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_nightly_aggregates/view.sql b/sql/moz-fx-glam-prod/glam_etl/glam_fog_nightly_aggregates/view.sql similarity index 96% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_nightly_aggregates/view.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_nightly_aggregates/view.sql index 270dd44f0bf..a551d94ae75 100644 --- a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_nightly_aggregates/view.sql +++ b/sql/moz-fx-glam-prod/glam_etl/glam_fog_nightly_aggregates/view.sql @@ -1,5 +1,5 @@ CREATE OR REPLACE VIEW - `moz-fx-data-glam-prod-fca7.glam_etl.glam_fog_nightly_aggregates` AS ( + `moz-fx-glam-prod.glam_etl.glam_fog_nightly_aggregates` AS ( WITH base AS ( SELECT * EXCEPT (percentiles, non_norm_percentiles), @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW percentiles AS existing_percentiles, non_norm_percentiles AS existing_non_norm_percentiles FROM - `moz-fx-data-glam-prod-fca7.glam_etl.glam_fog_nightly_aggregates_v1` + `moz-fx-glam-prod.glam_etl.glam_fog_nightly_aggregates_v1` WHERE -- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51 ( diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_nightly_aggregates_v1/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fog_nightly_aggregates_v1/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_nightly_aggregates_v1/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_nightly_aggregates_v1/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_nightly_aggregates_v1/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fog_nightly_aggregates_v1/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_nightly_aggregates_v1/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_nightly_aggregates_v1/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_nightly_aggregates_v1/script.sql b/sql/moz-fx-glam-prod/glam_etl/glam_fog_nightly_aggregates_v1/script.sql similarity index 93% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_nightly_aggregates_v1/script.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_nightly_aggregates_v1/script.sql index 7a4ec8571c5..4a7c3da59a6 100644 --- a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_nightly_aggregates_v1/script.sql +++ b/sql/moz-fx-glam-prod/glam_etl/glam_fog_nightly_aggregates_v1/script.sql @@ -7,7 +7,7 @@ MERGE INTO SELECT * FROM - `moz-fx-data-glam-prod-fca7.glam_etl.firefox_desktop_glam_nightly__extract_probe_counts_v1` + `moz-fx-glam-prod.glam_etl.firefox_desktop_glam_nightly__extract_probe_counts_v1` ) S ON T.version = S.version AND T.ping_type = S.ping_type diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_release_aggregates/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fog_release_aggregates/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_release_aggregates/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_release_aggregates/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_release_aggregates/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fog_release_aggregates/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_release_aggregates/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_release_aggregates/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_release_aggregates/view.sql b/sql/moz-fx-glam-prod/glam_etl/glam_fog_release_aggregates/view.sql similarity index 96% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_release_aggregates/view.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_release_aggregates/view.sql index 6a0f0add8b8..eec6ec78d32 100644 --- a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_release_aggregates/view.sql +++ b/sql/moz-fx-glam-prod/glam_etl/glam_fog_release_aggregates/view.sql @@ -1,5 +1,5 @@ CREATE OR REPLACE VIEW - `moz-fx-data-glam-prod-fca7.glam_etl.glam_fog_release_aggregates` AS ( + `moz-fx-glam-prod.glam_etl.glam_fog_release_aggregates` AS ( WITH base AS ( SELECT * EXCEPT (percentiles, non_norm_percentiles), @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW percentiles AS existing_percentiles, non_norm_percentiles AS existing_non_norm_percentiles FROM - `moz-fx-data-glam-prod-fca7.glam_etl.glam_fog_release_aggregates_v1` + `moz-fx-glam-prod.glam_etl.glam_fog_release_aggregates_v1` WHERE -- filter based on https://github.com/mozilla/python_mozaggregator/blob/6c0119bfd0b535346c37cb3f707d998039d3e24b/mozaggregator/service.py#L51 ( diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_release_aggregates_v1/metadata.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fog_release_aggregates_v1/metadata.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_release_aggregates_v1/metadata.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_release_aggregates_v1/metadata.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_release_aggregates_v1/schema.yaml b/sql/moz-fx-glam-prod/glam_etl/glam_fog_release_aggregates_v1/schema.yaml similarity index 100% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_release_aggregates_v1/schema.yaml rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_release_aggregates_v1/schema.yaml diff --git a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_release_aggregates_v1/script.sql b/sql/moz-fx-glam-prod/glam_etl/glam_fog_release_aggregates_v1/script.sql similarity index 93% rename from sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_release_aggregates_v1/script.sql rename to sql/moz-fx-glam-prod/glam_etl/glam_fog_release_aggregates_v1/script.sql index 89cd74826f2..5583d1db641 100644 --- a/sql/moz-fx-data-glam-prod-fca7/glam_etl/glam_fog_release_aggregates_v1/script.sql +++ b/sql/moz-fx-glam-prod/glam_etl/glam_fog_release_aggregates_v1/script.sql @@ -7,7 +7,7 @@ MERGE INTO SELECT * FROM - `moz-fx-data-glam-prod-fca7.glam_etl.firefox_desktop_glam_release__extract_probe_counts_v1` + `moz-fx-glam-prod.glam_etl.firefox_desktop_glam_release__extract_probe_counts_v1` ) S ON T.version = S.version AND T.ping_type = S.ping_type