adjusting the fenix counts (#2837)

bigquery_etl/glam/templates/extract_probe_counts_v1.sql

@@ -51,7 +51,6 @@ glam_sample_counts AS (
     AND fsc1.metric = fsc2.metric
     AND fsc1.key = fsc2.key
     AND fsc1.ping_type = fsc2.ping_type
-WHERE fsc2.agg_type = 'count'
 ),
 -- get all the rcords from view_probe_counts and the matching from view_sample_counts
 ranked_data AS (SELECT

bigquery_etl/glam/templates/view_sample_counts_v1.sql

@@ -65,13 +65,32 @@ scalars_histogram_data AS (
 SELECT
     {{ attributes }},
     metric, 
-    key,
+    '' AS key,
     agg_type,
     SUM(value) as total_sample
 FROM
     all_combos
+WHERE agg_type = 'summed_histogram'
 GROUP BY
     {{ attributes }}, 
     metric, 
     key,
     agg_type
+
+UNION ALL
+
+SELECT
+    {{ attributes }},
+    metric,
+    key,
+    agg_type,
+    SUM(value) as total_sample
+FROM
+    all_combos
+WHERE agg_type <> 'summed_histogram'
+GROUP BY
+    {{ attributes }},
+    metric,
+    key,
+    agg_type
+

sql/glam-fenix-dev/glam_etl/org_mozilla_fenix_glam_nightly__view_sample_counts_v1/view.sql

@@ -96,6 +96,8 @@ SELECT
   SUM(value) AS total_sample
 FROM
   all_combos
+WHERE
+  agg_type <> 'summed_histogram'
 GROUP BY
   ping_type,
   os,