[connectivity_wlan] Add reports with ps experiment

Bug: 92093
Change-Id: I1ebdfcf3498eded7d3407fc7d09784b636bed79d
Reviewed-on: https://fuchsia-review.googlesource.com/c/cobalt-registry/+/659346
Reviewed-by: Steve Fung <stevefung@google.com>
Privacy-Approval: Steve Fung <stevefung@google.com>
Fuchsia-Auto-Submit: Kiet Tran <kiettran@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
diff --git a/fuchsia/connectivity_wlan/metrics.yaml b/fuchsia/connectivity_wlan/metrics.yaml
index 72a23ac..b10dd2a 100644
--- a/fuchsia/connectivity_wlan/metrics.yaml
+++ b/fuchsia/connectivity_wlan/metrics.yaml
@@ -3269,6 +3269,14 @@
   <<: *fleetwide_total_time_quality_metric_template__metric_portion
   reports:
     - *fleetwide_total_time_quality_metric_template__default_report_1
+    - id: 101
+      report_name: fleetwide_hourly_local_sum__exp
+      experiment_id: [12345678, 87654321]
+      <<: &fleetwide_total_time_quality_metric_template__report_1_with_exp
+        report_type: HOURLY_VALUE_NUMERIC_STATS
+        local_aggregation_procedure: SUM_PROCEDURE
+        privacy_level: NO_ADDED_PRIVACY
+        system_profile_field: [BOARD_NAME, CHANNEL, SYSTEM_VERSION, EXPERIMENT_IDS]
 
 # Setup for metrics that simply log and sum up fleetwide occurrence. This
 # metric is highly aggregatable, hence only one default report that has all
@@ -3296,6 +3304,13 @@
   <<: *total_occurrence_counts_template__metric_portion
   reports:
     - *total_occurrence_counts_template__default_report_1
+    - id: 101
+      report_name: fleetwide_occurrence_counts__exp
+      experiment_id: [12345678, 87654321]
+      <<: &total_occurrence_counts_template__report_1_with_exp
+        report_type: FLEETWIDE_OCCURRENCE_COUNTS
+        privacy_level: NO_ADDED_PRIVACY
+        system_profile_field: [BOARD_NAME, CHANNEL, SYSTEM_VERSION, EXPERIMENT_IDS]
 
 # Setup for metrics where a device computes a ratio per day and log that
 # ratio before the end of the day. Only daily reports can be generated
@@ -3350,6 +3365,24 @@
         local_aggregation_procedure: MAX_PROCEDURE
         privacy_level: NO_ADDED_PRIVACY
         system_profile_field: [BOARD_NAME, CHANNEL, SYSTEM_VERSION]
+    - id: 101
+      report_name: device_daily_local_avg_stats__exp
+      experiment_id: [12345678, 87654321]
+      <<: &device_log_local_ratio_once_daily_monitoring_metric_template__report_1_with_exp
+        report_type: UNIQUE_DEVICE_NUMERIC_STATS
+        local_aggregation_period: WINDOW_1_DAY
+        local_aggregation_procedure: MEAN
+        privacy_level: NO_ADDED_PRIVACY
+        system_profile_field: [BOARD_NAME, CHANNEL, EXPERIMENT_IDS]
+    - id: 102
+      report_name: device_daily_local_avg_stats_system_ver__exp
+      experiment_id: [12345678, 87654321]
+      <<: &device_log_local_ratio_once_daily_monitoring_metric_template__report_2_with_exp
+        report_type: UNIQUE_DEVICE_NUMERIC_STATS
+        local_aggregation_period: WINDOW_1_DAY
+        local_aggregation_procedure: MEAN
+        privacy_level: NO_ADDED_PRIVACY
+        system_profile_field: [BOARD_NAME, CHANNEL, SYSTEM_VERSION, EXPERIMENT_IDS]
 
 # Setup for metrics that count the number of devices where an event has
 # occurred or a feature has been used at least once, or the device itself
@@ -3415,6 +3448,26 @@
   <<: *device_counts_metric_template__metric_portion
   reports:
     - *device_counts_metric_template__default_report_1
