There is a need to expose some PPA data within Grafana. Grafana is only able to access mozilla-confidential data, so here we're stripping the sensitive fields from this data (advertiser and campaign identifiers)
Also updated the description of a related view
Checklist for reviewer:
[ ] Commits should reference a bug or github issue, if relevant (if a bug is referenced, the pull request should include the bug number in the title).
[ ] If the PR comes from a fork, trigger integration CI tests by running the Push to upstream workflow and provide the <username>:<branch> of the fork as parameter. The parameter will also show up
in the logs of the manual-trigger-required-for-fork CI task together with more detailed instructions.
[ ] If adding a new field to a query, ensure that the schema and dependent downstream schemas have been updated.
[ ] When adding a new derived dataset, ensure that data is not available already (fully or partially) and recommend extending an existing dataset in favor of creating new ones. Data can be available in the bigquery-etl repository, looker-hub or in looker-spoke-default.
For modifications to schemas in restricted namespaces (see CODEOWNERS):
Integration report for "Merge branch 'ppa-measurements-moz-conf' of github.com:mozilla/bigquery-etl into ppa-measurements-moz-conf"
sql.diff
Click to expand!
```diff
Only in /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/ads: ppa_measurements_wo_advertiser
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements/metadata.yaml 2024-08-02 20:20:46.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements/metadata.yaml 2024-08-02 20:21:01.000000000 +0000
@@ -5,9 +5,6 @@
This data lives in the moz-fx-ads-nonprod project and is generated by the
PPA DAP Collector job (dap_collector_ppa_dev DAG, defined in
telemetry-airflow and docker-etl)
-
- Temporarily pointed at the dev instance of this data; will point to prod once
- that exists
owners:
- cmorales@mozilla.com
workgroup_access:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_wo_advertiser/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_wo_advertiser/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_wo_advertiser/metadata.yaml 1970-01-01 00:00:00.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_wo_advertiser/metadata.yaml 2024-08-02 20:21:01.000000000 +0000
@@ -0,0 +1,21 @@
+friendly_name: PPA Measurements
+description: |-
+ Aggregated conversion data from PPA (Privacy-Preserving Attribution)
+
+ Strips sensitive fields advertiser_name, advertiser_id, and campaign_id to
+ produce a version of this view that is safe to expose to mozilla-confidential
+
+ This data lives in the moz-fx-ads-nonprod project and is generated by the
+ PPA DAP Collector job (dap_collector_ppa_dev DAG, defined in
+ telemetry-airflow and docker-etl)
+owners:
+ - cmorales@mozilla.com
+workgroup_access:
+ - role: roles/bigquery.dataViewer
+ members:
+ - workgroup:mozilla-confidential
+
+# Generated by bigquery_etl.dependency
+references:
+ view.sql:
+ - moz-fx-ads-prod.ppa.measurements
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_wo_advertiser/view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_wo_advertiser/view.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_wo_advertiser/view.sql 1970-01-01 00:00:00.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_wo_advertiser/view.sql 2024-08-02 20:20:00.000000000 +0000
@@ -0,0 +1,14 @@
+CREATE OR REPLACE VIEW
+ `moz-fx-data-shared-prod.ads.ppa_measurements_wo_advertiser`
+AS
+SELECT
+ collection_time,
+ placement_id,
+ ad_id,
+ conversion_key,
+ task_size,
+ task_id,
+ task_index,
+ conversion_count,
+FROM
+ `moz-fx-ads-prod.ppa.measurements`
```
Click to expand!
```diff
Only in /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/ads: ppa_measurements_limited
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements/metadata.yaml 2024-08-02 20:31:56.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements/metadata.yaml 2024-08-02 20:31:59.000000000 +0000
@@ -5,9 +5,6 @@
This data lives in the moz-fx-ads-nonprod project and is generated by the
PPA DAP Collector job (dap_collector_ppa_dev DAG, defined in
telemetry-airflow and docker-etl)
-
- Temporarily pointed at the dev instance of this data; will point to prod once
- that exists
owners:
- cmorales@mozilla.com
workgroup_access:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_limited/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_limited/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_limited/metadata.yaml 1970-01-01 00:00:00.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_limited/metadata.yaml 2024-08-02 20:31:59.000000000 +0000
@@ -0,0 +1,23 @@
+friendly_name: PPA Measurements
+description: |-
+ Aggregated conversion data from PPA (Privacy-Preserving Attribution)
+
+ Strips sensitive fields advertiser_name, advertiser_id, and campaign_id to
+ produce a version of this view that is safe to expose to mozilla-confidential
+
+ This data lives in the moz-fx-ads-nonprod project and is generated by the
+ PPA DAP Collector job (dap_collector_ppa_dev DAG, defined in
+ telemetry-airflow and docker-etl)
+owners:
+ - cmorales@mozilla.com
+labels:
+ authorized: true
+workgroup_access:
+ - role: roles/bigquery.dataViewer
+ members:
+ - workgroup:mozilla-confidential
+
+# Generated by bigquery_etl.dependency
+references:
+ view.sql:
+ - moz-fx-ads-prod.ppa.measurements
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_limited/view.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_limited/view.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_limited/view.sql 1970-01-01 00:00:00.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/ads/ppa_measurements_limited/view.sql 2024-08-02 20:31:02.000000000 +0000
@@ -0,0 +1,14 @@
+CREATE OR REPLACE VIEW
+ `moz-fx-data-shared-prod.ads.ppa_measurements_limited`
+AS
+SELECT
+ collection_time,
+ placement_id,
+ ad_id,
+ conversion_key,
+ task_size,
+ task_id,
+ task_index,
+ conversion_count,
+FROM
+ `moz-fx-ads-prod.ppa.measurements`
```
There is a need to expose some PPA data within Grafana. Grafana is only able to access mozilla-confidential data, so here we're stripping the sensitive fields from this data (advertiser and campaign identifiers)
Also updated the description of a related view
Checklist for reviewer:
<username>:<branch>
of the fork as parameter. The parameter will also show up in the logs of themanual-trigger-required-for-fork
CI task together with more detailed instructions.For modifications to schemas in restricted namespaces (see
CODEOWNERS
):