Clean up + only filter release channel

Author: BenWu

sql/moz-fx-data-shared-prod/telemetry_derived/event_events_v1/query.sql

@@ -60,15 +60,15 @@ WHERE
     AND mozfun.norm.extract_version(app_version, 'major')
     BETWEEN 84
     AND 87
-  ) IS FALSE
+  ) IS NOT TRUE
   -- See https://bugzilla.mozilla.org/show_bug.cgi?id=1803833
   AND (
     event_category = 'normandy'
     AND event_method = 'validationFailed'
     AND mozfun.map.get_key(event_map_values, 'reason') = 'invalid-feature'
     AND mozfun.map.get_key(event_map_values, 'feature') IN ('nimbus-qa-1', 'nimbus-qa-2')
     AND mozfun.norm.extract_version(app_version, 'major') <= 108
-  ) IS FALSE
+  ) IS NOT TRUE
   -- See https://mozilla-hub.atlassian.net/browse/DENG-7513
   AND (
     event_category = 'security'
@@ -77,10 +77,11 @@ WHERE
     AND mozfun.norm.extract_version(app_version, 'major')
     BETWEEN 133
     AND 135
-  ) IS FALSE
+  ) IS NOT TRUE
   -- See https://mozilla-hub.atlassian.net/browse/DENG-9732
   AND (
     event_category = "uptake.remotecontent.result"
     AND event_method = "uptake"
+    AND normalized_channel = 'release'
     AND mozfun.norm.extract_version(app_version, 'major') >= 143
-  ) IS FALSE
+  ) IS NOT TRUE

sql_generators/glean_usage/templates/event_monitoring_aggregates_v1.query.sql

@@ -9,15 +9,8 @@ WITH
     base_{{ dataset['bq_dataset_family'] }}_{{ events_table }} AS (
       SELECT
         @submission_date AS submission_date,
-        TIMESTAMP_ADD(
-          TIMESTAMP_TRUNC(submission_timestamp, HOUR),
-            -- Aggregates event counts over 60-minute intervals
-          INTERVAL(DIV(EXTRACT(MINUTE FROM submission_timestamp), 60) * 60) MINUTE
-        ) AS window_start,
-        TIMESTAMP_ADD(
-          TIMESTAMP_TRUNC(submission_timestamp, HOUR),
-          INTERVAL((DIV(EXTRACT(MINUTE FROM submission_timestamp), 60) + 1) * 60) MINUTE
-        ) AS window_end,
+        TIMESTAMP_TRUNC(submission_timestamp, HOUR) AS window_start,
+        TIMESTAMP_ADD(TIMESTAMP_TRUNC(submission_timestamp, HOUR), INTERVAL 1 HOUR) AS window_end,
         event.category AS event_category,
         event.name AS event_name,
         event_extra.key AS event_extra_key,
@@ -47,7 +40,7 @@ WITH
             event.category = "uptake.remotecontent.result"
             AND event.name IN ("uptake_remotesettings", "uptake_normandy")
             AND mozfun.norm.extract_version(client_info.app_display_version, 'major') >= 143
-          ) IS FALSE
+          ) IS NOT TRUE
         {% endif %}
       GROUP BY
         submission_date,
@@ -57,17 +50,27 @@ WITH
         event_name,
         event_extra_key,
         country,
-        normalized_app_name,
         channel,
         version,
         experiment,
-      experiment_branch
+        experiment_branch
     ),
   {% endfor %}
   {{ dataset['bq_dataset_family'] }}_aggregated AS (
     SELECT
+      submission_date,
+      window_start,
+      window_end,
+      event_category,
+      event_name,
+      event_extra_key,
+      country,
       "{{ dataset['canonical_app_name'] }}" AS normalized_app_name,
-      * REPLACE (SUM(total_events) AS total_events),
+      channel,
+      version,
+      experiment,
+      experiment_branch,
+      SUM(total_events) AS total_events,
     FROM
       (
         {% for events_table in event_tables_per_dataset[dataset['bq_dataset_family']] -%}

sql_generators/glean_usage/templates/event_monitoring_live_v1.materialized_view.sql

@@ -35,10 +35,11 @@ IF
           WHERE
             -- See https://mozilla-hub.atlassian.net/browse/DENG-9732
             (
-              event.category = "uptake.remotecontent.result"
-              AND event.name IN ("uptake_remotesettings", "uptake_normandy")
+              normalized_channel = 'release'
+              AND event.category = 'uptake.remotecontent.result'
+              AND event.name IN ('uptake_remotesettings', 'uptake_normandy')
               AND mozfun.norm.extract_version(client_info.app_display_version, 'major') >= 143
-            ) IS FALSE
+            ) IS NOT TRUE
         {% endif %}
       ){{ "," if not loop.last }}
     {% endfor -%},
@@ -55,15 +56,8 @@ IF
     SELECT
       -- used for partitioning, only allows TIMESTAMP columns
       TIMESTAMP_TRUNC(submission_timestamp, DAY) AS submission_date,
-      TIMESTAMP_ADD(
-      TIMESTAMP_TRUNC(submission_timestamp, HOUR),
-        -- Aggregates event counts over 60-minute intervals
-        INTERVAL(DIV(EXTRACT(MINUTE FROM submission_timestamp), 60) * 60) MINUTE
-      ) AS window_start,
-      TIMESTAMP_ADD(
-        TIMESTAMP_TRUNC(submission_timestamp, HOUR),
-        INTERVAL((DIV(EXTRACT(MINUTE FROM submission_timestamp), 60) + 1) * 60) MINUTE
-      ) AS window_end,
+      TIMESTAMP_TRUNC(submission_timestamp, HOUR) AS window_start,
+      TIMESTAMP_ADD(TIMESTAMP_TRUNC(submission_timestamp, HOUR), INTERVAL 1 HOUR) AS window_end,
       * EXCEPT (submission_timestamp),
       COUNT(*) AS total_events,
     FROM

sql_generators/glean_usage/templates/events_stream_v1.query.sql

@@ -155,9 +155,10 @@ CROSS JOIN
       ) IS NOT TRUE
       -- See https://mozilla-hub.atlassian.net/browse/DENG-9732
       AND (
-        event.category = "uptake.remotecontent.result"
-        AND event.name IN ("uptake_remotesettings", "uptake_normandy")
-        AND mozfun.norm.extract_version(client_info.app_display_version, 'major') >= 143
+        normalized_channel = 'release'
+        AND event.category = 'uptake.remotecontent.result'
+        AND event.name IN ('uptake_remotesettings', 'uptake_normandy')
+        AND app_version_major >= 143
       ) IS NOT TRUE
   {% elif app_name == "firefox_desktop_background_update" %}
     WHERE