+    - id: 102
+      report_name: device_daily_counts_at_least_once_system_ver__exp
+      experiment_id: [12345678, 87654321]
+      <<: &device_counts_metric_template__report_2_with_exp
+        report_type: UNIQUE_DEVICE_COUNTS
+        system_profile_selection: SELECT_LAST
+        local_aggregation_period: WINDOW_1_DAY
+        local_aggregation_procedure: AT_LEAST_ONCE
+        privacy_level: NO_ADDED_PRIVACY
+        system_profile_field: [BOARD_NAME, CHANNEL, SYSTEM_VERSION, EXPERIMENT_IDS]
+    - id: 104
+      report_name: device_weekly_counts_at_least_once_system_ver__exp
+      experiment_id: [12345678, 87654321]
+      <<: &device_counts_metric_template__report_4_with_exp
+        report_type: UNIQUE_DEVICE_COUNTS
+        system_profile_selection: SELECT_LAST
+        local_aggregation_period: WINDOW_7_DAYS
+        local_aggregation_procedure: AT_LEAST_ONCE
+        privacy_level: NO_ADDED_PRIVACY
+        system_profile_field: [BOARD_NAME, CHANNEL, SYSTEM_VERSION, EXPERIMENT_IDS]
 
 # Setup for metrics where a device computes a ratio per day and log an
 # occurrence with that ratio as the dimension. Only daily reports can
@@ -3642,7 +3695,13 @@
 ################################################################################
 - id: 1000
   metric_name: total_wlan_uptime_near_saved_network
-  <<: *fleetwide_total_time_quality_metric_template
+  <<: *fleetwide_total_time_quality_metric_template__metric_portion
+  reports:
+    - *fleetwide_total_time_quality_metric_template__default_report_1
+    - <<: *fleetwide_total_time_quality_metric_template__report_1_with_exp
+      id: 101
+      report_name: fleetwide_hourly_local_sum__ps_exp
+      experiment_id: &ps_exp_ids [49331091, 49331092, 49331142, 49331143, 49331144]
 
 ################################################################################
 # Total amount of time that the client is connected
@@ -3654,9 +3713,15 @@
 #       disconnects per day connected), so make sure it has the same columns
 #       as the metrics that use this as the denominator.
 ################################################################################
-- <<: *fleetwide_total_time_quality_metric_template
-  id: 1001
+- id: 1001
   metric_name: total_connected_uptime
+  <<: *fleetwide_total_time_quality_metric_template__metric_portion
+  reports:
+    - *fleetwide_total_time_quality_metric_template__default_report_1
+    - <<: *fleetwide_total_time_quality_metric_template__report_1_with_exp
+      id: 101
+      report_name: fleetwide_hourly_local_sum__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Total number of disconnects
@@ -3665,7 +3730,13 @@
 ################################################################################
 - id: 1002
   metric_name: total_disconnect_count
-  <<: *total_occurrence_counts_template
+  <<: *total_occurrence_counts_template__metric_portion
+  reports:
+    - *total_occurrence_counts_template__default_report_1
+    - <<: *total_occurrence_counts_template__report_1_with_exp
+      id: 101
+      report_name: fleetwide_occurrence_counts__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Time with high RX packet drop
@@ -3673,9 +3744,15 @@
 # Periodically while a client is connected, log the amount of time when the
 # client has had high RX packet drop.
 ################################################################################
-- <<: *fleetwide_total_time_quality_metric_template
-  id: 1003
+- id: 1003
   metric_name: total_time_with_high_rx_packet_drop
+  <<: *fleetwide_total_time_quality_metric_template__metric_portion
+  reports:
+    - *fleetwide_total_time_quality_metric_template__default_report_1
+    - <<: *fleetwide_total_time_quality_metric_template__report_1_with_exp
+      id: 101
+      report_name: fleetwide_hourly_local_sum__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Time with high TX packet drop
@@ -3683,9 +3760,15 @@
 # Periodically while a client is connected, log the amount of time when the
 # client has had high TX packet drop.
 ################################################################################
-- <<: *fleetwide_total_time_quality_metric_template
-  id: 1004
+- id: 1004
   metric_name: total_time_with_high_tx_packet_drop
