From 6b6648be3e7b152e1b03735cb4d5cbd3f0042d52 Mon Sep 17 00:00:00 2001
From: Linh Nguyen <linhnguyen@mozilla.com>
Date: Wed, 6 Mar 2024 11:50:03 -0500
Subject: [PATCH 1/3] Update SQL modal

---
 src/components/SqlModal.svelte                      | 13 +++++++------
 src/routing/pages/probe/FirefoxLegacyDetails.svelte |  2 --
 src/routing/pages/probe/GleanDetails.svelte         |  7 -------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/components/SqlModal.svelte b/src/components/SqlModal.svelte
index 24756adb5..b69382262 100644
--- a/src/components/SqlModal.svelte
+++ b/src/components/SqlModal.svelte
@@ -84,12 +84,12 @@
     if ($store.probe.type === 'histogram') {
       tabs.push({
         id: 1,
-        label: 'Telemetry SQL',
+        label: 'Distribution SQL',
         sql: getDesktopSql,
       });
       tabs.push({
         id: 2,
-        label: 'Distribution SQL',
+        label: 'Telemetry SQL',
         sql: getDesktopSql,
       });
     }
@@ -202,8 +202,9 @@
       <p>Sorry, this feature is not available for Glean metrics yet.</p>
     {:else}
       <p>
-        The following SQL query can be copy/pasted and used in the BigQuery
-        console to explore this data further:
+        The following SQL query can be copied and used in the BigQuery console
+        to explore further. Please note that you need internal access to our
+        analysis tooling to query the data.
       </p>
     {/if}
     <ul>
@@ -232,8 +233,8 @@
     {#each tabs as tab}
       {#if activeTab === tab.id}
         <pre>
-          <code bind:this={sqlElement}>
-            {tab.label.includes('Distribution')
+          <code bind:this={sqlElement}
+            >{tab.label.includes('Distribution')
               ? tab.sql('distribution')
               : tab.sql('telemetry')}
           </code>
diff --git a/src/routing/pages/probe/FirefoxLegacyDetails.svelte b/src/routing/pages/probe/FirefoxLegacyDetails.svelte
index ecaabd21e..22518da22 100644
--- a/src/routing/pages/probe/FirefoxLegacyDetails.svelte
+++ b/src/routing/pages/probe/FirefoxLegacyDetails.svelte
@@ -6,7 +6,6 @@
   import StatusLabel from '../../../components/StatusLabel.svelte';
   import SqlModal from '../../../components/SqlModal.svelte';
   import Markdown from '../../../components/Markdown.svelte';
-  import LookerLink from '../../../components/LookerLink.svelte';
 
   export let showLinks = true;
 
@@ -245,7 +244,6 @@
           <Brackets size={16} />
           Export to JSON
         </button>
-        <LookerLink product="firefox" />
       </div>
     </div>
   {/if}
diff --git a/src/routing/pages/probe/GleanDetails.svelte b/src/routing/pages/probe/GleanDetails.svelte
index f44e47e5f..83307df41 100644
--- a/src/routing/pages/probe/GleanDetails.svelte
+++ b/src/routing/pages/probe/GleanDetails.svelte
@@ -7,7 +7,6 @@
   import { getBugURL, getBugLinkTitle } from '../../../utils/urls';
   import ExternalLink from '../../../components/icons/ExternalLink.svelte';
   import StatusLabel from '../../../components/StatusLabel.svelte';
-  import LookerLink from '../../../components/LookerLink.svelte';
 
   export let showLinks = true;
 
@@ -296,12 +295,6 @@
           <Brackets size={16} />
           Export to JSON
         </button>
-        <LookerLink
-          product="glean"
-          variants={$store.probe.variants}
-          sendInPings={$store.productDimensions.ping_type}
-          channel={$store.productDimensions.app_id}
-        />
       </div>
     </div>
   {/if}

From 3c8efbbe5fdb7bf30ebb0aca9afcc86e6bbc1f63 Mon Sep 17 00:00:00 2001
From: Linh Nguyen <linhnguyen@mozilla.com>
Date: Wed, 13 Mar 2024 11:00:26 -0400
Subject: [PATCH 2/3] Resolve rebase conflict

---
 .circleci/config.yml                        |  5 +-
 src/components/SqlModal.svelte              | 56 ++++++++++++++++++---
 src/routing/pages/probe/GleanDetails.svelte |  3 ++
 3 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b64d2e433..ca1f70a9e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -131,8 +131,7 @@ jobs:
             printf
             '{"commit":"%s","version":"%s","source":"https://github.com/%s/%s","build":"%s"}\n'
             "$CIRCLE_SHA1" "$CIRCLE_TAG" "$CIRCLE_PROJECT_USERNAME"
-            "$CIRCLE_PROJECT_REPONAME" "$CIRCLE_BUILD_URL"
-            > version.json
+            "$CIRCLE_PROJECT_REPONAME" "$CIRCLE_BUILD_URL" > version.json
       - run:
           name: Output version.json
           command: cat version.json
@@ -144,7 +143,7 @@ jobs:
           tag: $CIRCLE_TAG
           registry-url: gcr.io
       - gcp-gcr/push-image:
-          image:  auth0-proxy
+          image: auth0-proxy
           registry-url: gcr.io
           tag: $CIRCLE_TAG
           google-project-id: GOOGLE_PROJECT_ID
diff --git a/src/components/SqlModal.svelte b/src/components/SqlModal.svelte
index b69382262..32720848f 100644
--- a/src/components/SqlModal.svelte
+++ b/src/components/SqlModal.svelte
@@ -8,6 +8,8 @@
   import desktopTelemetrySql from '../stringTemplates/desktop-telemetry.tpl';
   import desktopDistributionSql from '../stringTemplates/desktop-distribution.tpl';
   import desktopHistogramProportionsSql from '../stringTemplates/desktop-histogram-proportions.tpl';
+  import fenixGlamSql from '../stringTemplates/fenix-glam.tpl';
+  import desktopGlamSql from '../stringTemplates/desktop-glam.tpl';
 
   let sqlElement;
   let status;
@@ -28,6 +30,40 @@
       sqlElement.style.transition = '';
     }, 500);
   }
