Merge pull request #833 from m-lab/sandbox-cristinaleon-pcap

Add pcap to existing bigquery exporter queries
m-lab · Aug 3, 2021 · 4897ce9 · 4897ce9
2 parents 7a1b7a0 + 0f3a2da
commit 4897ce9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/config/federation/bigquery/bq_gardener.sql.template b/config/federation/bigquery/bq_gardener.sql.template
@@ -42,6 +42,15 @@ WITH all_types AS (
     `{{PROJECT}}.raw_ndt.annotation`
   WHERE date > date('2019-01-01')
   UNION ALL
+  SELECT
+    "raw_ndt.pcap" AS datatype,
+    id,
+    date,
+    parser.Time as parseTime,
+  FROM
+    `{{PROJECT}}.raw_ndt.pcap`
+  WHERE date > date('2019-01-01')
+  UNION ALL
   -- ndt.ndt7 is generated by gardener by joining the raw ndt7 and raw annotation tables.
   SELECT
     "ndt.ndt7" AS datatype,

diff --git a/config/federation/bigquery/bq_gardener_parse_time.sql.template b/config/federation/bigquery/bq_gardener_parse_time.sql.template
@@ -42,4 +42,8 @@ FROM (
     SELECT "ndt/annotation" AS datatype, MIN(Parser.Time) AS min_parse_time
     FROM   `{{PROJECT}}.raw_ndt.annotation`
     WHERE date > date('2019-01-01')
+  UNION ALL
+    SELECT "ndt/pcap" AS datatype, MIN(Parser.Time) AS min_parse_time
+    FROM   `{{PROJECT}}.raw_ndt.pcap`
+    WHERE date > date('2019-01-01')
 )