+  <<: *fleetwide_total_time_quality_metric_template__metric_portion
+  reports:
+    - *fleetwide_total_time_quality_metric_template__default_report_1
+    - <<: *fleetwide_total_time_quality_metric_template__report_1_with_exp
+      id: 101
+      report_name: fleetwide_hourly_local_sum__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Time with no RX
@@ -3693,9 +3776,15 @@
 # Periodically while a client is connected, log the amount of time when the
 # client has had no RX.
 ################################################################################
-- <<: *fleetwide_total_time_quality_metric_template
-  id: 1005
+- id: 1005
   metric_name: total_time_with_no_rx
+  <<: *fleetwide_total_time_quality_metric_template__metric_portion
+  reports:
+    - *fleetwide_total_time_quality_metric_template__default_report_1
+    - <<: *fleetwide_total_time_quality_metric_template__report_1_with_exp
+      id: 101
+      report_name: fleetwide_hourly_local_sum__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Time with very high RX packet drop
@@ -3703,9 +3792,15 @@
 # Periodically while a client is connected, log the amount of time when the
 # client has had very high RX packet drop.
 ################################################################################
-- <<: *fleetwide_total_time_quality_metric_template
-  id: 1006
+- id: 1006
   metric_name: total_time_with_very_high_rx_packet_drop
+  <<: *fleetwide_total_time_quality_metric_template__metric_portion
+  reports:
+    - *fleetwide_total_time_quality_metric_template__default_report_1
+    - <<: *fleetwide_total_time_quality_metric_template__report_1_with_exp
+      id: 101
+      report_name: fleetwide_hourly_local_sum__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Time with very high TX packet drop
@@ -3713,9 +3808,15 @@
 # Periodically while a client is connected, log the amount of time when the
 # client has had very high TX packet drop.
 ################################################################################
-- <<: *fleetwide_total_time_quality_metric_template
-  id: 1007
+- id: 1007
   metric_name: total_time_with_very_high_tx_packet_drop
+  <<: *fleetwide_total_time_quality_metric_template__metric_portion
+  reports:
+    - *fleetwide_total_time_quality_metric_template__default_report_1
+    - <<: *fleetwide_total_time_quality_metric_template__report_1_with_exp
+      id: 101
+      report_name: fleetwide_hourly_local_sum__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Total number of roaming disconnects
@@ -3724,7 +3825,13 @@
 ################################################################################
 - id: 1008
   metric_name: total_roaming_disconnect_count
-  <<: *total_occurrence_counts_template
+  <<: *total_occurrence_counts_template__metric_portion
+  reports:
+    - *total_occurrence_counts_template__default_report_1
+    - <<: *total_occurrence_counts_template__report_1_with_exp
+      id: 101
+      report_name: fleetwide_occurrence_counts__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Total number of non-roaming disconnects
@@ -3735,7 +3842,13 @@
 ################################################################################
 - id: 1009
   metric_name: total_non_roaming_disconnect_count
-  <<: *total_occurrence_counts_template
+  <<: *total_occurrence_counts_template__metric_portion
+  reports:
+    - *total_occurrence_counts_template__default_report_1
+    - <<: *total_occurrence_counts_template__report_1_with_exp
+      id: 101
+      report_name: fleetwide_occurrence_counts__ps_exp
+      experiment_id: *ps_exp_ids
 
 #############################
 ### 2XXX - Monitoring metrics
@@ -3747,9 +3860,20 @@
 # Every day, before the end of the day UTC time, log the connected uptime ratio
 # for that day (time connected / WLAN uptime near saved network).
 ################################################################################
-- <<: *device_log_local_ratio_once_daily_monitoring_metric_template
-  id: 2000
+- id: 2000
   metric_name: connected_uptime_ratio
+  <<: *device_log_local_ratio_once_daily_monitoring_metric_template__metric_portion
+  reports:
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_1
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_2
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_1_with_exp
+      id: 101
+      report_name: device_daily_local_avg_stats__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_local_avg_stats_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Disconnect per day connected
@@ -3771,6 +3895,14 @@
           floor: 0
           num_buckets: 150
           step_size: 1000  # Each bucket is 0.1 ratio
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_1_with_exp
+      id: 101
+      report_name: device_daily_local_avg_stats__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_local_avg_stats_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Time ratio with high RX packet drop
@@ -3778,9 +3910,20 @@
 # Every day, before the end of the day UTC time, log the time ratio with high
 # RX packet drop for that day (time with high packet drop / time connected)
 ################################################################################