+  function getGlamSql() {
+    const osFilter =
+      $store.productDimensions.os === '*'
+        ? 'os IS NULL'
+        : `os="${$store.productDimensions.os}"`;
+    const buildIdFilter =
+      $store.productDimensions.aggregationLevel === 'build_id'
+        ? 'app_build_id IS NOT NULL'
+        : 'app_build_id IS NULL';
+    const processFilter = $store.productDimensions.process
+      ? `AND process="${$store.productDimensions.process}"`
+      : '';
+    return _.template(desktopGlamSql)({
+      metric: $store.probe.name,
+      channel: $store.productDimensions.channel,
+      osFilter,
+      buildIdFilter,
+      processFilter,
+    });
+  }
+
+  function getFenixGlamSql() {
+    const buildIdFilter =
+      $store.productDimensions.aggregationLevel === 'build_id'
+        ? 'app_build_id!="*"'
+        : 'app_build_id="*"';
+    return _.template(fenixGlamSql)({
+      app_id: $store.productDimensions.app_id,
+      metric: $store.probe.name.replace('.', '_'),
+      os: $store.productDimensions.os,
+      ping_type: $store.productDimensions.ping_type,
+      buildIdFilter,
+    });
+  }
 
   function getDesktopSql(tpl = 'telemetry') {
     // TODO: Use the time horizon to date window in SQL?
@@ -80,6 +116,11 @@
 
   const tabs = [];
   if ($store.product === 'firefox') {
+    tabs.push({
+      id: 2,
+      label: 'GLAM SQL',
+      sql: getGlamSql,
+    });
     // Telemetry SQL only works on histograms.
     if ($store.probe.type === 'histogram') {
       tabs.push({
@@ -87,12 +128,13 @@
         label: 'Distribution SQL',
         sql: getDesktopSql,
       });
-      tabs.push({
-        id: 2,
-        label: 'Telemetry SQL',
-        sql: getDesktopSql,
-      });
     }
+  } else if ($store.product === 'fenix') {
+    tabs.push({
+      id: 1,
+      label: 'GLAM SQL',
+      sql: getFenixGlamSql,
+    });
   }
 </script>
 
@@ -234,9 +276,7 @@
       {#if activeTab === tab.id}
         <pre>
           <code bind:this={sqlElement}
-            >{tab.label.includes('Distribution')
-              ? tab.sql('distribution')
-              : tab.sql('telemetry')}
+            >{tab.sql()}
           </code>
           <div class="buttons">
             <button class="copy" on:click={copySql} title="Copy to clipboard">
diff --git a/src/routing/pages/probe/GleanDetails.svelte b/src/routing/pages/probe/GleanDetails.svelte
index 83307df41..1bc84fd75 100644
--- a/src/routing/pages/probe/GleanDetails.svelte
+++ b/src/routing/pages/probe/GleanDetails.svelte
@@ -7,6 +7,8 @@
   import { getBugURL, getBugLinkTitle } from '../../../utils/urls';
   import ExternalLink from '../../../components/icons/ExternalLink.svelte';
   import StatusLabel from '../../../components/StatusLabel.svelte';
+  import LookerLink from '../../../components/LookerLink.svelte';
+  import SqlModal from '../../../components/SqlModal.svelte';
 
   export let showLinks = true;
 
@@ -291,6 +293,7 @@
   {#if showLinks}
     <div class="probe-details-download">
       <div class="drawer-section drawer-section--end">
+        <SqlModal />
         <button on:click={exportData} class="docs-button">
           <Brackets size={16} />
           Export to JSON

From 43aebe0483709979a3582d5bb4f372a1e0b9300a Mon Sep 17 00:00:00 2001
From: Linh Nguyen <linhnguyen@mozilla.com>
Date: Wed, 13 Mar 2024 11:02:56 -0400
Subject: [PATCH 3/3] Resurrect GLAM templates

---
 src/components/SqlModal.svelte              |  2 +-
 src/routing/pages/probe/GleanDetails.svelte |  1 -
 src/stringTemplates/desktop-glam.tpl        | 20 ++++++++++++++++++++
 src/stringTemplates/fenix-glam.tpl          | 18 ++++++++++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 src/stringTemplates/desktop-glam.tpl
 create mode 100644 src/stringTemplates/fenix-glam.tpl

diff --git a/src/components/SqlModal.svelte b/src/components/SqlModal.svelte
index 32720848f..3a3e11140 100644
--- a/src/components/SqlModal.svelte
+++ b/src/components/SqlModal.svelte
@@ -125,7 +125,7 @@
     if ($store.probe.type === 'histogram') {
       tabs.push({
         id: 1,
-        label: 'Distribution SQL',
+        label: 'Telemetry SQL',
         sql: getDesktopSql,
       });
     }
diff --git a/src/routing/pages/probe/GleanDetails.svelte b/src/routing/pages/probe/GleanDetails.svelte
index 1bc84fd75..bf62e0e1d 100644
--- a/src/routing/pages/probe/GleanDetails.svelte
+++ b/src/routing/pages/probe/GleanDetails.svelte
@@ -7,7 +7,6 @@
   import { getBugURL, getBugLinkTitle } from '../../../utils/urls';
   import ExternalLink from '../../../components/icons/ExternalLink.svelte';
   import StatusLabel from '../../../components/StatusLabel.svelte';
-  import LookerLink from '../../../components/LookerLink.svelte';
   import SqlModal from '../../../components/SqlModal.svelte';
 
   export let showLinks = true;
diff --git a/src/stringTemplates/desktop-glam.tpl b/src/stringTemplates/desktop-glam.tpl
new file mode 100644
index 000000000..31d45e050
--- /dev/null
+++ b/src/stringTemplates/desktop-glam.tpl
@@ -0,0 +1,20 @@
+-- GLAM public aggregates data for Firefox Desktop Nightly and Beta
+
+SELECT os,
+    app_version,
+    app_build_id,
+    channel,
+    metric,
+    metric_type,
+    KEY,
+    process,
+    client_agg_type,
+    agg_type,
+    total_users,
+    mozfun.glam.histogram_cast_json(aggregates) AS aggregates
+FROM `mozilla-public-data.glam_derived.client_probe_counts_firefox_desktop_nightly_v1` 
+--   for `beta` channel data: mozilla-public-data.glam_derived.client_probe_counts_firefox_desktop_beta_v1
+WHERE metric="${ metric }"
+AND channel="${ channel }"
+AND ${ osFilter }
+AND ${ buildIdFilter } ${ processFilter }
\ No newline at end of file
diff --git a/src/stringTemplates/fenix-glam.tpl b/src/stringTemplates/fenix-glam.tpl
new file mode 100644
index 000000000..1c2541993
--- /dev/null
+++ b/src/stringTemplates/fenix-glam.tpl
@@ -0,0 +1,18 @@
+-- GLAM Fenix aggregates data (note that this is an internal table)
+
+SELECT ping_type,
+    os,
+    app_version,
+    app_build_id,
+    metric,
+    metric_type,
+    KEY,
+    client_agg_type,
+    agg_type,
+    total_users,
+    mozfun.glam.histogram_cast_json(aggregates) AS aggregates,
+FROM `moz-fx-data-shared-prod.glam_etl.org_mozilla_fenix_glam_${ app_id }__view_probe_counts_v1`
+WHERE metric="${ metric }"
+AND os="${ os }"
+AND ping_type="${ ping_type }"
+AND ${ buildIdFilter }
\ No newline at end of file