Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DENG-476 - Update internet outages to reference main_v5 #4432

Merged
merged 2 commits into from
Oct 26, 2023
Merged

DENG-476 - Update internet outages to reference main_v5 #4432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a0f148
DENG-476 - Update internet outages to reference main_v5
relud Oct 16, 2023
59ae2c6
Merge branch 'main' into outages-main-v5
relud Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dags/bqetl_internet_outages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@
internet_outages__global_outages__v1.set_upstream(
wait_for_copy_deduplicate_main_ping
)
wait_for_telemetry_derived__clients_daily__v6 = ExternalTaskSensor(
task_id="wait_for_telemetry_derived__clients_daily__v6",
wait_for_telemetry_derived__clients_daily_joined__v1 = ExternalTaskSensor(
task_id="wait_for_telemetry_derived__clients_daily_joined__v1",
external_dag_id="bqetl_main_summary",
external_task_id="telemetry_derived__clients_daily__v6",
external_task_id="telemetry_derived__clients_daily_joined__v1",
execution_delta=datetime.timedelta(seconds=18000),
check_existence=True,
mode="reschedule",
Expand All @@ -97,5 +97,5 @@
)

internet_outages__global_outages__v1.set_upstream(
wait_for_telemetry_derived__clients_daily__v6
wait_for_telemetry_derived__clients_daily_joined__v1
)
14 changes: 7 additions & 7 deletions dags/bqetl_main_summary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,6 @@
external_task_id="wait_for_telemetry_derived__clients_daily__v6",
)

ExternalTaskMarker(
task_id="bqetl_internet_outages__wait_for_telemetry_derived__clients_daily__v6",
external_dag_id="bqetl_internet_outages",
external_task_id="wait_for_telemetry_derived__clients_daily__v6",
execution_date="{{ (execution_date - macros.timedelta(days=-1, seconds=68400)).isoformat() }}",
)

ExternalTaskMarker(
task_id="jetstream__wait_for_clients_daily",
external_dag_id="jetstream",
Expand Down Expand Up @@ -222,6 +215,13 @@
execution_date="{{ (execution_date - macros.timedelta(seconds=7200)).isoformat() }}",
)

ExternalTaskMarker(
task_id="bqetl_internet_outages__wait_for_telemetry_derived__clients_daily_joined__v1",
external_dag_id="bqetl_internet_outages",
external_task_id="wait_for_telemetry_derived__clients_daily_joined__v1",
execution_date="{{ (execution_date - macros.timedelta(days=-1, seconds=68400)).isoformat() }}",
)

ExternalTaskMarker(
task_id="bqetl_search__wait_for_telemetry_derived__clients_daily_joined__v1",
external_dag_id="bqetl_search",
Expand Down
12 changes: 0 additions & 12 deletions sql/moz-fx-data-shared-prod/internet_outages/global_outages_v1/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,6 @@ labels:
- '1640204'
scheduling:
dag_name: bqetl_internet_outages
# provide this value so that DAG generation does not have to dry run the
# query to get it, and that would be slow because main_v4 is referenced
referenced_tables:
- - moz-fx-data-shared-prod
- telemetry_stable
- main_v4
- - moz-fx-data-shared-prod
- telemetry_derived
- clients_daily_v6
- - moz-fx-data-shared-prod
- telemetry_stable
- health_v4
bigquery:
time_partitioning:
type: day
Expand Down
2 changes: 1 addition & 1 deletion sql/moz-fx-data-shared-prod/internet_outages/global_outages_v1/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ histogram_data_sample AS (
payload.processes.content.histograms.http_page_tls_handshake
).values AS tls_handshake,
FROM
telemetry_stable.main_v4
telemetry_stable.main_v5
WHERE
DATE(submission_timestamp) = @submission_date
-- Restrict to Firefox.
Expand Down