-- <<: *device_log_local_ratio_once_daily_monitoring_metric_template
-  id: 2002
+- id: 2002
   metric_name: time_ratio_with_high_rx_packet_drop
+  <<: *device_log_local_ratio_once_daily_monitoring_metric_template__metric_portion
+  reports:
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_1
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_2
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_1_with_exp
+      id: 101
+      report_name: device_daily_local_avg_stats__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_local_avg_stats_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Time ratio with high TX packet drop
@@ -3788,9 +3931,20 @@
 # Every day, before the end of the day UTC time, log the time ratio with high
 # TX packet drop for that day (time with high packet drop / time connected)
 ################################################################################
-- <<: *device_log_local_ratio_once_daily_monitoring_metric_template
-  id: 2003
+- id: 2003
   metric_name: time_ratio_with_high_tx_packet_drop
+  <<: *device_log_local_ratio_once_daily_monitoring_metric_template__metric_portion
+  reports:
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_1
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_2
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_1_with_exp
+      id: 101
+      report_name: device_daily_local_avg_stats__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_local_avg_stats_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Time ratio with no RX
@@ -3798,18 +3952,40 @@
 # Every day, before the end of the day UTC time, log the time ratio with no RX
 # for that day (time with high packet loss / time connected)
 ################################################################################
-- <<: *device_log_local_ratio_once_daily_monitoring_metric_template
-  id: 2004
+- id: 2004
   metric_name: time_ratio_with_no_rx
+  <<: *device_log_local_ratio_once_daily_monitoring_metric_template__metric_portion
+  reports:
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_1
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_2
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_1_with_exp
+      id: 101
+      report_name: device_daily_local_avg_stats__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_local_avg_stats_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Connection success rate
 #
 # Every day, log connection success rate of the device on that day
 ################################################################################
-- <<: *device_log_local_ratio_once_daily_monitoring_metric_template
-  id: 2005
+- id: 2005
   metric_name: connection_success_rate
+  <<: *device_log_local_ratio_once_daily_monitoring_metric_template__metric_portion
+  reports:
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_1
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_2
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_1_with_exp
+      id: 101
+      report_name: device_daily_local_avg_stats__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_local_avg_stats_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Time ratio with very high RX packet drop
@@ -3818,9 +3994,20 @@
 # high RX packet drop for that day
 # (time with very high packet drop / time connected)
 ################################################################################
-- <<: *device_log_local_ratio_once_daily_monitoring_metric_template
-  id: 2006
+- id: 2006
   metric_name: time_ratio_with_very_high_rx_packet_drop
+  <<: *device_log_local_ratio_once_daily_monitoring_metric_template__metric_portion
+  reports:
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_1
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_2
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_1_with_exp
+      id: 101
+      report_name: device_daily_local_avg_stats__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_local_avg_stats_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Time ratio with very high TX packet drop
@@ -3829,9 +4016,20 @@
 # high TX packet drop for that day
 # (time with very high packet drop / time connected)
 ################################################################################
-- <<: *device_log_local_ratio_once_daily_monitoring_metric_template
-  id: 2007
+- id: 2007
   metric_name: time_ratio_with_very_high_tx_packet_drop
+  <<: *device_log_local_ratio_once_daily_monitoring_metric_template__metric_portion
+  reports:
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_1
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_2
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_1_with_exp
+      id: 101
+      report_name: device_daily_local_avg_stats__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_local_avg_stats_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Roaming disconnect per day connected
@@ -3841,9 +4039,20 @@
 # in day). Roaming disconnects happen when the device decides to proactively
 # leave to join another network.
 ################################################################################
-- <<: *device_log_local_ratio_once_daily_monitoring_metric_template
-  id: 2008
+- id: 2008
   metric_name: roaming_disconnect_per_day_connected
+  <<: *device_log_local_ratio_once_daily_monitoring_metric_template__metric_portion
+  reports:
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_1
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_2
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_1_with_exp
+      id: 101
+      report_name: device_daily_local_avg_stats__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_local_avg_stats_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Non roaming disconnect per day connected
@@ -3854,9 +4063,20 @@
 # manual user actions, since they are not useful for comparing to the number of
 # roaming disconnects.
 ################################################################################
