wip

Change-Id: I05c4e68733bd3b36d561c9ccad7be38f9df07714
diff --git a/fuchsia/connectivity_wlan/metrics.yaml b/fuchsia/connectivity_wlan/metrics.yaml
index 0ec2f06..3654dca 100644
--- a/fuchsia/connectivity_wlan/metrics.yaml
+++ b/fuchsia/connectivity_wlan/metrics.yaml
@@ -2255,9 +2255,9 @@
 # on how long that connection has lasted, disconnect source, and SNR.
 ################################################################################
 - id: 304
-  no_replacement_metric: OUI based metrics must be manually migrated (https://fxbug.dev/69719)
   metric_name: disconnect_count_breakdown
-  metric_type: EVENT_COUNT
+  metric_type: OCCURRENCE
+  metric_semantics: [NETWORK_COMMUNICATION, USAGE_COUNTING]
   metric_dimensions:
     - dimension: connected_time
       event_codes: *connected_times
@@ -2266,6 +2266,84 @@
         0: user
         1: mlme
         2: ap
+    - dimension: disconnect_mlme_event_name
+      event_codes:
+        0: none
+        1: deauthenticate_indication
+        2: disassociate_indication
+    - dimension: disconnect_reason_code
+      event_codes:
+        1: unspecified_reason
+        2: invalid_authentication
+        3: leaving_network_deauth
+        4: reason_inactivity
+        5: no_more_stas
+        6: invalid_class2_frame
+        7: invalid_class3_frame
+        8: leaving_network_disassoc
+        9: not_authenticated
+        10: unacceptable_power_capability
+        11: unacceptable_supported_channels
+        12: bss_transition_disassoc
+        13: reason_invalid_element
+        14: mic_failure
+        15: fourway_handshake_timeout
+        16: gk_handshake_timeout
+        17: handshake_element_mismatch
+        18: reason_invalid_group_cipher
+        19: reason_invalid_pairwise_cipher
+        20: reason_invalid_akmp
+        21: unsupported_rsne_version
+        22: invalid_rsne_capabilities
+        23: ieee802_1_x_auth_failed
+        24: reason_cipher_out_of_policy
+        25: tdls_peer_unreachable
+        26: tdls_unspecified_reason
+        27: ssp_requested_disassoc
+        28: no_ssp_roaming_agreement
+        29: bad_cipher_or_akm
+        30: not_authorized_this_location
+        31: service_change_precludes_ts
+        32: unspecified_qos_reason
+        33: not_enough_bandwidth
+        34: missing_acks
+        35: exceeded_txop
+        36: sta_leaving
+        37: end_ts_ba_dls
+        38: unknown_ts_ba
+        39: timeout
+        45: peerkey_mismatch
+        46: peer_initiated
+        47: ap_initiated
+        48: reason_invalid_ft_action_frame_count
+        49: reason_invalid_pmkid
+        50: reason_invalid_mde
+        51: reason_invalid_fte
+        52: mesh_peering_canceled
+        53: mesh_max_peers
+        54: mesh_configuration_policy_violation
+        55: mesh_close_rcvd
+        56: mesh_max_retries
+        57: mesh_confirm_timeout
+        58: mesh_invalid_gtk
+        59: mesh_inconsistent_parameters
+        60: mesh_invalid_security_capability
+        61: mesh_path_error_no_proxy_information
+        62: mesh_path_error_no_forwarding_information
+        63: mesh_path_error_destination_unreachable
+        64: mac_address_already_exists_in_mbss
+        65: mesh_channel_switch_regulatory_requirements
+        66: mesh_channel_switch_unspecified
+        65536: user_unknown
+        65537: user_failed_to_connect
+        65538: user_fidl_connect_request
+        65539: user_fidl_stop_client_connections_request
+        65540: user_proactive_network_switch
+        65541: user_disconnect_detected_from_sme
+        65542: user_regulatory_region_change
+        65543: user_startup
+        65544: user_network_unsaved
+        65545: user_network_config_updated
     - dimension: snr
       event_codes: *snrs
     - dimension: recent_channel_switch
@@ -2277,7 +2355,18 @@
       id: 1
       report_type: NUMERIC_AGGREGATION
       system_profile_field: [BOARD_NAME, PRODUCT_NAME, CHANNEL, SYSTEM_VERSION]
-      candidate_file: fuchsia/connectivity_wlan/ouis.txt
+    - report_name: disconnect_count_breakdown_histogram_1_day
+      id: 2
+      report_type: UNIQUE_DEVICE_HISTOGRAMS
+      local_aggregation_period: WINDOW_1_DAY
+      privacy_level: NO_ADDED_PRIVACY
+      system_profile_field: [BOARD_NAME, PRODUCT_NAME, CHANNEL, SYSTEM_VERSION]
+    - report_name: disconnect_count_breakdown_histogram_7_days
+      id: 3
+      report_type: UNIQUE_DEVICE_HISTOGRAMS
+      local_aggregation_period: WINDOW_7_DAYS
+      privacy_level: NO_ADDED_PRIVACY
+      system_profile_field: [BOARD_NAME, PRODUCT_NAME, CHANNEL, SYSTEM_VERSION]
   meta_data:
     max_release_stage: GA
     expiration_date: "2021/10/02"