-- <<: *device_log_local_ratio_once_daily_monitoring_metric_template
-  id: 2009
+- id: 2009
   metric_name: non_roaming_disconnect_per_day_connected
+  <<: *device_log_local_ratio_once_daily_monitoring_metric_template__metric_portion
+  reports:
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_1
+    - *device_log_local_ratio_once_daily_monitoring_metric_template__default_report_2
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_1_with_exp
+      id: 101
+      report_name: device_daily_local_avg_stats__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_local_avg_stats_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Disconnect per day connected
@@ -3878,6 +4098,14 @@
           floor: 0
           num_buckets: 150
           step_size: 1000  # Each bucket is 0.1 ratio
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_1_with_exp
+      id: 101
+      report_name: device_daily_local_avg_stats__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_log_local_ratio_once_daily_monitoring_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_local_avg_stats_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 #############################################
 ### 3XXX - Monitoring metrics (device counts)
@@ -3890,88 +4118,218 @@
 ################################################################################
 - id: 3000
   metric_name: device_with_low_uptime
-  <<: *device_counts_metric_template
+  <<: *device_counts_metric_template__metric_portion
+  reports:
+    - *device_counts_metric_template__default_report_1
+    - *device_counts_metric_template__default_report_2
+    - *device_counts_metric_template__default_report_3
+    - *device_counts_metric_template__default_report_4
+    - <<: *device_counts_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_counts_metric_template__report_4_with_exp
+      id: 104
+      report_name: device_weekly_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Count of devices with high disconnect rate
 #
 # Every day, log a count if a device has high disconnect rate on that day.
 ################################################################################
-- <<: *device_counts_metric_template
-  id: 3001
+- id: 3001
   metric_name: device_with_high_disconnect_rate
+  <<: *device_counts_metric_template__metric_portion
+  reports:
+    - *device_counts_metric_template__default_report_1
+    - *device_counts_metric_template__default_report_2
+    - *device_counts_metric_template__default_report_3
+    - *device_counts_metric_template__default_report_4
+    - <<: *device_counts_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_counts_metric_template__report_4_with_exp
+      id: 104
+      report_name: device_weekly_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Count of devices with high avg time to connect
 #
 # Every day, log a count if a device has high avg time to connect.
 ################################################################################
-- <<: *device_counts_metric_template
-  id: 3002
+- id: 3002
   metric_name: device_with_high_avg_time_to_connect
+  <<: *device_counts_metric_template__metric_portion
+  reports:
+    - *device_counts_metric_template__default_report_1
+    - *device_counts_metric_template__default_report_2
+    - *device_counts_metric_template__default_report_3
+    - *device_counts_metric_template__default_report_4
+    - <<: *device_counts_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_counts_metric_template__report_4_with_exp
+      id: 104
+      report_name: device_weekly_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Count of devices with frequent high RX packet drop
 #
 # Every day, log a count if a device has frequent high RX packet drop.
 ################################################################################
-- <<: *device_counts_metric_template
-  id: 3003
+- id: 3003
   metric_name: device_with_frequent_high_rx_packet_drop
+  <<: *device_counts_metric_template__metric_portion
+  reports:
+    - *device_counts_metric_template__default_report_1
+    - *device_counts_metric_template__default_report_2
+    - *device_counts_metric_template__default_report_3
+    - *device_counts_metric_template__default_report_4
+    - <<: *device_counts_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_counts_metric_template__report_4_with_exp
+      id: 104
+      report_name: device_weekly_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Count of devices with frequent high TX packet drop
 #
 # Every day, log a count if a device has frequent high TX packet drop.
 ################################################################################
-- <<: *device_counts_metric_template
-  id: 3004
+- id: 3004
   metric_name: device_with_frequent_high_tx_packet_drop
+  <<: *device_counts_metric_template__metric_portion
+  reports:
+    - *device_counts_metric_template__default_report_1
+    - *device_counts_metric_template__default_report_2
+    - *device_counts_metric_template__default_report_3
+    - *device_counts_metric_template__default_report_4
+    - <<: *device_counts_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_counts_metric_template__report_4_with_exp
+      id: 104
+      report_name: device_weekly_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Count of devices with frequent no RX
 #
 # Every day, log a count if a device frequently has no RX.
 ################################################################################
-- <<: *device_counts_metric_template
-  id: 3005
+- id: 3005
   metric_name: device_with_frequent_no_rx
+  <<: *device_counts_metric_template__metric_portion
+  reports:
+    - *device_counts_metric_template__default_report_1
+    - *device_counts_metric_template__default_report_2
+    - *device_counts_metric_template__default_report_3
+    - *device_counts_metric_template__default_report_4
+    - <<: *device_counts_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_counts_metric_template__report_4_with_exp
+      id: 104
+      report_name: device_weekly_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Count of devices with low connection success rate
 #
 # Every day, log a count if the device has low connection success rate.
 ################################################################################
-- <<: *device_counts_metric_template
-  id: 3006
+- id: 3006
   metric_name: device_with_low_connection_success_rate
+  <<: *device_counts_metric_template__metric_portion
+  reports:
+    - *device_counts_metric_template__default_report_1
+    - *device_counts_metric_template__default_report_2
+    - *device_counts_metric_template__default_report_3
+    - *device_counts_metric_template__default_report_4
+    - <<: *device_counts_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_counts_metric_template__report_4_with_exp
+      id: 104
+      report_name: device_weekly_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Count of devices with frequent very high RX packet drop
 #
 # Every day, log a count if a device has frequent very high RX packet drop.
 ################################################################################
-- <<: *device_counts_metric_template
-  id: 3007
+- id: 3007
   metric_name: device_with_frequent_very_high_rx_packet_drop
+  <<: *device_counts_metric_template__metric_portion
+  reports:
+    - *device_counts_metric_template__default_report_1
+    - *device_counts_metric_template__default_report_2
+    - *device_counts_metric_template__default_report_3
+    - *device_counts_metric_template__default_report_4
+    - <<: *device_counts_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_counts_metric_template__report_4_with_exp
+      id: 104
+      report_name: device_weekly_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Count of devices with frequent very high TX packet drop
 #
 # Every day, log a count if a device has frequent very high TX packet drop.
 ################################################################################
-- <<: *device_counts_metric_template
-  id: 3008
+- id: 3008
   metric_name: device_with_frequent_very_high_tx_packet_drop
+  <<: *device_counts_metric_template__metric_portion
+  reports:
+    - *device_counts_metric_template__default_report_1
+    - *device_counts_metric_template__default_report_2
+    - *device_counts_metric_template__default_report_3
+    - *device_counts_metric_template__default_report_4
+    - <<: *device_counts_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_counts_metric_template__report_4_with_exp
+      id: 104
+      report_name: device_weekly_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Count of devices with high roaming disconnect rate
 #
 # Every day, log a count if a device has high roam disconnect rate on that day.
 ################################################################################
-- <<: *device_counts_metric_template
-  id: 3009
+- id: 3009
   metric_name: device_with_high_roaming_disconnect_rate
+  <<: *device_counts_metric_template__metric_portion
+  reports:
+    - *device_counts_metric_template__default_report_1
+    - *device_counts_metric_template__default_report_2
+    - *device_counts_metric_template__default_report_3
+    - *device_counts_metric_template__default_report_4
+    - <<: *device_counts_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_counts_metric_template__report_4_with_exp
+      id: 104
+      report_name: device_weekly_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 ################################################################################
 # Count of devices with high disconnect rate
@@ -3980,9 +4338,22 @@
 # disconnects on that day. This does not include disconnects that happen from
 # manual user interactions such as stopping all client connections.
 ################################################################################
-- <<: *device_counts_metric_template
-  id: 3010
+- id: 3010
   metric_name: device_with_high_non_roaming_disconnect_rate
+  <<: *device_counts_metric_template__metric_portion
+  reports:
+    - *device_counts_metric_template__default_report_1
+    - *device_counts_metric_template__default_report_2
+    - *device_counts_metric_template__default_report_3
+    - *device_counts_metric_template__default_report_4
+    - <<: *device_counts_metric_template__report_2_with_exp
+      id: 102
+      report_name: device_daily_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
+    - <<: *device_counts_metric_template__report_4_with_exp
+      id: 104
+      report_name: device_weekly_counts_at_least_once_system_ver__ps_exp
+      experiment_id: *ps_exp_ids
 
 #############################################
 ### 4XXX - Statistics metrics (WLAN area)