Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-17 19:05:49 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-17 19:05:49 +0300
commit43a25d93ebdabea52f99b05e15b06250cd8f07d7 (patch)
treedceebdc68925362117480a5d672bcff122fb625b /config
parent20c84b99005abd1c82101dfeff264ac50d2df211 (diff)
Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42
Diffstat (limited to 'config')
-rw-r--r--config/README.md11
-rw-r--r--config/application.rb12
-rw-r--r--config/audit_events/types/feature_flag_created.yml9
-rw-r--r--config/audit_events/types/feature_flag_deleted.yml9
-rw-r--r--config/audit_events/types/feature_flag_updated.yml9
-rw-r--r--config/database.yml.decomposed-postgresql7
-rw-r--r--config/database.yml.postgresql81
-rw-r--r--config/dependency_decisions.yml6
-rw-r--r--config/environments/development.rb9
-rw-r--r--config/esbuild.config.js59
-rw-r--r--config/events/1655841083_projects_settings_cicd_show_render.yml2
-rw-r--r--config/events/1655841352_projects_settings_cicd_show_upload.yml2
-rw-r--r--config/events/1655841364_projects_settings_cicd_show_delete.yml2
-rw-r--r--config/events/1666038724_Gitlab__Tracking__Helpers__WeakPasswordErrorEvent_track_weak_password_error.yml2
-rw-r--r--config/events/1674843937_Ci__Build_create_id_tokens.yml2
-rw-r--r--config/events/1676085590_Admin__AuditLogsController_visit_instance_compliance_audit_events.yml26
-rw-r--r--config/events/1676085625_Admin__CredentialsController_visit_compliance_credential_inventory.yml26
-rw-r--r--config/events/1676085737_Groups__AuditEventsController_visit_group_compliance_audit_events.yml26
-rw-r--r--config/events/1676085856_API__AuditEvents_admin_audit_event_request.yml26
-rw-r--r--config/events/1676085891_EE__API__Groups_group_audit_event_request.yml26
-rw-r--r--config/events/1676085919_EE__API__Projects_project_audit_event_request.yml26
-rw-r--r--config/events/202109151015_notes__create_service_execute.yml2
-rw-r--r--config/events/20211215022206_default_review_app_open_review_app.yml2
-rw-r--r--config/events/20230228151130_invite_members_modal_click_cancel.yml26
-rw-r--r--config/events/20230228151130_invite_members_modal_click_x.yml26
-rw-r--r--config/events/20230228151130_invite_members_modal_invite_successful.yml26
-rw-r--r--config/events/20230228151130_invite_members_modal_render.yml26
-rw-r--r--config/events/20230321151607_github_create.yml30
-rw-r--r--config/events/20230327141223_API__NpmProjectPackages_list_tags.yml25
-rw-r--r--config/events/20230327141524_API__NpmProjectPackages_create_tag.yml25
-rw-r--r--config/events/20230327141627_API__NpmProjectPackages_delete_tag.yml25
-rw-r--r--config/events/20230327142004_API__NpmInstancePackages_list_tags.yml25
-rw-r--r--config/events/20230327142151_API__NpmInstancePackages_create_tag.yml25
-rw-r--r--config/events/20230327142237_API__NpmInstancePackages_delete_tag.yml25
-rw-r--r--config/events/20230407142541_Gitlab__GithubGistsImport__ImportGistWorker_create.yml27
-rw-r--r--config/events/20230508093658_gcp_signup_offer_click_click.yml21
-rw-r--r--config/events/20230508093912_gcp_signup_offer_dismiss_dismiss.yml21
-rw-r--r--config/feature_categories.yml22
-rw-r--r--config/feature_flags/development/abuse_reports_list.yml (renamed from config/feature_flags/development/project_analytics_dashboards_page.yml)8
-rw-r--r--config/feature_flags/development/achievements.yml2
-rw-r--r--config/feature_flags/development/adapt_deprecated_approvals.yml (renamed from config/feature_flags/development/async_commit_diff_files.yml)8
-rw-r--r--config/feature_flags/development/ai_ci_config_generator.yml10
-rw-r--r--config/feature_flags/development/ai_experimentation_api.yml8
-rw-r--r--config/feature_flags/development/ai_git_command_ff.yml (renamed from config/feature_flags/development/use_marker_ranges.yml)8
-rw-r--r--config/feature_flags/development/ai_related_settings.yml8
-rw-r--r--config/feature_flags/development/allow_protected_branches_for_group.yml8
-rw-r--r--config/feature_flags/development/always_perform_delayed_deletion.yml8
-rw-r--r--config/feature_flags/development/anthropic_experimentation.yml8
-rw-r--r--config/feature_flags/development/application_settings_tokens_optional_encryption.yml8
-rw-r--r--config/feature_flags/development/arkose_labs_trial_signup_challenge.yml8
-rw-r--r--config/feature_flags/development/artifacts_management_page.yml8
-rw-r--r--config/feature_flags/development/auto_merge_labels_mr_widget.yml (renamed from config/feature_flags/development/ci_inbound_job_token_scope.yml)8
-rw-r--r--config/feature_flags/development/batched_migrations_parallel_execution.yml2
-rw-r--r--config/feature_flags/development/branch_rules.yml2
-rw-r--r--config/feature_flags/development/bulk_imports_batched_import_export.yml8
-rw-r--r--config/feature_flags/development/ci_artifacts_upload_to_final_location.yml8
-rw-r--r--config/feature_flags/development/ci_batch_project_includes_context.yml (renamed from config/feature_flags/development/ci_hooks_pre_get_sources_script.yml)8
-rw-r--r--config/feature_flags/development/ci_includable_files_interpolation.yml8
-rw-r--r--config/feature_flags/development/ci_include_components.yml2
-rw-r--r--config/feature_flags/development/ci_job_artifact_bulk_destroy.yml8
-rw-r--r--config/feature_flags/development/ci_limit_environment_scope.yml8
-rw-r--r--config/feature_flags/development/ci_multi_doc_yaml.yml2
-rw-r--r--config/feature_flags/development/ci_namespace_catalog_experimental.yml (renamed from config/feature_flags/development/ci_recreate_downstream_pipeline.yml)8
-rw-r--r--config/feature_flags/development/ci_remove_legacy_predefined_variables.yml8
-rw-r--r--config/feature_flags/development/ci_support_reset_skipped_jobs_for_multiple_jobs.yml8
-rw-r--r--config/feature_flags/development/ci_variables_pages.yml8
-rw-r--r--config/feature_flags/development/cloudseed_aws.yml (renamed from config/feature_flags/development/airflow_dags.yml)8
-rw-r--r--config/feature_flags/development/code_quality_inline_drawer.yml (renamed from config/feature_flags/development/sec_mark_dropped_findings_as_resolved_scheduler.yml)8
-rw-r--r--config/feature_flags/development/counter_attribute_db_lease_for_update.yml8
-rw-r--r--config/feature_flags/development/create_runner_workflow_for_admin.yml (renamed from config/feature_flags/development/create_runner_workflow.yml)4
-rw-r--r--config/feature_flags/development/create_runner_workflow_for_namespace.yml (renamed from config/feature_flags/development/github_client_fetch_repos_via_graphql.yml)10
-rw-r--r--config/feature_flags/development/data_transfer_monitoring.yml2
-rw-r--r--config/feature_flags/development/data_transfer_monitoring_mock_data.yml (renamed from config/feature_flags/development/add_refresh_pull_mirror_worker.yml)8
-rw-r--r--config/feature_flags/development/default_pat_expiration.yml (renamed from config/feature_flags/development/hash_oauth_secrets.yml)9
-rw-r--r--config/feature_flags/development/delay_delete_own_user.yml (renamed from config/feature_flags/development/git_abuse_rate_limit_feature_flag.yml)8
-rw-r--r--config/feature_flags/development/delayed_repository_update_mirror_worker.yml8
-rw-r--r--config/feature_flags/development/deploy_key_for_protected_tags.yml2
-rw-r--r--config/feature_flags/development/deployments_raise_updated_at_inefficient_error.yml8
-rw-r--r--config/feature_flags/development/deployments_raise_updated_at_inefficient_error_override.yml8
-rw-r--r--config/feature_flags/development/deprecate_vulnerabilities_feedback.yml8
-rw-r--r--config/feature_flags/development/detect_android_projects.yml8
-rw-r--r--config/feature_flags/development/disable_follow_users.yml (renamed from config/feature_flags/development/webauthn.yml)10
-rw-r--r--config/feature_flags/development/do_not_run_safety_net_auth_refresh_jobs.yml2
-rw-r--r--config/feature_flags/development/enable_environments_search_within_folder.yml2
-rw-r--r--config/feature_flags/development/enforce_scan_result_policies_for_preexisting_vulnerabilities.yml8
-rw-r--r--config/feature_flags/development/environment_details_vue.yml4
-rw-r--r--config/feature_flags/development/environment_search_api_min_chars.yml8
-rw-r--r--config/feature_flags/development/environments_search_logging.yml8
-rw-r--r--config/feature_flags/development/exit_registration_verification.yml8
-rw-r--r--config/feature_flags/development/explain_code_chat.yml (renamed from config/feature_flags/development/notes_create_service_tracking.yml)8
-rw-r--r--config/feature_flags/development/explain_code_snippet.yml (renamed from config/feature_flags/development/file_line_blame.yml)8
-rw-r--r--config/feature_flags/development/explain_vulnerability.yml (renamed from config/feature_flags/development/full_path_project_search.yml)8
-rw-r--r--config/feature_flags/development/explain_vulnerability_vertex.yml8
-rw-r--r--config/feature_flags/development/expose_authorized_cluster_agents.yml8
-rw-r--r--config/feature_flags/development/external_note_author_service_desk.yml (renamed from config/feature_flags/development/incident_event_tags.yml)8
-rw-r--r--config/feature_flags/development/fe_epic_board_total_weight.yml8
-rw-r--r--config/feature_flags/development/filter_vulnerability_findings_dismissed_on_default.yml8
-rw-r--r--config/feature_flags/development/fix_dora_deployment_frequency_calculation.yml (renamed from config/feature_flags/development/ci_destroy_unlocked_job_artifacts.yml)10
-rw-r--r--config/feature_flags/development/fork_divergence_counts.yml8
-rw-r--r--config/feature_flags/development/free_user_cap_clear_over_limit_notification_flags.yml (renamed from config/feature_flags/development/trial_email_validation.yml)8
-rw-r--r--config/feature_flags/development/frozen_outbound_job_token_scopes.yml8
-rw-r--r--config/feature_flags/development/frozen_outbound_job_token_scopes_override.yml (renamed from config/feature_flags/development/deduplicate_archive_traces_cron_worker.yml)8
-rw-r--r--config/feature_flags/development/generate_description_ai.yml (renamed from config/feature_flags/development/use_iid_in_work_items_path.yml)8
-rw-r--r--config/feature_flags/development/github_import_gists.yml8
-rw-r--r--config/feature_flags/development/global_time_tracking_report.yml8
-rw-r--r--config/feature_flags/development/group_analytics_dashboards_page.yml8
-rw-r--r--config/feature_flags/development/group_level_git_protocol_control.yml8
-rw-r--r--config/feature_flags/development/groups_tokens_optional_encryption.yml2
-rw-r--r--config/feature_flags/development/hidden_notes.yml (renamed from config/feature_flags/development/license_from_gitaly.yml)10
-rw-r--r--config/feature_flags/development/hide_create_issue_resolve_all.yml8
-rw-r--r--config/feature_flags/development/hide_public_email_on_profile.yml2
-rw-r--r--config/feature_flags/development/import_details_page.yml (renamed from config/feature_flags/development/improved_spread_parallel_import.yml)8
-rw-r--r--config/feature_flags/development/import_export_work_items_csv.yml2
-rw-r--r--config/feature_flags/development/import_project_from_remote_file_s3.yml8
-rw-r--r--config/feature_flags/development/include_memberships_from_group_shares_in_preloader.yml8
-rw-r--r--config/feature_flags/development/increase_page_size_exponentially.yml8
-rw-r--r--config/feature_flags/development/inherit_approval_rules_on_creation.yml (renamed from config/feature_flags/development/enforce_max_attachment_size_upload_api.yml)8
-rw-r--r--config/feature_flags/development/instance_streaming_audit_events.yml (renamed from config/feature_flags/development/use_response_url_for_chat_responder.yml)8
-rw-r--r--config/feature_flags/development/integration_slack_app_notifications.yml8
-rw-r--r--config/feature_flags/development/introduce_rules_with_needs.yml (renamed from config/feature_flags/development/ci_includes_count_duplicates.yml)8
-rw-r--r--config/feature_flags/development/invitation_flow_enforcement_setting.yml2
-rw-r--r--config/feature_flags/development/jira_connect_oauth.yml8
-rw-r--r--config/feature_flags/development/jira_dvcs_end_of_life_amnesty.yml8
-rw-r--r--config/feature_flags/development/kas_user_access.yml8
-rw-r--r--config/feature_flags/development/kas_user_access_project.yml8
-rw-r--r--config/feature_flags/development/large_ipynb_diffs.yml (renamed from config/feature_flags/development/apple_app_store_integration.yml)8
-rw-r--r--config/feature_flags/development/last_pipeline_from_pipeline_status.yml (renamed from config/feature_flags/development/remove_job_token_on_completion.yml)8
-rw-r--r--config/feature_flags/development/legacy_merge_request_state_check_for_merged_result_pipelines.yml8
-rw-r--r--config/feature_flags/development/limited_capacity_seat_refresh_worker_medium.yml8
-rw-r--r--config/feature_flags/development/linear_group_descendants_finder_upto.yml4
-rw-r--r--config/feature_flags/development/linear_project_authorization.yml (renamed from config/feature_flags/development/linear_user_manageable_groups.yml)8
-rw-r--r--config/feature_flags/development/log_response_length.yml2
-rw-r--r--config/feature_flags/development/log_user_git_push_activity.yml (renamed from config/feature_flags/development/remove_namespace_aggregator_delay.yml)8
-rw-r--r--config/feature_flags/development/members_with_shared_group_access.yml8
-rw-r--r--config/feature_flags/development/mirror_only_branches_match_regex.yml2
-rw-r--r--config/feature_flags/development/mobile_devops_projects_promo.yml8
-rw-r--r--config/feature_flags/development/mr_activity_filters.yml8
-rw-r--r--config/feature_flags/development/mr_show_reports_immediately.yml2
-rw-r--r--config/feature_flags/development/multiple_environment_approval_rules_fe.yml8
-rw-r--r--config/feature_flags/development/namespace_limits_admin_dashboard.yml (renamed from config/feature_flags/development/limited_capacity_seat_refresh_worker_low.yml)8
-rw-r--r--config/feature_flags/development/non_public_artifacts.yml2
-rw-r--r--config/feature_flags/development/notify_kas_on_git_push.yml8
-rw-r--r--config/feature_flags/development/npm_allow_packages_in_multiple_projects.yml8
-rw-r--r--config/feature_flags/development/openai_experimentation.yml8
-rw-r--r--config/feature_flags/development/openai_moderation.yml8
-rw-r--r--config/feature_flags/development/optimize_scope_projects_with_feature_available.yml (renamed from config/feature_flags/development/bulk_import_projects.yml)10
-rw-r--r--config/feature_flags/development/packages_delete_orphaned_dependencies_worker.yml8
-rw-r--r--config/feature_flags/development/packages_display_last_pipeline.yml8
-rw-r--r--config/feature_flags/development/pages_deploy_upload_file_outside_transaction.yml8
-rw-r--r--config/feature_flags/development/pages_unique_domain.yml (renamed from config/feature_flags/development/new_header_search.yml)10
-rw-r--r--config/feature_flags/development/permit_all_shared_groups_for_approval.yml8
-rw-r--r--config/feature_flags/development/pipeline_name_in_api.yml (renamed from config/feature_flags/development/cache_home_panel.yml)10
-rw-r--r--config/feature_flags/development/pipeline_trigger_merge_status.yml8
-rw-r--r--config/feature_flags/development/preload_max_access_levels_for_labels_finder.yml8
-rw-r--r--config/feature_flags/development/present_groups_select_all.yml8
-rw-r--r--config/feature_flags/development/product_analytics_dashboards.yml8
-rw-r--r--config/feature_flags/development/product_analytics_snowplow_support.yml8
-rw-r--r--config/feature_flags/development/product_intelligence_database_event_tracking.yml2
-rw-r--r--config/feature_flags/development/product_intelligence_database_event_tracking_batch2.yml8
-rw-r--r--config/feature_flags/development/profile_tabs_vue.yml2
-rw-r--r--config/feature_flags/development/project_export_as_ndjson.yml8
-rw-r--r--config/feature_flags/development/project_import_ndjson.yml8
-rw-r--r--config/feature_flags/development/project_members_index_by_project_namespace.yml8
-rw-r--r--config/feature_flags/development/project_statistics_bulk_increment.yml2
-rw-r--r--config/feature_flags/development/projects_tokens_optional_encryption.yml2
-rw-r--r--config/feature_flags/development/prom_metrics_rust.yml8
-rw-r--r--config/feature_flags/development/realtime_approvals.yml8
-rw-r--r--config/feature_flags/development/realtime_mr_status_change.yml2
-rw-r--r--config/feature_flags/development/record_issue_and_mr_assignee_events.yml8
-rw-r--r--config/feature_flags/development/recursive_approach_for_all_projects.yml8
-rw-r--r--config/feature_flags/development/reduce_aggregation_schedule_lease.yml (renamed from config/feature_flags/development/namespace_storage_limit_bypass_date_check.yml)8
-rw-r--r--config/feature_flags/development/refactor_security_extension.yml4
-rw-r--r--config/feature_flags/development/registry_data_repair_worker.yml8
-rw-r--r--config/feature_flags/development/rely_on_protected_branches_cache.yml8
-rw-r--r--config/feature_flags/development/remove_cicd_settings_update.yml (renamed from config/feature_flags/development/create_runner_machine.yml)8
-rw-r--r--config/feature_flags/development/remove_monitor_metrics.yml8
-rw-r--r--config/feature_flags/development/remove_startup_css.yml (renamed from config/feature_flags/development/vue_issues_dashboard.yml)8
-rw-r--r--config/feature_flags/development/repack_after_shard_migration.yml8
-rw-r--r--config/feature_flags/development/resolve_ambiguous_archives.yml (renamed from config/feature_flags/development/unlink_fork_network_upon_visibility_decrease.yml)8
-rw-r--r--config/feature_flags/development/restrict_merge_status_recheck.yml8
-rw-r--r--config/feature_flags/development/restrict_special_characters_in_namespace_path.yml8
-rw-r--r--config/feature_flags/development/revert_daily_hll_events_to_weekly_aggregation.yml8
-rw-r--r--config/feature_flags/development/review_apps_redeploy_mr_widget.yml (renamed from config/feature_flags/development/ci_enforce_rate_limits_jobs_api.yml)8
-rw-r--r--config/feature_flags/development/role_targeted_broadcast_messages.yml8
-rw-r--r--config/feature_flags/development/rollup_timebox_chart.yml8
-rw-r--r--config/feature_flags/development/root_storage_statistics_calculate_forks.yml (renamed from config/feature_flags/development/limited_capacity_seat_refresh_worker_high.yml)8
-rw-r--r--config/feature_flags/development/route_hll_to_snowplow_phase2.yml8
-rw-r--r--config/feature_flags/development/route_hll_to_snowplow_phase3.yml8
-rw-r--r--config/feature_flags/development/sast_reports_in_inline_diff.yml (renamed from config/feature_flags/development/refactor_code_quality_inline_findings.yml)10
-rw-r--r--config/feature_flags/development/saved_replies.yml2
-rw-r--r--config/feature_flags/development/scan_execution_bot_users.yml8
-rw-r--r--config/feature_flags/development/scan_result_role_action.yml2
-rw-r--r--config/feature_flags/development/search_index_integrity.yml (renamed from config/feature_flags/development/search_blobs_language_aggregation.yml)8
-rw-r--r--config/feature_flags/development/search_index_partitioning_notes.yml (renamed from config/feature_flags/development/code_basic_search_files_by_regexp.yml)9
-rw-r--r--config/feature_flags/development/search_rate_limited_scopes.yml (renamed from config/feature_flags/development/elasticsearch_use_traversal_id_optimization.yml)8
-rw-r--r--config/feature_flags/development/service_accounts_crud.yml (renamed from config/feature_flags/development/linear_project_ancestors.yml)8
-rw-r--r--config/feature_flags/development/service_desk_html_to_text_email_handler.yml8
-rw-r--r--config/feature_flags/development/service_desk_new_note_email_native_attachments.yml2
-rw-r--r--config/feature_flags/development/set_traversal_ids_on_save.yml8
-rw-r--r--config/feature_flags/development/show_group_readme.yml8
-rw-r--r--config/feature_flags/development/sidekiq_execution_application_slis.yml8
-rw-r--r--config/feature_flags/development/single_file_file_by_file.yml8
-rw-r--r--config/feature_flags/development/skip_group_share_unlink_auth_refresh.yml2
-rw-r--r--config/feature_flags/development/soft_email_confirmation.yml8
-rw-r--r--config/feature_flags/development/summarize_comments.yml8
-rw-r--r--config/feature_flags/development/summarize_diff_quick_action.yml (renamed from config/feature_flags/development/draft_quick_action_non_toggle.yml)8
-rw-r--r--config/feature_flags/development/summarize_my_code_review.yml (renamed from config/feature_flags/development/disabled_mr_discussions_redis_cache.yml)8
-rw-r--r--config/feature_flags/development/super_sidebar_nav.yml2
-rw-r--r--config/feature_flags/development/super_sidebar_nav_enrolled.yml (renamed from config/feature_flags/development/allow_dots_on_tf_state_names.yml)10
-rw-r--r--config/feature_flags/development/super_sidebar_peek.yml8
-rw-r--r--config/feature_flags/development/sync_approval_rules_from_findings.yml8
-rw-r--r--config/feature_flags/development/synchronize_fork.yml (renamed from config/feature_flags/development/revoke_ssh_signatures.yml)8
-rw-r--r--config/feature_flags/development/ultimate_feature_removal_banner.yml2
-rw-r--r--config/feature_flags/development/unbatch_graphql_queries.yml8
-rw-r--r--config/feature_flags/development/use_pipeline_over_multikey.yml8
-rw-r--r--config/feature_flags/development/use_primary_and_secondary_stores_for_rate_limiting.yml8
-rw-r--r--config/feature_flags/development/use_primary_store_as_default_for_rate_limiting.yml8
-rw-r--r--config/feature_flags/development/use_traversal_ids.yml2
-rw-r--r--config/feature_flags/development/use_traversal_ids_for_ancestor_scopes.yml4
-rw-r--r--config/feature_flags/development/use_traversal_ids_for_ancestors.yml4
-rw-r--r--config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml4
-rw-r--r--config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml2
-rw-r--r--config/feature_flags/development/use_traversal_ids_for_root_ancestor.yml8
-rw-r--r--config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy.yml4
-rw-r--r--config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy_scopes.yml2
-rw-r--r--config/feature_flags/development/use_traversal_ids_groups_finder.yml4
-rw-r--r--config/feature_flags/development/use_traversal_ids_roots.yml4
-rw-r--r--config/feature_flags/development/user_spam_scores.yml8
-rw-r--r--config/feature_flags/development/user_time_settings.yml8
-rw-r--r--config/feature_flags/development/validate_environment_tier_presence.yml2
-rw-r--r--config/feature_flags/development/visible_label_selection_on_metadata.yml8
-rw-r--r--config/feature_flags/development/vsa_group_and_project_parity.yml8
-rw-r--r--config/feature_flags/development/vscode_web_ide.yml2
-rw-r--r--config/feature_flags/development/webui_members_inherited_users.yml2
-rw-r--r--config/feature_flags/experiment/generic_explore_groups.yml8
-rw-r--r--config/feature_flags/experiment/invite_members_in_side_nav.yml8
-rw-r--r--config/feature_flags/experiment/pql_three_cta_test.yml8
-rw-r--r--config/feature_flags/experiment/require_verification_for_namespace_creation.yml8
-rw-r--r--config/feature_flags/experiment/runners_availability_section.yml8
-rw-r--r--config/feature_flags/experiment/security_actions_continuous_onboarding.yml8
-rw-r--r--config/feature_flags/experiment/security_reports_mr_widget_prompt.yml8
-rw-r--r--config/feature_flags/ops/advanced_user_index.yml8
-rw-r--r--config/feature_flags/ops/auto_disabling_web_hooks.yml9
-rw-r--r--config/feature_flags/ops/automatic_lock_writes_on_table.yml2
-rw-r--r--config/feature_flags/ops/batched_migrations_health_status_patroni_apdex.yml8
-rw-r--r--config/feature_flags/ops/ci_build_dependencies_artifacts_logger.yml2
-rw-r--r--config/feature_flags/ops/circuit_breaker.yml (renamed from config/feature_flags/ops/advanced_user_search.yml)10
-rw-r--r--config/feature_flags/ops/detect_cross_database_modification.yml2
-rw-r--r--config/feature_flags/ops/dynamic_nonce.yml8
-rw-r--r--config/feature_flags/ops/legacy_open_source_license_available.yml2
-rw-r--r--config/feature_flags/ops/mr_approved_filter.yml (renamed from config/feature_flags/development/collect_package_events.yml)10
-rw-r--r--config/feature_flags/ops/ops_prune_old_events.yml8
-rw-r--r--config/feature_flags/ops/partition_manager_sync_partitions.yml (renamed from config/feature_flags/ops/dynamic_image_resizing.yml)10
-rw-r--r--config/feature_flags/ops/projects_build_artifacts_size_refresh.yml2
-rw-r--r--config/feature_flags/ops/projects_build_artifacts_size_refresh_high.yml2
-rw-r--r--config/feature_flags/ops/projects_build_artifacts_size_refresh_medium.yml2
-rw-r--r--config/feature_flags/ops/query_analyzer_gitlab_schema_metrics.yml2
-rw-r--r--config/feature_flags/ops/runner_migrations_backoff.yml8
-rw-r--r--config/feature_flags/ops/s3_multithreaded_uploads.yml (renamed from config/feature_flags/development/s3_multithreaded_uploads.yml)4
-rw-r--r--config/feature_flags/ops/search_index_curation_wikis.yml (renamed from config/feature_flags/development/route_hll_to_snowplow_phase4.yml)12
-rw-r--r--config/feature_flags/ops/sidekiq_memory_killer_read_only_mode.yml7
-rw-r--r--config/feature_flags/ops/split_log_bulk_increment_counter.yml2
-rw-r--r--config/gitlab.yml.example40
-rw-r--r--config/gitlab_loose_foreign_keys.yml23
-rw-r--r--config/gitleaks.toml21
-rw-r--r--config/initializers/00_deprecations.rb7
-rw-r--r--config/initializers/0_1_yaml_safe_load_file_patch.rb15
-rw-r--r--config/initializers/1_settings.rb416
-rw-r--r--config/initializers/7_redis.rb1
-rw-r--r--config/initializers/action_mailer_hooks.rb4
-rw-r--r--config/initializers/active_record_database_tasks.rb2
-rw-r--r--config/initializers/active_record_migrations.rb2
-rw-r--r--config/initializers/active_record_preloader.rb11
-rw-r--r--config/initializers/active_record_transaction_observer.rb15
-rw-r--r--config/initializers/carrierwave_patch.rb8
-rw-r--r--config/initializers/circuitbox.rb8
-rw-r--r--config/initializers/doorkeeper.rb14
-rw-r--r--config/initializers/fog_core_patch.rb3
-rw-r--r--config/initializers/gettext_rails_i18n_patch.rb50
-rw-r--r--config/initializers/google_cloud_profiler.rb25
-rw-r--r--config/initializers/lograge.rb2
-rw-r--r--config/initializers/mail_encoding_patch.rb18
-rw-r--r--config/initializers/mail_starttls_patch.rb87
-rw-r--r--config/initializers/mailer_retries.rb2
-rw-r--r--config/initializers/net_http_patch.rb4
-rw-r--r--config/initializers/net_http_response_patch.rb2
-rw-r--r--config/initializers/peek.rb1
-rw-r--r--config/initializers/postgres_partitioning.rb6
-rw-r--r--config/initializers/safe_session_store_patch.rb80
-rw-r--r--config/initializers/sidekiq.rb4
-rw-r--r--config/initializers/tracing.rb6
-rw-r--r--config/initializers/warden.rb5
-rw-r--r--config/initializers/zz_metrics.rb14
-rw-r--r--config/initializers_before_autoloader/001_fast_gettext.rb1
-rw-r--r--config/initializers_before_autoloader/004_zeitwerk.rb3
-rw-r--r--config/locales/doorkeeper.en.yml6
-rw-r--r--config/metrics/counts_28d/20210201124930_deployments.yml1
-rw-r--r--config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175055_merge_requests.yml1
-rw-r--r--config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml1
-rw-r--r--config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml1
-rw-r--r--config/metrics/counts_28d/20210216175101_merge_requests_users.yml9
-rw-r--r--config/metrics/counts_28d/20210216175109_suggestions.yml1
-rw-r--r--config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml3
-rw-r--r--config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml2
-rw-r--r--config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml2
-rw-r--r--config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml2
-rw-r--r--config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml2
-rw-r--r--config/metrics/counts_28d/20210216175413_clusters_management_project.yml2
-rw-r--r--config/metrics/counts_28d/20210216175415_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175417_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml2
-rw-r--r--config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml2
-rw-r--r--config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml2
-rw-r--r--config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_28d/20210216175542_ci_builds.yml1
-rw-r--r--config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml1
-rw-r--r--config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml1
-rw-r--r--config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml1
-rw-r--r--config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml1
-rw-r--r--config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml3
-rw-r--r--config/metrics/counts_28d/20210216175554_ci_pipelines.yml1
-rw-r--r--config/metrics/counts_28d/20210216175556_ci_triggers.yml1
-rw-r--r--config/metrics/counts_28d/20210216180308_personal_snippets.yml1
-rw-r--r--config/metrics/counts_28d/20210216180310_project_snippets.yml1
-rw-r--r--config/metrics/counts_28d/20210216180312_snippets.yml3
-rw-r--r--config/metrics/counts_28d/20210216180317_snippets.yml1
-rw-r--r--config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml5
-rw-r--r--config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml5
-rw-r--r--config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml5
-rw-r--r--config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml1
-rw-r--r--config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml1
-rw-r--r--config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml3
-rw-r--r--config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml1
-rw-r--r--config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml1
-rw-r--r--config/metrics/counts_28d/20210216180524_projects_with_incidents.yml1
-rw-r--r--config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml1
-rw-r--r--config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml1
-rw-r--r--config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml1
-rw-r--r--config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml5
-rw-r--r--config/metrics/counts_28d/20210216180814_events.yml1
-rw-r--r--config/metrics/counts_28d/20210216180816_groups.yml1
-rw-r--r--config/metrics/counts_28d/20210216180818_users_created.yml1
-rw-r--r--config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml1
-rw-r--r--config/metrics/counts_28d/20210216180956_clusters.yml1
-rw-r--r--config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml1
-rw-r--r--config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml1
-rw-r--r--config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml1
-rw-r--r--config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml1
-rw-r--r--config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml1
-rw-r--r--config/metrics/counts_28d/20210216181050_packages.yml1
-rw-r--r--config/metrics/counts_28d/20210216181057_projects_with_packages.yml1
-rw-r--r--config/metrics/counts_28d/20210216181139_issues.yml1
-rw-r--r--config/metrics/counts_28d/20210216181141_notes.yml1
-rw-r--r--config/metrics/counts_28d/20210216181143_projects.yml1
-rw-r--r--config/metrics/counts_28d/20210216181145_todos.yml1
-rw-r--r--config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml7
-rw-r--r--config/metrics/counts_28d/20210216181148_service_desk_issues.yml7
-rw-r--r--config/metrics/counts_28d/20210216181150_projects_jira_active.yml1
-rw-r--r--config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml1
-rw-r--r--config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml1
-rw-r--r--config/metrics/counts_28d/20210216181158_epics.yml1
-rw-r--r--config/metrics/counts_28d/20210216181200_label_lists.yml1
-rw-r--r--config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216181923_successful_deployments.yml1
-rw-r--r--config/metrics/counts_28d/20210216181924_failed_deployments.yml1
-rw-r--r--config/metrics/counts_28d/20210216181935_deployments.yml1
-rw-r--r--config/metrics/counts_28d/20210216181937_failed_deployments.yml1
-rw-r--r--config/metrics/counts_28d/20210216181939_releases.yml1
-rw-r--r--config/metrics/counts_28d/20210216181941_successful_deployments.yml1
-rw-r--r--config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml1
-rw-r--r--config/metrics/counts_28d/20210216182034_deploy_keys.yml1
-rw-r--r--config/metrics/counts_28d/20210216182036_keys.yml1
-rw-r--r--config/metrics/counts_28d/20210216182038_remote_mirrors.yml1
-rw-r--r--config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml1
-rw-r--r--config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml1
-rw-r--r--config/metrics/counts_28d/20210216182051_protected_branches.yml1
-rw-r--r--config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml5
-rw-r--r--config/metrics/counts_28d/20210216182106_design_action_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216182109_project_action_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216182129_sast_pipeline.yml1
-rw-r--r--config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml1
-rw-r--r--config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml3
-rw-r--r--config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml1
-rw-r--r--config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml1
-rw-r--r--config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml1
-rw-r--r--config/metrics/counts_28d/20210216183627_omniauth_providers.yml1
-rw-r--r--config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml1
-rw-r--r--config/metrics/counts_28d/20210216183640_gitlab.yml1
-rw-r--r--config/metrics/counts_28d/20210216183642_gitlab_v1.yml1
-rw-r--r--config/metrics/counts_28d/20210216183644_gitlab_project.yml1
-rw-r--r--config/metrics/counts_28d/20210216183646_gitlab.yml5
-rw-r--r--config/metrics/counts_28d/20210216183648_github.yml1
-rw-r--r--config/metrics/counts_28d/20210216183650_bitbucket.yml1
-rw-r--r--config/metrics/counts_28d/20210216183652_bitbucket_server.yml1
-rw-r--r--config/metrics/counts_28d/20210216183653_gitea.yml1
-rw-r--r--config/metrics/counts_28d/20210216183655_git.yml1
-rw-r--r--config/metrics/counts_28d/20210216183657_manifest.yml1
-rw-r--r--config/metrics/counts_28d/20210216183659_gitlab_migration.yml1
-rw-r--r--config/metrics/counts_28d/20210216183701_jira.yml1
-rw-r--r--config/metrics/counts_28d/20210216183703_fogbugz.yml1
-rw-r--r--config/metrics/counts_28d/20210216183705_phabricator.yml5
-rw-r--r--config/metrics/counts_28d/20210216183707_csv.yml1
-rw-r--r--config/metrics/counts_28d/20210216183709_group_import.yml1
-rw-r--r--config/metrics/counts_28d/20210216183711_gitlab_migration.yml1
-rw-r--r--config/metrics/counts_28d/20210216183712_total.yml1
-rw-r--r--config/metrics/counts_28d/20210216183714_gitlab_project.yml1
-rw-r--r--config/metrics/counts_28d/20210216183716_gitlab.yml1
-rw-r--r--config/metrics/counts_28d/20210216183718_github.yml1
-rw-r--r--config/metrics/counts_28d/20210216183720_bitbucket.yml1
-rw-r--r--config/metrics/counts_28d/20210216183722_bitbucket_server.yml1
-rw-r--r--config/metrics/counts_28d/20210216183724_gitea.yml1
-rw-r--r--config/metrics/counts_28d/20210216183726_git.yml1
-rw-r--r--config/metrics/counts_28d/20210216183728_manifest.yml1
-rw-r--r--config/metrics/counts_28d/20210216183730_jira.yml1
-rw-r--r--config/metrics/counts_28d/20210216183731_fogbugz.yml1
-rw-r--r--config/metrics/counts_28d/20210216183733_phabricator.yml1
-rw-r--r--config/metrics/counts_28d/20210216183735_csv.yml1
-rw-r--r--config/metrics/counts_28d/20210216183737_groups_imported.yml1
-rw-r--r--config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml4
-rw-r--r--config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml5
-rw-r--r--config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml3
-rw-r--r--config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml1
-rwxr-xr-xconfig/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml3
-rw-r--r--config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml3
-rw-r--r--config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml3
-rw-r--r--config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml5
-rw-r--r--config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml5
-rw-r--r--config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml7
-rw-r--r--config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml5
-rw-r--r--config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml1
-rw-r--r--config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml1
-rw-r--r--config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml1
-rw-r--r--config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210520111133_total.yml1
-rw-r--r--config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210715094458_releases_with_milestones.yml1
-rw-r--r--config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221242_p_ci_templates_terraform_base_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221251_p_ci_templates_dotnet_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221300_p_ci_templates_nodejs_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221308_p_ci_templates_openshift_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221317_p_ci_templates_bash_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221326_p_ci_templates_rust_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221335_p_ci_templates_elixir_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221343_p_ci_templates_clojure_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221352_p_ci_templates_crystal_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221401_p_ci_templates_getting_started_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221410_p_ci_templates_code_quality_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221503_p_ci_templates_grails_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221511_p_ci_templates_security_dast_runner_validation_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221520_p_ci_templates_security_dast_on_demand_scan_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221529_p_ci_templates_security_license_scanning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221538_p_ci_templates_security_coverage_fuzzing_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221547_p_ci_templates_security_api_fuzzing_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221605_p_ci_templates_security_dast_api_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221614_p_ci_templates_security_container_scanning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221623_p_ci_templates_security_dast_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221632_p_ci_templates_security_dependency_scanning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221641_p_ci_templates_security_api_fuzzing_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221650_p_ci_templates_security_dast_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221659_p_ci_templates_security_cluster_image_scanning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221708_p_ci_templates_ios_fastlane_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221717_p_ci_templates_composer_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221726_p_ci_templates_c_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221735_p_ci_templates_python_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221744_p_ci_templates_android_fastlane_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221754_p_ci_templates_django_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221803_p_ci_templates_maven_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221812_p_ci_templates_flutter_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221822_p_ci_templates_workflows_branch_pipelines_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221831_p_ci_templates_workflows_mergerequest_pipelines_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221840_p_ci_templates_laravel_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221849_p_ci_templates_managed_cluster_applications_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221857_p_ci_templates_php_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221906_p_ci_templates_packer_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221915_p_ci_templates_terraform_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221923_p_ci_templates_mono_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221932_p_ci_templates_serverless_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221941_p_ci_templates_go_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221950_p_ci_templates_scala_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901221958_p_ci_templates_latex_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222007_p_ci_templates_android_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222016_p_ci_templates_indeni_cloudrail_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222025_p_ci_templates_deploy_ecs_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222033_p_ci_templates_aws_cf_provision_and_deploy_ec2_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222042_p_ci_templates_gradle_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222051_p_ci_templates_chef_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222100_p_ci_templates_jobs_dast_default_branch_deploy_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222117_p_ci_templates_jobs_helm_2to3_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222126_p_ci_templates_jobs_sast_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222144_p_ci_templates_jobs_code_intelligence_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222153_p_ci_templates_jobs_code_quality_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222202_p_ci_templates_jobs_deploy_ecs_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222211_p_ci_templates_jobs_deploy_ec2_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222220_p_ci_templates_jobs_deploy_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222229_p_ci_templates_jobs_build_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222246_p_ci_templates_jobs_test_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222256_p_ci_templates_jobs_deploy_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222313_p_ci_templates_jobs_cf_provision_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222322_p_ci_templates_jobs_build_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222331_p_ci_templates_terraform_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222341_p_ci_templates_swift_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222707_p_ci_templates_pages_jekyll_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901222742_p_ci_templates_pages_harp_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223200_p_ci_templates_pages_octopress_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223210_p_ci_templates_pages_brunch_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223219_p_ci_templates_pages_doxygen_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223227_p_ci_templates_pages_hyde_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223236_p_ci_templates_pages_lektor_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223244_p_ci_templates_pages_jbake_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223253_p_ci_templates_pages_hexo_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223302_p_ci_templates_pages_middleman_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223311_p_ci_templates_pages_hugo_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223319_p_ci_templates_pages_pelican_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223328_p_ci_templates_pages_nanoc_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223337_p_ci_templates_pages_swaggerui_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223346_p_ci_templates_pages_jigsaw_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223354_p_ci_templates_pages_metalsmith_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223403_p_ci_templates_pages_gatsby_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223412_p_ci_templates_pages_html_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223421_p_ci_templates_dart_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223430_p_ci_templates_docker_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223439_p_ci_templates_julia_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223447_p_ci_templates_npm_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223456_p_ci_templates_dotnet_core_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223505_p_ci_templates_5_minute_production_app_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223514_p_ci_templates_ruby_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223523_p_ci_templates_implicit_jobs_dast_default_branch_deploy_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223541_p_ci_templates_implicit_jobs_helm_2to3_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223550_p_ci_templates_implicit_jobs_sast_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223559_p_ci_templates_implicit_jobs_secret_detection_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223608_p_ci_templates_implicit_jobs_code_intelligence_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223617_p_ci_templates_implicit_jobs_code_quality_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223626_p_ci_templates_implicit_jobs_deploy_ecs_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223635_p_ci_templates_implicit_jobs_deploy_ec2_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223653_p_ci_templates_implicit_jobs_test_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223748_p_ci_templates_implicit_security_license_scanning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223832_p_ci_templates_implicit_security_container_scanning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223850_p_ci_templates_implicit_security_dependency_scanning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223907_p_ci_templates_implicit_security_dast_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210901223916_p_ci_templates_implicit_security_cluster_image_scanning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210902191057_i_quickactions_unapprove_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210908093509_p_ci_templates_android_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210908150458_i_code_review_user_resolve_thread_in_issue_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml1
-rw-r--r--config/metrics/counts_28d/20210916080405_promoted_issues.yml1
-rw-r--r--config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml1
-rw-r--r--config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220121140644_user_jetbrains_api_request_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220131143209_i_quickactions_attention_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220131153230_i_quickactions_remove_attention_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_dependency_scanning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_license_scanning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml1
-rw-r--r--config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220222215951_xmau_plan.yml1
-rw-r--r--config/metrics/counts_28d/20220222215952_xmau_project_management.yml1
-rw-r--r--config/metrics/counts_28d/20220222215955_users_work_items.yml1
-rw-r--r--config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220309183501_error_tracking_view_details_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220309195504_error_tracking_view_list_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220428154012_live_preview.yml1
-rw-r--r--config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_commit_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_mr_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml1
-rw-r--r--config/metrics/counts_28d/20220531145023_p_ci_templates_katalon_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220622084700_p_analytics_ci_cd_time_to_restore_service_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220627133135_i_code_review_submit_review_approve_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220627134108_i_code_review_submit_review_comment_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220707054530_p_analytics_ci_cd_change_failure_rate_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220708162311_i_code_review_merge_request_widget_test_summary_view_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220708163625_i_code_review_merge_request_widget_test_summary_full_report_clicked_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220708164545_i_code_review_merge_request_widget_test_summary_expand_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220708165638_i_code_review_merge_request_widget_test_summary_expand_success_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220708170514_i_code_review_merge_request_widget_test_summary_expand_warning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220708173741_i_code_review_merge_request_widget_test_summary_expand_failed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220715195415_p_ci_templates_security_fortify_fod_sast_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220719133315_p_ci_templates_implicit_security_fortify_fod_sast_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220725193059_users_updating_work_item_dates_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220725210913_i_code_review_merge_request_widget_accessibility_view_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220725210919_i_code_review_merge_request_widget_accessibility_full_report_clicked_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220725210926_i_code_review_merge_request_widget_accessibility_expand_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220725210935_i_code_review_merge_request_widget_accessibility_expand_success_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220725210942_i_code_review_merge_request_widget_accessibility_expand_warning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220725210949_i_code_review_merge_request_widget_accessibility_expand_failed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220727020440_i_code_review_merge_request_widget_code_quality_view_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220727020446_i_code_review_merge_request_widget_code_quality_full_report_clicked_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220727020452_i_code_review_merge_request_widget_code_quality_expand_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220727020457_i_code_review_merge_request_widget_code_quality_expand_success_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220727020503_i_code_review_merge_request_widget_code_quality_expand_warning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220727020509_i_code_review_merge_request_widget_code_quality_expand_failed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220727045317_i_code_review_merge_request_widget_terraform_view_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220727045323_i_code_review_merge_request_widget_terraform_full_report_clicked_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220727045330_i_code_review_merge_request_widget_terraform_expand_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220727045336_i_code_review_merge_request_widget_terraform_expand_success_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220727045342_i_code_review_merge_request_widget_terraform_expand_warning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220727045349_i_code_review_merge_request_widget_terraform_expand_failed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml2
-rw-r--r--config/metrics/counts_28d/20220816202928_bulk_import_entities_group_failed.yml1
-rw-r--r--config/metrics/counts_28d/20220816202928_bulk_import_entities_group_finished.yml1
-rw-r--r--config/metrics/counts_28d/20220816202928_bulk_import_entities_group_timeout.yml1
-rw-r--r--config/metrics/counts_28d/20220823125645_bulk_import_entities_project_timeout.yml1
-rw-r--r--config/metrics/counts_28d/20220823125924_bulk_import_entities_project_failed.yml1
-rw-r--r--config/metrics/counts_28d/20220823130209_bulk_import_entities_project_finished.yml1
-rw-r--r--config/metrics/counts_28d/20220825142533_i_testing_test_report_uploaded_monthly.yml3
-rw-r--r--config/metrics/counts_28d/20220825232557_count_user_auth.yml1
-rw-r--r--config/metrics/counts_28d/20220830104453_i_code_review_merge_request_widget_license_compliance_view_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220830104500_i_code_review_merge_request_widget_license_compliance_full_report_clicked_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220830104507_i_code_review_merge_request_widget_license_compliance_expand_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220830104514_i_code_review_merge_request_widget_license_compliance_expand_success_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220830104521_i_code_review_merge_request_widget_license_compliance_expand_warning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220830104528_i_code_review_merge_request_widget_license_compliance_expand_failed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220905210112_users_visiting_environments_pages_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220906065651_incident_management_timeline_event_created_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220906070355_incident_management_timeline_event_edited_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220906070634_incident_management_timeline_event_deleted_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220907080630_i_quickactions_timeline_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220907084347_p_ci_templates_implicit_security_sast_iac_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220907102714_p_ci_templates_implicit_jobs_sast_iac_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220907202807_p_ci_templates_jobs_dependency_scanning_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220907212005_p_ci_templates_security_container_scanning_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220907215635_p_ci_templates_jobs_license_scanning_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220912161240_p_ci_templates_implicit_jobs_dependency_scanning_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220912162308_p_ci_templates_implicit_jobs_license_scanning_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220912162752_p_ci_templates_implicit_security_container_scanning_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220913225020_p_ci_templates_security_coverage_fuzzing_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220913225303_p_ci_templates_implicit_security_coverage_fuzzing_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20220922042106_users_updating_work_item_iteration_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20221006065524_i_quickactions_link_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml3
-rw-r--r--config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_confidential_issue_notification_monthly.yml24
-rw-r--r--config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_confidential_note_notification_monthly.yml24
-rw-r--r--config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_deployment_notification_monthly.yml24
-rw-r--r--config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_issue_notification_monthly.yml24
-rw-r--r--config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_merge_request_notification_monthly.yml24
-rw-r--r--config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_note_notification_monthly.yml24
-rw-r--r--config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_push_notification_monthly.yml24
-rw-r--r--config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_tag_push_notification_monthly.yml24
-rw-r--r--config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_wiki_page_notification_monthly.yml24
-rw-r--r--config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20221121115622_i_code_review_merge_request_widget_security_reports_view_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_expand_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_full_report_clicked_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20221121115624_i_code_review_merge_request_widget_security_reports_expand_success_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_failed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_warning_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml3
-rw-r--r--config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml3
-rw-r--r--config/metrics/counts_28d/20230120094644_g_runner_fleet_read_jobs_statistics_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20230123233604_i_ci_secrets_management_id_tokens_build_created_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20230129134935_i_container_registry_push_tag_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20230129135520_i_container_registry_delete_tag_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20230129135748_i_container_registry_push_repository_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20230129140646_i_container_registry_delete_repository_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20230129140954_i_container_registry_create_repository_user_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20230130074932_p_ci_templates_terraform_module_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20230130075614_p_ci_templates_terraform_module_base_monthly.yml1
-rw-r--r--config/metrics/counts_28d/20230215180530_p_ci_templates_security_api_discovery_monthly.yml24
-rw-r--r--config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml22
-rw-r--r--config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_with_failures.yml26
-rw-r--r--config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_without_failures.yml26
-rw-r--r--config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_with_failures.yml26
-rw-r--r--config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_without_failures.yml26
-rw-r--r--config/metrics/counts_28d/20230306134018_github_import_project_cancelled_monthly.yml25
-rw-r--r--config/metrics/counts_28d/20230306134609_github_import_project_partially_completed_monthly.yml25
-rw-r--r--config/metrics/counts_28d/20230417064258_i_container_registry_writes_user_monthly.yml32
-rw-r--r--config/metrics/counts_28d/20230420160442_i_quickactions_type_monthly.yml25
-rw-r--r--config/metrics/counts_28d/20230502171807_ci_interpolation_users.yml25
-rw-r--r--config/metrics/counts_28d/20230509140528_p_ci_templates_security_bas_latest_monthly.yml24
-rw-r--r--config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml1
-rw-r--r--config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml1
-rw-r--r--config/metrics/counts_7d/20210216174856_p_analytics_repo.yml1
-rw-r--r--config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml1
-rw-r--r--config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml1
-rw-r--r--config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml1
-rw-r--r--config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml1
-rw-r--r--config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml2
-rw-r--r--config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180416_i_search_total.yml1
-rw-r--r--config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml1
-rw-r--r--config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml1
-rw-r--r--config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216182104_design_action_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216182107_project_action_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml3
-rw-r--r--config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml1
-rw-r--r--config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml1
-rw-r--r--config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml5
-rw-r--r--config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml1
-rwxr-xr-xconfig/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml3
-rw-r--r--config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml3
-rw-r--r--config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml3
-rw-r--r--config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml7
-rw-r--r--config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml1
-rw-r--r--config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml1
-rw-r--r--config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml1
-rw-r--r--config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml1
-rw-r--r--config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml1
-rw-r--r--config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210902191054_i_quickactions_unapprove_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210908151645_i_code_review_user_resolve_thread_in_issue_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml1
-rw-r--r--config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml1
-rw-r--r--config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml1
-rw-r--r--config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml1
-rw-r--r--config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220121140634_user_jetbrains_api_request_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_dependency_scanning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_license_scanning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220222215851_xmau_plan.yml1
-rw-r--r--config/metrics/counts_7d/20220222215852_xmau_project_management.yml1
-rw-r--r--config/metrics/counts_7d/20220222215855_users_work_items.yml1
-rw-r--r--config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220309183454_error_tracking_view_details_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220309195457_error_tracking_view_list_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220322194922_users_gitlab_cli_api_request_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220622084654_p_analytics_ci_cd_time_to_restore_service_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220627133128_i_code_review_submit_review_approve_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220627134100_i_code_review_submit_review_comment_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220706175117_ci_users_executing_verify_job_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220707054526_p_analytics_ci_cd_change_failure_rate_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220708162305_i_code_review_merge_request_widget_test_summary_view_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220708163619_i_code_review_merge_request_widget_test_summary_full_report_clicked_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220708164539_i_code_review_merge_request_widget_test_summary_expand_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220708165632_i_code_review_merge_request_widget_test_summary_expand_success_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220708170508_i_code_review_merge_request_widget_test_summary_expand_warning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220708173736_i_code_review_merge_request_widget_test_summary_expand_failed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220715195411_p_ci_templates_security_fortify_fod_sast_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220719133311_p_ci_templates_implicit_security_fortify_fod_sast_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220725201348_users_updating_work_item_dates_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220725210831_i_code_review_merge_request_widget_accessibility_view_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220725210838_i_code_review_merge_request_widget_accessibility_full_report_clicked_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220725210845_i_code_review_merge_request_widget_accessibility_expand_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220725210851_i_code_review_merge_request_widget_accessibility_expand_success_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220725210858_i_code_review_merge_request_widget_accessibility_expand_warning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220725210906_i_code_review_merge_request_widget_accessibility_expand_failed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220727020407_i_code_review_merge_request_widget_code_quality_view_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220727020413_i_code_review_merge_request_widget_code_quality_full_report_clicked_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220727020419_i_code_review_merge_request_widget_code_quality_expand_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220727020424_i_code_review_merge_request_widget_code_quality_expand_success_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220727020429_i_code_review_merge_request_widget_code_quality_expand_warning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220727020435_i_code_review_merge_request_widget_code_quality_expand_failed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220727045240_i_code_review_merge_request_widget_terraform_view_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220727045246_i_code_review_merge_request_widget_terraform_full_report_clicked_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220727045252_i_code_review_merge_request_widget_terraform_expand_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220727045258_i_code_review_merge_request_widget_terraform_expand_success_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220727045304_i_code_review_merge_request_widget_terraform_expand_warning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220727045311_i_code_review_merge_request_widget_terraform_expand_failed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml3
-rw-r--r--config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220906065645_incident_management_timeline_event_created_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220906070351_incident_management_timeline_event_edited_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220906070629_incident_management_timeline_event_deleted_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220907080626_i_quickactions_timeline_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220909143617_i_package_rpm_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220913104805_i_package_rpm_deploy_token_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220913225013_p_ci_templates_security_coverage_fuzzing_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220913225257_p_ci_templates_implicit_security_coverage_fuzzing_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20220922042528_users_updating_work_item_iteration_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20221006065521_i_quickactions_link_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml3
-rw-r--r--config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_issue_notification_weekly.yml24
-rw-r--r--config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_note_notification_weekly.yml24
-rw-r--r--config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_deployment_notification_weekly.yml24
-rw-r--r--config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_issue_notification_weekly.yml24
-rw-r--r--config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_merge_request_notification_weekly.yml24
-rw-r--r--config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_note_notification_weekly.yml24
-rw-r--r--config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_push_notification_weekly.yml24
-rw-r--r--config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_tag_push_notification_weekly.yml24
-rw-r--r--config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_wiki_page_notification_weekly.yml24
-rw-r--r--config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml3
-rw-r--r--config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml3
-rw-r--r--config/metrics/counts_7d/20230120094643_g_runner_fleet_read_jobs_statistics_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20230123233604_i_ci_secrets_management_id_tokens_build_created_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20230129032841_i_container_registry_push_tag_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20230129034513_i_container_registry_delete_tag_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20230129034950_i_container_registry_push_repository_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20230129035454_i_container_registry_delete_repository_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20230129035748_i_container_registry_create_repository_user_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20230130074931_p_ci_templates_terraform_module_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20230130075613_p_ci_templates_terraform_module_base_weekly.yml1
-rw-r--r--config/metrics/counts_7d/20230215180530_p_ci_templates_security_api_discovery_weekly.yml24
-rw-r--r--config/metrics/counts_7d/20230306133608_github_import_project_cancelled_weekly.yml25
-rw-r--r--config/metrics/counts_7d/20230306134308_github_import_project_partially_completed_weekly.yml25
-rw-r--r--config/metrics/counts_7d/20230417063146_i_container_registry_writes_user_weekly.yml32
-rw-r--r--config/metrics/counts_7d/20230420160441_i_quickactions_type_weekly.yml25
-rw-r--r--config/metrics/counts_7d/20230502171807_ci_interpolation_users.yml25
-rw-r--r--config/metrics/counts_7d/20230509085219_i_quickactions_blocked_by_weekly.yml23
-rw-r--r--config/metrics/counts_7d/20230509090906_i_quickactions_blocks_weekly.yml23
-rw-r--r--config/metrics/counts_7d/20230509140526_p_ci_templates_security_bas_latest_weekly.yml24
-rw-r--r--config/metrics/counts_all/20210204124930_servers.yml1
-rw-r--r--config/metrics/counts_all/20210204124932_clusters.yml1
-rw-r--r--config/metrics/counts_all/20210216174832_cycle_analytics_views.yml1
-rw-r--r--config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml1
-rw-r--r--config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml1
-rw-r--r--config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml7
-rw-r--r--config/metrics/counts_all/20210216175026_service_desk_issues.yml7
-rw-r--r--config/metrics/counts_all/20210216175037_suggestions.yml1
-rw-r--r--config/metrics/counts_all/20210216175039_merge_requests.yml1
-rw-r--r--config/metrics/counts_all/20210216175041_merge_request_comment.yml1
-rw-r--r--config/metrics/counts_all/20210216175043_merge_request_create.yml1
-rw-r--r--config/metrics/counts_all/20210216175045_merge_requests.yml1
-rw-r--r--config/metrics/counts_all/20210216175053_suggestions.yml1
-rw-r--r--config/metrics/counts_all/20210216175229_auto_devops_enabled.yml1
-rw-r--r--config/metrics/counts_all/20210216175231_auto_devops_disabled.yml1
-rw-r--r--config/metrics/counts_all/20210216175232_clusters.yml2
-rw-r--r--config/metrics/counts_all/20210216175234_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175236_project_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175238_group_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175242_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175244_project_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175246_group_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml2
-rw-r--r--config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml2
-rw-r--r--config/metrics/counts_all/20210216175253_clusters_platforms_user.yml2
-rw-r--r--config/metrics/counts_all/20210216175255_clusters_applications_helm.yml2
-rw-r--r--config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml2
-rw-r--r--config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml2
-rw-r--r--config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml2
-rw-r--r--config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml2
-rw-r--r--config/metrics/counts_all/20210216175305_clusters_applications_runner.yml2
-rw-r--r--config/metrics/counts_all/20210216175307_clusters_applications_knative.yml2
-rw-r--r--config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml2
-rw-r--r--config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml2
-rw-r--r--config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml2
-rw-r--r--config/metrics/counts_all/20210216175314_clusters_management_project.yml2
-rw-r--r--config/metrics/counts_all/20210216175316_kubernetes_agents.yml2
-rw-r--r--config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml2
-rw-r--r--config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml1
-rw-r--r--config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml1
-rw-r--r--config/metrics/counts_all/20210216175324_terraform_reports.yml1
-rw-r--r--config/metrics/counts_all/20210216175326_terraform_states.yml1
-rw-r--r--config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml2
-rw-r--r--config/metrics/counts_all/20210216175331_clusters_applications_helm.yml2
-rw-r--r--config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml2
-rw-r--r--config/metrics/counts_all/20210216175335_clusters_applications_knative.yml2
-rw-r--r--config/metrics/counts_all/20210216175337_clusters_management_project.yml2
-rw-r--r--config/metrics/counts_all/20210216175339_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175341_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml2
-rw-r--r--config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml2
-rw-r--r--config/metrics/counts_all/20210216175346_clusters_platforms_user.yml2
-rw-r--r--config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175352_group_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175354_group_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175356_project_clusters_disabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175358_project_clusters_enabled.yml2
-rw-r--r--config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml2
-rw-r--r--config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml1
-rw-r--r--config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml1
-rw-r--r--config/metrics/counts_all/20210216175446_network_policy_forwards.yml1
-rw-r--r--config/metrics/counts_all/20210216175448_network_policy_drops.yml1
-rw-r--r--config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml1
-rw-r--r--config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml1
-rw-r--r--config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml1
-rw-r--r--config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml1
-rw-r--r--config/metrics/counts_all/20210216175510_ci_builds.yml1
-rw-r--r--config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml1
-rw-r--r--config/metrics/counts_all/20210216175514_ci_external_pipelines.yml1
-rw-r--r--config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml1
-rw-r--r--config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml1
-rw-r--r--config/metrics/counts_all/20210216175520_ci_runners.yml2
-rw-r--r--config/metrics/counts_all/20210216175521_ci_triggers.yml1
-rw-r--r--config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml1
-rw-r--r--config/metrics/counts_all/20210216175525_ci_builds.yml1
-rw-r--r--config/metrics/counts_all/20210216175527_ci_external_pipelines.yml1
-rw-r--r--config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml1
-rw-r--r--config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml1
-rw-r--r--config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml1
-rw-r--r--config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml1
-rw-r--r--config/metrics/counts_all/20210216175537_ci_pipelines.yml1
-rw-r--r--config/metrics/counts_all/20210216175539_ci_triggers.yml1
-rw-r--r--config/metrics/counts_all/20210216175621_web_hooks.yml1
-rw-r--r--config/metrics/counts_all/20210216175623_projects_asana_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175625_groups_asana_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175627_templates_asana_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175628_instances_asana_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175634_projects_assembla_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175636_groups_assembla_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175638_templates_assembla_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175640_instances_assembla_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175645_projects_bamboo_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175647_groups_bamboo_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175649_templates_bamboo_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175651_instances_bamboo_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175708_projects_buildkite_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175710_groups_buildkite_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175712_templates_buildkite_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175714_instances_buildkite_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175719_projects_campfire_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175721_groups_campfire_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175723_templates_campfire_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175725_instances_campfire_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175731_projects_confluence_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175733_groups_confluence_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175734_templates_confluence_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175736_instances_confluence_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175753_projects_discord_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175755_groups_discord_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175756_templates_discord_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175758_instances_discord_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175837_projects_flowdock_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175839_groups_flowdock_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175840_templates_flowdock_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175842_instances_flowdock_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175910_projects_hipchat_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175912_groups_hipchat_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175913_templates_hipchat_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175915_instances_hipchat_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175921_projects_irker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175923_groups_irker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175924_templates_irker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175926_instances_irker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175932_projects_jenkins_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175934_groups_jenkins_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175935_templates_jenkins_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175937_instances_jenkins_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175943_projects_jira_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175945_groups_jira_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175946_templates_jira_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175948_instances_jira_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175954_projects_mattermost_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175956_groups_mattermost_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175957_templates_mattermost_active.yml1
-rw-r--r--config/metrics/counts_all/20210216175959_instances_mattermost_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180027_projects_packagist_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180029_groups_packagist_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180030_templates_packagist_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180032_instances_packagist_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180100_projects_pushover_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180102_groups_pushover_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180104_templates_pushover_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180105_instances_pushover_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180111_projects_redmine_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180113_groups_redmine_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180115_templates_redmine_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180116_instances_redmine_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180122_projects_slack_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180124_groups_slack_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180126_templates_slack_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180127_instances_slack_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180144_projects_teamcity_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180146_groups_teamcity_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180148_templates_teamcity_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180149_instances_teamcity_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180217_projects_youtrack_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180219_groups_youtrack_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180221_templates_youtrack_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180223_instances_youtrack_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180228_projects_jira_server_active.yml5
-rw-r--r--config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml5
-rw-r--r--config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180239_personal_snippets.yml1
-rw-r--r--config/metrics/counts_all/20210216180241_project_snippets.yml1
-rw-r--r--config/metrics/counts_all/20210216180242_web_ide_commits.yml3
-rw-r--r--config/metrics/counts_all/20210216180244_web_ide_views.yml1
-rw-r--r--config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml1
-rw-r--r--config/metrics/counts_all/20210216180248_web_ide_previews.yml1
-rw-r--r--config/metrics/counts_all/20210216180250_web_ide_terminals.yml1
-rw-r--r--config/metrics/counts_all/20210216180252_web_ide_pipelines.yml1
-rw-r--r--config/metrics/counts_all/20210216180253_snippet_comment.yml1
-rw-r--r--config/metrics/counts_all/20210216180255_snippet_create.yml1
-rw-r--r--config/metrics/counts_all/20210216180257_snippet_update.yml1
-rw-r--r--config/metrics/counts_all/20210216180259_static_site_editor_views.yml1
-rw-r--r--config/metrics/counts_all/20210216180301_static_site_editor_commits.yml1
-rw-r--r--config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml1
-rw-r--r--config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml1
-rw-r--r--config/metrics/counts_all/20210216180306_snippets.yml1
-rw-r--r--config/metrics/counts_all/20210216180316_snippets.yml1
-rw-r--r--config/metrics/counts_all/20210216180410_pool_repositories.yml1
-rw-r--r--config/metrics/counts_all/20210216180413_all_searches.yml1
-rw-r--r--config/metrics/counts_all/20210216180414_navbar_searches.yml1
-rw-r--r--config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml1
-rw-r--r--config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml1
-rw-r--r--config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml1
-rw-r--r--config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml1
-rw-r--r--config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml1
-rw-r--r--config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml1
-rw-r--r--config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml1
-rw-r--r--config/metrics/counts_all/20210216180447_incident_issues.yml1
-rw-r--r--config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml1
-rw-r--r--config/metrics/counts_all/20210216180451_incident_labeled_issues.yml1
-rw-r--r--config/metrics/counts_all/20210216180453_projects_creating_incidents.yml1
-rw-r--r--config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml1
-rw-r--r--config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml1
-rw-r--r--config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml1
-rw-r--r--config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml1
-rw-r--r--config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml1
-rw-r--r--config/metrics/counts_all/20210216180518_projects_with_incidents.yml1
-rw-r--r--config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml1
-rw-r--r--config/metrics/counts_all/20210216180628_projects_imported_from_github.yml1
-rw-r--r--config/metrics/counts_all/20210216180630_projects_imported_from_github.yml1
-rw-r--r--config/metrics/counts_all/20210216180632_unique_users_all_imports.yml1
-rw-r--r--config/metrics/counts_all/20210216180634_gitlab.yml1
-rw-r--r--config/metrics/counts_all/20210216180636_gitlab_v1.yml1
-rw-r--r--config/metrics/counts_all/20210216180638_gitlab_project.yml1
-rw-r--r--config/metrics/counts_all/20210216180639_gitlab.yml5
-rw-r--r--config/metrics/counts_all/20210216180641_github.yml1
-rw-r--r--config/metrics/counts_all/20210216180643_bitbucket.yml1
-rw-r--r--config/metrics/counts_all/20210216180645_bitbucket_server.yml1
-rw-r--r--config/metrics/counts_all/20210216180647_gitea.yml1
-rw-r--r--config/metrics/counts_all/20210216180649_git.yml1
-rw-r--r--config/metrics/counts_all/20210216180650_manifest.yml1
-rw-r--r--config/metrics/counts_all/20210216180652_gitlab_migration.yml1
-rw-r--r--config/metrics/counts_all/20210216180654_jira.yml1
-rw-r--r--config/metrics/counts_all/20210216180656_fogbugz.yml1
-rw-r--r--config/metrics/counts_all/20210216180658_phabricator.yml5
-rw-r--r--config/metrics/counts_all/20210216180700_csv.yml1
-rw-r--r--config/metrics/counts_all/20210216180702_group_import.yml1
-rw-r--r--config/metrics/counts_all/20210216180703_gitlab_migration.yml1
-rw-r--r--config/metrics/counts_all/20210216180705_total.yml1
-rw-r--r--config/metrics/counts_all/20210216180707_gitlab_project.yml1
-rw-r--r--config/metrics/counts_all/20210216180709_gitlab.yml1
-rw-r--r--config/metrics/counts_all/20210216180711_github.yml1
-rw-r--r--config/metrics/counts_all/20210216180713_bitbucket.yml1
-rw-r--r--config/metrics/counts_all/20210216180715_bitbucket_server.yml1
-rw-r--r--config/metrics/counts_all/20210216180716_gitea.yml1
-rw-r--r--config/metrics/counts_all/20210216180718_git.yml1
-rw-r--r--config/metrics/counts_all/20210216180720_manifest.yml1
-rw-r--r--config/metrics/counts_all/20210216180722_jira.yml1
-rw-r--r--config/metrics/counts_all/20210216180724_fogbugz.yml1
-rw-r--r--config/metrics/counts_all/20210216180726_phabricator.yml1
-rw-r--r--config/metrics/counts_all/20210216180727_csv.yml1
-rw-r--r--config/metrics/counts_all/20210216180729_groups_imported.yml1
-rw-r--r--config/metrics/counts_all/20210216180734_wiki_pages_create.yml1
-rw-r--r--config/metrics/counts_all/20210216180736_wiki_pages_update.yml1
-rw-r--r--config/metrics/counts_all/20210216180738_wiki_pages_delete.yml1
-rw-r--r--config/metrics/counts_all/20210216180740_design_management_designs_create.yml1
-rw-r--r--config/metrics/counts_all/20210216180741_design_management_designs_update.yml1
-rw-r--r--config/metrics/counts_all/20210216180743_design_management_designs_delete.yml1
-rw-r--r--config/metrics/counts_all/20210216180750_groups.yml1
-rw-r--r--config/metrics/counts_all/20210216180752_keys.yml1
-rw-r--r--config/metrics/counts_all/20210216180754_events.yml1
-rw-r--r--config/metrics/counts_all/20210216180756_groups.yml1
-rw-r--r--config/metrics/counts_all/20210216180758_users_created.yml1
-rw-r--r--config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml1
-rw-r--r--config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml1
-rw-r--r--config/metrics/counts_all/20210216180931_projects_prometheus_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180933_groups_prometheus_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180934_templates_prometheus_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180936_instances_prometheus_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml1
-rw-r--r--config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml1
-rw-r--r--config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml1
-rw-r--r--config/metrics/counts_all/20210216180945_clusters.yml1
-rw-r--r--config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml1
-rw-r--r--config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml1
-rw-r--r--config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml1
-rw-r--r--config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml1
-rw-r--r--config/metrics/counts_all/20210216181009_lfs_objects.yml1
-rw-r--r--config/metrics/counts_all/20210216181011_projects_with_packages.yml1
-rw-r--r--config/metrics/counts_all/20210216181012_packages.yml1
-rw-r--r--config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml1
-rw-r--r--config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml1
-rw-r--r--config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml1
-rw-r--r--config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml1
-rw-r--r--config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml1
-rw-r--r--config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml1
-rw-r--r--config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml1
-rw-r--r--config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml1
-rw-r--r--config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml1
-rw-r--r--config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml1
-rw-r--r--config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml1
-rw-r--r--config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml1
-rw-r--r--config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml1
-rw-r--r--config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml1
-rw-r--r--config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml1
-rw-r--r--config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml1
-rw-r--r--config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml1
-rw-r--r--config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml1
-rw-r--r--config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml1
-rw-r--r--config/metrics/counts_all/20210216181051_vendor.yml1
-rw-r--r--config/metrics/counts_all/20210216181055_projects_with_packages.yml1
-rw-r--r--config/metrics/counts_all/20210216181102_issues.yml1
-rw-r--r--config/metrics/counts_all/20210216181104_label_lists.yml1
-rw-r--r--config/metrics/counts_all/20210216181108_milestones.yml1
-rw-r--r--config/metrics/counts_all/20210216181109_uploads.yml1
-rw-r--r--config/metrics/counts_all/20210216181111_labels.yml1
-rw-r--r--config/metrics/counts_all/20210216181113_notes.yml1
-rw-r--r--config/metrics/counts_all/20210216181115_issues.yml1
-rw-r--r--config/metrics/counts_all/20210216181117_notes.yml1
-rw-r--r--config/metrics/counts_all/20210216181119_projects.yml1
-rw-r--r--config/metrics/counts_all/20210216181121_todos.yml1
-rw-r--r--config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml7
-rw-r--r--config/metrics/counts_all/20210216181124_service_desk_issues.yml7
-rw-r--r--config/metrics/counts_all/20210216181126_projects_jira_active.yml1
-rw-r--r--config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml1
-rw-r--r--config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml1
-rw-r--r--config/metrics/counts_all/20210216181134_epics.yml1
-rw-r--r--config/metrics/counts_all/20210216181135_label_lists.yml1
-rw-r--r--config/metrics/counts_all/20210216181249_feature_flags.yml1
-rw-r--r--config/metrics/counts_all/20210216181252_boards.yml1
-rw-r--r--config/metrics/counts_all/20210216181254_projects.yml1
-rw-r--r--config/metrics/counts_all/20210216181256_todos.yml1
-rw-r--r--config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml1
-rw-r--r--config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml1
-rw-r--r--config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml1
-rw-r--r--config/metrics/counts_all/20210216181908_deploy_keys.yml1
-rw-r--r--config/metrics/counts_all/20210216181911_successful_deployments.yml1
-rw-r--r--config/metrics/counts_all/20210216181912_failed_deployments.yml1
-rw-r--r--config/metrics/counts_all/20210216181914_environments.yml1
-rw-r--r--config/metrics/counts_all/20210216181916_in_review_folder.yml1
-rw-r--r--config/metrics/counts_all/20210216181918_releases.yml1
-rw-r--r--config/metrics/counts_all/20210216181926_deployments.yml1
-rw-r--r--config/metrics/counts_all/20210216181928_failed_deployments.yml1
-rw-r--r--config/metrics/counts_all/20210216181930_releases.yml1
-rw-r--r--config/metrics/counts_all/20210216181932_successful_deployments.yml1
-rw-r--r--config/metrics/counts_all/20210216181946_pages_domains.yml1
-rw-r--r--config/metrics/counts_all/20210216181949_clusters_applications_runner.yml2
-rw-r--r--config/metrics/counts_all/20210216182002_remote_mirrors.yml1
-rw-r--r--config/metrics/counts_all/20210216182004_commit_comment.yml1
-rw-r--r--config/metrics/counts_all/20210216182006_source_code_pushes.yml1
-rw-r--r--config/metrics/counts_all/20210216182010_deploy_keys.yml1
-rw-r--r--config/metrics/counts_all/20210216182012_keys.yml1
-rw-r--r--config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml1
-rw-r--r--config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml1
-rw-r--r--config/metrics/counts_all/20210216182017_remote_mirrors.yml1
-rw-r--r--config/metrics/counts_all/20210216182454_protected_branches_except_default.yml1
-rw-r--r--config/metrics/counts_all/20210216182547_projects_datadog_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182549_groups_datadog_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182551_templates_datadog_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182553_instances_datadog_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182614_projects_ewm_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182616_groups_ewm_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182618_templates_ewm_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182620_instances_ewm_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml1
-rw-r--r--config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml1
-rw-r--r--config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml1
-rw-r--r--config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml1
-rw-r--r--config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml1
-rw-r--r--config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml1
-rw-r--r--config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml1
-rw-r--r--config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml1
-rw-r--r--config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml1
-rw-r--r--config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml1
-rw-r--r--config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml1
-rw-r--r--config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml1
-rw-r--r--config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml1
-rw-r--r--config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml1
-rw-r--r--config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml1
-rw-r--r--config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml1
-rw-r--r--config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml1
-rw-r--r--config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml1
-rw-r--r--config/metrics/counts_all/20210216183023_wiki_pages_view.yml5
-rw-r--r--config/metrics/counts_all/20210216183400_omniauth_providers.yml1
-rw-r--r--config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml1
-rw-r--r--config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml1
-rw-r--r--config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml1
-rw-r--r--config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml1
-rw-r--r--config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml5
-rw-r--r--config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml5
-rw-r--r--config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml5
-rw-r--r--config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml2
-rw-r--r--config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml2
-rw-r--r--config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml2
-rw-r--r--config/metrics/counts_all/20210502050942_ci_runners_online.yml1
-rw-r--r--config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml2
-rw-r--r--config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml2
-rw-r--r--config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml2
-rw-r--r--config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml2
-rw-r--r--config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml1
-rw-r--r--config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml1
-rw-r--r--config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml1
-rw-r--r--config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml1
-rw-r--r--config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml1
-rw-r--r--config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml1
-rw-r--r--config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml1
-rw-r--r--config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml1
-rw-r--r--config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml1
-rw-r--r--config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml1
-rw-r--r--config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml1
-rw-r--r--config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml1
-rw-r--r--config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml1
-rw-r--r--config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml1
-rw-r--r--config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml1
-rw-r--r--config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml1
-rw-r--r--config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml1
-rw-r--r--config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml1
-rw-r--r--config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml1
-rw-r--r--config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml1
-rw-r--r--config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml1
-rw-r--r--config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml1
-rw-r--r--config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml1
-rw-r--r--config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml1
-rw-r--r--config/metrics/counts_all/20210514141520_project_imports_total.yml1
-rw-r--r--config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml1
-rw-r--r--config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml1
-rw-r--r--config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml1
-rw-r--r--config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml1
-rw-r--r--config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml1
-rw-r--r--config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml1
-rw-r--r--config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml1
-rw-r--r--config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml1
-rw-r--r--config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml1
-rw-r--r--config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml1
-rw-r--r--config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml1
-rw-r--r--config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml1
-rw-r--r--config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml1
-rw-r--r--config/metrics/counts_all/20210715094459_releases_with_milestones.yml1
-rw-r--r--config/metrics/counts_all/20210723075525_diff_searches.yml1
-rw-r--r--config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml1
-rw-r--r--config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml1
-rw-r--r--config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml1
-rw-r--r--config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml1
-rw-r--r--config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml1
-rw-r--r--config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml1
-rw-r--r--config/metrics/counts_all/20210730011801_projects_zentao_active.yml1
-rw-r--r--config/metrics/counts_all/20210730011802_groups_zentao_active.yml1
-rw-r--r--config/metrics/counts_all/20210730011804_instances_zentao_active.yml1
-rw-r--r--config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml1
-rw-r--r--config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml1
-rw-r--r--config/metrics/counts_all/20210910132001_user_auth_by_provider.yml1
-rw-r--r--config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml1
-rw-r--r--config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml1
-rw-r--r--config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml1
-rw-r--r--config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml1
-rw-r--r--config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml2
-rw-r--r--config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml2
-rw-r--r--config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml1
-rw-r--r--config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml1
-rw-r--r--config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml1
-rw-r--r--config/metrics/counts_all/20211028210001_projects_shimo_active.yml1
-rw-r--r--config/metrics/counts_all/20211028210002_groups_shimo_active.yml1
-rw-r--r--config/metrics/counts_all/20211028210003_instances_shimo_active.yml1
-rw-r--r--config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml1
-rw-r--r--config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml1
-rw-r--r--config/metrics/counts_all/20220122022215_web_ide_previews_success.yml1
-rw-r--r--config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml1
-rw-r--r--config/metrics/counts_all/20220315180122_projects_harbor_active.yml1
-rw-r--r--config/metrics/counts_all/20220315180124_groups_harbor_active.yml1
-rw-r--r--config/metrics/counts_all/20220315180127_instances_harbor_active.yml1
-rw-r--r--config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml1
-rw-r--r--config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml1
-rw-r--r--config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml1
-rw-r--r--config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml1
-rw-r--r--config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml1
-rw-r--r--config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml1
-rw-r--r--config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml1
-rw-r--r--config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml1
-rw-r--r--config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml1
-rw-r--r--config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml1
-rw-r--r--config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml1
-rw-r--r--config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml1
-rw-r--r--config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml1
-rw-r--r--config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml1
-rw-r--r--config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml1
-rw-r--r--config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml1
-rw-r--r--config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml1
-rw-r--r--config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml1
-rw-r--r--config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml1
-rw-r--r--config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml1
-rw-r--r--config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml1
-rw-r--r--config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml1
-rw-r--r--config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml1
-rw-r--r--config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml1
-rw-r--r--config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml1
-rw-r--r--config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml1
-rw-r--r--config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml1
-rw-r--r--config/metrics/counts_all/20220802141715_groups_pumble_active.yml1
-rw-r--r--config/metrics/counts_all/20220802141715_instances_pumble_active.yml1
-rw-r--r--config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml1
-rw-r--r--config/metrics/counts_all/20220802141715_projects_pumble_active.yml1
-rw-r--r--config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml1
-rw-r--r--config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml1
-rw-r--r--config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml1
-rw-r--r--config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml1
-rw-r--r--config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml1
-rw-r--r--config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml1
-rw-r--r--config/metrics/counts_all/20220825232556_count_user_auth.yml1
-rw-r--r--config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml1
-rw-r--r--config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml1
-rw-r--r--config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml1
-rw-r--r--config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml1
-rw-r--r--config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml1
-rw-r--r--config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml1
-rw-r--r--config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml1
-rw-r--r--config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml1
-rw-r--r--config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml1
-rw-r--r--config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml1
-rw-r--r--config/metrics/counts_all/20221209212603_projects_inheriting_apple_app_store_active.yml1
-rw-r--r--config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml1
-rw-r--r--config/metrics/counts_all/20221209214020_projects_apple_app_store_active.yml1
-rw-r--r--config/metrics/counts_all/20221209233053_groups_inheriting_apple_app_store_active.yml1
-rw-r--r--config/metrics/counts_all/20221209233201_instances_apple_app_store_active.yml1
-rw-r--r--config/metrics/counts_all/20230119154124_projects_with_monitor_enabled.yml1
-rw-r--r--config/metrics/counts_all/20230201120001_count_ml_candidates.yml1
-rw-r--r--config/metrics/counts_all/20230201120002_count_ml_experiments.yml1
-rw-r--r--config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml1
-rw-r--r--config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml1
-rw-r--r--config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml1
-rw-r--r--config/metrics/counts_all/20230209153034_projects_jira_server_deployment_type_active.yml1
-rw-r--r--config/metrics/counts_all/20230209153255_projects_jira_cloud_deployment_type_active.yml1
-rw-r--r--config/metrics/counts_all/20230210184724_projects_inheriting_google_play_active.yml21
-rw-r--r--config/metrics/counts_all/20230222192643_projects_google_play_active.yml21
-rw-r--r--config/metrics/counts_all/20230222193011_instances_google_play_active.yml21
-rw-r--r--config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml21
-rw-r--r--config/metrics/counts_all/20230222193255_groups_google_play_active.yml21
-rw-r--r--config/metrics/counts_all/20230303131933_groups_inheriting_squash_tm_active.yml21
-rw-r--r--config/metrics/counts_all/20230303131936_groups_squash_tm_active.yml21
-rw-r--r--config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml21
-rw-r--r--config/metrics/counts_all/20230303132048_projects_inheriting_squash_tm_active.yml21
-rw-r--r--config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml21
-rw-r--r--config/metrics/counts_all/20230306191328_i_container_registry_delete_manifest.yml25
-rw-r--r--config/metrics/license/20210201124932_recorded_at.yml1
-rw-r--r--config/metrics/license/20210201124933_uuid.yml1
-rw-r--r--config/metrics/license/20210204124827_hostname.yml1
-rw-r--r--config/metrics/license/20210204124829_active_user_count.yml1
-rw-r--r--config/metrics/license/20210204124928_version.yml1
-rw-r--r--config/metrics/license/20210204124936_pages_version.yml1
-rw-r--r--config/metrics/license/20210204124938_recording_ce_finished_at.yml1
-rw-r--r--config/metrics/license/20210216175601_version.yml2
-rw-r--r--config/metrics/license/20210216175602_installation_type.yml2
-rw-r--r--config/metrics/license/20210216181053_version.yml1
-rw-r--r--config/metrics/license/20210216183237_version.yml1
-rw-r--r--config/metrics/license/20230228110448_installation_creation_date.yml22
-rw-r--r--config/metrics/license/20230314161014_gitlab_dedicated.yml19
-rw-r--r--config/metrics/license/20230505112412_installation_creation_date_approximation.yml22
-rw-r--r--config/metrics/objects_schemas/index_inconsistencies_metric.json19
-rw-r--r--config/metrics/schema.json8
-rw-r--r--config/metrics/settings/20210201124935_database_adapter.yml1
-rw-r--r--config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml1
-rw-r--r--config/metrics/settings/20210204124858_container_registry_enabled.yml1
-rw-r--r--config/metrics/settings/20210204124900_dependency_proxy_enabled.yml1
-rw-r--r--config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml1
-rw-r--r--config/metrics/settings/20210204124904_gravatar_enabled.yml1
-rw-r--r--config/metrics/settings/20210204124906_ldap_enabled.yml1
-rw-r--r--config/metrics/settings/20210204124908_mattermost_enabled.yml1
-rw-r--r--config/metrics/settings/20210204124910_omniauth_enabled.yml1
-rw-r--r--config/metrics/settings/20210204124916_reply_by_email_enabled.yml1
-rw-r--r--config/metrics/settings/20210204124918_signup_enabled.yml1
-rw-r--r--config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml1
-rw-r--r--config/metrics/settings/20210204124922_grafana_link_enabled.yml1
-rw-r--r--config/metrics/settings/20210204124934_pages_enabled.yml1
-rw-r--r--config/metrics/settings/20210216174829_smtp_server.yml1
-rw-r--r--config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml1
-rw-r--r--config/metrics/settings/20210216175604_edition.yml2
-rw-r--r--config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml1
-rw-r--r--config/metrics/settings/20210216175609_version.yml1
-rw-r--r--config/metrics/settings/20210216180314_gitpod_enabled.yml1
-rw-r--r--config/metrics/settings/20210216180836_enabled.yml1
-rw-r--r--config/metrics/settings/20210216180838_enabled.yml1
-rw-r--r--config/metrics/settings/20210216180840_direct_upload.yml1
-rw-r--r--config/metrics/settings/20210216180841_background_upload.yml1
-rw-r--r--config/metrics/settings/20210216180843_provider.yml1
-rw-r--r--config/metrics/settings/20210216180845_enabled.yml1
-rw-r--r--config/metrics/settings/20210216180847_enabled.yml1
-rw-r--r--config/metrics/settings/20210216180849_direct_upload.yml1
-rw-r--r--config/metrics/settings/20210216180851_background_upload.yml1
-rw-r--r--config/metrics/settings/20210216180852_provider.yml1
-rw-r--r--config/metrics/settings/20210216180854_enabled.yml1
-rw-r--r--config/metrics/settings/20210216180856_enabled.yml1
-rw-r--r--config/metrics/settings/20210216180858_direct_upload.yml1
-rw-r--r--config/metrics/settings/20210216180900_background_upload.yml1
-rw-r--r--config/metrics/settings/20210216180902_provider.yml1
-rw-r--r--config/metrics/settings/20210216180903_enabled.yml1
-rw-r--r--config/metrics/settings/20210216180905_enabled.yml1
-rw-r--r--config/metrics/settings/20210216180907_direct_upload.yml1
-rw-r--r--config/metrics/settings/20210216180909_background_upload.yml1
-rw-r--r--config/metrics/settings/20210216180911_provider.yml1
-rw-r--r--config/metrics/settings/20210216180913_enabled.yml1
-rw-r--r--config/metrics/settings/20210216180915_enabled.yml1
-rw-r--r--config/metrics/settings/20210216180916_direct_upload.yml1
-rw-r--r--config/metrics/settings/20210216180918_background_upload.yml1
-rw-r--r--config/metrics/settings/20210216180920_provider.yml1
-rw-r--r--config/metrics/settings/20210216183241_filesystems.yml1
-rw-r--r--config/metrics/settings/20210216183248_pg_system_id.yml1
-rw-r--r--config/metrics/settings/20210225045628_operating_system.yml1
-rw-r--r--config/metrics/settings/20210321224827_gitaly_apdex.yml1
-rw-r--r--config/metrics/settings/20210323120839_topology.yml1
-rw-r--r--config/metrics/settings/20210702140138_collected_data_categories.yml1
-rw-r--r--config/metrics/settings/20210915152326_service_ping_features_enabled.yml1
-rw-r--r--config/metrics/settings/20211124061450_snowplow_enabled.yml1
-rw-r--r--config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml1
-rw-r--r--config/metrics/settings/20211201012652_flavor.yml1
-rw-r--r--config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml1
-rw-r--r--config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml1
-rw-r--r--config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml1
-rw-r--r--config/metrics/settings/20230125220526_incoming_email_encrypted_secrets_enabled.yml1
-rw-r--r--config/metrics/settings/20230125221700_service_desk_email_encrypted_secrets_enabled.yml1
-rw-r--r--config/metrics/settings/20230203164341_index_inconsistencies_metric.yml24
-rw-r--r--config/metrics/settings/20230328165533_mode.yml23
-rw-r--r--config/object_store_settings.rb22
-rw-r--r--config/plugins/graphql_known_operations_plugin.js6
-rw-r--r--config/prometheus/self_monitoring_default.yml69
-rw-r--r--config/puma.example.development.rb6
-rw-r--r--config/puma.rb.example6
-rw-r--r--config/routes.rb24
-rw-r--r--config/routes/admin.rb42
-rw-r--r--config/routes/directs.rb1
-rw-r--r--config/routes/directs/subscription_portal.rb19
-rw-r--r--config/routes/group.rb37
-rw-r--r--config/routes/import.rb11
-rw-r--r--config/routes/issues.rb9
-rw-r--r--config/routes/jira_connect.rb1
-rw-r--r--config/routes/pipelines.rb1
-rw-r--r--config/routes/profile.rb16
-rw-r--r--config/routes/project.rb112
-rw-r--r--config/routes/repository.rb2
-rw-r--r--config/routes/repository_deprecated.rb19
-rw-r--r--config/routes/snippets.rb2
-rw-r--r--config/routes/unmatched_project.rb16
-rw-r--r--config/routes/uploads.rb22
-rw-r--r--config/routes/user.rb16
-rw-r--r--config/settings.rb352
-rw-r--r--config/sidekiq_queues.yml56
-rw-r--r--config/smime_signature_settings.rb2
-rw-r--r--config/vue3migration/compiler.js126
-rw-r--r--config/webpack.config.js146
-rw-r--r--config/webpack.vendor.config.js28
2328 files changed, 4182 insertions, 3713 deletions
diff --git a/config/README.md b/config/README.md
index 71f18505a88..70d66f3f96d 100644
--- a/config/README.md
+++ b/config/README.md
@@ -59,13 +59,9 @@ order of precedence for configuration is described below, where `$NAME` and
`$FALLBACK_NAME` are the upper-cased instance names from the table, and `$name`
and `$fallback_name` are the lower-cased versions:
-1. The configuration file pointed to by the `GITLAB_REDIS_$NAME_CONFIG_FILE`
- environment variable.
1. The configuration file `redis.$name.yml`.
1. **If a fallback instance is available**, the configuration file
`redis.$fallback_name.yml`.
-1. The configuration file pointed to by the `GITLAB_REDIS_CONFIG_FILE`
-environment variable.
1. The configuration file `resque.yml`.
An example configuration file for Redis is in this directory under the name
@@ -83,9 +79,4 @@ An example configuration file for Redis is in this directory under the name
| `db_load_balancing` | `shared_state` | [Database Load Balancing](https://docs.gitlab.com/ee/administration/postgresql/database_load_balancing.html) |
If no configuration is found, or no URL is found in the configuration
-file, the default URL used is:
-
-1. `redis://localhost:6380` for `cache`.
-1. `redis://localhost:6381` for `queues`.
-1. `redis://localhost:6382` for `shared_state`.
-1. The URL from the fallback instance for all other instances.
+file, the default URL used is `redis://localhost:6379` for all Redis instances.
diff --git a/config/application.rb b/config/application.rb
index c6ecfcc0cb1..e7bea556960 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -32,7 +32,6 @@ module Gitlab
# Rails 6.1
config.action_dispatch.cookies_same_site_protection = nil # New default is :lax
ActiveSupport.utc_to_local_returns_utc_offset_times = false
- config.action_controller.urlsafe_csrf_tokens = false
config.action_view.preload_links_header = false
# Rails 5.2
@@ -258,7 +257,7 @@ module Gitlab
config.assets.precompile << "page_bundles/_mixins_and_variables_and_functions.css"
config.assets.precompile << "page_bundles/admin/application_settings_metrics_and_profiling.css"
config.assets.precompile << "page_bundles/admin/elasticsearch_form.css"
- config.assets.precompile << "page_bundles/admin/geo_nodes.css"
+ config.assets.precompile << "page_bundles/admin/geo_sites.css"
config.assets.precompile << "page_bundles/admin/geo_replicable.css"
config.assets.precompile << "page_bundles/admin/jobs_index.css"
config.assets.precompile << "page_bundles/alert_management_details.css"
@@ -268,6 +267,7 @@ module Gitlab
config.assets.precompile << "page_bundles/branches.css"
config.assets.precompile << "page_bundles/build.css"
config.assets.precompile << "page_bundles/ci_status.css"
+ config.assets.precompile << "page_bundles/ci_cd_settings.css"
config.assets.precompile << "page_bundles/cluster_agents.css"
config.assets.precompile << "page_bundles/clusters.css"
config.assets.precompile << "page_bundles/cycle_analytics.css"
@@ -292,14 +292,15 @@ module Gitlab
config.assets.precompile << "page_bundles/issues_list.css"
config.assets.precompile << "page_bundles/issues_show.css"
config.assets.precompile << "page_bundles/jira_connect.css"
- config.assets.precompile << "page_bundles/jira_connect_users.css"
config.assets.precompile << "page_bundles/learn_gitlab.css"
+ config.assets.precompile << "page_bundles/login.css"
config.assets.precompile << "page_bundles/marketing_popover.css"
config.assets.precompile << "page_bundles/members.css"
config.assets.precompile << "page_bundles/merge_conflicts.css"
config.assets.precompile << "page_bundles/merge_request_analytics.css"
config.assets.precompile << "page_bundles/merge_requests.css"
config.assets.precompile << "page_bundles/milestone.css"
+ config.assets.precompile << "page_bundles/ml_experiment_tracking.css"
config.assets.precompile << "page_bundles/new_namespace.css"
config.assets.precompile << "page_bundles/notifications.css"
config.assets.precompile << "page_bundles/oncall_schedules.css"
@@ -315,9 +316,11 @@ module Gitlab
config.assets.precompile << "page_bundles/profiles/preferences.css"
config.assets.precompile << "page_bundles/project.css"
config.assets.precompile << "page_bundles/projects_edit.css"
+ config.assets.precompile << "page_bundles/projects_usage_quotas.css"
config.assets.precompile << "page_bundles/prometheus.css"
config.assets.precompile << "page_bundles/promotions.css"
config.assets.precompile << "page_bundles/releases.css"
+ config.assets.precompile << "page_bundles/remote_development.css"
config.assets.precompile << "page_bundles/reports.css"
config.assets.precompile << "page_bundles/roadmap.css"
config.assets.precompile << "page_bundles/requirements.css"
@@ -381,7 +384,6 @@ module Gitlab
config.assets.paths << "#{config.root}/app/assets/stylesheets/_ee"
config.assets.paths << "#{config.root}/vendor/assets/javascripts/"
- config.assets.precompile << "snowplow/sp.js"
# This path must come last to avoid confusing sprockets
# See https://gitlab.com/gitlab-org/gitlab-foss/issues/64091#note_194512508
@@ -403,7 +405,7 @@ module Gitlab
config.middleware.insert_before ActionDispatch::RemoteIp, ::Gitlab::Middleware::HandleIpSpoofAttackError
- config.middleware.insert_after ActionDispatch::ActionableExceptions, ::Gitlab::Middleware::HandleMalformedStrings
+ config.middleware.insert_after Rails::Rack::Logger, ::Gitlab::Middleware::HandleMalformedStrings
config.middleware.insert_after Rack::Sendfile, ::Gitlab::Middleware::RackMultipartTempfileFactory
diff --git a/config/audit_events/types/feature_flag_created.yml b/config/audit_events/types/feature_flag_created.yml
new file mode 100644
index 00000000000..053580879fd
--- /dev/null
+++ b/config/audit_events/types/feature_flag_created.yml
@@ -0,0 +1,9 @@
+---
+name: feature_flag_created
+description: Triggered when a feature flag is created.
+introduced_by_issue: https://gitlab.com/gitlab-org/gitlab/-/issues/374109
+introduced_by_mr: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113453
+feature_category: feature_flags
+milestone: '15.10'
+saved_to_database: true
+streamed: true
diff --git a/config/audit_events/types/feature_flag_deleted.yml b/config/audit_events/types/feature_flag_deleted.yml
new file mode 100644
index 00000000000..3de626409d5
--- /dev/null
+++ b/config/audit_events/types/feature_flag_deleted.yml
@@ -0,0 +1,9 @@
+---
+name: feature_flag_deleted
+description: Triggered when a feature flag is deleted.
+introduced_by_issue: https://gitlab.com/gitlab-org/gitlab/-/issues/374109
+introduced_by_mr: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113453
+feature_category: feature_flags
+milestone: '15.10'
+saved_to_database: true
+streamed: true
diff --git a/config/audit_events/types/feature_flag_updated.yml b/config/audit_events/types/feature_flag_updated.yml
new file mode 100644
index 00000000000..0314684cb48
--- /dev/null
+++ b/config/audit_events/types/feature_flag_updated.yml
@@ -0,0 +1,9 @@
+---
+name: feature_flag_updated
+description: Triggered when a feature flag is updated.
+introduced_by_issue: https://gitlab.com/gitlab-org/gitlab/-/issues/374109
+introduced_by_mr: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113453
+feature_category: feature_flags
+milestone: '15.10'
+saved_to_database: true
+streamed: true
diff --git a/config/database.yml.decomposed-postgresql b/config/database.yml.decomposed-postgresql
index 3348c8cb277..3b5d1ff2ed5 100644
--- a/config/database.yml.decomposed-postgresql
+++ b/config/database.yml.decomposed-postgresql
@@ -103,3 +103,10 @@ test: &test
username: postgres
password:
host: localhost
+ embedding:
+ adapter: postgresql
+ encoding: unicode
+ database: gitlabhq_embedding_test
+ username: postgres
+ password:
+ host: localhost
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
index c1b1247b5b0..b210b9c412b 100644
--- a/config/database.yml.postgresql
+++ b/config/database.yml.postgresql
@@ -18,14 +18,14 @@ production:
# port: 8600
# record: secondary.postgresql.service.consul
# interval: 300
- # ci:
- # adapter: postgresql
- # encoding: unicode
- # database: gitlabhq_production
- # database_tasks: false
- # username: git
- # password: "secure password"
- # host: localhost
+ ci:
+ adapter: postgresql
+ encoding: unicode
+ database: gitlabhq_production
+ database_tasks: false
+ username: git
+ password: "secure password"
+ host: localhost
geo:
adapter: postgresql
encoding: unicode
@@ -47,16 +47,16 @@ development:
host: localhost
variables:
statement_timeout: 15s
- # ci:
- # adapter: postgresql
- # encoding: unicode
- # database: gitlabhq_development
- # database_tasks: false
- # username: postgres
- # password: "secure password"
- # host: localhost
- # variables:
- # statement_timeout: 15s
+ ci:
+ adapter: postgresql
+ encoding: unicode
+ database: gitlabhq_development
+ database_tasks: false
+ username: postgres
+ password: "secure password"
+ host: localhost
+ variables:
+ statement_timeout: 15s
geo:
adapter: postgresql
encoding: unicode
@@ -76,14 +76,14 @@ staging:
username: git
password: "secure password"
host: localhost
- # ci:
- # adapter: postgresql
- # encoding: unicode
- # database: gitlabhq_staging
- # database_tasks: false
- # username: git
- # password: "secure password"
- # host: localhost
+ ci:
+ adapter: postgresql
+ encoding: unicode
+ database: gitlabhq_staging
+ database_tasks: false
+ username: git
+ password: "secure password"
+ host: localhost
geo:
adapter: postgresql
encoding: unicode
@@ -106,17 +106,17 @@ test: &test
prepared_statements: false
variables:
statement_timeout: 15s
- # ci:
- # adapter: postgresql
- # encoding: unicode
- # database: gitlabhq_test
- # database_tasks: false
- # username: postgres
- # password:
- # host: localhost
- # prepared_statements: false
- # variables:
- # statement_timeout: 15s
+ ci:
+ adapter: postgresql
+ encoding: unicode
+ database: gitlabhq_test
+ database_tasks: false
+ username: postgres
+ password:
+ host: localhost
+ prepared_statements: false
+ variables:
+ statement_timeout: 15s
geo:
adapter: postgresql
encoding: unicode
@@ -124,3 +124,10 @@ test: &test
username: postgres
password:
host: localhost
+ embedding:
+ adapter: postgresql
+ encoding: unicode
+ database: gitlabhq_embedding_test
+ username: postgres
+ password:
+ host: localhost
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml
index 959d6f23156..e74e9367304 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -375,3 +375,9 @@
:why: https://gitlab.com/gitlab-com/legal-and-compliance/-/issues/1293
:versions: []
:when: 2022-12-09 20:28:33.507704000 Z
+- - :approve
+ - elkjs
+ - :who: John T Skarbek
+ :why: https://gitlab.com/gitlab-com/legal-and-compliance/-/issues/1505
+ :versions: ["0.8.2"]
+ :when: 2023-04-07 09:15:33.00004000 Z
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 6b44af3b658..06e58966199 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -37,16 +37,17 @@ Rails.application.configure do
# Annotate rendered view with template file names as HTML comments
config.action_view.annotate_rendered_view_with_filenames = true
- # ViewComponent previews
+ # ViewComponent & Lookbook previews
config.view_component.default_preview_layout = "component_preview"
config.view_component.preview_route = "/-/view_component/previews"
- config.view_component.preview_paths << "#{config.root}/spec/components/previews"
- # Push preview path now to prevent FrozenError during view_component's initialzer
+ config.lookbook.preview_paths = ["#{config.root}/spec/components/previews"]
+ # Push preview path now to prevent FrozenError during initialzer
config.autoload_paths.push("#{config.root}/spec/components/previews")
config.lookbook.page_paths = ["#{config.root}/spec/components/docs"]
config.lookbook.preview_params_options_eval = true
config.lookbook.preview_display_options = {
+ layout: %w[fixed fluid],
theme: ["light", "dark (alpha)"]
}
@@ -74,6 +75,8 @@ Rails.application.configure do
# BetterErrors live shell (REPL) on every stack frame
BetterErrors::Middleware.allow_ip!("127.0.0.1/0")
+ # Disable REPL due to security concerns.
+ BetterErrors.binding_of_caller_available = false
# Reassign some performance related settings when we profile the app
if Gitlab::Utils.to_boolean(ENV['RAILS_PROFILE'].to_s)
diff --git a/config/esbuild.config.js b/config/esbuild.config.js
deleted file mode 100644
index e876436e864..00000000000
--- a/config/esbuild.config.js
+++ /dev/null
@@ -1,59 +0,0 @@
-const browserslist = require('browserslist');
-const esbuild = require('esbuild');
-
-const ESBUILD_SUPPORTED_TARGETS = new Set([
- 'chrome',
- 'edge',
- 'firefox',
- 'hermes',
- 'ie',
- 'ios',
- 'node',
- 'opera',
- 'rhino',
- 'safari',
-]);
-
-const parseBrowserslist = (browserslistResult) => {
- return browserslistResult.map((browsers) => {
- const [family, version] = browsers.split(' ');
- let normalizedVersion = version;
-
- // browserslist can return a range: safari15.2-15.4
- if (version.indexOf('-') >= -1) {
- // we take the lowest version
- [normalizedVersion] = version.split('-');
- }
-
- return {
- family,
- version: normalizedVersion,
- };
- });
-};
-
-const mapBrowserslistToESBuildTarget = (browsersList) => {
- return parseBrowserslist(browsersList)
- .filter(({ family, version }) => {
- if (!ESBUILD_SUPPORTED_TARGETS.has(family)) {
- console.warning('Unknown ESBuild target %s, version %s', family, version);
- return false;
- }
-
- return true;
- })
- .map(({ family, version }) => {
- return `${family}${version}`;
- });
-};
-
-module.exports = {
- target: mapBrowserslistToESBuildTarget(browserslist()),
- supported: {
- 'optional-chain': false,
- 'nullish-coalescing': false,
- 'class-static-field': false,
- 'class-field': false,
- },
- implementation: esbuild,
-};
diff --git a/config/events/1655841083_projects_settings_cicd_show_render.yml b/config/events/1655841083_projects_settings_cicd_show_render.yml
index 45f0037443b..81612662a0d 100644
--- a/config/events/1655841083_projects_settings_cicd_show_render.yml
+++ b/config/events/1655841083_projects_settings_cicd_show_render.yml
@@ -19,7 +19,7 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90449
distributions:
- ce
- ee
-tiers:
+tiers:
- free
- premium
- ultimate
diff --git a/config/events/1655841352_projects_settings_cicd_show_upload.yml b/config/events/1655841352_projects_settings_cicd_show_upload.yml
index a19462d671e..12dd9fd8850 100644
--- a/config/events/1655841352_projects_settings_cicd_show_upload.yml
+++ b/config/events/1655841352_projects_settings_cicd_show_upload.yml
@@ -19,7 +19,7 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90449
distributions:
- ce
- ee
-tiers:
+tiers:
- free
- premium
- ultimate
diff --git a/config/events/1655841364_projects_settings_cicd_show_delete.yml b/config/events/1655841364_projects_settings_cicd_show_delete.yml
index c106ab376e3..f4504d5df63 100644
--- a/config/events/1655841364_projects_settings_cicd_show_delete.yml
+++ b/config/events/1655841364_projects_settings_cicd_show_delete.yml
@@ -19,7 +19,7 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90449
distributions:
- ce
- ee
-tiers:
+tiers:
- free
- premium
- ultimate
diff --git a/config/events/1666038724_Gitlab__Tracking__Helpers__WeakPasswordErrorEvent_track_weak_password_error.yml b/config/events/1666038724_Gitlab__Tracking__Helpers__WeakPasswordErrorEvent_track_weak_password_error.yml
index d19db52074b..4fc127ebfb1 100644
--- a/config/events/1666038724_Gitlab__Tracking__Helpers__WeakPasswordErrorEvent_track_weak_password_error.yml
+++ b/config/events/1666038724_Gitlab__Tracking__Helpers__WeakPasswordErrorEvent_track_weak_password_error.yml
@@ -16,7 +16,7 @@ identifiers:
product_section: dev
product_stage: manage
product_group: group::authentication and authorization
-product_category: authentication_and_authorization
+product_category: system_access
milestone: "15.6"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100237
distributions:
diff --git a/config/events/1674843937_Ci__Build_create_id_tokens.yml b/config/events/1674843937_Ci__Build_create_id_tokens.yml
index a6cc03c2bad..ca9f9c04213 100644
--- a/config/events/1674843937_Ci__Build_create_id_tokens.yml
+++ b/config/events/1674843937_Ci__Build_create_id_tokens.yml
@@ -19,7 +19,7 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110422
distributions:
- ce
- ee
-tiers:
+tiers:
- free
- premium
- ultimate
diff --git a/config/events/1676085590_Admin__AuditLogsController_visit_instance_compliance_audit_events.yml b/config/events/1676085590_Admin__AuditLogsController_visit_instance_compliance_audit_events.yml
new file mode 100644
index 00000000000..28c80a4cbc7
--- /dev/null
+++ b/config/events/1676085590_Admin__AuditLogsController_visit_instance_compliance_audit_events.yml
@@ -0,0 +1,26 @@
+---
+description: Mirrored `i_compliance_audit_events` Redis HLL metric as a Snowplow event. Emitted when audit logs page is visited in Admin area.
+category: Admin::AuditLogsController
+action: visit_instance_compliance_audit_events
+label_description: Mirrored Service Ping metric key path
+property_description: Mirrored Service Ping Redis HLL event name
+value_description:
+extra_properties:
+identifiers:
+#- project
+- user
+#- namespace
+product_section: dev
+product_stage: manage
+product_group: compliance
+product_category: compliance_management
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
+distributions:
+#- ce
+- ee
+tiers:
+#- free
+- premium
+- ultimate
+
diff --git a/config/events/1676085625_Admin__CredentialsController_visit_compliance_credential_inventory.yml b/config/events/1676085625_Admin__CredentialsController_visit_compliance_credential_inventory.yml
new file mode 100644
index 00000000000..ce1000556a7
--- /dev/null
+++ b/config/events/1676085625_Admin__CredentialsController_visit_compliance_credential_inventory.yml
@@ -0,0 +1,26 @@
+---
+description: Mirrored `i_compliance_credential_inventory` Redis HLL metric as a Snowplow event. Emitted when credentials page is visited in Admin area.
+category: Admin::CredentialsController
+action: visit_compliance_credential_inventory
+label_description: Mirrored Service Ping metric key path
+property_description: Mirrored Service Ping Redis HLL event name
+value_description:
+extra_properties:
+identifiers:
+#- project
+- user
+#- namespace
+product_section: dev
+product_stage: manage
+product_group: compliance
+product_category: compliance_management
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
+distributions:
+#- ce
+- ee
+tiers:
+#- free
+- premium
+- ultimate
+
diff --git a/config/events/1676085737_Groups__AuditEventsController_visit_group_compliance_audit_events.yml b/config/events/1676085737_Groups__AuditEventsController_visit_group_compliance_audit_events.yml
new file mode 100644
index 00000000000..c2b8dd03ac2
--- /dev/null
+++ b/config/events/1676085737_Groups__AuditEventsController_visit_group_compliance_audit_events.yml
@@ -0,0 +1,26 @@
+---
+description: Mirrored `g_compliance_audit_events` Redis HLL metric as a Snowplow event. Emitted when group audit events page is visited.
+category: Groups::AuditEventsController
+action: visit_group_compliance_audit_events
+label_description: Mirrored Service Ping metric key path
+property_description: Mirrored Service Ping Redis HLL event name
+value_description:
+extra_properties:
+identifiers:
+#- project
+- user
+- namespace
+product_section: dev
+product_stage: manage
+product_group: compliance
+product_category: compliance_management
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
+distributions:
+#- ce
+- ee
+tiers:
+#- free
+- premium
+- ultimate
+
diff --git a/config/events/1676085856_API__AuditEvents_admin_audit_event_request.yml b/config/events/1676085856_API__AuditEvents_admin_audit_event_request.yml
new file mode 100644
index 00000000000..4a0db5f83a8
--- /dev/null
+++ b/config/events/1676085856_API__AuditEvents_admin_audit_event_request.yml
@@ -0,0 +1,26 @@
+---
+description: Mirrored `a_compliance_audit_events_api` Redis HLL metric as a Snowplow event. Emitted when Instance Audit Events REST API endpoint is called.
+category: API::AuditEvents
+action: admin_audit_event_request
+label_description: Mirrored Service Ping metric key path
+property_description: Mirrored Service Ping Redis HLL event name
+value_description:
+extra_properties:
+identifiers:
+#- project
+- user
+#- namespace
+product_section: dev
+product_stage: manage
+product_group: compliance
+product_category: compliance_management
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
+distributions:
+#- ce
+- ee
+tiers:
+#- free
+- premium
+- ultimate
+
diff --git a/config/events/1676085891_EE__API__Groups_group_audit_event_request.yml b/config/events/1676085891_EE__API__Groups_group_audit_event_request.yml
new file mode 100644
index 00000000000..cbc12d58ed1
--- /dev/null
+++ b/config/events/1676085891_EE__API__Groups_group_audit_event_request.yml
@@ -0,0 +1,26 @@
+---
+description: Mirrored `a_compliance_audit_events_api` Redis HLL metric as a Snowplow event. Emitted when Group Audit Events REST API endpoint is called.
+category: EE::API::Groups
+action: group_audit_event_request
+label_description: Mirrored Service Ping metric key path
+property_description: Mirrored Service Ping Redis HLL event name
+value_description:
+extra_properties:
+identifiers:
+#- project
+- user
+- namespace
+product_section: dev
+product_stage: manage
+product_group: compliance
+product_category: compliance_management
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
+distributions:
+#- ce
+- ee
+tiers:
+#- free
+- premium
+- ultimate
+
diff --git a/config/events/1676085919_EE__API__Projects_project_audit_event_request.yml b/config/events/1676085919_EE__API__Projects_project_audit_event_request.yml
new file mode 100644
index 00000000000..8b895871275
--- /dev/null
+++ b/config/events/1676085919_EE__API__Projects_project_audit_event_request.yml
@@ -0,0 +1,26 @@
+---
+description: Mirrored `a_compliance_audit_events_api` Redis HLL metric as a Snowplow event. Emitted when Project Audit Events REST API endpoint is called.
+category: EE::API::Projects
+action: project_audit_event_request
+label_description: Mirrored Service Ping metric key path
+property_description: Mirrored Service Ping Redis HLL event name
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: manage
+product_group: compliance
+product_category: compliance_management
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107120
+distributions:
+#- ce
+- ee
+tiers:
+#- free
+- premium
+- ultimate
+
diff --git a/config/events/202109151015_notes__create_service_execute.yml b/config/events/202109151015_notes__create_service_execute.yml
index 12da6da02f0..5ca57011bb9 100644
--- a/config/events/202109151015_notes__create_service_execute.yml
+++ b/config/events/202109151015_notes__create_service_execute.yml
@@ -8,7 +8,7 @@ extra_properties:
identifiers:
product_section: ops
product_stage: verify
-product_group: group::pipeline insights
+product_group: group::pipeline execution
product_category:
milestone: "12.5"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18890
diff --git a/config/events/20211215022206_default_review_app_open_review_app.yml b/config/events/20211215022206_default_review_app_open_review_app.yml
index c77b904bc01..67e7e9be15d 100644
--- a/config/events/20211215022206_default_review_app_open_review_app.yml
+++ b/config/events/20211215022206_default_review_app_open_review_app.yml
@@ -8,7 +8,7 @@ extra_properties:
identifiers:
product_section: ops
product_stage: verify
-product_group: group::pipeline insights
+product_group: group::pipeline execution
product_category:
milestone: "12.6"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18141
diff --git a/config/events/20230228151130_invite_members_modal_click_cancel.yml b/config/events/20230228151130_invite_members_modal_click_cancel.yml
new file mode 100644
index 00000000000..76ae982fd8b
--- /dev/null
+++ b/config/events/20230228151130_invite_members_modal_click_cancel.yml
@@ -0,0 +1,26 @@
+---
+description: Invite members modal is canceled
+category: invite_members_modal
+action: click_cancel
+label_description: area/source of invite members modal being triggered
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: growth
+product_stage: growth
+product_group: activation
+product_category:
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112958
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/20230228151130_invite_members_modal_click_x.yml b/config/events/20230228151130_invite_members_modal_click_x.yml
new file mode 100644
index 00000000000..6b9830add5f
--- /dev/null
+++ b/config/events/20230228151130_invite_members_modal_click_x.yml
@@ -0,0 +1,26 @@
+---
+description: Invite members modal is dismissed
+category: invite_members_modal
+action: click_x
+label_description: area/source of invite members modal being triggered
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: growth
+product_stage: growth
+product_group: activation
+product_category:
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112958
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/20230228151130_invite_members_modal_invite_successful.yml b/config/events/20230228151130_invite_members_modal_invite_successful.yml
new file mode 100644
index 00000000000..5f0beed721f
--- /dev/null
+++ b/config/events/20230228151130_invite_members_modal_invite_successful.yml
@@ -0,0 +1,26 @@
+---
+description: Invite members modal is submitted successfully
+category: invite_members_modal
+action: invite_successful
+label_description: area/source of invite members modal being triggered
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: growth
+product_stage: growth
+product_group: activation
+product_category:
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112958
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/20230228151130_invite_members_modal_render.yml b/config/events/20230228151130_invite_members_modal_render.yml
new file mode 100644
index 00000000000..5417d64c6e7
--- /dev/null
+++ b/config/events/20230228151130_invite_members_modal_render.yml
@@ -0,0 +1,26 @@
+---
+description: Invite members modal is opened from top nav
+category: invite_members_modal
+action: render
+label_description: area/source of invite members modal being triggered
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: growth
+product_stage: growth
+product_group: activation
+product_category:
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112958
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/20230321151607_github_create.yml b/config/events/20230321151607_github_create.yml
new file mode 100644
index 00000000000..8099fe03a07
--- /dev/null
+++ b/config/events/20230321151607_github_create.yml
@@ -0,0 +1,30 @@
+---
+description: State of projects imported from GitHub
+category: Import::GithubService
+action: create
+label_description: github_import_project_state
+property_description:
+value_description:
+extra_properties:
+ import_type:
+ type: string
+ description: Type of project import
+ state:
+ type: string
+ description: Import state
+identifiers:
+- project
+product_section: dev
+product_stage: manage
+product_group: import
+product_category: importers
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112062
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/20230327141223_API__NpmProjectPackages_list_tags.yml b/config/events/20230327141223_API__NpmProjectPackages_list_tags.yml
new file mode 100644
index 00000000000..78021b29564
--- /dev/null
+++ b/config/events/20230327141223_API__NpmProjectPackages_list_tags.yml
@@ -0,0 +1,25 @@
+---
+description: List NPM project packages tags
+category: API::NpmProjectPackages
+action: list_tags
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: ops
+product_stage: package
+product_group: group::package registry
+product_category:
+milestone: "15.11"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115545
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20230327141524_API__NpmProjectPackages_create_tag.yml b/config/events/20230327141524_API__NpmProjectPackages_create_tag.yml
new file mode 100644
index 00000000000..6283880e81a
--- /dev/null
+++ b/config/events/20230327141524_API__NpmProjectPackages_create_tag.yml
@@ -0,0 +1,25 @@
+---
+description: Create NPM project packages tag
+category: API::NpmProjectPackages
+action: create_tag
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: ops
+product_stage: package
+product_group: group::package registry
+product_category:
+milestone: "15.11"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115545
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20230327141627_API__NpmProjectPackages_delete_tag.yml b/config/events/20230327141627_API__NpmProjectPackages_delete_tag.yml
new file mode 100644
index 00000000000..45a140a45aa
--- /dev/null
+++ b/config/events/20230327141627_API__NpmProjectPackages_delete_tag.yml
@@ -0,0 +1,25 @@
+---
+description: Delete NPM project packages tag
+category: API::NpmProjectPackages
+action: delete_tag
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: ops
+product_stage: package
+product_group: group::package registry
+product_category:
+milestone: "15.11"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115545
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20230327142004_API__NpmInstancePackages_list_tags.yml b/config/events/20230327142004_API__NpmInstancePackages_list_tags.yml
new file mode 100644
index 00000000000..aa63e85894d
--- /dev/null
+++ b/config/events/20230327142004_API__NpmInstancePackages_list_tags.yml
@@ -0,0 +1,25 @@
+---
+description: List NPM instance packages tags
+category: API::NpmInstancePackages
+action: list_tags
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: ops
+product_stage: package
+product_group: group::package registry
+product_category:
+milestone: "15.11"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115545
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20230327142151_API__NpmInstancePackages_create_tag.yml b/config/events/20230327142151_API__NpmInstancePackages_create_tag.yml
new file mode 100644
index 00000000000..f8de9d98e87
--- /dev/null
+++ b/config/events/20230327142151_API__NpmInstancePackages_create_tag.yml
@@ -0,0 +1,25 @@
+---
+description: Create NPM instance packages tag
+category: API::NpmInstancePackages
+action: create_tag
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: ops
+product_stage: package
+product_group: group::package registry
+product_category:
+milestone: "15.11"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115545
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20230327142237_API__NpmInstancePackages_delete_tag.yml b/config/events/20230327142237_API__NpmInstancePackages_delete_tag.yml
new file mode 100644
index 00000000000..aa78ff240f7
--- /dev/null
+++ b/config/events/20230327142237_API__NpmInstancePackages_delete_tag.yml
@@ -0,0 +1,25 @@
+---
+description: Delete NPM instance packages tag
+category: API::NpmInstancePackages
+action: delete_tag
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: ops
+product_stage: package
+product_group: group::package registry
+product_category:
+milestone: "15.11"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115545
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20230407142541_Gitlab__GithubGistsImport__ImportGistWorker_create.yml b/config/events/20230407142541_Gitlab__GithubGistsImport__ImportGistWorker_create.yml
new file mode 100644
index 00000000000..efc1c443e5d
--- /dev/null
+++ b/config/events/20230407142541_Gitlab__GithubGistsImport__ImportGistWorker_create.yml
@@ -0,0 +1,27 @@
+---
+description: State of imported gist from GitHub
+category: Gitlab::GithubGistsImport::ImportGistWorker
+action: create
+label_description: github_gist_import
+property_description:
+value_description:
+extra_properties:
+ status:
+ type: string
+ description: Import status
+identifiers:
+- user
+product_section: dev
+product_stage: manage
+product_group: import
+product_category: importers
+milestone: "15.11"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117057
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/20230508093658_gcp_signup_offer_click_click.yml b/config/events/20230508093658_gcp_signup_offer_click_click.yml
new file mode 100644
index 00000000000..493a7733225
--- /dev/null
+++ b/config/events/20230508093658_gcp_signup_offer_click_click.yml
@@ -0,0 +1,21 @@
+---
+description: GCP offer banner Apply for credit is clicked
+category: gcp_signup_offer_click
+action: click
+label_description: 'gcp_signup_offer_banner'
+property_description:
+value_description:
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: deploy
+product_group: group::environments
+milestone: '16.0'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119940
+distributions:
+ - ce
+ - ee
+tiers:
+ - free
+ - premium
+ - ultimate
diff --git a/config/events/20230508093912_gcp_signup_offer_dismiss_dismiss.yml b/config/events/20230508093912_gcp_signup_offer_dismiss_dismiss.yml
new file mode 100644
index 00000000000..f42cb7d8f2e
--- /dev/null
+++ b/config/events/20230508093912_gcp_signup_offer_dismiss_dismiss.yml
@@ -0,0 +1,21 @@
+---
+description: GCP offer banner is dismissed
+category: gcp_signup_offer_dismiss
+action: dismiss
+label_description: 'gcp_signup_offer_banner'
+property_description:
+value_description:
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: deploy
+product_group: group::environments
+milestone: '16.0'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119940
+distributions:
+ - ce
+ - ee
+tiers:
+ - free
+ - premium
+ - ultimate
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index 64a4eeaaea3..804ab08ad6a 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -7,7 +7,6 @@
# PLEASE DO NOT EDIT THIS FILE MANUALLY.
#
---
-- advanced_deployments
- advisory_database
- api
- api_security
@@ -15,14 +14,15 @@
- application_performance
- attack_emulation
- audit_events
-- authentication_and_authorization
- auto_devops
- backup_restore
- billing_and_payments
- build
- build_artifacts
+- capacity_planning
+- cell
+- ci-cd_visibility
- cloud_native_installation
-- cluster_cost_management
- code_quality
- code_review_workflow
- code_search
@@ -30,12 +30,11 @@
- code_testing
- commerce_integrations
- compliance_management
+- consumables_cost_management
- container_registry
- container_scanning
- continuous_delivery
- continuous_integration
-- continuous_verification
-- credential_management
- customersdot_application
- database
- dataops
@@ -44,7 +43,6 @@
- dependency_firewall
- dependency_management
- dependency_proxy
-- dependency_scanning
- deployment_management
- design_management
- design_system
@@ -67,6 +65,7 @@
- geo_replication
- gitaly
- gitlab_cli
+- gitlab_docs
- global_search
- helm_chart_registry
- importers
@@ -79,8 +78,6 @@
- intel_code_security
- interactive_application_security_testing
- internationalization
-- kubernetes_management
-- license_compliance
- logging
- merge_trains
- metrics
@@ -93,11 +90,7 @@
- onboarding
- package_registry
- pages
-- performance_testing
-- permissions
-- pipeline_authoring
-- planning_analytics
-- pods
+- pipeline_composition
- portfolio_management
- product_analytics
- projects
@@ -118,6 +111,7 @@
- saas_provisioning
- sbom
- scalability
+- seat_cost_management
- secret_detection
- secrets_management
- security_benchmarking
@@ -125,10 +119,10 @@
- service_desk
- service_ping
- sm_provisioning
+- software_composition_analysis
- source_code_management
- static_application_security_testing
- subgroups
-- subscription_cost_management
- subscription_management
- system_access
- team_planning
diff --git a/config/feature_flags/development/project_analytics_dashboards_page.yml b/config/feature_flags/development/abuse_reports_list.yml
index 192d86bd30a..21954797720 100644
--- a/config/feature_flags/development/project_analytics_dashboards_page.yml
+++ b/config/feature_flags/development/abuse_reports_list.yml
@@ -1,8 +1,8 @@
---
-name: project_analytics_dashboards_page
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109618
+name: abuse_reports_list
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110205
rollout_issue_url:
-milestone: '15.9'
+milestone: '15.10'
type: development
-group: group::optimize
+group: group::anti-abuse
default_enabled: false
diff --git a/config/feature_flags/development/achievements.yml b/config/feature_flags/development/achievements.yml
index 853a8133351..ef4842b45bb 100644
--- a/config/feature_flags/development/achievements.yml
+++ b/config/feature_flags/development/achievements.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106909
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386817
milestone: '15.8'
type: development
-group: group::organization
+group: group::tenant scale
default_enabled: false
diff --git a/config/feature_flags/development/async_commit_diff_files.yml b/config/feature_flags/development/adapt_deprecated_approvals.yml
index 0cadf592cc1..697f7e21025 100644
--- a/config/feature_flags/development/async_commit_diff_files.yml
+++ b/config/feature_flags/development/adapt_deprecated_approvals.yml
@@ -1,8 +1,8 @@
---
-name: async_commit_diff_files
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38450
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369439
-milestone: '13.3'
+name: adapt_deprecated_approvals
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118036
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409686
+milestone: '16.0'
type: development
group: group::source code
default_enabled: false
diff --git a/config/feature_flags/development/ai_ci_config_generator.yml b/config/feature_flags/development/ai_ci_config_generator.yml
new file mode 100644
index 00000000000..51e5f539233
--- /dev/null
+++ b/config/feature_flags/development/ai_ci_config_generator.yml
@@ -0,0 +1,10 @@
+---
+name: ai_ci_config_generator
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120141
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/407799
+milestone: '16.0'
+type: development
+# This is an ai experiment related to the pipeline authoring groups features
+# We use the authors group so the MR label matches for danger
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/development/ai_experimentation_api.yml b/config/feature_flags/development/ai_experimentation_api.yml
new file mode 100644
index 00000000000..29a9fe4a181
--- /dev/null
+++ b/config/feature_flags/development/ai_experimentation_api.yml
@@ -0,0 +1,8 @@
+---
+name: ai_experimentation_api
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117369
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/406754
+milestone: '15.11'
+type: development
+group: group::ai-enablement
+default_enabled: false
diff --git a/config/feature_flags/development/use_marker_ranges.yml b/config/feature_flags/development/ai_git_command_ff.yml
index 068e403e2cf..08da04eaf2b 100644
--- a/config/feature_flags/development/use_marker_ranges.yml
+++ b/config/feature_flags/development/ai_git_command_ff.yml
@@ -1,8 +1,8 @@
---
-name: use_marker_ranges
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56361
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/324638
-milestone: '13.10'
+name: ai_git_command_ff
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118120
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/408675
+milestone: '16.0'
type: development
group: group::source code
default_enabled: false
diff --git a/config/feature_flags/development/ai_related_settings.yml b/config/feature_flags/development/ai_related_settings.yml
new file mode 100644
index 00000000000..3d4b24c6999
--- /dev/null
+++ b/config/feature_flags/development/ai_related_settings.yml
@@ -0,0 +1,8 @@
+---
+name: ai_related_settings
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118222
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/408791
+milestone: '16.0'
+type: development
+group: group::ai-enablement
+default_enabled: false
diff --git a/config/feature_flags/development/allow_protected_branches_for_group.yml b/config/feature_flags/development/allow_protected_branches_for_group.yml
new file mode 100644
index 00000000000..16b06182f7c
--- /dev/null
+++ b/config/feature_flags/development/allow_protected_branches_for_group.yml
@@ -0,0 +1,8 @@
+---
+name: allow_protected_branches_for_group
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116779
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383178
+milestone: '15.11'
+type: development
+group: group::compliance
+default_enabled: false
diff --git a/config/feature_flags/development/always_perform_delayed_deletion.yml b/config/feature_flags/development/always_perform_delayed_deletion.yml
new file mode 100644
index 00000000000..df3d318a395
--- /dev/null
+++ b/config/feature_flags/development/always_perform_delayed_deletion.yml
@@ -0,0 +1,8 @@
+---
+name: always_perform_delayed_deletion
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113332
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/393622
+milestone: '15.10'
+type: development
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/development/anthropic_experimentation.yml b/config/feature_flags/development/anthropic_experimentation.yml
new file mode 100644
index 00000000000..8d4f2200532
--- /dev/null
+++ b/config/feature_flags/development/anthropic_experimentation.yml
@@ -0,0 +1,8 @@
+---
+name: anthropic_experimentation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119729
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409939
+milestone: '16.0'
+type: development
+group: group::ai-enablement
+default_enabled: false
diff --git a/config/feature_flags/development/application_settings_tokens_optional_encryption.yml b/config/feature_flags/development/application_settings_tokens_optional_encryption.yml
deleted file mode 100644
index c3619dbe2d0..00000000000
--- a/config/feature_flags/development/application_settings_tokens_optional_encryption.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: application_settings_tokens_optional_encryption
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/25532
-rollout_issue_url:
-milestone: '11.9'
-type: development
-group: group::runner
-default_enabled: false
diff --git a/config/feature_flags/development/arkose_labs_trial_signup_challenge.yml b/config/feature_flags/development/arkose_labs_trial_signup_challenge.yml
new file mode 100644
index 00000000000..c24a6994045
--- /dev/null
+++ b/config/feature_flags/development/arkose_labs_trial_signup_challenge.yml
@@ -0,0 +1,8 @@
+---
+name: arkose_labs_trial_signup_challenge
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113985
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/395754
+milestone: '15.10'
+type: development
+group: group::anti-abuse
+default_enabled: false
diff --git a/config/feature_flags/development/artifacts_management_page.yml b/config/feature_flags/development/artifacts_management_page.yml
deleted file mode 100644
index 94ef885f4b9..00000000000
--- a/config/feature_flags/development/artifacts_management_page.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: artifacts_management_page
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16654
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/254938
-milestone: '12.4'
-type: development
-group: group::pipeline insights
-default_enabled: false
diff --git a/config/feature_flags/development/ci_inbound_job_token_scope.yml b/config/feature_flags/development/auto_merge_labels_mr_widget.yml
index a0e2e09dde5..ea689058ee2 100644
--- a/config/feature_flags/development/ci_inbound_job_token_scope.yml
+++ b/config/feature_flags/development/auto_merge_labels_mr_widget.yml
@@ -1,8 +1,8 @@
---
-name: ci_inbound_job_token_scope
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99165
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/376063
-milestone: '15.5'
+name: auto_merge_labels_mr_widget
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115436
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409530
+milestone: '15.11'
type: development
group: group::pipeline execution
default_enabled: true
diff --git a/config/feature_flags/development/batched_migrations_parallel_execution.yml b/config/feature_flags/development/batched_migrations_parallel_execution.yml
index 8cd030b8912..343225a68dc 100644
--- a/config/feature_flags/development/batched_migrations_parallel_execution.yml
+++ b/config/feature_flags/development/batched_migrations_parallel_execution.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384883
milestone: '15.7'
type: development
group: group::database
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/branch_rules.yml b/config/feature_flags/development/branch_rules.yml
index 822496b48b0..2c1eefb8681 100644
--- a/config/feature_flags/development/branch_rules.yml
+++ b/config/feature_flags/development/branch_rules.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363170
milestone: '15.1'
type: development
group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/bulk_imports_batched_import_export.yml b/config/feature_flags/development/bulk_imports_batched_import_export.yml
new file mode 100644
index 00000000000..45c6c07c720
--- /dev/null
+++ b/config/feature_flags/development/bulk_imports_batched_import_export.yml
@@ -0,0 +1,8 @@
+---
+name: bulk_imports_batched_import_export
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117243
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/406559
+milestone: '16.0'
+type: development
+group: group::import and integrate
+default_enabled: false
diff --git a/config/feature_flags/development/ci_artifacts_upload_to_final_location.yml b/config/feature_flags/development/ci_artifacts_upload_to_final_location.yml
new file mode 100644
index 00000000000..452c6ed8331
--- /dev/null
+++ b/config/feature_flags/development/ci_artifacts_upload_to_final_location.yml
@@ -0,0 +1,8 @@
+---
+name: ci_artifacts_upload_to_final_location
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106740'
+rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/385447'
+milestone: '16.0'
+type: development
+group: group::pipeline security
+default_enabled: false
diff --git a/config/feature_flags/development/ci_hooks_pre_get_sources_script.yml b/config/feature_flags/development/ci_batch_project_includes_context.yml
index 42afd4235cc..634ed19bf34 100644
--- a/config/feature_flags/development/ci_hooks_pre_get_sources_script.yml
+++ b/config/feature_flags/development/ci_batch_project_includes_context.yml
@@ -1,8 +1,8 @@
---
-name: ci_hooks_pre_get_sources_script
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102332
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381840
-milestone: '15.6'
+name: ci_batch_project_includes_context
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112570
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/392746
+milestone: '15.10'
type: development
group: group::pipeline authoring
default_enabled: false
diff --git a/config/feature_flags/development/ci_includable_files_interpolation.yml b/config/feature_flags/development/ci_includable_files_interpolation.yml
new file mode 100644
index 00000000000..7a6eef0f27c
--- /dev/null
+++ b/config/feature_flags/development/ci_includable_files_interpolation.yml
@@ -0,0 +1,8 @@
+---
+name: ci_includable_files_interpolation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113211
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/399146
+milestone: '15.11'
+type: development
+group: group::pipeline authoring
+default_enabled: true
diff --git a/config/feature_flags/development/ci_include_components.yml b/config/feature_flags/development/ci_include_components.yml
index b61863e9675..262493bc0cc 100644
--- a/config/feature_flags/development/ci_include_components.yml
+++ b/config/feature_flags/development/ci_include_components.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/39064
milestone: '15.9'
type: development
group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_job_artifact_bulk_destroy.yml b/config/feature_flags/development/ci_job_artifact_bulk_destroy.yml
new file mode 100644
index 00000000000..a99c892020f
--- /dev/null
+++ b/config/feature_flags/development/ci_job_artifact_bulk_destroy.yml
@@ -0,0 +1,8 @@
+---
+name: ci_job_artifact_bulk_destroy
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110026
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386768
+milestone: '15.10'
+type: development
+group: group::pipeline security
+default_enabled: false
diff --git a/config/feature_flags/development/ci_limit_environment_scope.yml b/config/feature_flags/development/ci_limit_environment_scope.yml
new file mode 100644
index 00000000000..0beed23a151
--- /dev/null
+++ b/config/feature_flags/development/ci_limit_environment_scope.yml
@@ -0,0 +1,8 @@
+---
+name: ci_limit_environment_scope
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113171
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/395003
+milestone: '15.10'
+type: development
+group: group::pipeline security
+default_enabled: false
diff --git a/config/feature_flags/development/ci_multi_doc_yaml.yml b/config/feature_flags/development/ci_multi_doc_yaml.yml
index 4e6289abefa..ec86ecd95c2 100644
--- a/config/feature_flags/development/ci_multi_doc_yaml.yml
+++ b/config/feature_flags/development/ci_multi_doc_yaml.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/388836
milestone: '15.9'
type: development
group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_recreate_downstream_pipeline.yml b/config/feature_flags/development/ci_namespace_catalog_experimental.yml
index e97ee2d572d..d15e135e383 100644
--- a/config/feature_flags/development/ci_recreate_downstream_pipeline.yml
+++ b/config/feature_flags/development/ci_namespace_catalog_experimental.yml
@@ -1,7 +1,7 @@
-name: ci_recreate_downstream_pipeline
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108698
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387972
-milestone: '15.9'
+name: ci_namespace_catalog_experimental
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113407
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/394772
+milestone: '15.10'
type: development
group: group::pipeline authoring
default_enabled: false
diff --git a/config/feature_flags/development/ci_remove_legacy_predefined_variables.yml b/config/feature_flags/development/ci_remove_legacy_predefined_variables.yml
new file mode 100644
index 00000000000..48f09f39dff
--- /dev/null
+++ b/config/feature_flags/development/ci_remove_legacy_predefined_variables.yml
@@ -0,0 +1,8 @@
+---
+name: ci_remove_legacy_predefined_variables
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116606
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/404533
+milestone: '15.11'
+type: development
+group: group::pipeline authoring
+default_enabled: true
diff --git a/config/feature_flags/development/ci_support_reset_skipped_jobs_for_multiple_jobs.yml b/config/feature_flags/development/ci_support_reset_skipped_jobs_for_multiple_jobs.yml
new file mode 100644
index 00000000000..3dc826b627f
--- /dev/null
+++ b/config/feature_flags/development/ci_support_reset_skipped_jobs_for_multiple_jobs.yml
@@ -0,0 +1,8 @@
+---
+name: ci_support_reset_skipped_jobs_for_multiple_jobs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120060
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410415
+milestone: '16.1'
+type: development
+group: group::pipeline authoring
+default_enabled: false
diff --git a/config/feature_flags/development/ci_variables_pages.yml b/config/feature_flags/development/ci_variables_pages.yml
new file mode 100644
index 00000000000..49fc081ede4
--- /dev/null
+++ b/config/feature_flags/development/ci_variables_pages.yml
@@ -0,0 +1,8 @@
+name: ci_variables_pages
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110817
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/392874
+milestone: '15.10'
+type: development
+group: group::pipeline security
+default_enabled: false
+
diff --git a/config/feature_flags/development/airflow_dags.yml b/config/feature_flags/development/cloudseed_aws.yml
index e32035e7d2a..eba4bede372 100644
--- a/config/feature_flags/development/airflow_dags.yml
+++ b/config/feature_flags/development/cloudseed_aws.yml
@@ -1,8 +1,8 @@
---
-name: airflow_dags
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108900
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387529
-milestone: '15.9'
+name: cloudseed_aws
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114245
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/395777
+milestone: '15.10'
type: development
group: group::incubation
default_enabled: false
diff --git a/config/feature_flags/development/sec_mark_dropped_findings_as_resolved_scheduler.yml b/config/feature_flags/development/code_quality_inline_drawer.yml
index 1f26ffb28ae..0af4c98ada8 100644
--- a/config/feature_flags/development/sec_mark_dropped_findings_as_resolved_scheduler.yml
+++ b/config/feature_flags/development/code_quality_inline_drawer.yml
@@ -1,8 +1,8 @@
---
-name: sec_mark_dropped_findings_as_resolved_scheduler
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108486
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387577
-milestone: '15.8'
+name: code_quality_inline_drawer
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114649
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/397037
+milestone: '15.11'
type: development
group: group::static analysis
default_enabled: false
diff --git a/config/feature_flags/development/counter_attribute_db_lease_for_update.yml b/config/feature_flags/development/counter_attribute_db_lease_for_update.yml
deleted file mode 100644
index 7c30bb3e913..00000000000
--- a/config/feature_flags/development/counter_attribute_db_lease_for_update.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: counter_attribute_db_lease_for_update
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97912
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/374596
-milestone: '15.5'
-type: development
-group: group::pipeline insights
-default_enabled: false
diff --git a/config/feature_flags/development/create_runner_workflow.yml b/config/feature_flags/development/create_runner_workflow_for_admin.yml
index 1a0c8b3e847..7d13be6760b 100644
--- a/config/feature_flags/development/create_runner_workflow.yml
+++ b/config/feature_flags/development/create_runner_workflow_for_admin.yml
@@ -1,8 +1,8 @@
---
-name: create_runner_workflow
+name: create_runner_workflow_for_admin
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109497
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389269
milestone: '15.9'
type: development
group: group::runner
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/github_client_fetch_repos_via_graphql.yml b/config/feature_flags/development/create_runner_workflow_for_namespace.yml
index 2d045e8ca06..032a5b49ffd 100644
--- a/config/feature_flags/development/github_client_fetch_repos_via_graphql.yml
+++ b/config/feature_flags/development/create_runner_workflow_for_namespace.yml
@@ -1,8 +1,8 @@
---
-name: github_client_fetch_repos_via_graphql
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105824
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385649
-milestone: '15.7'
+name: create_runner_workflow_for_namespace
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113535
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/393919
+milestone: '15.10'
type: development
-group: group::import
+group: group::runner
default_enabled: true
diff --git a/config/feature_flags/development/data_transfer_monitoring.yml b/config/feature_flags/development/data_transfer_monitoring.yml
index 1675bf2de1d..d1c5c50cd22 100644
--- a/config/feature_flags/development/data_transfer_monitoring.yml
+++ b/config/feature_flags/development/data_transfer_monitoring.yml
@@ -1,7 +1,7 @@
---
name: data_transfer_monitoring
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110211
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/391682
milestone: '15.9'
type: development
group: group::source code
diff --git a/config/feature_flags/development/add_refresh_pull_mirror_worker.yml b/config/feature_flags/development/data_transfer_monitoring_mock_data.yml
index f59f0ff3d8e..77a43426e74 100644
--- a/config/feature_flags/development/add_refresh_pull_mirror_worker.yml
+++ b/config/feature_flags/development/data_transfer_monitoring_mock_data.yml
@@ -1,8 +1,8 @@
---
-name: add_refresh_pull_mirror_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103665
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382226
-milestone: '15.7'
+name: data_transfer_monitoring_mock_data
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113392
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/397693
+milestone: '15.11'
type: development
group: group::source code
default_enabled: false
diff --git a/config/feature_flags/development/hash_oauth_secrets.yml b/config/feature_flags/development/default_pat_expiration.yml
index 4f42dc6883c..b48d6a02723 100644
--- a/config/feature_flags/development/hash_oauth_secrets.yml
+++ b/config/feature_flags/development/default_pat_expiration.yml
@@ -1,8 +1,7 @@
----
-name: hash_oauth_secrets
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96252
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/374588
-milestone: '15.4'
+name: default_pat_expiration
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120213
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410440
+milestone: '16.0'
type: development
group: group::authentication and authorization
default_enabled: true
diff --git a/config/feature_flags/development/git_abuse_rate_limit_feature_flag.yml b/config/feature_flags/development/delay_delete_own_user.yml
index c71a5064b29..030ccd29c00 100644
--- a/config/feature_flags/development/git_abuse_rate_limit_feature_flag.yml
+++ b/config/feature_flags/development/delay_delete_own_user.yml
@@ -1,8 +1,8 @@
---
-name: git_abuse_rate_limit_feature_flag
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87872
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364782
-milestone: '15.1'
+name: delay_delete_own_user
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118887
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409025
+milestone: '16.0'
type: development
group: group::anti-abuse
default_enabled: false
diff --git a/config/feature_flags/development/delayed_repository_update_mirror_worker.yml b/config/feature_flags/development/delayed_repository_update_mirror_worker.yml
deleted file mode 100644
index acf5902716e..00000000000
--- a/config/feature_flags/development/delayed_repository_update_mirror_worker.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: delayed_repository_update_mirror_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89501
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362894
-milestone: '15.1'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/deploy_key_for_protected_tags.yml b/config/feature_flags/development/deploy_key_for_protected_tags.yml
index 48192a81899..fe89c889a5e 100644
--- a/config/feature_flags/development/deploy_key_for_protected_tags.yml
+++ b/config/feature_flags/development/deploy_key_for_protected_tags.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389237
milestone: '15.9'
type: development
group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/deployments_raise_updated_at_inefficient_error.yml b/config/feature_flags/development/deployments_raise_updated_at_inefficient_error.yml
new file mode 100644
index 00000000000..25db63e93cf
--- /dev/null
+++ b/config/feature_flags/development/deployments_raise_updated_at_inefficient_error.yml
@@ -0,0 +1,8 @@
+---
+name: deployments_raise_updated_at_inefficient_error
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116656
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409584
+milestone: '15.11'
+type: development
+group: group::environments
+default_enabled: true
diff --git a/config/feature_flags/development/deployments_raise_updated_at_inefficient_error_override.yml b/config/feature_flags/development/deployments_raise_updated_at_inefficient_error_override.yml
new file mode 100644
index 00000000000..80b06d9a720
--- /dev/null
+++ b/config/feature_flags/development/deployments_raise_updated_at_inefficient_error_override.yml
@@ -0,0 +1,8 @@
+---
+name: deployments_raise_updated_at_inefficient_error_override
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120066
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409584
+milestone: '16.0'
+type: development
+group: group::environments
+default_enabled: false
diff --git a/config/feature_flags/development/deprecate_vulnerabilities_feedback.yml b/config/feature_flags/development/deprecate_vulnerabilities_feedback.yml
new file mode 100644
index 00000000000..25e33effa1d
--- /dev/null
+++ b/config/feature_flags/development/deprecate_vulnerabilities_feedback.yml
@@ -0,0 +1,8 @@
+---
+name: deprecate_vulnerabilities_feedback
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86497
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/361797
+milestone: '15.0'
+type: development
+group: group::threat insights
+default_enabled: true
diff --git a/config/feature_flags/development/detect_android_projects.yml b/config/feature_flags/development/detect_android_projects.yml
deleted file mode 100644
index 4270cbdff7c..00000000000
--- a/config/feature_flags/development/detect_android_projects.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: detect_android_projects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85681
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360902
-milestone: '15.0'
-type: development
-group: group::activation
-default_enabled: false
diff --git a/config/feature_flags/development/webauthn.yml b/config/feature_flags/development/disable_follow_users.yml
index 6bd4fc95020..1c9879899a2 100644
--- a/config/feature_flags/development/webauthn.yml
+++ b/config/feature_flags/development/disable_follow_users.yml
@@ -1,8 +1,8 @@
---
-name: webauthn
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26692
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/232671
-milestone: '13.4'
+name: disable_follow_users
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116023
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/408886
+milestone: '16.0'
type: development
group: group::authentication and authorization
-default_enabled: true
+default_enabled: enable
diff --git a/config/feature_flags/development/do_not_run_safety_net_auth_refresh_jobs.yml b/config/feature_flags/development/do_not_run_safety_net_auth_refresh_jobs.yml
index 30790841695..94784f3facb 100644
--- a/config/feature_flags/development/do_not_run_safety_net_auth_refresh_jobs.yml
+++ b/config/feature_flags/development/do_not_run_safety_net_auth_refresh_jobs.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110986
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390336
milestone: '15.9'
type: development
-group: group::organization
+group: group::authentication and authorization
default_enabled: false
diff --git a/config/feature_flags/development/enable_environments_search_within_folder.yml b/config/feature_flags/development/enable_environments_search_within_folder.yml
index a03b31ffbfc..18edc467293 100644
--- a/config/feature_flags/development/enable_environments_search_within_folder.yml
+++ b/config/feature_flags/development/enable_environments_search_within_folder.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102227/
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382108
milestone: '15.7'
type: development
-group: group::release
+group: group::configure
default_enabled: true
diff --git a/config/feature_flags/development/enforce_scan_result_policies_for_preexisting_vulnerabilities.yml b/config/feature_flags/development/enforce_scan_result_policies_for_preexisting_vulnerabilities.yml
deleted file mode 100644
index e72dc713e02..00000000000
--- a/config/feature_flags/development/enforce_scan_result_policies_for_preexisting_vulnerabilities.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: enforce_scan_result_policies_for_preexisting_vulnerabilities
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105248
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384260
-milestone: '15.7'
-type: development
-group: group::security policies
-default_enabled: false
diff --git a/config/feature_flags/development/environment_details_vue.yml b/config/feature_flags/development/environment_details_vue.yml
index 5a647f65a7a..c90038a600c 100644
--- a/config/feature_flags/development/environment_details_vue.yml
+++ b/config/feature_flags/development/environment_details_vue.yml
@@ -4,5 +4,5 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105527
rollout_issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/384914"
milestone: '15.7'
type: development
-group: group::release
-default_enabled: false
+group: group::configure
+default_enabled: true
diff --git a/config/feature_flags/development/environment_search_api_min_chars.yml b/config/feature_flags/development/environment_search_api_min_chars.yml
deleted file mode 100644
index 2d719a41cd0..00000000000
--- a/config/feature_flags/development/environment_search_api_min_chars.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: environment_search_api_min_chars
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108277
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387244
-milestone: '15.8'
-type: development
-group: group::release
-default_enabled: false
diff --git a/config/feature_flags/development/environments_search_logging.yml b/config/feature_flags/development/environments_search_logging.yml
deleted file mode 100644
index 76f6c78154b..00000000000
--- a/config/feature_flags/development/environments_search_logging.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: environments_search_logging
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107866
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386778
-milestone: '15.8'
-type: development
-group: group::release
-default_enabled: false
diff --git a/config/feature_flags/development/exit_registration_verification.yml b/config/feature_flags/development/exit_registration_verification.yml
deleted file mode 100644
index c544ebc2943..00000000000
--- a/config/feature_flags/development/exit_registration_verification.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: exit_registration_verification
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80286
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352397
-milestone: '14.8'
-type: development
-group: group::activation
-default_enabled: false
diff --git a/config/feature_flags/development/notes_create_service_tracking.yml b/config/feature_flags/development/explain_code_chat.yml
index 578c1e2a707..6599c3015b4 100644
--- a/config/feature_flags/development/notes_create_service_tracking.yml
+++ b/config/feature_flags/development/explain_code_chat.yml
@@ -1,8 +1,8 @@
---
-name: notes_create_service_tracking
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18890
+name: explain_code_chat
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117674
rollout_issue_url:
-milestone: '12.5'
+milestone: '16.0'
type: development
-group: group::pipeline insights
+group: group::source code
default_enabled: false
diff --git a/config/feature_flags/development/file_line_blame.yml b/config/feature_flags/development/explain_code_snippet.yml
index f763d436041..13a098e41e0 100644
--- a/config/feature_flags/development/file_line_blame.yml
+++ b/config/feature_flags/development/explain_code_snippet.yml
@@ -1,8 +1,8 @@
---
-name: file_line_blame
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92538
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370818
-milestone: '15.3'
+name: explain_code_snippet
+introduced_by_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/404631
+milestone: '15.11'
type: development
group: group::source code
default_enabled: false
diff --git a/config/feature_flags/development/full_path_project_search.yml b/config/feature_flags/development/explain_vulnerability.yml
index 83c52a20995..0b0b6f6dfb4 100644
--- a/config/feature_flags/development/full_path_project_search.yml
+++ b/config/feature_flags/development/explain_vulnerability.yml
@@ -1,8 +1,8 @@
---
-name: full_path_project_search
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108906
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/388473
-milestone: '15.9'
+name: explain_vulnerability
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117472
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/407282
+milestone: '15.11'
type: development
group: group::threat insights
default_enabled: false
diff --git a/config/feature_flags/development/explain_vulnerability_vertex.yml b/config/feature_flags/development/explain_vulnerability_vertex.yml
new file mode 100644
index 00000000000..f93be4fc22c
--- /dev/null
+++ b/config/feature_flags/development/explain_vulnerability_vertex.yml
@@ -0,0 +1,8 @@
+---
+name: explain_vulnerability_vertex
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118754
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409182
+milestone: '16.0'
+type: development
+group: group::threat insights
+default_enabled: false
diff --git a/config/feature_flags/development/expose_authorized_cluster_agents.yml b/config/feature_flags/development/expose_authorized_cluster_agents.yml
new file mode 100644
index 00000000000..b5a44d5d309
--- /dev/null
+++ b/config/feature_flags/development/expose_authorized_cluster_agents.yml
@@ -0,0 +1,8 @@
+---
+name: expose_authorized_cluster_agents
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117128
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/407841
+milestone: '16.0'
+type: development
+group: group::environments
+default_enabled: true
diff --git a/config/feature_flags/development/incident_event_tags.yml b/config/feature_flags/development/external_note_author_service_desk.yml
index 68101b21569..bd5b5d9d350 100644
--- a/config/feature_flags/development/incident_event_tags.yml
+++ b/config/feature_flags/development/external_note_author_service_desk.yml
@@ -1,8 +1,8 @@
---
-name: incident_event_tags
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107194
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387647
-milestone: '15.8'
+name: external_note_author_service_desk
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117149
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/408932
+milestone: '16.0'
type: development
group: group::respond
default_enabled: false
diff --git a/config/feature_flags/development/fe_epic_board_total_weight.yml b/config/feature_flags/development/fe_epic_board_total_weight.yml
deleted file mode 100644
index 5550d7fa01d..00000000000
--- a/config/feature_flags/development/fe_epic_board_total_weight.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: fe_epic_board_total_weight
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89390
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364503
-milestone: '15.1'
-type: development
-group: group::product planning
-default_enabled: false
diff --git a/config/feature_flags/development/filter_vulnerability_findings_dismissed_on_default.yml b/config/feature_flags/development/filter_vulnerability_findings_dismissed_on_default.yml
new file mode 100644
index 00000000000..93d79757511
--- /dev/null
+++ b/config/feature_flags/development/filter_vulnerability_findings_dismissed_on_default.yml
@@ -0,0 +1,8 @@
+---
+name: filter_vulnerability_findings_dismissed_on_default
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113711
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/396747
+milestone: '15.11'
+type: development
+group: group::threat insights
+default_enabled: true
diff --git a/config/feature_flags/development/ci_destroy_unlocked_job_artifacts.yml b/config/feature_flags/development/fix_dora_deployment_frequency_calculation.yml
index eba1c4ead3b..efc68c28eab 100644
--- a/config/feature_flags/development/ci_destroy_unlocked_job_artifacts.yml
+++ b/config/feature_flags/development/fix_dora_deployment_frequency_calculation.yml
@@ -1,8 +1,8 @@
---
-name: ci_destroy_unlocked_job_artifacts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72406
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338165
-milestone: '14.5'
+name: fix_dora_deployment_frequency_calculation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116644
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/404565
+milestone: '15.11'
type: development
-group: group::pipeline insights
+group: group::optimize
default_enabled: true
diff --git a/config/feature_flags/development/fork_divergence_counts.yml b/config/feature_flags/development/fork_divergence_counts.yml
deleted file mode 100644
index 929e9fae790..00000000000
--- a/config/feature_flags/development/fork_divergence_counts.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: fork_divergence_counts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103814
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382878
-milestone: '15.7'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/trial_email_validation.yml b/config/feature_flags/development/free_user_cap_clear_over_limit_notification_flags.yml
index c658a49f195..a889ea63226 100644
--- a/config/feature_flags/development/trial_email_validation.yml
+++ b/config/feature_flags/development/free_user_cap_clear_over_limit_notification_flags.yml
@@ -1,8 +1,8 @@
---
-name: trial_email_validation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92762
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368999
-milestone: '15.3'
+name: free_user_cap_clear_over_limit_notification_flags
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111312
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/398150
+milestone: '15.11'
type: development
group: group::acquisition
default_enabled: false
diff --git a/config/feature_flags/development/frozen_outbound_job_token_scopes.yml b/config/feature_flags/development/frozen_outbound_job_token_scopes.yml
new file mode 100644
index 00000000000..f8ebc46d7f9
--- /dev/null
+++ b/config/feature_flags/development/frozen_outbound_job_token_scopes.yml
@@ -0,0 +1,8 @@
+---
+name: frozen_outbound_job_token_scopes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118254
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/407401
+milestone: '16.0'
+type: development
+group: group::pipeline execution
+default_enabled: true
diff --git a/config/feature_flags/development/deduplicate_archive_traces_cron_worker.yml b/config/feature_flags/development/frozen_outbound_job_token_scopes_override.yml
index c26968381ae..44dcb134318 100644
--- a/config/feature_flags/development/deduplicate_archive_traces_cron_worker.yml
+++ b/config/feature_flags/development/frozen_outbound_job_token_scopes_override.yml
@@ -1,8 +1,8 @@
---
-name: deduplicate_archive_traces_cron_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110305
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389632
-milestone: '15.9'
+name: frozen_outbound_job_token_scopes_override
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118254
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/407401
+milestone: '16.0'
type: development
group: group::pipeline execution
default_enabled: false
diff --git a/config/feature_flags/development/use_iid_in_work_items_path.yml b/config/feature_flags/development/generate_description_ai.yml
index d2d328bbbc1..b90594d263d 100644
--- a/config/feature_flags/development/use_iid_in_work_items_path.yml
+++ b/config/feature_flags/development/generate_description_ai.yml
@@ -1,8 +1,8 @@
---
-name: use_iid_in_work_items_path
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101451
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378349
-milestone: '15.5'
+name: generate_description_ai
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118712
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409369
+milestone: '16.0'
type: development
group: group::project management
default_enabled: false
diff --git a/config/feature_flags/development/github_import_gists.yml b/config/feature_flags/development/github_import_gists.yml
deleted file mode 100644
index 8e6e5825362..00000000000
--- a/config/feature_flags/development/github_import_gists.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: github_import_gists
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107651
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386579
-milestone: '15.8'
-type: development
-group: group::import
-default_enabled: false
diff --git a/config/feature_flags/development/global_time_tracking_report.yml b/config/feature_flags/development/global_time_tracking_report.yml
new file mode 100644
index 00000000000..eb2072e33d3
--- /dev/null
+++ b/config/feature_flags/development/global_time_tracking_report.yml
@@ -0,0 +1,8 @@
+---
+name: global_time_tracking_report
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108368
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/394715
+milestone: '15.11'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/group_analytics_dashboards_page.yml b/config/feature_flags/development/group_analytics_dashboards_page.yml
deleted file mode 100644
index 8002ddb9204..00000000000
--- a/config/feature_flags/development/group_analytics_dashboards_page.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: group_analytics_dashboards_page
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98767'
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375251
-milestone: '15.5'
-type: development
-group: group::optimize
-default_enabled: false
diff --git a/config/feature_flags/development/group_level_git_protocol_control.yml b/config/feature_flags/development/group_level_git_protocol_control.yml
deleted file mode 100644
index ad9ba309d69..00000000000
--- a/config/feature_flags/development/group_level_git_protocol_control.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: group_level_git_protocol_control
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89817
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365357
-milestone: '15.1'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/groups_tokens_optional_encryption.yml b/config/feature_flags/development/groups_tokens_optional_encryption.yml
index c34cae689c2..4f67ea4bd6c 100644
--- a/config/feature_flags/development/groups_tokens_optional_encryption.yml
+++ b/config/feature_flags/development/groups_tokens_optional_encryption.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333862
milestone: '11.9'
type: development
group: group::runner
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/license_from_gitaly.yml b/config/feature_flags/development/hidden_notes.yml
index ad79d56a8ab..239234d6960 100644
--- a/config/feature_flags/development/license_from_gitaly.yml
+++ b/config/feature_flags/development/hidden_notes.yml
@@ -1,8 +1,8 @@
---
-name: license_from_gitaly
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77041
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/374300
-milestone: '15.5'
+name: hidden_notes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112973
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/405148
+milestone: '15.11'
type: development
-group: group::gitaly
+group: group::anti-abuse
default_enabled: false
diff --git a/config/feature_flags/development/hide_create_issue_resolve_all.yml b/config/feature_flags/development/hide_create_issue_resolve_all.yml
new file mode 100644
index 00000000000..504961f8f5b
--- /dev/null
+++ b/config/feature_flags/development/hide_create_issue_resolve_all.yml
@@ -0,0 +1,8 @@
+---
+name: hide_create_issue_resolve_all
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116322
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/404498
+milestone: '15.11'
+type: development
+group: group::ux paper cuts
+default_enabled: false
diff --git a/config/feature_flags/development/hide_public_email_on_profile.yml b/config/feature_flags/development/hide_public_email_on_profile.yml
index acf8e4e9ca7..5bf5a203e49 100644
--- a/config/feature_flags/development/hide_public_email_on_profile.yml
+++ b/config/feature_flags/development/hide_public_email_on_profile.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79717
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351731
milestone: '14.8'
type: development
-group: group::workspace
+group: group::tenant scale
default_enabled: false
diff --git a/config/feature_flags/development/improved_spread_parallel_import.yml b/config/feature_flags/development/import_details_page.yml
index a1d7caf12b0..d59e2945ae9 100644
--- a/config/feature_flags/development/improved_spread_parallel_import.yml
+++ b/config/feature_flags/development/import_details_page.yml
@@ -1,8 +1,8 @@
---
-name: improved_spread_parallel_import
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109264
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/388665
-milestone: '15.9'
+name: import_details_page
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116090
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/397650
+milestone: '15.11'
type: development
group: group::import
default_enabled: true
diff --git a/config/feature_flags/development/import_export_work_items_csv.yml b/config/feature_flags/development/import_export_work_items_csv.yml
index 344af8659ca..5810e77e794 100644
--- a/config/feature_flags/development/import_export_work_items_csv.yml
+++ b/config/feature_flags/development/import_export_work_items_csv.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111935
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390330
milestone: '15.9'
type: development
-group: group::certify
+group: group::product planning
default_enabled: false
diff --git a/config/feature_flags/development/import_project_from_remote_file_s3.yml b/config/feature_flags/development/import_project_from_remote_file_s3.yml
deleted file mode 100644
index c7d52202726..00000000000
--- a/config/feature_flags/development/import_project_from_remote_file_s3.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: import_project_from_remote_file_s3
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77259
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350571
-milestone: '14.9'
-type: development
-group: group::import
-default_enabled: false
diff --git a/config/feature_flags/development/include_memberships_from_group_shares_in_preloader.yml b/config/feature_flags/development/include_memberships_from_group_shares_in_preloader.yml
deleted file mode 100644
index d7f2d1f5552..00000000000
--- a/config/feature_flags/development/include_memberships_from_group_shares_in_preloader.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: include_memberships_from_group_shares_in_preloader
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111157
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390780
-milestone: '15.9'
-type: development
-group: group::organization
-default_enabled: false
diff --git a/config/feature_flags/development/increase_page_size_exponentially.yml b/config/feature_flags/development/increase_page_size_exponentially.yml
deleted file mode 100644
index 8297a4078fa..00000000000
--- a/config/feature_flags/development/increase_page_size_exponentially.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: increase_page_size_exponentially
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66174
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369434
-milestone: '14.1'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/enforce_max_attachment_size_upload_api.yml b/config/feature_flags/development/inherit_approval_rules_on_creation.yml
index 25e193aa590..e80ba1cb2a0 100644
--- a/config/feature_flags/development/enforce_max_attachment_size_upload_api.yml
+++ b/config/feature_flags/development/inherit_approval_rules_on_creation.yml
@@ -1,8 +1,8 @@
---
-name: enforce_max_attachment_size_upload_api
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57250
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325787
-milestone: '13.11'
+name: inherit_approval_rules_on_creation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118235
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/408218
+milestone: '16.0'
type: development
group: group::source code
default_enabled: true
diff --git a/config/feature_flags/development/use_response_url_for_chat_responder.yml b/config/feature_flags/development/instance_streaming_audit_events.yml
index 84ac2a27fab..964d7ac7cbd 100644
--- a/config/feature_flags/development/use_response_url_for_chat_responder.yml
+++ b/config/feature_flags/development/instance_streaming_audit_events.yml
@@ -1,8 +1,8 @@
---
-name: use_response_url_for_chat_responder
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110625
+name: instance_streaming_audit_events
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119008
rollout_issue_url:
-milestone: '15.9'
+milestone: '16.0'
type: development
-group: group::integrations
+group: group::compliance
default_enabled: false
diff --git a/config/feature_flags/development/integration_slack_app_notifications.yml b/config/feature_flags/development/integration_slack_app_notifications.yml
deleted file mode 100644
index 4b9903b25c9..00000000000
--- a/config/feature_flags/development/integration_slack_app_notifications.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: integration_slack_app_notifications
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98663
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381012
-milestone: '15.5'
-type: development
-group: group::integrations
-default_enabled: false
diff --git a/config/feature_flags/development/ci_includes_count_duplicates.yml b/config/feature_flags/development/introduce_rules_with_needs.yml
index 5e33edddc03..8b2940438ee 100644
--- a/config/feature_flags/development/ci_includes_count_duplicates.yml
+++ b/config/feature_flags/development/introduce_rules_with_needs.yml
@@ -1,8 +1,8 @@
---
-name: ci_includes_count_duplicates
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111726
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/391517
-milestone: '15.9'
+name: introduce_rules_with_needs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112725
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/394769
+milestone: '16.0'
type: development
group: group::pipeline authoring
default_enabled: false
diff --git a/config/feature_flags/development/invitation_flow_enforcement_setting.yml b/config/feature_flags/development/invitation_flow_enforcement_setting.yml
index 39da6c40bed..d5b5d57c933 100644
--- a/config/feature_flags/development/invitation_flow_enforcement_setting.yml
+++ b/config/feature_flags/development/invitation_flow_enforcement_setting.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92218
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367666
milestone: '15.4'
type: development
-group: group::workspace
+group: group::tenant scale
default_enabled: false
diff --git a/config/feature_flags/development/jira_connect_oauth.yml b/config/feature_flags/development/jira_connect_oauth.yml
deleted file mode 100644
index 2f090d56bd1..00000000000
--- a/config/feature_flags/development/jira_connect_oauth.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: jira_connect_oauth
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81126
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355048
-milestone: '14.9'
-type: development
-group: group::integrations
-default_enabled: false
diff --git a/config/feature_flags/development/jira_dvcs_end_of_life_amnesty.yml b/config/feature_flags/development/jira_dvcs_end_of_life_amnesty.yml
new file mode 100644
index 00000000000..dd72f9e13dd
--- /dev/null
+++ b/config/feature_flags/development/jira_dvcs_end_of_life_amnesty.yml
@@ -0,0 +1,8 @@
+---
+name: jira_dvcs_end_of_life_amnesty
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118126
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/408148
+milestone: '16.0'
+type: development
+group: group::import and integrate
+default_enabled: false
diff --git a/config/feature_flags/development/kas_user_access.yml b/config/feature_flags/development/kas_user_access.yml
new file mode 100644
index 00000000000..efcf0c15227
--- /dev/null
+++ b/config/feature_flags/development/kas_user_access.yml
@@ -0,0 +1,8 @@
+---
+name: kas_user_access
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104504'
+rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/391201'
+milestone: '15.10'
+type: development
+group: group::configure
+default_enabled: false
diff --git a/config/feature_flags/development/kas_user_access_project.yml b/config/feature_flags/development/kas_user_access_project.yml
new file mode 100644
index 00000000000..34a4ac1271a
--- /dev/null
+++ b/config/feature_flags/development/kas_user_access_project.yml
@@ -0,0 +1,8 @@
+---
+name: kas_user_access_project
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104504'
+rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/391211'
+milestone: '15.10'
+type: development
+group: group::configure
+default_enabled: false
diff --git a/config/feature_flags/development/apple_app_store_integration.yml b/config/feature_flags/development/large_ipynb_diffs.yml
index ec55f1ef932..fd1f8f487e6 100644
--- a/config/feature_flags/development/apple_app_store_integration.yml
+++ b/config/feature_flags/development/large_ipynb_diffs.yml
@@ -1,8 +1,8 @@
---
-name: apple_app_store_integration
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104888
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385335
-milestone: '15.8'
+name: large_ipynb_diffs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113370
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/393886
+milestone: '15.10'
type: development
group: group::incubation
default_enabled: false
diff --git a/config/feature_flags/development/remove_job_token_on_completion.yml b/config/feature_flags/development/last_pipeline_from_pipeline_status.yml
index 4ab5ffc27ee..79bc83c73fe 100644
--- a/config/feature_flags/development/remove_job_token_on_completion.yml
+++ b/config/feature_flags/development/last_pipeline_from_pipeline_status.yml
@@ -1,8 +1,8 @@
---
-name: remove_job_token_on_completion
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108021
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386871
-milestone: '15.8'
+name: last_pipeline_from_pipeline_status
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117742
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/407789
+milestone: '16.0'
type: development
group: group::pipeline execution
default_enabled: false
diff --git a/config/feature_flags/development/legacy_merge_request_state_check_for_merged_result_pipelines.yml b/config/feature_flags/development/legacy_merge_request_state_check_for_merged_result_pipelines.yml
deleted file mode 100644
index f0f38d8e9b2..00000000000
--- a/config/feature_flags/development/legacy_merge_request_state_check_for_merged_result_pipelines.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: legacy_merge_request_state_check_for_merged_result_pipelines
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91849
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367019
-milestone: '15.2'
-type: development
-group: group::pipeline execution
-default_enabled: false
diff --git a/config/feature_flags/development/limited_capacity_seat_refresh_worker_medium.yml b/config/feature_flags/development/limited_capacity_seat_refresh_worker_medium.yml
deleted file mode 100644
index 1df482e0624..00000000000
--- a/config/feature_flags/development/limited_capacity_seat_refresh_worker_medium.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: limited_capacity_seat_refresh_worker_medium
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104099
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382725
-milestone: '15.9'
-type: development
-group: group::utilization
-default_enabled: false
diff --git a/config/feature_flags/development/linear_group_descendants_finder_upto.yml b/config/feature_flags/development/linear_group_descendants_finder_upto.yml
index db3a37191ff..3955332bd90 100644
--- a/config/feature_flags/development/linear_group_descendants_finder_upto.yml
+++ b/config/feature_flags/development/linear_group_descendants_finder_upto.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78991
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350972
milestone: '14.8'
type: development
-group: group::workspace
-default_enabled: false
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/development/linear_user_manageable_groups.yml b/config/feature_flags/development/linear_project_authorization.yml
index 8d59d689f6e..f3fcb968b8e 100644
--- a/config/feature_flags/development/linear_user_manageable_groups.yml
+++ b/config/feature_flags/development/linear_project_authorization.yml
@@ -1,8 +1,8 @@
---
-name: linear_user_manageable_groups
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68845
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339434
-milestone: '14.3'
+name: linear_project_authorization
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117988
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410459
+milestone: '16.0'
type: development
group: group::authentication and authorization
default_enabled: false
diff --git a/config/feature_flags/development/log_response_length.yml b/config/feature_flags/development/log_response_length.yml
index 1ade057204c..689a262bec1 100644
--- a/config/feature_flags/development/log_response_length.yml
+++ b/config/feature_flags/development/log_response_length.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91448
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366854
milestone: '15.3'
type: development
-group: group::workspace
+group: group::tenant scale
default_enabled: false
diff --git a/config/feature_flags/development/remove_namespace_aggregator_delay.yml b/config/feature_flags/development/log_user_git_push_activity.yml
index e9e0268fb55..5e45670a8cd 100644
--- a/config/feature_flags/development/remove_namespace_aggregator_delay.yml
+++ b/config/feature_flags/development/log_user_git_push_activity.yml
@@ -1,8 +1,8 @@
---
-name: remove_namespace_aggregator_delay
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99226
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375722
-milestone: '15.5'
+name: log_user_git_push_activity
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112527
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/393283
+milestone: "15.10"
type: development
group: group::utilization
default_enabled: false
diff --git a/config/feature_flags/development/members_with_shared_group_access.yml b/config/feature_flags/development/members_with_shared_group_access.yml
new file mode 100644
index 00000000000..83d3ca62681
--- /dev/null
+++ b/config/feature_flags/development/members_with_shared_group_access.yml
@@ -0,0 +1,8 @@
+---
+name: members_with_shared_group_access
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115346
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/398621
+milestone: '15.11'
+type: development
+group: group::tenant scale
+default_enabled: false
diff --git a/config/feature_flags/development/mirror_only_branches_match_regex.yml b/config/feature_flags/development/mirror_only_branches_match_regex.yml
index 6494569b364..3311187e3b4 100644
--- a/config/feature_flags/development/mirror_only_branches_match_regex.yml
+++ b/config/feature_flags/development/mirror_only_branches_match_regex.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381667
milestone: '15.6'
type: development
group: "group::source code"
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/mobile_devops_projects_promo.yml b/config/feature_flags/development/mobile_devops_projects_promo.yml
new file mode 100644
index 00000000000..c1fcca28858
--- /dev/null
+++ b/config/feature_flags/development/mobile_devops_projects_promo.yml
@@ -0,0 +1,8 @@
+---
+name: mobile_devops_projects_promo
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120144
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410601
+milestone: '16.0'
+type: development
+group: group::mobile devops
+default_enabled: false
diff --git a/config/feature_flags/development/mr_activity_filters.yml b/config/feature_flags/development/mr_activity_filters.yml
new file mode 100644
index 00000000000..fcad25e3ba8
--- /dev/null
+++ b/config/feature_flags/development/mr_activity_filters.yml
@@ -0,0 +1,8 @@
+---
+name: mr_activity_filters
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115383
+rollout_issue_url:
+milestone: '15.11'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/mr_show_reports_immediately.yml b/config/feature_flags/development/mr_show_reports_immediately.yml
index 23ac381a521..08cc49bcfd3 100644
--- a/config/feature_flags/development/mr_show_reports_immediately.yml
+++ b/config/feature_flags/development/mr_show_reports_immediately.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76612
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367027
milestone: '15.2'
type: development
-group: group::pipeline insights
+group: group::pipeline execution
default_enabled: false
diff --git a/config/feature_flags/development/multiple_environment_approval_rules_fe.yml b/config/feature_flags/development/multiple_environment_approval_rules_fe.yml
deleted file mode 100644
index c282313f409..00000000000
--- a/config/feature_flags/development/multiple_environment_approval_rules_fe.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: multiple_environment_approval_rules_fe
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105719
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384334
-milestone: '15.7'
-type: development
-group: group::release
-default_enabled: false
diff --git a/config/feature_flags/development/limited_capacity_seat_refresh_worker_low.yml b/config/feature_flags/development/namespace_limits_admin_dashboard.yml
index a0b306ac792..12706a8e3f9 100644
--- a/config/feature_flags/development/limited_capacity_seat_refresh_worker_low.yml
+++ b/config/feature_flags/development/namespace_limits_admin_dashboard.yml
@@ -1,8 +1,8 @@
---
-name: limited_capacity_seat_refresh_worker_low
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104099
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382725
-milestone: '15.9'
+name: namespace_limits_admin_dashboard
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115704
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/399220
+milestone: '15.11'
type: development
group: group::utilization
default_enabled: false
diff --git a/config/feature_flags/development/non_public_artifacts.yml b/config/feature_flags/development/non_public_artifacts.yml
index e2a2fd49df7..74826abd7df 100644
--- a/config/feature_flags/development/non_public_artifacts.yml
+++ b/config/feature_flags/development/non_public_artifacts.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49775
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294503
milestone: '13.8'
type: development
-group: group::configure
+group: group::pipeline security
default_enabled: false
diff --git a/config/feature_flags/development/notify_kas_on_git_push.yml b/config/feature_flags/development/notify_kas_on_git_push.yml
new file mode 100644
index 00000000000..df90a4d1942
--- /dev/null
+++ b/config/feature_flags/development/notify_kas_on_git_push.yml
@@ -0,0 +1,8 @@
+---
+name: notify_kas_on_git_push
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119168
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410429
+milestone: '16.0'
+type: development
+group: group::environments
+default_enabled: false
diff --git a/config/feature_flags/development/npm_allow_packages_in_multiple_projects.yml b/config/feature_flags/development/npm_allow_packages_in_multiple_projects.yml
new file mode 100644
index 00000000000..7541a0dd24e
--- /dev/null
+++ b/config/feature_flags/development/npm_allow_packages_in_multiple_projects.yml
@@ -0,0 +1,8 @@
+---
+name: npm_allow_packages_in_multiple_projects
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111775
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/391692
+milestone: '15.10'
+type: development
+group: group::package registry
+default_enabled: false
diff --git a/config/feature_flags/development/openai_experimentation.yml b/config/feature_flags/development/openai_experimentation.yml
new file mode 100644
index 00000000000..8f0bb6df036
--- /dev/null
+++ b/config/feature_flags/development/openai_experimentation.yml
@@ -0,0 +1,8 @@
+---
+name: openai_experimentation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116364
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/403855
+milestone: '15.11'
+type: development
+group: group::ai-enablement
+default_enabled: false
diff --git a/config/feature_flags/development/openai_moderation.yml b/config/feature_flags/development/openai_moderation.yml
new file mode 100644
index 00000000000..97915ceac41
--- /dev/null
+++ b/config/feature_flags/development/openai_moderation.yml
@@ -0,0 +1,8 @@
+---
+name: openai_moderation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119050
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409452
+milestone: '16.0'
+type: development
+group: group::ai-enablement
+default_enabled: false
diff --git a/config/feature_flags/development/bulk_import_projects.yml b/config/feature_flags/development/optimize_scope_projects_with_feature_available.yml
index 853389577cf..86811a6c534 100644
--- a/config/feature_flags/development/bulk_import_projects.yml
+++ b/config/feature_flags/development/optimize_scope_projects_with_feature_available.yml
@@ -1,8 +1,8 @@
---
-name: bulk_import_projects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68873
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339941
-milestone: '14.3'
+name: optimize_scope_projects_with_feature_available
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119950/
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410693
+milestone: '16.0'
type: development
-group: group::import
+group: group::tenant scale
default_enabled: false
diff --git a/config/feature_flags/development/packages_delete_orphaned_dependencies_worker.yml b/config/feature_flags/development/packages_delete_orphaned_dependencies_worker.yml
new file mode 100644
index 00000000000..2966d6b9bc3
--- /dev/null
+++ b/config/feature_flags/development/packages_delete_orphaned_dependencies_worker.yml
@@ -0,0 +1,8 @@
+---
+name: packages_delete_orphaned_dependencies_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113076
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409458
+milestone: '16.0'
+type: development
+group: group::package registry
+default_enabled: false
diff --git a/config/feature_flags/development/packages_display_last_pipeline.yml b/config/feature_flags/development/packages_display_last_pipeline.yml
new file mode 100644
index 00000000000..a90edb4bb86
--- /dev/null
+++ b/config/feature_flags/development/packages_display_last_pipeline.yml
@@ -0,0 +1,8 @@
+---
+name: packages_display_last_pipeline
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120125
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410362
+milestone: '16.0'
+type: development
+group: group::package registry
+default_enabled: false
diff --git a/config/feature_flags/development/pages_deploy_upload_file_outside_transaction.yml b/config/feature_flags/development/pages_deploy_upload_file_outside_transaction.yml
new file mode 100644
index 00000000000..c656166bcc0
--- /dev/null
+++ b/config/feature_flags/development/pages_deploy_upload_file_outside_transaction.yml
@@ -0,0 +1,8 @@
+---
+name: pages_deploy_upload_file_outside_transaction
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114774
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/396512
+milestone: '15.11'
+type: development
+group: group::knowledge
+default_enabled: true
diff --git a/config/feature_flags/development/new_header_search.yml b/config/feature_flags/development/pages_unique_domain.yml
index 58bd1781dae..39a1db5712f 100644
--- a/config/feature_flags/development/new_header_search.yml
+++ b/config/feature_flags/development/pages_unique_domain.yml
@@ -1,8 +1,8 @@
---
-name: new_header_search
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68681
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339348
-milestone: '14.3'
+name: pages_unique_domain
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109011
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/388151
+milestone: '15.9'
type: development
-group: group::global search
+group: group::editor
default_enabled: true
diff --git a/config/feature_flags/development/permit_all_shared_groups_for_approval.yml b/config/feature_flags/development/permit_all_shared_groups_for_approval.yml
deleted file mode 100644
index 4ea3b7f696b..00000000000
--- a/config/feature_flags/development/permit_all_shared_groups_for_approval.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: permit_all_shared_groups_for_approval
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80655
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352766
-milestone: '14.8'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/cache_home_panel.yml b/config/feature_flags/development/pipeline_name_in_api.yml
index 63798cd31d0..cb22fca2932 100644
--- a/config/feature_flags/development/cache_home_panel.yml
+++ b/config/feature_flags/development/pipeline_name_in_api.yml
@@ -1,8 +1,8 @@
---
-name: cache_home_panel
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57031
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328421
-milestone: '13.12'
+name: pipeline_name_in_api
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115310
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/398131
+milestone: '15.11'
type: development
-group: group::source code
+group: group::delivery
default_enabled: false
diff --git a/config/feature_flags/development/pipeline_trigger_merge_status.yml b/config/feature_flags/development/pipeline_trigger_merge_status.yml
new file mode 100644
index 00000000000..840b5353123
--- /dev/null
+++ b/config/feature_flags/development/pipeline_trigger_merge_status.yml
@@ -0,0 +1,8 @@
+---
+name: pipeline_trigger_merge_status
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112525
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/392989
+milestone: '15.10'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/preload_max_access_levels_for_labels_finder.yml b/config/feature_flags/development/preload_max_access_levels_for_labels_finder.yml
deleted file mode 100644
index 45661638432..00000000000
--- a/config/feature_flags/development/preload_max_access_levels_for_labels_finder.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: preload_max_access_levels_for_labels_finder
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111313
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390664
-milestone: '15.9'
-type: development
-group: group::optimize
-default_enabled: false
diff --git a/config/feature_flags/development/present_groups_select_all.yml b/config/feature_flags/development/present_groups_select_all.yml
deleted file mode 100644
index 4d8ac160fa0..00000000000
--- a/config/feature_flags/development/present_groups_select_all.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: present_groups_select_all
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93633
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370306
-milestone: '15.5'
-type: development
-group: group::workspace
-default_enabled: false
diff --git a/config/feature_flags/development/product_analytics_dashboards.yml b/config/feature_flags/development/product_analytics_dashboards.yml
new file mode 100644
index 00000000000..7133d01d4db
--- /dev/null
+++ b/config/feature_flags/development/product_analytics_dashboards.yml
@@ -0,0 +1,8 @@
+---
+name: product_analytics_dashboards
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115177
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/398653
+milestone: '15.11'
+type: development
+group: group::product analytics
+default_enabled: false
diff --git a/config/feature_flags/development/product_analytics_snowplow_support.yml b/config/feature_flags/development/product_analytics_snowplow_support.yml
new file mode 100644
index 00000000000..f3684a3f26b
--- /dev/null
+++ b/config/feature_flags/development/product_analytics_snowplow_support.yml
@@ -0,0 +1,8 @@
+---
+name: product_analytics_snowplow_support
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116317
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/403418
+milestone: '15.11'
+type: development
+group: group::product analytics
+default_enabled: false
diff --git a/config/feature_flags/development/product_intelligence_database_event_tracking.yml b/config/feature_flags/development/product_intelligence_database_event_tracking.yml
index 545cdc47f2b..63b53996eea 100644
--- a/config/feature_flags/development/product_intelligence_database_event_tracking.yml
+++ b/config/feature_flags/development/product_intelligence_database_event_tracking.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368976
milestone: '15.3'
type: development
group: group::product intelligence
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/product_intelligence_database_event_tracking_batch2.yml b/config/feature_flags/development/product_intelligence_database_event_tracking_batch2.yml
new file mode 100644
index 00000000000..825f684ed8c
--- /dev/null
+++ b/config/feature_flags/development/product_intelligence_database_event_tracking_batch2.yml
@@ -0,0 +1,8 @@
+---
+name: product_intelligence_database_event_tracking_batch2
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116125
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/403041
+milestone: '16.0'
+type: development
+group: group::analytics instrumentation
+default_enabled: true
diff --git a/config/feature_flags/development/profile_tabs_vue.yml b/config/feature_flags/development/profile_tabs_vue.yml
index 95fd4bbde27..7a8a30fed4b 100644
--- a/config/feature_flags/development/profile_tabs_vue.yml
+++ b/config/feature_flags/development/profile_tabs_vue.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109422
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/388708
milestone: '15.9'
type: development
-group: group::organization
+group: group::tenant scale
default_enabled: false
diff --git a/config/feature_flags/development/project_export_as_ndjson.yml b/config/feature_flags/development/project_export_as_ndjson.yml
deleted file mode 100644
index f77c1979e55..00000000000
--- a/config/feature_flags/development/project_export_as_ndjson.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: project_export_as_ndjson
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26995
-rollout_issue_url:
-milestone: '12.10'
-type: development
-group: group::import
-default_enabled: true
diff --git a/config/feature_flags/development/project_import_ndjson.yml b/config/feature_flags/development/project_import_ndjson.yml
deleted file mode 100644
index 756c6c1aaa5..00000000000
--- a/config/feature_flags/development/project_import_ndjson.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: project_import_ndjson
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27206
-rollout_issue_url:
-milestone: '12.10'
-type: development
-group: group::import
-default_enabled: true
diff --git a/config/feature_flags/development/project_members_index_by_project_namespace.yml b/config/feature_flags/development/project_members_index_by_project_namespace.yml
deleted file mode 100644
index 0727c32143a..00000000000
--- a/config/feature_flags/development/project_members_index_by_project_namespace.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: project_members_index_by_project_namespace
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105781
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384521
-milestone: '15.7'
-type: development
-group: group::workspace
-default_enabled: true
diff --git a/config/feature_flags/development/project_statistics_bulk_increment.yml b/config/feature_flags/development/project_statistics_bulk_increment.yml
index 6e8b9083a4d..2fa2b6d2611 100644
--- a/config/feature_flags/development/project_statistics_bulk_increment.yml
+++ b/config/feature_flags/development/project_statistics_bulk_increment.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103879
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385845
milestone: '15.7'
type: development
-group: group::pipeline insights
+group: group::pipeline security
default_enabled: false
diff --git a/config/feature_flags/development/projects_tokens_optional_encryption.yml b/config/feature_flags/development/projects_tokens_optional_encryption.yml
index 6a0fed009ea..c35becd87ab 100644
--- a/config/feature_flags/development/projects_tokens_optional_encryption.yml
+++ b/config/feature_flags/development/projects_tokens_optional_encryption.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333864
milestone: '11.9'
type: development
group: group::runner
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/prom_metrics_rust.yml b/config/feature_flags/development/prom_metrics_rust.yml
new file mode 100644
index 00000000000..3b4a4e23a08
--- /dev/null
+++ b/config/feature_flags/development/prom_metrics_rust.yml
@@ -0,0 +1,8 @@
+---
+name: prom_metrics_rust
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119005
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409023
+milestone: '16.0'
+type: development
+group: group::gitaly::cluster
+default_enabled: false
diff --git a/config/feature_flags/development/realtime_approvals.yml b/config/feature_flags/development/realtime_approvals.yml
new file mode 100644
index 00000000000..adb818e52bf
--- /dev/null
+++ b/config/feature_flags/development/realtime_approvals.yml
@@ -0,0 +1,8 @@
+---
+name: realtime_approvals
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114963'
+rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/399539'
+milestone: '16.0'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/realtime_mr_status_change.yml b/config/feature_flags/development/realtime_mr_status_change.yml
index 0cba2d3ca57..a922ba7d12a 100644
--- a/config/feature_flags/development/realtime_mr_status_change.yml
+++ b/config/feature_flags/development/realtime_mr_status_change.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385077
milestone: '15.7'
type: development
group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/record_issue_and_mr_assignee_events.yml b/config/feature_flags/development/record_issue_and_mr_assignee_events.yml
new file mode 100644
index 00000000000..83660a2a4a6
--- /dev/null
+++ b/config/feature_flags/development/record_issue_and_mr_assignee_events.yml
@@ -0,0 +1,8 @@
+---
+name: record_issue_and_mr_assignee_events
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117545
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/397050
+milestone: '15.11'
+type: development
+group: group::optimize
+default_enabled: true
diff --git a/config/feature_flags/development/recursive_approach_for_all_projects.yml b/config/feature_flags/development/recursive_approach_for_all_projects.yml
deleted file mode 100644
index e2d656b7de2..00000000000
--- a/config/feature_flags/development/recursive_approach_for_all_projects.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: recursive_approach_for_all_projects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64632
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334817
-milestone: '14.1'
-type: development
-group: group::fulfillment
-default_enabled: true
diff --git a/config/feature_flags/development/namespace_storage_limit_bypass_date_check.yml b/config/feature_flags/development/reduce_aggregation_schedule_lease.yml
index f70e60d14b5..2603b1ce07c 100644
--- a/config/feature_flags/development/namespace_storage_limit_bypass_date_check.yml
+++ b/config/feature_flags/development/reduce_aggregation_schedule_lease.yml
@@ -1,8 +1,8 @@
---
-name: namespace_storage_limit_bypass_date_check
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86794
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/361785
-milestone: '15.0'
+name: reduce_aggregation_schedule_lease
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118472
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/408463
+milestone: '16.0'
type: development
group: group::utilization
default_enabled: false
diff --git a/config/feature_flags/development/refactor_security_extension.yml b/config/feature_flags/development/refactor_security_extension.yml
index 7651f7d387d..f7573acce23 100644
--- a/config/feature_flags/development/refactor_security_extension.yml
+++ b/config/feature_flags/development/refactor_security_extension.yml
@@ -1,8 +1,8 @@
---
name: refactor_security_extension
-introduced_by_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84896
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365320
milestone: '14.10'
type: development
group: group::threat insights
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/registry_data_repair_worker.yml b/config/feature_flags/development/registry_data_repair_worker.yml
new file mode 100644
index 00000000000..3d8982c3e81
--- /dev/null
+++ b/config/feature_flags/development/registry_data_repair_worker.yml
@@ -0,0 +1,8 @@
+---
+name: registry_data_repair_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115156
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/397505
+milestone: '16.0'
+type: development
+group: group::container registry
+default_enabled: false
diff --git a/config/feature_flags/development/rely_on_protected_branches_cache.yml b/config/feature_flags/development/rely_on_protected_branches_cache.yml
deleted file mode 100644
index 5154d4cee08..00000000000
--- a/config/feature_flags/development/rely_on_protected_branches_cache.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: rely_on_protected_branches_cache
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92937
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370608
-milestone: '15.4'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/create_runner_machine.yml b/config/feature_flags/development/remove_cicd_settings_update.yml
index 5ad3766ff6e..d26355e6084 100644
--- a/config/feature_flags/development/create_runner_machine.yml
+++ b/config/feature_flags/development/remove_cicd_settings_update.yml
@@ -1,8 +1,8 @@
---
-name: create_runner_machine
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109983
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390261
-milestone: '15.9'
+name: remove_cicd_settings_update
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119061
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409379
+milestone: '16.0'
type: development
group: group::runner
default_enabled: false
diff --git a/config/feature_flags/development/remove_monitor_metrics.yml b/config/feature_flags/development/remove_monitor_metrics.yml
new file mode 100644
index 00000000000..d1aa57510ce
--- /dev/null
+++ b/config/feature_flags/development/remove_monitor_metrics.yml
@@ -0,0 +1,8 @@
+---
+name: remove_monitor_metrics
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115714
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/399248
+milestone: '15.11'
+type: development
+group: group::respond
+default_enabled: true
diff --git a/config/feature_flags/development/vue_issues_dashboard.yml b/config/feature_flags/development/remove_startup_css.yml
index 133343b3a3c..91e78682755 100644
--- a/config/feature_flags/development/vue_issues_dashboard.yml
+++ b/config/feature_flags/development/remove_startup_css.yml
@@ -1,8 +1,8 @@
---
-name: vue_issues_dashboard
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102197
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/379025
-milestone: '15.6'
+name: remove_startup_css
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117495
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/407140
+milestone: '15.11'
type: development
group: group::project management
default_enabled: false
diff --git a/config/feature_flags/development/repack_after_shard_migration.yml b/config/feature_flags/development/repack_after_shard_migration.yml
deleted file mode 100644
index 15b7a3e67b0..00000000000
--- a/config/feature_flags/development/repack_after_shard_migration.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: repack_after_shard_migration
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/21502
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/195597
-milestone: '12.6'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/unlink_fork_network_upon_visibility_decrease.yml b/config/feature_flags/development/resolve_ambiguous_archives.yml
index e7e220c310b..ed4ed492105 100644
--- a/config/feature_flags/development/unlink_fork_network_upon_visibility_decrease.yml
+++ b/config/feature_flags/development/resolve_ambiguous_archives.yml
@@ -1,8 +1,8 @@
---
-name: unlink_fork_network_upon_visibility_decrease
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20466
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369438
-milestone: '12.6'
+name: resolve_ambiguous_archives
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116411
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/403650
+milestone: '15.11'
type: development
group: group::source code
default_enabled: true
diff --git a/config/feature_flags/development/restrict_merge_status_recheck.yml b/config/feature_flags/development/restrict_merge_status_recheck.yml
new file mode 100644
index 00000000000..8b7da326773
--- /dev/null
+++ b/config/feature_flags/development/restrict_merge_status_recheck.yml
@@ -0,0 +1,8 @@
+---
+name: restrict_merge_status_recheck
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115948
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/404567
+milestone: '15.11'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/restrict_special_characters_in_namespace_path.yml b/config/feature_flags/development/restrict_special_characters_in_namespace_path.yml
new file mode 100644
index 00000000000..fb04e8310e5
--- /dev/null
+++ b/config/feature_flags/development/restrict_special_characters_in_namespace_path.yml
@@ -0,0 +1,8 @@
+---
+name: restrict_special_characters_in_namespace_path
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111017
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390954
+milestone: '15.9'
+type: development
+group: group::tenant scale
+default_enabled: false
diff --git a/config/feature_flags/development/revert_daily_hll_events_to_weekly_aggregation.yml b/config/feature_flags/development/revert_daily_hll_events_to_weekly_aggregation.yml
new file mode 100644
index 00000000000..aca0bc96a33
--- /dev/null
+++ b/config/feature_flags/development/revert_daily_hll_events_to_weekly_aggregation.yml
@@ -0,0 +1,8 @@
+---
+name: revert_daily_hll_events_to_weekly_aggregation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114967
+rollout_issue_url:
+milestone: '16.0'
+type: development
+group: group::analytics instrumentation
+default_enabled: false
diff --git a/config/feature_flags/development/ci_enforce_rate_limits_jobs_api.yml b/config/feature_flags/development/review_apps_redeploy_mr_widget.yml
index 14c435f294a..c2bbdef3c83 100644
--- a/config/feature_flags/development/ci_enforce_rate_limits_jobs_api.yml
+++ b/config/feature_flags/development/review_apps_redeploy_mr_widget.yml
@@ -1,8 +1,8 @@
---
-name: ci_enforce_rate_limits_jobs_api
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104912
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384186
-milestone: '15.7'
+name: review_apps_redeploy_mr_widget
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118260
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/407456
+milestone: '15.11'
type: development
group: group::pipeline execution
default_enabled: false
diff --git a/config/feature_flags/development/role_targeted_broadcast_messages.yml b/config/feature_flags/development/role_targeted_broadcast_messages.yml
deleted file mode 100644
index 3de916d9e6d..00000000000
--- a/config/feature_flags/development/role_targeted_broadcast_messages.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: role_targeted_broadcast_messages
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81232
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351736
-milestone: '14.9'
-type: development
-group: group::activation
-default_enabled: false
diff --git a/config/feature_flags/development/rollup_timebox_chart.yml b/config/feature_flags/development/rollup_timebox_chart.yml
new file mode 100644
index 00000000000..00952adfe8c
--- /dev/null
+++ b/config/feature_flags/development/rollup_timebox_chart.yml
@@ -0,0 +1,8 @@
+---
+name: rollup_timebox_chart
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115674
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/399186
+milestone: '15.11'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/limited_capacity_seat_refresh_worker_high.yml b/config/feature_flags/development/root_storage_statistics_calculate_forks.yml
index 28f1c8a988e..e1035c8c35f 100644
--- a/config/feature_flags/development/limited_capacity_seat_refresh_worker_high.yml
+++ b/config/feature_flags/development/root_storage_statistics_calculate_forks.yml
@@ -1,8 +1,8 @@
---
-name: limited_capacity_seat_refresh_worker_high
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104099
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382725
-milestone: '15.9'
+name: root_storage_statistics_calculate_forks
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118105
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/408139
+milestone: '16.0'
type: development
group: group::utilization
default_enabled: false
diff --git a/config/feature_flags/development/route_hll_to_snowplow_phase2.yml b/config/feature_flags/development/route_hll_to_snowplow_phase2.yml
deleted file mode 100644
index 2a3a820afd2..00000000000
--- a/config/feature_flags/development/route_hll_to_snowplow_phase2.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: route_hll_to_snowplow_phase2
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88482
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363562
-milestone: '15.1'
-type: development
-group: group::product intelligence
-default_enabled: true
diff --git a/config/feature_flags/development/route_hll_to_snowplow_phase3.yml b/config/feature_flags/development/route_hll_to_snowplow_phase3.yml
deleted file mode 100644
index 5a000a0569a..00000000000
--- a/config/feature_flags/development/route_hll_to_snowplow_phase3.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: route_hll_to_snowplow_phase3
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104947
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383657
-milestone: '15.7'
-type: development
-group: 'group::product intelligence'
-default_enabled: false
diff --git a/config/feature_flags/development/refactor_code_quality_inline_findings.yml b/config/feature_flags/development/sast_reports_in_inline_diff.yml
index 98e2a307a50..2e320e8e602 100644
--- a/config/feature_flags/development/refactor_code_quality_inline_findings.yml
+++ b/config/feature_flags/development/sast_reports_in_inline_diff.yml
@@ -1,8 +1,8 @@
---
-name: refactor_code_quality_inline_findings
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88576
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364198
-milestone: '15.1'
+name: sast_reports_in_inline_diff
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119975
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410191
+milestone: '16.0'
type: development
group: group::static analysis
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/saved_replies.yml b/config/feature_flags/development/saved_replies.yml
index b6a7151addf..0c973292ba0 100644
--- a/config/feature_flags/development/saved_replies.yml
+++ b/config/feature_flags/development/saved_replies.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352956
milestone: '14.9'
type: development
group: group::project management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/scan_execution_bot_users.yml b/config/feature_flags/development/scan_execution_bot_users.yml
new file mode 100644
index 00000000000..70890ee4ba8
--- /dev/null
+++ b/config/feature_flags/development/scan_execution_bot_users.yml
@@ -0,0 +1,8 @@
+---
+name: scan_execution_bot_users
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118089
+rollout_issue_url:
+milestone: '16.0'
+type: development
+group: group::security policies
+default_enabled: false
diff --git a/config/feature_flags/development/scan_result_role_action.yml b/config/feature_flags/development/scan_result_role_action.yml
index e6a4a552350..62129692f80 100644
--- a/config/feature_flags/development/scan_result_role_action.yml
+++ b/config/feature_flags/development/scan_result_role_action.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377866
milestone: '15.6'
type: development
group: group::security policies
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/search_blobs_language_aggregation.yml b/config/feature_flags/development/search_index_integrity.yml
index da1b81dc52c..84e1e4b65c8 100644
--- a/config/feature_flags/development/search_blobs_language_aggregation.yml
+++ b/config/feature_flags/development/search_index_integrity.yml
@@ -1,8 +1,8 @@
---
-name: search_blobs_language_aggregation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71937
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342621
-milestone: '14.4'
+name: search_index_integrity
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112369
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/392981
+milestone: '15.10'
type: development
group: group::global search
default_enabled: false
diff --git a/config/feature_flags/development/code_basic_search_files_by_regexp.yml b/config/feature_flags/development/search_index_partitioning_notes.yml
index e68581bdfbd..1abd3be35c5 100644
--- a/config/feature_flags/development/code_basic_search_files_by_regexp.yml
+++ b/config/feature_flags/development/search_index_partitioning_notes.yml
@@ -1,9 +1,8 @@
---
-name: code_basic_search_files_by_regexp
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109987
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389551
-milestone: '15.9'
+name: search_index_partitioning_notes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112402
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/392376
+milestone: '15.10'
type: development
group: group::global search
default_enabled: false
-
diff --git a/config/feature_flags/development/elasticsearch_use_traversal_id_optimization.yml b/config/feature_flags/development/search_rate_limited_scopes.yml
index 499da142527..499a51feca5 100644
--- a/config/feature_flags/development/elasticsearch_use_traversal_id_optimization.yml
+++ b/config/feature_flags/development/search_rate_limited_scopes.yml
@@ -1,8 +1,8 @@
---
-name: elasticsearch_use_traversal_id_optimization
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108135
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/391286
-milestone: '15.9'
+name: search_rate_limited_scopes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118525
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/408521
+milestone: '16.0'
type: development
group: group::global search
default_enabled: false
diff --git a/config/feature_flags/development/linear_project_ancestors.yml b/config/feature_flags/development/service_accounts_crud.yml
index 00b04b20b30..48a9104398d 100644
--- a/config/feature_flags/development/linear_project_ancestors.yml
+++ b/config/feature_flags/development/service_accounts_crud.yml
@@ -1,8 +1,8 @@
---
-name: linear_project_ancestors
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68072
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338403
-milestone: '14.2'
+name: service_accounts_crud
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113884
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/397730
+milestone: '15.11'
type: development
group: group::authentication and authorization
default_enabled: false
diff --git a/config/feature_flags/development/service_desk_html_to_text_email_handler.yml b/config/feature_flags/development/service_desk_html_to_text_email_handler.yml
deleted file mode 100644
index 733b2521c8d..00000000000
--- a/config/feature_flags/development/service_desk_html_to_text_email_handler.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: service_desk_html_to_text_email_handler
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109811
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372301
-milestone: '15.9'
-type: development
-group: group::respond
-default_enabled: false
diff --git a/config/feature_flags/development/service_desk_new_note_email_native_attachments.yml b/config/feature_flags/development/service_desk_new_note_email_native_attachments.yml
index 2299b33db84..89f0804ad39 100644
--- a/config/feature_flags/development/service_desk_new_note_email_native_attachments.yml
+++ b/config/feature_flags/development/service_desk_new_note_email_native_attachments.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386860
milestone: '15.8'
type: development
group: group::respond
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/set_traversal_ids_on_save.yml b/config/feature_flags/development/set_traversal_ids_on_save.yml
deleted file mode 100644
index ea07dafd9e4..00000000000
--- a/config/feature_flags/development/set_traversal_ids_on_save.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: set_traversal_ids_on_save
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104328
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383217
-milestone: '15.8'
-type: development
-group: group::organization
-default_enabled: false
diff --git a/config/feature_flags/development/show_group_readme.yml b/config/feature_flags/development/show_group_readme.yml
deleted file mode 100644
index b5764b9195f..00000000000
--- a/config/feature_flags/development/show_group_readme.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: show_group_readme
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109480
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390230
-milestone: '15.9'
-type: development
-group: group::organization
-default_enabled: false
diff --git a/config/feature_flags/development/sidekiq_execution_application_slis.yml b/config/feature_flags/development/sidekiq_execution_application_slis.yml
new file mode 100644
index 00000000000..4c1dcda82c0
--- /dev/null
+++ b/config/feature_flags/development/sidekiq_execution_application_slis.yml
@@ -0,0 +1,8 @@
+---
+name: sidekiq_execution_application_slis
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116827
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/407325
+milestone: '15.11'
+type: development
+group: group::scalability
+default_enabled: false
diff --git a/config/feature_flags/development/single_file_file_by_file.yml b/config/feature_flags/development/single_file_file_by_file.yml
new file mode 100644
index 00000000000..bc38cf8afb2
--- /dev/null
+++ b/config/feature_flags/development/single_file_file_by_file.yml
@@ -0,0 +1,8 @@
+---
+name: single_file_file_by_file
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111895'
+rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/403571'
+milestone: '15.11'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/skip_group_share_unlink_auth_refresh.yml b/config/feature_flags/development/skip_group_share_unlink_auth_refresh.yml
index cd7acaceaf5..d6a0848d80b 100644
--- a/config/feature_flags/development/skip_group_share_unlink_auth_refresh.yml
+++ b/config/feature_flags/development/skip_group_share_unlink_auth_refresh.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90871
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366086
milestone: '15.2'
type: development
-group: group::workspace
+group: group::tenant scale
default_enabled: false
diff --git a/config/feature_flags/development/soft_email_confirmation.yml b/config/feature_flags/development/soft_email_confirmation.yml
deleted file mode 100644
index 60ebcf1ee50..00000000000
--- a/config/feature_flags/development/soft_email_confirmation.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: soft_email_confirmation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31245
-rollout_issue_url:
-milestone: '12.2'
-type: development
-group: group::acquisition
-default_enabled: false
diff --git a/config/feature_flags/development/summarize_comments.yml b/config/feature_flags/development/summarize_comments.yml
new file mode 100644
index 00000000000..e0f8b223895
--- /dev/null
+++ b/config/feature_flags/development/summarize_comments.yml
@@ -0,0 +1,8 @@
+---
+name: summarize_comments
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117296
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/406758
+milestone: '15.11'
+type: development
+group: group::ai-enablement
+default_enabled: false
diff --git a/config/feature_flags/development/draft_quick_action_non_toggle.yml b/config/feature_flags/development/summarize_diff_quick_action.yml
index 4d28b61f3bf..ebbfaba2dba 100644
--- a/config/feature_flags/development/draft_quick_action_non_toggle.yml
+++ b/config/feature_flags/development/summarize_diff_quick_action.yml
@@ -1,8 +1,8 @@
---
-name: draft_quick_action_non_toggle
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92654
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368610
-milestone: '15.4'
+name: summarize_diff_quick_action
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117458
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/407256
+milestone: '15.11'
type: development
group: group::code review
default_enabled: false
diff --git a/config/feature_flags/development/disabled_mr_discussions_redis_cache.yml b/config/feature_flags/development/summarize_my_code_review.yml
index c4f0ca0effe..02840af2bfa 100644
--- a/config/feature_flags/development/disabled_mr_discussions_redis_cache.yml
+++ b/config/feature_flags/development/summarize_my_code_review.yml
@@ -1,8 +1,8 @@
---
-name: disabled_mr_discussions_redis_cache
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92752
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368366
-milestone: '15.3'
+name: summarize_my_code_review
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118807
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/408869
+milestone: '16.0'
type: development
group: group::code review
default_enabled: false
diff --git a/config/feature_flags/development/super_sidebar_nav.yml b/config/feature_flags/development/super_sidebar_nav.yml
index cf088956bc0..81dd4a7842a 100644
--- a/config/feature_flags/development/super_sidebar_nav.yml
+++ b/config/feature_flags/development/super_sidebar_nav.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381456
milestone: '15.7'
type: development
group: group::foundations
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/allow_dots_on_tf_state_names.yml b/config/feature_flags/development/super_sidebar_nav_enrolled.yml
index 3bbff808eda..2ece807f6fe 100644
--- a/config/feature_flags/development/allow_dots_on_tf_state_names.yml
+++ b/config/feature_flags/development/super_sidebar_nav_enrolled.yml
@@ -1,8 +1,8 @@
---
-name: allow_dots_on_tf_state_names
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106861
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385597
-milestone: '15.7'
+name: super_sidebar_nav_enrolled
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119506
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410121
+milestone: '16.0'
type: development
-group: group::configure
+group: group::foundations
default_enabled: false
diff --git a/config/feature_flags/development/super_sidebar_peek.yml b/config/feature_flags/development/super_sidebar_peek.yml
new file mode 100644
index 00000000000..6a80580f9fa
--- /dev/null
+++ b/config/feature_flags/development/super_sidebar_peek.yml
@@ -0,0 +1,8 @@
+---
+name: super_sidebar_peek
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116914
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/404966
+milestone: '15.11'
+type: development
+group: group::foundations
+default_enabled: true
diff --git a/config/feature_flags/development/sync_approval_rules_from_findings.yml b/config/feature_flags/development/sync_approval_rules_from_findings.yml
new file mode 100644
index 00000000000..c3f85a98b74
--- /dev/null
+++ b/config/feature_flags/development/sync_approval_rules_from_findings.yml
@@ -0,0 +1,8 @@
+---
+name: sync_approval_rules_from_findings
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115825
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/397011
+milestone: '15.11'
+type: development
+group: group::security policies
+default_enabled: true
diff --git a/config/feature_flags/development/revoke_ssh_signatures.yml b/config/feature_flags/development/synchronize_fork.yml
index de50bae7d1d..207739cf34e 100644
--- a/config/feature_flags/development/revoke_ssh_signatures.yml
+++ b/config/feature_flags/development/synchronize_fork.yml
@@ -1,8 +1,8 @@
---
-name: revoke_ssh_signatures
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108344
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/388986
-milestone: '15.9'
+name: synchronize_fork
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114299
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/395793
+milestone: '15.10'
type: development
group: group::source code
default_enabled: true
diff --git a/config/feature_flags/development/ultimate_feature_removal_banner.yml b/config/feature_flags/development/ultimate_feature_removal_banner.yml
index 14d7b4921c1..933e8ace9cc 100644
--- a/config/feature_flags/development/ultimate_feature_removal_banner.yml
+++ b/config/feature_flags/development/ultimate_feature_removal_banner.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94271
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371690
milestone: '15.4'
type: development
-group: group::workspace
+group: group::tenant scale
default_enabled: false
diff --git a/config/feature_flags/development/unbatch_graphql_queries.yml b/config/feature_flags/development/unbatch_graphql_queries.yml
new file mode 100644
index 00000000000..c5bc8c3033a
--- /dev/null
+++ b/config/feature_flags/development/unbatch_graphql_queries.yml
@@ -0,0 +1,8 @@
+---
+name: unbatch_graphql_queries
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117407
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/406765
+milestone: '16.0'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/use_pipeline_over_multikey.yml b/config/feature_flags/development/use_pipeline_over_multikey.yml
new file mode 100644
index 00000000000..35a84868fe4
--- /dev/null
+++ b/config/feature_flags/development/use_pipeline_over_multikey.yml
@@ -0,0 +1,8 @@
+---
+name: use_pipeline_over_multikey
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118884
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409436
+milestone: '16.0'
+type: development
+group: group::scalability
+default_enabled: false
diff --git a/config/feature_flags/development/use_primary_and_secondary_stores_for_rate_limiting.yml b/config/feature_flags/development/use_primary_and_secondary_stores_for_rate_limiting.yml
deleted file mode 100644
index f6679a52ff2..00000000000
--- a/config/feature_flags/development/use_primary_and_secondary_stores_for_rate_limiting.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_primary_and_secondary_stores_for_rate_limiting
-introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106123"
-rollout_issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/385681"
-milestone: '15.9'
-type: development
-group: group::scalability
-default_enabled: false
diff --git a/config/feature_flags/development/use_primary_store_as_default_for_rate_limiting.yml b/config/feature_flags/development/use_primary_store_as_default_for_rate_limiting.yml
deleted file mode 100644
index a958c1c3247..00000000000
--- a/config/feature_flags/development/use_primary_store_as_default_for_rate_limiting.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_primary_store_as_default_for_rate_limiting
-introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106123"
-rollout_issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/385681"
-milestone: '15.9'
-type: development
-group: group::scalability
-default_enabled: false
diff --git a/config/feature_flags/development/use_traversal_ids.yml b/config/feature_flags/development/use_traversal_ids.yml
index 3d566ddc3c0..51f0ba39025 100644
--- a/config/feature_flags/development/use_traversal_ids.yml
+++ b/config/feature_flags/development/use_traversal_ids.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56296
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321948
milestone: '13.11'
type: development
-group: group::workspace
+group: group::tenant scale
default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_for_ancestor_scopes.yml b/config/feature_flags/development/use_traversal_ids_for_ancestor_scopes.yml
index e2619ef5231..0ac765b6ab3 100644
--- a/config/feature_flags/development/use_traversal_ids_for_ancestor_scopes.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_ancestor_scopes.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67652
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340159
milestone: '14.3'
type: development
-group: group::workspace
-default_enabled: false
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_for_ancestors.yml b/config/feature_flags/development/use_traversal_ids_for_ancestors.yml
index 4a89aac140d..64ba5b17513 100644
--- a/config/feature_flags/development/use_traversal_ids_for_ancestors.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_ancestors.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57137
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334952
milestone: '13.12'
type: development
-group: group::workspace
-default_enabled: false
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml b/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml
index 9da967f87ea..910cf3e2d83 100644
--- a/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72662
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343619
milestone: '14.6'
type: development
-group: group::workspace
-default_enabled: false
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml b/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml
index 3eece0b906a..74b6d6d2f70 100644
--- a/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_descendants_scopes.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78542
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350637
milestone: '14.8'
type: development
-group: group::workspace
+group: group::tenant scale
default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_for_root_ancestor.yml b/config/feature_flags/development/use_traversal_ids_for_root_ancestor.yml
deleted file mode 100644
index 00c6edfc148..00000000000
--- a/config/feature_flags/development/use_traversal_ids_for_root_ancestor.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_traversal_ids_for_root_ancestor
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61163
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331907
-milestone: '14.0'
-type: development
-group: group::workspace
-default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy.yml b/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy.yml
index 06bddc2aa1c..e1f1ec0df35 100644
--- a/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76814
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348527
milestone: '14.7'
type: development
-group: group::workspace
-default_enabled: false
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy_scopes.yml b/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy_scopes.yml
index bdbfe33b16d..094534abc4d 100644
--- a/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy_scopes.yml
+++ b/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy_scopes.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80045
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352120
milestone: '14.8'
type: development
-group: group::workspace
+group: group::tenant scale
default_enabled: false
diff --git a/config/feature_flags/development/use_traversal_ids_groups_finder.yml b/config/feature_flags/development/use_traversal_ids_groups_finder.yml
index 2f35ede7e87..cb4e140769a 100644
--- a/config/feature_flags/development/use_traversal_ids_groups_finder.yml
+++ b/config/feature_flags/development/use_traversal_ids_groups_finder.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67650
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345666
milestone: '14.6'
type: development
-group: group::workspace
-default_enabled: false
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_roots.yml b/config/feature_flags/development/use_traversal_ids_roots.yml
index 3c0685dc872..d1f4cec7517 100644
--- a/config/feature_flags/development/use_traversal_ids_roots.yml
+++ b/config/feature_flags/development/use_traversal_ids_roots.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74148
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345438
milestone: '14.5'
type: development
-group: group::workspace
-default_enabled: false
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/development/user_spam_scores.yml b/config/feature_flags/development/user_spam_scores.yml
new file mode 100644
index 00000000000..1d685a9fb16
--- /dev/null
+++ b/config/feature_flags/development/user_spam_scores.yml
@@ -0,0 +1,8 @@
+---
+name: user_spam_scores
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118706'
+rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/408753'
+milestone: '16.0'
+type: development
+group: group::antiabuse
+default_enabled: false
diff --git a/config/feature_flags/development/user_time_settings.yml b/config/feature_flags/development/user_time_settings.yml
deleted file mode 100644
index 77ee79fe80a..00000000000
--- a/config/feature_flags/development/user_time_settings.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: user_time_settings
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/25381
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321407
-milestone: '11.11'
-type: development
-group: group::workspace
-default_enabled: false
diff --git a/config/feature_flags/development/validate_environment_tier_presence.yml b/config/feature_flags/development/validate_environment_tier_presence.yml
index 78593e338a4..5cc16b36f19 100644
--- a/config/feature_flags/development/validate_environment_tier_presence.yml
+++ b/config/feature_flags/development/validate_environment_tier_presence.yml
@@ -3,5 +3,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111011
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/391293
milestone: '15.9'
type: development
-group: group::release
+group: group::configure
default_enabled: true
diff --git a/config/feature_flags/development/visible_label_selection_on_metadata.yml b/config/feature_flags/development/visible_label_selection_on_metadata.yml
new file mode 100644
index 00000000000..bf173b26d44
--- /dev/null
+++ b/config/feature_flags/development/visible_label_selection_on_metadata.yml
@@ -0,0 +1,8 @@
+---
+name: visible_label_selection_on_metadata
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88908
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364534
+milestone: '16.0'
+type: development
+group: "group::ux paper cuts"
+default_enabled: false
diff --git a/config/feature_flags/development/vsa_group_and_project_parity.yml b/config/feature_flags/development/vsa_group_and_project_parity.yml
new file mode 100644
index 00000000000..d75621a8e5d
--- /dev/null
+++ b/config/feature_flags/development/vsa_group_and_project_parity.yml
@@ -0,0 +1,8 @@
+---
+name: vsa_group_and_project_parity
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114056
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/396865
+milestone: '15.11'
+type: development
+group: group::optimize
+default_enabled: true
diff --git a/config/feature_flags/development/vscode_web_ide.yml b/config/feature_flags/development/vscode_web_ide.yml
index 3d29ae40e7c..dc9d9d5f5f1 100644
--- a/config/feature_flags/development/vscode_web_ide.yml
+++ b/config/feature_flags/development/vscode_web_ide.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371084
milestone: '15.4'
type: development
group: group::editor
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/webui_members_inherited_users.yml b/config/feature_flags/development/webui_members_inherited_users.yml
index 14704fd8341..a3efb05c140 100644
--- a/config/feature_flags/development/webui_members_inherited_users.yml
+++ b/config/feature_flags/development/webui_members_inherited_users.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83214
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364078
milestone: '15.4'
type: development
-group: group::workspace
+group: group::tenant scale
default_enabled: false
diff --git a/config/feature_flags/experiment/generic_explore_groups.yml b/config/feature_flags/experiment/generic_explore_groups.yml
deleted file mode 100644
index d928dcd4189..00000000000
--- a/config/feature_flags/experiment/generic_explore_groups.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: generic_explore_groups
-introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103019"
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381564
-milestone: '15.6'
-type: experiment
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/experiment/invite_members_in_side_nav.yml b/config/feature_flags/experiment/invite_members_in_side_nav.yml
deleted file mode 100644
index 1cb8d6d2b0a..00000000000
--- a/config/feature_flags/experiment/invite_members_in_side_nav.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_members_in_side_nav
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70451
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342951
-milestone: '14.5'
-type: experiment
-group: group::acquisition
-default_enabled: false
diff --git a/config/feature_flags/experiment/pql_three_cta_test.yml b/config/feature_flags/experiment/pql_three_cta_test.yml
deleted file mode 100644
index aa46c51d7ed..00000000000
--- a/config/feature_flags/experiment/pql_three_cta_test.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: pql_three_cta_test
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74054
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349799
-milestone: '14.7'
-type: experiment
-group: group::acquisition
-default_enabled: false
diff --git a/config/feature_flags/experiment/require_verification_for_namespace_creation.yml b/config/feature_flags/experiment/require_verification_for_namespace_creation.yml
deleted file mode 100644
index 5772d3217b8..00000000000
--- a/config/feature_flags/experiment/require_verification_for_namespace_creation.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: require_verification_for_namespace_creation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77315
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350251
-milestone: '14.8'
-type: experiment
-group: group::activation
-default_enabled: false
diff --git a/config/feature_flags/experiment/runners_availability_section.yml b/config/feature_flags/experiment/runners_availability_section.yml
deleted file mode 100644
index 41286c94e02..00000000000
--- a/config/feature_flags/experiment/runners_availability_section.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: runners_availability_section
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80717
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352850
-milestone: '14.9'
-type: experiment
-group: group::activation
-default_enabled: false
diff --git a/config/feature_flags/experiment/security_actions_continuous_onboarding.yml b/config/feature_flags/experiment/security_actions_continuous_onboarding.yml
deleted file mode 100644
index ce7124cf0c8..00000000000
--- a/config/feature_flags/experiment/security_actions_continuous_onboarding.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: security_actions_continuous_onboarding
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82274
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345176
-milestone: '15.2'
-type: experiment
-group: group::acquisition
-default_enabled: false
diff --git a/config/feature_flags/experiment/security_reports_mr_widget_prompt.yml b/config/feature_flags/experiment/security_reports_mr_widget_prompt.yml
deleted file mode 100644
index 16cc3d890d7..00000000000
--- a/config/feature_flags/experiment/security_reports_mr_widget_prompt.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: security_reports_mr_widget_prompt
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70086
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340436
-milestone: '14.3'
-type: experiment
-group: group::acquisition
-default_enabled: false
diff --git a/config/feature_flags/ops/advanced_user_index.yml b/config/feature_flags/ops/advanced_user_index.yml
deleted file mode 100644
index 2aa33aa265a..00000000000
--- a/config/feature_flags/ops/advanced_user_index.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: advanced_user_index
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110946
-rollout_issue_url:
-milestone: '15.9'
-type: ops
-group: group::global_search
-default_enabled: true
diff --git a/config/feature_flags/ops/auto_disabling_web_hooks.yml b/config/feature_flags/ops/auto_disabling_web_hooks.yml
new file mode 100644
index 00000000000..2eebdd3d1d9
--- /dev/null
+++ b/config/feature_flags/ops/auto_disabling_web_hooks.yml
@@ -0,0 +1,9 @@
+---
+name: auto_disabling_web_hooks
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113479
+rollout_issue_url:
+milestone: '15.10'
+type: ops
+group: group::integrations
+default_enabled: false # Keep this value as false, as feature should be disabled by default for self-managed
+ # https://gitlab.com/gitlab-org/gitlab/-/issues/390157.
diff --git a/config/feature_flags/ops/automatic_lock_writes_on_table.yml b/config/feature_flags/ops/automatic_lock_writes_on_table.yml
index 4e9ba8824a6..116814a1738 100644
--- a/config/feature_flags/ops/automatic_lock_writes_on_table.yml
+++ b/config/feature_flags/ops/automatic_lock_writes_on_table.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99287
rollout_issue_url:
milestone: '15.7'
type: ops
-group: group::pods
+group: group::tenant scale
default_enabled: true
diff --git a/config/feature_flags/ops/batched_migrations_health_status_patroni_apdex.yml b/config/feature_flags/ops/batched_migrations_health_status_patroni_apdex.yml
new file mode 100644
index 00000000000..300b0cdcb8e
--- /dev/null
+++ b/config/feature_flags/ops/batched_migrations_health_status_patroni_apdex.yml
@@ -0,0 +1,8 @@
+---
+name: batched_migrations_health_status_patroni_apdex
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97087
+rollout_issue_url:
+milestone: '15.10'
+type: ops
+group: group::database
+default_enabled: false
diff --git a/config/feature_flags/ops/ci_build_dependencies_artifacts_logger.yml b/config/feature_flags/ops/ci_build_dependencies_artifacts_logger.yml
index 533900efdac..1e4e5ac3438 100644
--- a/config/feature_flags/ops/ci_build_dependencies_artifacts_logger.yml
+++ b/config/feature_flags/ops/ci_build_dependencies_artifacts_logger.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93179
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369441
milestone: '15.3'
type: ops
-group: group::pipeline insights
+group: group::pipeline security
default_enabled: false
diff --git a/config/feature_flags/ops/advanced_user_search.yml b/config/feature_flags/ops/circuit_breaker.yml
index 0f52e9f22f0..b6a4e1cc327 100644
--- a/config/feature_flags/ops/advanced_user_search.yml
+++ b/config/feature_flags/ops/circuit_breaker.yml
@@ -1,8 +1,8 @@
---
-name: advanced_user_search
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102724
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382542
-milestone: '15.7'
+name: circuit_breaker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117993
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409619
+milestone: '16.0'
type: ops
-group: group::global search
+group: group::ai-enablement
default_enabled: false
diff --git a/config/feature_flags/ops/detect_cross_database_modification.yml b/config/feature_flags/ops/detect_cross_database_modification.yml
index 5f496118c4b..6c94e81ba82 100644
--- a/config/feature_flags/ops/detect_cross_database_modification.yml
+++ b/config/feature_flags/ops/detect_cross_database_modification.yml
@@ -3,5 +3,5 @@ name: detect_cross_database_modification
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73316
milestone: '14.5'
type: ops
-group: group::sharding
+group: group::tenant scale
default_enabled: false
diff --git a/config/feature_flags/ops/dynamic_nonce.yml b/config/feature_flags/ops/dynamic_nonce.yml
deleted file mode 100644
index ad8c63f9fa3..00000000000
--- a/config/feature_flags/ops/dynamic_nonce.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: dynamic_nonce
-introduced_by_url:
-rollout_issue_url:
-milestone: '14.0'
-type: ops
-group: group::authentication and authorization
-default_enabled: false
diff --git a/config/feature_flags/ops/legacy_open_source_license_available.yml b/config/feature_flags/ops/legacy_open_source_license_available.yml
index 36ee6c230bf..903212e90a0 100644
--- a/config/feature_flags/ops/legacy_open_source_license_available.yml
+++ b/config/feature_flags/ops/legacy_open_source_license_available.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79855
rollout_issue_url:
milestone: '14.8'
type: ops
-group: 'group::workspace'
+group: 'group::tenant scale'
default_enabled: true
diff --git a/config/feature_flags/development/collect_package_events.yml b/config/feature_flags/ops/mr_approved_filter.yml
index 68ceb596d8a..e20c34d0126 100644
--- a/config/feature_flags/development/collect_package_events.yml
+++ b/config/feature_flags/ops/mr_approved_filter.yml
@@ -1,8 +1,8 @@
---
-name: collect_package_events
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45802
+name: mr_approved_filter
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118087
rollout_issue_url:
-milestone: '13.6'
-type: development
-group: group::package registry
+milestone: '16.0'
+type: ops
+group: group::code review
default_enabled: false
diff --git a/config/feature_flags/ops/ops_prune_old_events.yml b/config/feature_flags/ops/ops_prune_old_events.yml
new file mode 100644
index 00000000000..3148afa633d
--- /dev/null
+++ b/config/feature_flags/ops/ops_prune_old_events.yml
@@ -0,0 +1,8 @@
+---
+name: ops_prune_old_events
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115100
+rollout_issue_url:
+milestone: '15.10'
+type: ops
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/ops/dynamic_image_resizing.yml b/config/feature_flags/ops/partition_manager_sync_partitions.yml
index 2b83b043a22..11de5d02061 100644
--- a/config/feature_flags/ops/dynamic_image_resizing.yml
+++ b/config/feature_flags/ops/partition_manager_sync_partitions.yml
@@ -1,8 +1,8 @@
---
-name: dynamic_image_resizing
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45050
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/266986
-milestone: '13.6'
+name: partition_manager_sync_partitions
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120378
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410997
+milestone: '16.0'
type: ops
-group: group::workspace
+group: group::database
default_enabled: true
diff --git a/config/feature_flags/ops/projects_build_artifacts_size_refresh.yml b/config/feature_flags/ops/projects_build_artifacts_size_refresh.yml
index 8b54a0e3ff5..e3b27dfe8ea 100644
--- a/config/feature_flags/ops/projects_build_artifacts_size_refresh.yml
+++ b/config/feature_flags/ops/projects_build_artifacts_size_refresh.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84701
rollout_issue_url:
milestone: '15.1'
type: ops
-group: group::pipeline insights
+group: group::pipeline security
default_enabled: true
diff --git a/config/feature_flags/ops/projects_build_artifacts_size_refresh_high.yml b/config/feature_flags/ops/projects_build_artifacts_size_refresh_high.yml
index d16ee72ab71..5289bacae8e 100644
--- a/config/feature_flags/ops/projects_build_artifacts_size_refresh_high.yml
+++ b/config/feature_flags/ops/projects_build_artifacts_size_refresh_high.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84701
rollout_issue_url:
milestone: '15.8'
type: ops
-group: group::pipeline insights
+group: group::pipeline security
default_enabled: false
diff --git a/config/feature_flags/ops/projects_build_artifacts_size_refresh_medium.yml b/config/feature_flags/ops/projects_build_artifacts_size_refresh_medium.yml
index 73bfd16ec94..0c38b67a9cc 100644
--- a/config/feature_flags/ops/projects_build_artifacts_size_refresh_medium.yml
+++ b/config/feature_flags/ops/projects_build_artifacts_size_refresh_medium.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84701
rollout_issue_url:
milestone: '15.8'
type: ops
-group: group::pipeline insights
+group: group::pipeline security
default_enabled: false
diff --git a/config/feature_flags/ops/query_analyzer_gitlab_schema_metrics.yml b/config/feature_flags/ops/query_analyzer_gitlab_schema_metrics.yml
index 9793eebb014..3fe041105dd 100644
--- a/config/feature_flags/ops/query_analyzer_gitlab_schema_metrics.yml
+++ b/config/feature_flags/ops/query_analyzer_gitlab_schema_metrics.yml
@@ -3,5 +3,5 @@ name: query_analyzer_gitlab_schema_metrics
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73839
milestone: '14.5'
type: ops
-group: group::sharding
+group: group::tenant scale
default_enabled: false
diff --git a/config/feature_flags/ops/runner_migrations_backoff.yml b/config/feature_flags/ops/runner_migrations_backoff.yml
new file mode 100644
index 00000000000..5b8dc2bd420
--- /dev/null
+++ b/config/feature_flags/ops/runner_migrations_backoff.yml
@@ -0,0 +1,8 @@
+---
+name: runner_migrations_backoff
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115679
+rollout_issue_url:
+milestone: '16.0'
+type: ops
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/development/s3_multithreaded_uploads.yml b/config/feature_flags/ops/s3_multithreaded_uploads.yml
index 6c3ecac4143..7f5b5cef658 100644
--- a/config/feature_flags/development/s3_multithreaded_uploads.yml
+++ b/config/feature_flags/ops/s3_multithreaded_uploads.yml
@@ -3,6 +3,6 @@ name: s3_multithreaded_uploads
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50922
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/296772
milestone: '13.8'
-type: development
-group: group::pipeline insights
+type: ops
+group: group::pipeline security
default_enabled: true
diff --git a/config/feature_flags/development/route_hll_to_snowplow_phase4.yml b/config/feature_flags/ops/search_index_curation_wikis.yml
index a4109b15533..67bbef665a5 100644
--- a/config/feature_flags/development/route_hll_to_snowplow_phase4.yml
+++ b/config/feature_flags/ops/search_index_curation_wikis.yml
@@ -1,8 +1,8 @@
---
-name: route_hll_to_snowplow_phase4
-introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103528"
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366767
-milestone: '15.7'
-type: development
-group: group::product intelligence
+name: search_index_curation_wikis
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104423"
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383093
+milestone: '16.0'
+type: ops
+group: group::global search
default_enabled: false
diff --git a/config/feature_flags/ops/sidekiq_memory_killer_read_only_mode.yml b/config/feature_flags/ops/sidekiq_memory_killer_read_only_mode.yml
deleted file mode 100644
index aa5cb754aff..00000000000
--- a/config/feature_flags/ops/sidekiq_memory_killer_read_only_mode.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: sidekiq_memory_killer_read_only_mode
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98519
-milestone: '15.5'
-type: ops
-group: group::application performance
-default_enabled: false
diff --git a/config/feature_flags/ops/split_log_bulk_increment_counter.yml b/config/feature_flags/ops/split_log_bulk_increment_counter.yml
index ba8c3a7d22e..efc3f77b77b 100644
--- a/config/feature_flags/ops/split_log_bulk_increment_counter.yml
+++ b/config/feature_flags/ops/split_log_bulk_increment_counter.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111147
rollout_issue_url:
milestone: '15.9'
type: ops
-group: group::pipeline insights
+group: group::pipeline security
default_enabled: false
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index c89db25c347..e46bc5b646c 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -127,8 +127,8 @@ production: &base
# username_changing_enabled: false # default: true - User can change their username/namespace
## Default theme ID
## 1 - Indigo
- ## 2 - Dark
- ## 3 - Light
+ ## 2 - Gray
+ ## 3 - Light Gray
## 4 - Blue
## 5 - Green
## 6 - Light Indigo
@@ -136,6 +136,7 @@ production: &base
## 8 - Light Green
## 9 - Red
## 10 - Light Red
+ ## 11 - Dark Mode (alpha)
# default_theme: 1 # default: 1
## Automatic issue closing
@@ -272,7 +273,7 @@ production: &base
# secret_file: /home/git/gitlab/.gitlab_mailroom_secret
# File location to read encrypted incoming email secrets from
- # encrypted_secret_file: /mnt/gitlab/smtp.yaml.enc
+ # encrypted_secret_file: /mnt/gitlab/smtp.yaml.enc
# Default: shared/encrypted_settings/incoming_email.yaml.enc
## Consolidated object store config
@@ -495,7 +496,6 @@ production: &base
## To switch to a Jira connect development environment
jira_connect:
# atlassian_js_url: 'http://localhost:9292/atlassian.js'
- # enable_public_keys_storage: true
# enforce_jira_base_url_https: false
# additional_iframe_ancestors: ['localhost:*']
@@ -1002,7 +1002,7 @@ production: &base
# auto_sign_in_with_provider: saml
# Sync user's profile from the specified Omniauth providers every time the user logs in (default: empty).
- # Define the allowed providers using an array, e.g. ["cas3", "saml", "twitter"],
+ # Define the allowed providers using an array, e.g. ["saml", "twitter"],
# or as true/false to allow all providers or none.
# When authenticating using LDAP, the user's email is always synced.
# sync_profile_from_provider: []
@@ -1068,15 +1068,6 @@ production: &base
# - { name: 'alicloud',
# app_id: 'YOUR_APP_ID',
# app_secret: 'YOUR_APP_SECRET' }
- # See omniauth-cas3 for more configuration details
- # - { name: 'cas3',
- # label: 'cas3',
- # args: {
- # url: 'https://sso.example.com',
- # disable_ssl_verification: false,
- # login_url: '/cas/login',
- # service_validate_url: '/cas/p3/serviceValidate',
- # logout_url: '/cas/logout' } }
# - { name: 'github',
# app_id: 'YOUR_APP_ID',
# app_secret: 'YOUR_APP_SECRET',
@@ -1140,10 +1131,6 @@ production: &base
# client_secret: 'YOUR_AUTH0_CLIENT_SECRET',
# namespace: 'YOUR_AUTH0_DOMAIN' } }
- # SSO maximum session duration in seconds. Defaults to CAS default of 8 hours.
- # cas3:
- # session_duration: 28800
-
# FortiAuthenticator settings
forti_authenticator:
# Allow using FortiAuthenticator as OTP provider
@@ -1168,6 +1155,16 @@ production: &base
# client_id: 'YOUR_FORTI_TOKEN_CLOUD_CLIENT_ID'
# client_secret: 'YOUR_FORTI_TOKEN_CLOUD_CLIENT_SECRET'
+ # Duo Auth settings
+ duo_auth:
+ # Allow using Duo as an OTP provider
+ enabled: false
+
+ # Client ID and Secret to access Duo's API
+ # integration_key: 'YOUR_DUO_INTEGRATION_KEY'
+ # secret_key: 'YOUR_DUO_SECRET_KEY'
+ # hostname: 'YOUR_DUO_API_FQDN'
+
# Shared file storage settings
shared:
# path: /mnt/gitlab # Default: shared
@@ -1574,13 +1571,6 @@ test:
- { name: 'alicloud',
app_id: 'YOUR_APP_ID',
app_secret: 'YOUR_APP_SECRET' }
- - { name: 'cas3',
- label: 'cas3',
- args: { url: 'https://sso.example.com',
- disable_ssl_verification: false,
- login_url: '/cas/login',
- service_validate_url: '/cas/p3/serviceValidate',
- logout_url: '/cas/logout' } }
- { name: 'github',
app_id: 'YOUR_APP_ID',
app_secret: 'YOUR_APP_SECRET',
diff --git a/config/gitlab_loose_foreign_keys.yml b/config/gitlab_loose_foreign_keys.yml
index c4be4cc1800..1f97975a806 100644
--- a/config/gitlab_loose_foreign_keys.yml
+++ b/config/gitlab_loose_foreign_keys.yml
@@ -39,6 +39,13 @@ ci_daily_build_group_report_results:
- table: projects
column: project_id
on_delete: async_delete
+ci_editor_ai_conversation_messages:
+ - table: projects
+ column: project_id
+ on_delete: async_delete
+ - table: users
+ column: user_id
+ on_delete: async_delete
ci_freeze_periods:
- table: projects
column: project_id
@@ -184,10 +191,6 @@ ci_variables:
- table: projects
column: project_id
on_delete: async_delete
-clusters_applications_runners:
- - table: ci_runners
- column: runner_id
- on_delete: async_nullify
dast_pre_scan_verifications:
- table: ci_pipelines
column: ci_pipeline_id
@@ -240,10 +243,18 @@ merge_trains:
- table: ci_pipelines
column: pipeline_id
on_delete: async_nullify
+ml_candidates:
+ - table: ci_builds
+ column: ci_build_id
+ on_delete: async_nullify
p_ci_builds_metadata:
- table: projects
column: project_id
on_delete: async_delete
+p_ci_runner_machine_builds:
+ - table: ci_runner_machines
+ column: runner_machine_id
+ on_delete: async_delete
packages_build_infos:
- table: ci_pipelines
column: pipeline_id
@@ -280,6 +291,10 @@ vulnerability_occurrence_pipelines:
- table: ci_pipelines
column: pipeline_id
on_delete: async_delete
+vulnerability_state_transitions:
+ - table: ci_pipelines
+ column: state_changed_at_pipeline_id
+ on_delete: async_nullify
vulnerability_statistics:
- table: ci_pipelines
column: latest_pipeline_id
diff --git a/config/gitleaks.toml b/config/gitleaks.toml
new file mode 100644
index 00000000000..be02a43aa9c
--- /dev/null
+++ b/config/gitleaks.toml
@@ -0,0 +1,21 @@
+title = "extension of default gitleaks config"
+
+[extend]
+# Extends default packaged path
+path = "/gitleaks.toml"
+
+[allowlist]
+ description = "global allow list"
+ regexTarget = "match"
+ regexes = [
+ # spotted in doc/user/application_security/secret_detection/index.md and some frontend specs
+ "glpat-1234567890abcdefghij",
+ # spec/frontend/lib/utils/secret_detection_spec.js
+ "glpat-cgyKc1k_AsnEpmP-5fRL",
+ # spec/frontend/lib/utils/secret_detection_spec.js
+ "GlPat-abcdefghijklmnopqrstuvwxyz",
+ # doc/development/sec/token_revocation_api.md
+ "glpat--8GMtG8Mf4EnMJzmAWDU",
+ # doc/development/sec/token_revocation_api.md
+ "glpat--tG84EGK33nMLLDE70zU",
+ ]
diff --git a/config/initializers/00_deprecations.rb b/config/initializers/00_deprecations.rb
index c5f9833822d..915e8d704c9 100644
--- a/config/initializers/00_deprecations.rb
+++ b/config/initializers/00_deprecations.rb
@@ -1,5 +1,12 @@
# frozen_string_literal: true
+# Silence warnings:
+
+# PG::Coder.new(hash) is deprecated. Please use keyword arguments instead! Called from ...
+# https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118484#note_1366522061
+# Can be removed with Rails 7.0.
+Warning.ignore(/PG::Coder.new\(hash\) is deprecated/)
+
if Rails.env.production?
ActiveSupport::Deprecation.silenced = !Gitlab::Utils.to_boolean(ENV['GITLAB_LOG_DEPRECATIONS'])
ActiveSupport::Deprecation.behavior = :notify
diff --git a/config/initializers/0_1_yaml_safe_load_file_patch.rb b/config/initializers/0_1_yaml_safe_load_file_patch.rb
new file mode 100644
index 00000000000..f43712900eb
--- /dev/null
+++ b/config/initializers/0_1_yaml_safe_load_file_patch.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# TODO: Remove this once we're on Ruby 3
+# https://gitlab.com/gitlab-org/gitlab/-/issues/393651
+unless YAML.respond_to?(:safe_load_file)
+ module YAML
+ # Temporary Ruby 2 back-compat workaround.
+ #
+ # This method only exists as of stdlib 3.0.0:
+ # https://ruby-doc.org/stdlib-3.0.0/libdoc/psych/rdoc/Psych.html
+ def self.safe_load_file(path, **options)
+ YAML.safe_load(File.read(path), **options)
+ end
+ end
+end
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index a1637d8c339..d096174fca3 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -5,16 +5,16 @@ require_relative '../object_store_settings'
require_relative '../smime_signature_settings'
# Default settings
-Settings['shared'] ||= Settingslogic.new({})
+Settings['shared'] ||= {}
Settings.shared['path'] = Settings.absolute(Settings.shared['path'] || "shared")
-Settings['encrypted_settings'] ||= Settingslogic.new({})
+Settings['encrypted_settings'] ||= {}
Settings.encrypted_settings['path'] ||= File.join(Settings.shared['path'], "encrypted_settings")
Settings.encrypted_settings['path'] = Settings.absolute(Settings.encrypted_settings['path'])
-Settings['ldap'] ||= Settingslogic.new({})
+Settings['ldap'] ||= {}
Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil?
-Settings.ldap['servers'] ||= Settingslogic.new({})
+Settings.ldap['servers'] ||= {}
Settings.ldap['prevent_ldap_sign_in'] = false if Settings.ldap['prevent_ldap_sign_in'].blank?
Settings.ldap['secret_file'] = Settings.absolute(Settings.ldap['secret_file'] || File.join(Settings.encrypted_settings['path'], "ldap.yaml.enc"))
@@ -27,7 +27,6 @@ end
# backwards compatibility, we only have one host
if Settings.ldap['enabled'] || Rails.env.test?
- Settings.ldap['sync_name'] = true if Settings.ldap['sync_name'].nil?
if Settings.ldap['host'].present?
# We detected old LDAP configuration syntax. Update the config to make it
# look like it was entered with the new syntax.
@@ -38,8 +37,6 @@ if Settings.ldap['enabled'] || Rails.env.test?
end
Settings.ldap['servers'].each do |key, server|
- server = Settingslogic.new(server)
-
server['label'] ||= 'LDAP'
server['timeout'] ||= 10.seconds
server['block_auto_created_users'] = false if server['block_auto_created_users'].nil?
@@ -68,6 +65,8 @@ if Settings.ldap['enabled'] || Rails.env.test?
# `ssl_version` in favor of `tls_options` hash option.
server['tls_options'] ||= {}
+ server['sync_name'] = true if server['sync_name'].nil?
+
if server['ssl_version'] || server['ca_file']
Gitlab::AppLogger.warn 'DEPRECATED: LDAP options `ssl_version` and `ca_file` should be nested within `tls_options`'
end
@@ -86,7 +85,7 @@ if Settings.ldap['enabled'] || Rails.env.test?
end
end
-Settings['omniauth'] ||= Settingslogic.new({})
+Settings['omniauth'] ||= {}
Settings.omniauth['enabled'] = true if Settings.omniauth['enabled'].nil?
Settings.omniauth['auto_sign_in_with_provider'] = false if Settings.omniauth['auto_sign_in_with_provider'].nil?
Settings.omniauth['allow_single_sign_on'] = false if Settings.omniauth['allow_single_sign_on'].nil?
@@ -113,10 +112,6 @@ if Settings.omniauth['sync_email_from_provider']
end
Settings.omniauth['providers'] ||= []
-Settings.omniauth['cas3'] ||= Settingslogic.new({})
-Settings.omniauth.cas3['session_duration'] ||= 8.hours
-Settings.omniauth['session_tickets'] ||= Settingslogic.new({})
-Settings.omniauth.session_tickets['cas3'] = 'ticket'
# Handle backward compatibility with the renamed kerberos_spnego provider
# https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96335#note_1094265436
@@ -151,7 +146,7 @@ if github_settings
github_settings['url'] = github_default_url
end
- github_settings["args"] ||= Settingslogic.new({})
+ github_settings["args"] ||= {}
github_settings["args"]["client_options"] =
if github_settings["url"].include?(github_default_url)
@@ -171,7 +166,7 @@ saml_provider_enabled = Settings.omniauth.providers.any? do |provider|
end
if Gitlab.ee? && Rails.env.test? && !saml_provider_enabled
- Settings.omniauth.providers << Settingslogic.new({ 'name' => 'group_saml' })
+ Settings.omniauth.providers << GitlabSettings::Options.build({ 'name' => 'group_saml' })
end
Settings['issues_tracker'] ||= {}
@@ -179,7 +174,7 @@ Settings['issues_tracker'] ||= {}
#
# GitLab
#
-Settings['gitlab'] ||= Settingslogic.new({})
+Settings['gitlab'] ||= {}
Settings.gitlab['default_project_creation'] ||= ::Gitlab::Access::DEVELOPER_MAINTAINER_PROJECT_ACCESS
Settings.gitlab['default_project_deletion_protection'] ||= false
Settings.gitlab['default_projects_limit'] ||= 100000
@@ -233,7 +228,7 @@ Settings.gitlab.default_projects_features['builds'] = true if Settin
Settings.gitlab.default_projects_features['container_registry'] = true if Settings.gitlab.default_projects_features['container_registry'].nil?
Settings.gitlab.default_projects_features['visibility_level'] = Settings.__send__(:verify_constant, Gitlab::VisibilityLevel, Settings.gitlab.default_projects_features['visibility_level'], Gitlab::VisibilityLevel::PRIVATE)
Settings.gitlab['domain_allowlist'] ||= []
-Settings.gitlab['import_sources'] ||= Gitlab::ImportSources.values
+Settings.gitlab['import_sources'] ||= []
Settings.gitlab['trusted_proxies'] ||= []
Settings.gitlab['content_security_policy'] ||= {}
Settings.gitlab['allowed_hosts'] ||= []
@@ -253,7 +248,7 @@ end
# Elasticseacrh
#
Gitlab.ee do
- Settings['elasticsearch'] ||= Settingslogic.new({})
+ Settings['elasticsearch'] ||= {}
Settings.elasticsearch['enabled'] = false if Settings.elasticsearch['enabled'].nil?
Settings.elasticsearch['url'] = ENV['ELASTIC_URL'] || "http://localhost:9200"
Settings.elasticsearch['indexer_path'] ||= Gitlab::Utils.which('gitlab-elasticsearch-indexer')
@@ -262,7 +257,7 @@ end
#
# CI
#
-Settings['gitlab_ci'] ||= Settingslogic.new({})
+Settings['gitlab_ci'] ||= {}
Settings.gitlab_ci['shared_runners_enabled'] = true if Settings.gitlab_ci['shared_runners_enabled'].nil?
Settings.gitlab_ci['builds_path'] = Settings.absolute(Settings.gitlab_ci['builds_path'] || "builds/")
Settings.gitlab_ci['url'] ||= Settings.__send__(:build_gitlab_ci_url)
@@ -271,7 +266,7 @@ Settings.gitlab_ci['component_fqdn'] ||= Settings.__send__(:build_ci_compon
#
# CI Secure Files
#
-Settings['ci_secure_files'] ||= Settingslogic.new({})
+Settings['ci_secure_files'] ||= {}
Settings.ci_secure_files['enabled'] = true if Settings.ci_secure_files['enabled'].nil?
Settings.ci_secure_files['storage_path'] = Settings.absolute(Settings.ci_secure_files['storage_path'] || File.join(Settings.shared['path'], "ci_secure_files"))
Settings.ci_secure_files['object_store'] = ObjectStoreSettings.legacy_parse(Settings.ci_secure_files['object_store'], 'secure_files')
@@ -279,7 +274,7 @@ Settings.ci_secure_files['object_store'] = ObjectStoreSettings.legacy_parse(Sett
#
# Reply by email
#
-Settings['incoming_email'] ||= Settingslogic.new({})
+Settings['incoming_email'] ||= {}
Settings.incoming_email['enabled'] = false if Settings.incoming_email['enabled'].nil?
Settings.incoming_email['inbox_method'] ||= 'imap'
Settings.incoming_email['encrypted_secret_file'] = Settings.absolute(Settings.incoming_email['encrypted_secret_file'] || File.join(Settings.encrypted_settings['path'], "incoming_email.yaml.enc"))
@@ -287,14 +282,14 @@ Settings.incoming_email['encrypted_secret_file'] = Settings.absolute(Settings.in
#
# Service desk email
#
-Settings['service_desk_email'] ||= Settingslogic.new({})
+Settings['service_desk_email'] ||= {}
Settings.service_desk_email['enabled'] = false if Settings.service_desk_email['enabled'].nil?
Settings.service_desk_email['encrypted_secret_file'] = Settings.absolute(Settings.service_desk_email['encrypted_secret_file'] || File.join(Settings.encrypted_settings['path'], "service_desk_email.yaml.enc"))
#
# Build Artifacts
#
-Settings['artifacts'] ||= Settingslogic.new({})
+Settings['artifacts'] ||= {}
Settings.artifacts['enabled'] = true if Settings.artifacts['enabled'].nil?
Settings.artifacts['storage_path'] = Settings.absolute(Settings.artifacts.values_at('path', 'storage_path').compact.first || File.join(Settings.shared['path'], "artifacts"))
# Settings.artifact['path'] is deprecated, use `storage_path` instead
@@ -305,7 +300,7 @@ Settings.artifacts['object_store'] = ObjectStoreSettings.legacy_parse(Settings.a
#
# Registry
#
-Settings['registry'] ||= Settingslogic.new({})
+Settings['registry'] ||= {}
Settings.registry['enabled'] ||= false
Settings.registry['host'] ||= "example.com"
Settings.registry['port'] ||= nil
@@ -319,7 +314,7 @@ Settings.registry['notifications'] ||= []
#
# Error Reporting and Logging with Sentry
#
-Settings['sentry'] ||= Settingslogic.new({})
+Settings['sentry'] ||= {}
Settings.sentry['enabled'] ||= false
Settings.sentry['dsn'] ||= nil
Settings.sentry['environment'] ||= nil
@@ -328,7 +323,7 @@ Settings.sentry['clientside_dsn'] ||= nil
#
# Pages
#
-Settings['pages'] ||= Settingslogic.new({})
+Settings['pages'] ||= {}
Settings['pages'] = ::Gitlab::Pages::Settings.new(Settings.pages) # For path access detection https://gitlab.com/gitlab-org/gitlab/-/issues/230702
Settings.pages['enabled'] = false if Settings.pages['enabled'].nil?
Settings.pages['access_control'] = false if Settings.pages['access_control'].nil?
@@ -346,14 +341,14 @@ Settings.pages['secret_file'] ||= Rails.root.join('.gitlab_pages_secret')
# this will allow us to easier migrate existing instances with NFS
Settings.pages['storage_path'] = Settings.pages['path']
Settings.pages['object_store'] = ObjectStoreSettings.legacy_parse(Settings.pages['object_store'], 'pages')
-Settings.pages['local_store'] ||= Settingslogic.new({})
+Settings.pages['local_store'] ||= {}
Settings.pages['local_store']['path'] = Settings.absolute(Settings.pages['local_store']['path'] || File.join(Settings.shared['path'], "pages"))
Settings.pages['local_store']['enabled'] = true if Settings.pages['local_store']['enabled'].nil?
#
# GitLab documentation
#
-Settings['gitlab_docs'] ||= Settingslogic.new({})
+Settings['gitlab_docs'] ||= {}
Settings.gitlab_docs['enabled'] ||= false
Settings.gitlab_docs['host'] = nil unless Settings.gitlab_docs.enabled
@@ -361,28 +356,28 @@ Settings.gitlab_docs['host'] = nil unless Settings.gitlab_docs.enabled
# Geo
#
Gitlab.ee do
- Settings['geo'] ||= Settingslogic.new({})
+ Settings['geo'] ||= {}
# For backwards compatibility, default to gitlab_url and if so, ensure it ends with "/"
Settings.geo['node_name'] = Settings.geo['node_name'].presence || Settings.gitlab['url'].chomp('/').concat('/')
#
# Registry replication
#
- Settings.geo['registry_replication'] ||= Settingslogic.new({})
+ Settings.geo['registry_replication'] ||= {}
Settings.geo.registry_replication['enabled'] ||= false
end
#
# Unleash
#
-Settings['feature_flags'] ||= Settingslogic.new({})
-Settings.feature_flags['unleash'] ||= Settingslogic.new({})
+Settings['feature_flags'] ||= {}
+Settings.feature_flags['unleash'] ||= {}
Settings.feature_flags.unleash['enabled'] = false if Settings.feature_flags.unleash['enabled'].nil?
#
# External merge request diffs
#
-Settings['external_diffs'] ||= Settingslogic.new({})
+Settings['external_diffs'] ||= {}
Settings.external_diffs['enabled'] = false if Settings.external_diffs['enabled'].nil?
Settings.external_diffs['when'] = 'always' if Settings.external_diffs['when'].nil?
Settings.external_diffs['storage_path'] = Settings.absolute(Settings.external_diffs['storage_path'] || File.join(Settings.shared['path'], 'external-diffs'))
@@ -391,7 +386,7 @@ Settings.external_diffs['object_store'] = ObjectStoreSettings.legacy_parse(Setti
#
# Git LFS
#
-Settings['lfs'] ||= Settingslogic.new({})
+Settings['lfs'] ||= {}
Settings.lfs['enabled'] = true if Settings.lfs['enabled'].nil?
Settings.lfs['storage_path'] = Settings.absolute(Settings.lfs['storage_path'] || File.join(Settings.shared['path'], "lfs-objects"))
Settings.lfs['object_store'] = ObjectStoreSettings.legacy_parse(Settings.lfs['object_store'], 'lfs')
@@ -399,7 +394,7 @@ Settings.lfs['object_store'] = ObjectStoreSettings.legacy_parse(Settings.lfs['ob
#
# Uploads
#
-Settings['uploads'] ||= Settingslogic.new({})
+Settings['uploads'] ||= {}
Settings.uploads['storage_path'] = Settings.absolute(Settings.uploads['storage_path'] || 'public')
Settings.uploads['base_dir'] = Settings.uploads['base_dir'] || 'uploads/-/system'
Settings.uploads['object_store'] = ObjectStoreSettings.legacy_parse(Settings.uploads['object_store'], 'uploads')
@@ -408,7 +403,7 @@ Settings.uploads['object_store']['remote_directory'] ||= 'uploads'
#
# Packages
#
-Settings['packages'] ||= Settingslogic.new({})
+Settings['packages'] ||= {}
Settings.packages['enabled'] = true if Settings.packages['enabled'].nil?
Settings.packages['dpkg_deb_path'] = '/usr/bin/dpkg-deb' if Settings.packages['dpkg_deb_path'].nil?
Settings.packages['storage_path'] = Settings.absolute(Settings.packages['storage_path'] || File.join(Settings.shared['path'], "packages"))
@@ -417,7 +412,7 @@ Settings.packages['object_store'] = ObjectStoreSettings.legacy_parse(Settings.p
#
# Dependency Proxy
#
-Settings['dependency_proxy'] ||= Settingslogic.new({})
+Settings['dependency_proxy'] ||= {}
Settings.dependency_proxy['enabled'] = true if Settings.dependency_proxy['enabled'].nil?
Settings.dependency_proxy['storage_path'] = Settings.absolute(Settings.dependency_proxy['storage_path'] || File.join(Settings.shared['path'], "dependency_proxy"))
Settings.dependency_proxy['object_store'] = ObjectStoreSettings.legacy_parse(Settings.dependency_proxy['object_store'], 'dependency_proxy')
@@ -431,7 +426,7 @@ Settings.dependency_proxy['enabled'] = false unless Gitlab::Runtime.puma?
#
# Terraform state
#
-Settings['terraform_state'] ||= Settingslogic.new({})
+Settings['terraform_state'] ||= {}
Settings.terraform_state['enabled'] = true if Settings.terraform_state['enabled'].nil?
Settings.terraform_state['storage_path'] = Settings.absolute(Settings.terraform_state['storage_path'] || File.join(Settings.shared['path'], "terraform_state"))
Settings.terraform_state['object_store'] = ObjectStoreSettings.legacy_parse(Settings.terraform_state['object_store'], 'terraform_state')
@@ -439,25 +434,23 @@ Settings.terraform_state['object_store'] = ObjectStoreSettings.legacy_parse(Sett
#
# Mattermost
#
-Settings['mattermost'] ||= Settingslogic.new({})
+Settings['mattermost'] ||= {}
Settings.mattermost['enabled'] = false if Settings.mattermost['enabled'].nil?
Settings.mattermost['host'] = nil unless Settings.mattermost.enabled
#
# Jira Connect (GitLab for Jira Cloud App)
#
-Settings['jira_connect'] ||= Settingslogic.new({})
+Settings['jira_connect'] ||= {}
Settings.jira_connect['atlassian_js_url'] ||= 'https://connect-cdn.atl-paas.net/all.js'
-Settings.jira_connect['enable_public_keys_storage'] ||= false
-Settings.jira_connect['enable_public_keys_storage'] = true if Gitlab.com?
Settings.jira_connect['enforce_jira_base_url_https'] = true if Settings.jira_connect['enforce_jira_base_url_https'].nil?
Settings.jira_connect['additional_iframe_ancestors'] ||= []
#
# Gravatar
#
-Settings['gravatar'] ||= Settingslogic.new({})
+Settings['gravatar'] ||= {}
Settings.gravatar['enabled'] = true if Settings.gravatar['enabled'].nil?
Settings.gravatar['plain_url'] ||= 'https://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
Settings.gravatar['ssl_url'] ||= 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
@@ -466,386 +459,401 @@ Settings.gravatar['host'] = Settings.host_without_www(Settings.gravatar[
#
# Cron Jobs
#
-Settings['cron_jobs'] ||= Settingslogic.new({})
+Settings['cron_jobs'] ||= {}
if Gitlab.ee? && Settings['ee_cron_jobs']
Settings.cron_jobs.merge!(Settings.ee_cron_jobs)
end
Settings.cron_jobs['poll_interval'] ||= nil
-Settings.cron_jobs['stuck_ci_jobs_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['stuck_ci_jobs_worker'] ||= {}
Settings.cron_jobs['stuck_ci_jobs_worker']['cron'] ||= '0 * * * *'
Settings.cron_jobs['stuck_ci_jobs_worker']['job_class'] = 'StuckCiJobsWorker'
-Settings.cron_jobs['pipeline_schedule_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['pipeline_schedule_worker'] ||= {}
Settings.cron_jobs['pipeline_schedule_worker']['cron'] ||= '3-59/10 * * * *'
Settings.cron_jobs['pipeline_schedule_worker']['job_class'] = 'PipelineScheduleWorker'
-Settings.cron_jobs['expire_build_artifacts_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['expire_build_artifacts_worker'] ||= {}
Settings.cron_jobs['expire_build_artifacts_worker']['cron'] ||= '*/7 * * * *'
Settings.cron_jobs['expire_build_artifacts_worker']['job_class'] = 'ExpireBuildArtifactsWorker'
-Settings.cron_jobs['update_locked_unknown_artifacts_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['update_locked_unknown_artifacts_worker'] ||= {}
Settings.cron_jobs['update_locked_unknown_artifacts_worker']['cron'] ||= '*/7 * * * *'
Settings.cron_jobs['update_locked_unknown_artifacts_worker']['job_class'] = 'Ci::UpdateLockedUnknownArtifactsWorker'
-Settings.cron_jobs['ci_pipelines_expire_artifacts_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['ci_pipelines_expire_artifacts_worker'] ||= {}
Settings.cron_jobs['ci_pipelines_expire_artifacts_worker']['cron'] ||= '*/23 * * * *'
Settings.cron_jobs['ci_pipelines_expire_artifacts_worker']['job_class'] = 'Ci::PipelineArtifacts::ExpireArtifactsWorker'
-Settings.cron_jobs['ci_schedule_delete_objects_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['ci_schedule_delete_objects_worker'] ||= {}
Settings.cron_jobs['ci_schedule_delete_objects_worker']['cron'] ||= '*/16 * * * *'
Settings.cron_jobs['ci_schedule_delete_objects_worker']['job_class'] = 'Ci::ScheduleDeleteObjectsCronWorker'
-Settings.cron_jobs['environments_auto_stop_cron_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['environments_auto_stop_cron_worker'] ||= {}
Settings.cron_jobs['environments_auto_stop_cron_worker']['cron'] ||= '24 * * * *'
Settings.cron_jobs['environments_auto_stop_cron_worker']['job_class'] = 'Environments::AutoStopCronWorker'
-Settings.cron_jobs['environments_auto_delete_cron_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['environments_auto_delete_cron_worker'] ||= {}
Settings.cron_jobs['environments_auto_delete_cron_worker']['cron'] ||= '34 * * * *'
Settings.cron_jobs['environments_auto_delete_cron_worker']['job_class'] = 'Environments::AutoDeleteCronWorker'
-Settings.cron_jobs['repository_check_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['repository_check_worker'] ||= {}
Settings.cron_jobs['repository_check_worker']['cron'] ||= '20 * * * *'
Settings.cron_jobs['repository_check_worker']['job_class'] = 'RepositoryCheck::DispatchWorker'
-Settings.cron_jobs['admin_email_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['admin_email_worker'] ||= {}
Settings.cron_jobs['admin_email_worker']['cron'] ||= '0 0 * * 0'
Settings.cron_jobs['admin_email_worker']['job_class'] = 'AdminEmailWorker'
-Settings.cron_jobs['personal_access_tokens_expiring_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['personal_access_tokens_expiring_worker'] ||= {}
Settings.cron_jobs['personal_access_tokens_expiring_worker']['cron'] ||= '0 1 * * *'
Settings.cron_jobs['personal_access_tokens_expiring_worker']['job_class'] = 'PersonalAccessTokens::ExpiringWorker'
-Settings.cron_jobs['personal_access_tokens_expired_notification_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['personal_access_tokens_expired_notification_worker'] ||= {}
Settings.cron_jobs['personal_access_tokens_expired_notification_worker']['cron'] ||= '0 2 * * *'
Settings.cron_jobs['personal_access_tokens_expired_notification_worker']['job_class'] = 'PersonalAccessTokens::ExpiredNotificationWorker'
-Settings.cron_jobs['repository_archive_cache_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['repository_archive_cache_worker'] ||= {}
Settings.cron_jobs['repository_archive_cache_worker']['cron'] ||= '0 * * * *'
Settings.cron_jobs['repository_archive_cache_worker']['job_class'] = 'RepositoryArchiveCacheWorker'
-Settings.cron_jobs['import_export_project_cleanup_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['import_export_project_cleanup_worker'] ||= {}
Settings.cron_jobs['import_export_project_cleanup_worker']['cron'] ||= '0 * * * *'
Settings.cron_jobs['import_export_project_cleanup_worker']['job_class'] = 'ImportExportProjectCleanupWorker'
-Settings.cron_jobs['ci_archive_traces_cron_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['ci_archive_traces_cron_worker'] ||= {}
Settings.cron_jobs['ci_archive_traces_cron_worker']['cron'] ||= '17 * * * *'
Settings.cron_jobs['ci_archive_traces_cron_worker']['job_class'] = 'Ci::ArchiveTracesCronWorker'
-Settings.cron_jobs['remove_expired_members_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['remove_expired_members_worker'] ||= {}
Settings.cron_jobs['remove_expired_members_worker']['cron'] ||= '10 0 * * *'
Settings.cron_jobs['remove_expired_members_worker']['job_class'] = 'RemoveExpiredMembersWorker'
-Settings.cron_jobs['remove_expired_group_links_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['remove_expired_group_links_worker'] ||= {}
Settings.cron_jobs['remove_expired_group_links_worker']['cron'] ||= '10 0 * * *'
Settings.cron_jobs['remove_expired_group_links_worker']['job_class'] = 'RemoveExpiredGroupLinksWorker'
-Settings.cron_jobs['remove_unaccepted_member_invites_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['remove_unaccepted_member_invites_worker'] ||= {}
Settings.cron_jobs['remove_unaccepted_member_invites_worker']['cron'] ||= '10 15 * * *'
Settings.cron_jobs['remove_unaccepted_member_invites_worker']['job_class'] = 'RemoveUnacceptedMemberInvitesWorker'
-Settings.cron_jobs['prune_old_events_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['prune_old_events_worker'] ||= {}
Settings.cron_jobs['prune_old_events_worker']['cron'] ||= '0 */6 * * *'
Settings.cron_jobs['prune_old_events_worker']['job_class'] = 'PruneOldEventsWorker'
-Settings.cron_jobs['gitlab_export_prune_project_export_jobs_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['gitlab_export_prune_project_export_jobs_worker'] ||= {}
Settings.cron_jobs['gitlab_export_prune_project_export_jobs_worker']['cron'] ||= '30 3 * * */7'
Settings.cron_jobs['gitlab_export_prune_project_export_jobs_worker']['job_class'] = 'Gitlab::Export::PruneProjectExportJobsWorker'
-Settings.cron_jobs['trending_projects_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['trending_projects_worker'] ||= {}
Settings.cron_jobs['trending_projects_worker']['cron'] = '0 1 * * *'
Settings.cron_jobs['trending_projects_worker']['job_class'] = 'TrendingProjectsWorker'
-Settings.cron_jobs['remove_unreferenced_lfs_objects_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['remove_unreferenced_lfs_objects_worker'] ||= {}
Settings.cron_jobs['remove_unreferenced_lfs_objects_worker']['cron'] ||= '20 0 * * *'
Settings.cron_jobs['remove_unreferenced_lfs_objects_worker']['job_class'] = 'RemoveUnreferencedLfsObjectsWorker'
-Settings.cron_jobs['bulk_imports_stuck_import_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['bulk_imports_stuck_import_worker'] ||= {}
Settings.cron_jobs['bulk_imports_stuck_import_worker']['cron'] ||= '0 */4 * * *'
Settings.cron_jobs['bulk_imports_stuck_import_worker']['job_class'] = 'BulkImports::StuckImportWorker'
-Settings.cron_jobs['import_stuck_project_import_jobs'] ||= Settingslogic.new({})
+Settings.cron_jobs['import_stuck_project_import_jobs'] ||= {}
Settings.cron_jobs['import_stuck_project_import_jobs']['cron'] ||= '15 * * * *'
Settings.cron_jobs['import_stuck_project_import_jobs']['job_class'] = 'Gitlab::Import::StuckProjectImportJobsWorker'
-Settings.cron_jobs['jira_import_stuck_jira_import_jobs'] ||= Settingslogic.new({})
+Settings.cron_jobs['jira_import_stuck_jira_import_jobs'] ||= {}
Settings.cron_jobs['jira_import_stuck_jira_import_jobs']['cron'] ||= '* 0/15 * * *'
Settings.cron_jobs['jira_import_stuck_jira_import_jobs']['job_class'] = 'Gitlab::JiraImport::StuckJiraImportJobsWorker'
-Settings.cron_jobs['stuck_export_jobs_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['stuck_export_jobs_worker'] ||= {}
Settings.cron_jobs['stuck_export_jobs_worker']['cron'] ||= '30 * * * *'
Settings.cron_jobs['stuck_export_jobs_worker']['job_class'] = 'StuckExportJobsWorker'
-Settings.cron_jobs['gitlab_service_ping_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['gitlab_service_ping_worker'] ||= {}
Settings.cron_jobs['gitlab_service_ping_worker']['cron'] ||= nil # This is dynamically loaded in the sidekiq initializer
Settings.cron_jobs['gitlab_service_ping_worker']['job_class'] = 'GitlabServicePingWorker'
-Settings.cron_jobs['stuck_merge_jobs_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['stuck_merge_jobs_worker'] ||= {}
Settings.cron_jobs['stuck_merge_jobs_worker']['cron'] ||= '0 */2 * * *'
Settings.cron_jobs['stuck_merge_jobs_worker']['job_class'] = 'StuckMergeJobsWorker'
-Settings.cron_jobs['pages_domain_verification_cron_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['pages_domain_verification_cron_worker'] ||= {}
Settings.cron_jobs['pages_domain_verification_cron_worker']['cron'] ||= '*/15 * * * *'
Settings.cron_jobs['pages_domain_verification_cron_worker']['job_class'] = 'PagesDomainVerificationCronWorker'
-Settings.cron_jobs['pages_domain_removal_cron_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['pages_domain_removal_cron_worker'] ||= {}
Settings.cron_jobs['pages_domain_removal_cron_worker']['cron'] ||= '47 0 * * *'
Settings.cron_jobs['pages_domain_removal_cron_worker']['job_class'] = 'PagesDomainRemovalCronWorker'
-Settings.cron_jobs['pages_domain_ssl_renewal_cron_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['pages_domain_ssl_renewal_cron_worker'] ||= {}
Settings.cron_jobs['pages_domain_ssl_renewal_cron_worker']['cron'] ||= '*/10 * * * *'
Settings.cron_jobs['pages_domain_ssl_renewal_cron_worker']['job_class'] = 'PagesDomainSslRenewalCronWorker'
-Settings.cron_jobs['issue_due_scheduler_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['issue_due_scheduler_worker'] ||= {}
Settings.cron_jobs['issue_due_scheduler_worker']['cron'] ||= '50 00 * * *'
Settings.cron_jobs['issue_due_scheduler_worker']['job_class'] = 'IssueDueSchedulerWorker'
-Settings.cron_jobs['metrics_dashboard_schedule_annotations_prune_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['metrics_dashboard_schedule_annotations_prune_worker'] ||= {}
Settings.cron_jobs['metrics_dashboard_schedule_annotations_prune_worker']['cron'] ||= '0 1 * * *'
Settings.cron_jobs['metrics_dashboard_schedule_annotations_prune_worker']['job_class'] = 'Metrics::Dashboard::ScheduleAnnotationsPruneWorker'
-Settings.cron_jobs['schedule_migrate_external_diffs_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['schedule_migrate_external_diffs_worker'] ||= {}
Settings.cron_jobs['schedule_migrate_external_diffs_worker']['cron'] ||= '15 * * * *'
Settings.cron_jobs['schedule_migrate_external_diffs_worker']['job_class'] = 'ScheduleMigrateExternalDiffsWorker'
-Settings.cron_jobs['namespaces_prune_aggregation_schedules_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['namespaces_prune_aggregation_schedules_worker'] ||= {}
Settings.cron_jobs['namespaces_prune_aggregation_schedules_worker']['cron'] ||= '5 1 * * *'
Settings.cron_jobs['namespaces_prune_aggregation_schedules_worker']['job_class'] = 'Namespaces::PruneAggregationSchedulesWorker'
-Settings.cron_jobs['container_expiration_policy_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['container_expiration_policy_worker'] ||= {}
Settings.cron_jobs['container_expiration_policy_worker']['cron'] ||= '50 * * * *'
Settings.cron_jobs['container_expiration_policy_worker']['job_class'] = 'ContainerExpirationPolicyWorker'
-Settings.cron_jobs['container_registry_migration_guard_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['container_registry_migration_guard_worker'] ||= {}
Settings.cron_jobs['container_registry_migration_guard_worker']['cron'] ||= '*/10 * * * *'
Settings.cron_jobs['container_registry_migration_guard_worker']['job_class'] = 'ContainerRegistry::Migration::GuardWorker'
-Settings.cron_jobs['container_registry_migration_observer_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['container_registry_migration_observer_worker'] ||= {}
Settings.cron_jobs['container_registry_migration_observer_worker']['cron'] ||= '*/30 * * * *'
Settings.cron_jobs['container_registry_migration_observer_worker']['job_class'] = 'ContainerRegistry::Migration::ObserverWorker'
-Settings.cron_jobs['container_registry_migration_enqueuer_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['container_registry_migration_enqueuer_worker'] ||= {}
Settings.cron_jobs['container_registry_migration_enqueuer_worker']['cron'] ||= '15,45 */1 * * *'
Settings.cron_jobs['container_registry_migration_enqueuer_worker']['job_class'] = 'ContainerRegistry::Migration::EnqueuerWorker'
-Settings.cron_jobs['cleanup_container_registry_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['cleanup_container_registry_worker'] ||= {}
Settings.cron_jobs['cleanup_container_registry_worker']['cron'] ||= '*/5 * * * *'
Settings.cron_jobs['cleanup_container_registry_worker']['job_class'] = 'ContainerRegistry::CleanupWorker'
-Settings.cron_jobs['image_ttl_group_policy_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['image_ttl_group_policy_worker'] ||= {}
Settings.cron_jobs['image_ttl_group_policy_worker']['cron'] ||= '40 0 * * *'
Settings.cron_jobs['image_ttl_group_policy_worker']['job_class'] = 'DependencyProxy::ImageTtlGroupPolicyWorker'
-Settings.cron_jobs['cleanup_dependency_proxy_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['cleanup_dependency_proxy_worker'] ||= {}
Settings.cron_jobs['cleanup_dependency_proxy_worker']['cron'] ||= '20 3,15 * * *'
Settings.cron_jobs['cleanup_dependency_proxy_worker']['job_class'] = 'DependencyProxy::CleanupDependencyProxyWorker'
-Settings.cron_jobs['cleanup_package_registry_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['cleanup_package_registry_worker'] ||= {}
Settings.cron_jobs['cleanup_package_registry_worker']['cron'] ||= '20 * * * *'
Settings.cron_jobs['cleanup_package_registry_worker']['job_class'] = 'Packages::CleanupPackageRegistryWorker'
-Settings.cron_jobs['x509_issuer_crl_check_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['x509_issuer_crl_check_worker'] ||= {}
Settings.cron_jobs['x509_issuer_crl_check_worker']['cron'] ||= '30 1 * * *'
Settings.cron_jobs['x509_issuer_crl_check_worker']['job_class'] = 'X509IssuerCrlCheckWorker'
-Settings.cron_jobs['users_create_statistics_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['users_create_statistics_worker'] ||= {}
Settings.cron_jobs['users_create_statistics_worker']['cron'] ||= '2 15 * * *'
Settings.cron_jobs['users_create_statistics_worker']['job_class'] = 'Users::CreateStatisticsWorker'
-Settings.cron_jobs['authorized_project_update_periodic_recalculate_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['authorized_project_update_periodic_recalculate_worker'] ||= {}
Settings.cron_jobs['authorized_project_update_periodic_recalculate_worker']['cron'] ||= '45 1 1,15 * *'
Settings.cron_jobs['authorized_project_update_periodic_recalculate_worker']['job_class'] = 'AuthorizedProjectUpdate::PeriodicRecalculateWorker'
-Settings.cron_jobs['update_container_registry_info_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['update_container_registry_info_worker'] ||= {}
Settings.cron_jobs['update_container_registry_info_worker']['cron'] ||= '0 0 * * *'
Settings.cron_jobs['update_container_registry_info_worker']['job_class'] = 'UpdateContainerRegistryInfoWorker'
-Settings.cron_jobs['postgres_dynamic_partitions_manager'] ||= Settingslogic.new({})
+Settings.cron_jobs['postgres_dynamic_partitions_manager'] ||= {}
Settings.cron_jobs['postgres_dynamic_partitions_manager']['cron'] ||= '21 */6 * * *'
Settings.cron_jobs['postgres_dynamic_partitions_manager']['job_class'] ||= 'Database::PartitionManagementWorker'
-Settings.cron_jobs['postgres_dynamic_partitions_dropper'] ||= Settingslogic.new({})
+Settings.cron_jobs['postgres_dynamic_partitions_dropper'] ||= {}
Settings.cron_jobs['postgres_dynamic_partitions_dropper']['cron'] ||= '45 12 * * *'
Settings.cron_jobs['postgres_dynamic_partitions_dropper']['job_class'] ||= 'Database::DropDetachedPartitionsWorker'
-Settings.cron_jobs['ci_platform_metrics_update_cron_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['ci_platform_metrics_update_cron_worker'] ||= {}
Settings.cron_jobs['ci_platform_metrics_update_cron_worker']['cron'] ||= '47 9 * * *'
Settings.cron_jobs['ci_platform_metrics_update_cron_worker']['job_class'] = 'CiPlatformMetricsUpdateCronWorker'
-Settings.cron_jobs['analytics_usage_trends_count_job_trigger_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['analytics_usage_trends_count_job_trigger_worker'] ||= {}
Settings.cron_jobs['analytics_usage_trends_count_job_trigger_worker']['cron'] ||= '50 23 */1 * *'
Settings.cron_jobs['analytics_usage_trends_count_job_trigger_worker']['job_class'] ||= 'Analytics::UsageTrends::CountJobTriggerWorker'
-Settings.cron_jobs['member_invitation_reminder_emails_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['member_invitation_reminder_emails_worker'] ||= {}
Settings.cron_jobs['member_invitation_reminder_emails_worker']['cron'] ||= '0 0 * * *'
Settings.cron_jobs['member_invitation_reminder_emails_worker']['job_class'] = 'MemberInvitationReminderEmailsWorker'
-Settings.cron_jobs['schedule_merge_request_cleanup_refs_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['schedule_merge_request_cleanup_refs_worker'] ||= {}
Settings.cron_jobs['schedule_merge_request_cleanup_refs_worker']['cron'] ||= '* * * * *'
Settings.cron_jobs['schedule_merge_request_cleanup_refs_worker']['job_class'] = 'ScheduleMergeRequestCleanupRefsWorker'
-Settings.cron_jobs['manage_evidence_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['manage_evidence_worker'] ||= {}
Settings.cron_jobs['manage_evidence_worker']['cron'] ||= '0 * * * *'
Settings.cron_jobs['manage_evidence_worker']['job_class'] = 'Releases::ManageEvidenceWorker'
-Settings.cron_jobs['user_status_cleanup_batch_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['user_status_cleanup_batch_worker'] ||= {}
Settings.cron_jobs['user_status_cleanup_batch_worker']['cron'] ||= '* * * * *'
Settings.cron_jobs['user_status_cleanup_batch_worker']['job_class'] = 'UserStatusCleanup::BatchWorker'
-Settings.cron_jobs['ssh_keys_expired_notification_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['ssh_keys_expired_notification_worker'] ||= {}
Settings.cron_jobs['ssh_keys_expired_notification_worker']['cron'] ||= '0 2,14 * * *'
Settings.cron_jobs['ssh_keys_expired_notification_worker']['job_class'] = 'SshKeys::ExpiredNotificationWorker'
-Settings.cron_jobs['namespaces_in_product_marketing_emails_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['namespaces_in_product_marketing_emails_worker'] ||= {}
Settings.cron_jobs['namespaces_in_product_marketing_emails_worker']['cron'] ||= '0 16 * * *'
Settings.cron_jobs['namespaces_in_product_marketing_emails_worker']['job_class'] = 'Namespaces::InProductMarketingEmailsWorker'
-Settings.cron_jobs['ssh_keys_expiring_soon_notification_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['ssh_keys_expiring_soon_notification_worker'] ||= {}
Settings.cron_jobs['ssh_keys_expiring_soon_notification_worker']['cron'] ||= '0 1 * * *'
Settings.cron_jobs['ssh_keys_expiring_soon_notification_worker']['job_class'] = 'SshKeys::ExpiringSoonNotificationWorker'
-Settings.cron_jobs['users_deactivate_dormant_users_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['users_deactivate_dormant_users_worker'] ||= {}
Settings.cron_jobs['users_deactivate_dormant_users_worker']['cron'] ||= '21,42 0-4 * * *'
Settings.cron_jobs['users_deactivate_dormant_users_worker']['job_class'] = 'Users::DeactivateDormantUsersWorker'
-Settings.cron_jobs['ci_delete_unit_tests_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['ci_delete_unit_tests_worker'] ||= {}
Settings.cron_jobs['ci_delete_unit_tests_worker']['cron'] ||= '0 0 * * *'
Settings.cron_jobs['ci_delete_unit_tests_worker']['job_class'] = 'Ci::DeleteUnitTestsWorker'
-Settings.cron_jobs['batched_background_migrations_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['batched_background_migrations_worker'] ||= {}
Settings.cron_jobs['batched_background_migrations_worker']['cron'] ||= '* * * * *'
Settings.cron_jobs['batched_background_migrations_worker']['job_class'] = 'Database::BatchedBackgroundMigrationWorker'
-Settings.cron_jobs['batched_background_migration_worker_ci_database'] ||= Settingslogic.new({})
+Settings.cron_jobs['batched_background_migration_worker_ci_database'] ||= {}
Settings.cron_jobs['batched_background_migration_worker_ci_database']['cron'] ||= '* * * * *'
Settings.cron_jobs['batched_background_migration_worker_ci_database']['job_class'] = 'Database::BatchedBackgroundMigration::CiDatabaseWorker'
-Settings.cron_jobs['issues_reschedule_stuck_issue_rebalances'] ||= Settingslogic.new({})
+Settings.cron_jobs['issues_reschedule_stuck_issue_rebalances'] ||= {}
Settings.cron_jobs['issues_reschedule_stuck_issue_rebalances']['cron'] ||= '*/15 * * * *'
Settings.cron_jobs['issues_reschedule_stuck_issue_rebalances']['job_class'] = 'Issues::RescheduleStuckIssueRebalancesWorker'
-Settings.cron_jobs['clusters_integrations_check_prometheus_health_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['clusters_integrations_check_prometheus_health_worker'] ||= {}
Settings.cron_jobs['clusters_integrations_check_prometheus_health_worker']['cron'] ||= '0 * * * *'
Settings.cron_jobs['clusters_integrations_check_prometheus_health_worker']['job_class'] = 'Clusters::Integrations::CheckPrometheusHealthWorker'
-Settings.cron_jobs['projects_schedule_refresh_build_artifacts_size_statistics_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['projects_schedule_refresh_build_artifacts_size_statistics_worker'] ||= {}
Settings.cron_jobs['projects_schedule_refresh_build_artifacts_size_statistics_worker']['cron'] ||= '2/17 * * * *'
Settings.cron_jobs['projects_schedule_refresh_build_artifacts_size_statistics_worker']['job_class'] = 'Projects::ScheduleRefreshBuildArtifactsSizeStatisticsWorker'
-Settings.cron_jobs['inactive_projects_deletion_cron_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['inactive_projects_deletion_cron_worker'] ||= {}
Settings.cron_jobs['inactive_projects_deletion_cron_worker']['cron'] ||= '*/10 * * * *'
Settings.cron_jobs['inactive_projects_deletion_cron_worker']['job_class'] = 'Projects::InactiveProjectsDeletionCronWorker'
-Settings.cron_jobs['loose_foreign_keys_cleanup_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['loose_foreign_keys_cleanup_worker'] ||= {}
Settings.cron_jobs['loose_foreign_keys_cleanup_worker']['cron'] ||= '*/1 * * * *'
Settings.cron_jobs['loose_foreign_keys_cleanup_worker']['job_class'] = 'LooseForeignKeys::CleanupWorker'
-Settings.cron_jobs['ci_runner_versions_reconciliation_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['ci_runner_versions_reconciliation_worker'] ||= {}
Settings.cron_jobs['ci_runner_versions_reconciliation_worker']['cron'] ||= '@daily'
Settings.cron_jobs['ci_runner_versions_reconciliation_worker']['job_class'] = 'Ci::Runners::ReconcileExistingRunnerVersionsCronWorker'
-Settings.cron_jobs['users_migrate_records_to_ghost_user_in_batches_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['users_migrate_records_to_ghost_user_in_batches_worker'] ||= {}
Settings.cron_jobs['users_migrate_records_to_ghost_user_in_batches_worker']['cron'] ||= '*/2 * * * *'
Settings.cron_jobs['users_migrate_records_to_ghost_user_in_batches_worker']['job_class'] = 'Users::MigrateRecordsToGhostUserInBatchesWorker'
-Settings.cron_jobs['ci_runners_stale_machines_cleanup_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['ci_runners_stale_machines_cleanup_worker'] ||= {}
Settings.cron_jobs['ci_runners_stale_machines_cleanup_worker']['cron'] ||= '36 4 * * *'
Settings.cron_jobs['ci_runners_stale_machines_cleanup_worker']['job_class'] = 'Ci::Runners::StaleMachinesCleanupCronWorker'
+Settings.cron_jobs['packages_cleanup_delete_orphaned_dependencies_worker'] ||= {}
+Settings.cron_jobs['packages_cleanup_delete_orphaned_dependencies_worker']['cron'] ||= '*/10 * * * *'
+Settings.cron_jobs['packages_cleanup_delete_orphaned_dependencies_worker']['job_class'] = 'Packages::Cleanup::DeleteOrphanedDependenciesWorker'
+Settings.cron_jobs['cleanup_dangling_debian_package_files_worker'] ||= {}
+Settings.cron_jobs['cleanup_dangling_debian_package_files_worker']['cron'] ||= '20 21 * * *'
+Settings.cron_jobs['cleanup_dangling_debian_package_files_worker']['job_class'] = 'Packages::Debian::CleanupDanglingPackageFilesWorker'
+Settings.cron_jobs['global_metrics_update_worker'] ||= {}
+Settings.cron_jobs['global_metrics_update_worker']['cron'] ||= '*/1 * * * *'
+Settings.cron_jobs['global_metrics_update_worker']['job_class'] ||= 'Metrics::GlobalMetricsUpdateWorker'
Gitlab.ee do
- Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker'] ||= {}
Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker']['cron'] ||= '0 1 * * *'
Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker']['job_class'] = 'Analytics::DevopsAdoption::CreateAllSnapshotsWorker'
- Settings.cron_jobs['analytics_cycle_analytics_incremental_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['analytics_cycle_analytics_incremental_worker'] ||= {}
Settings.cron_jobs['analytics_cycle_analytics_incremental_worker']['cron'] ||= '*/10 * * * *'
Settings.cron_jobs['analytics_cycle_analytics_incremental_worker']['job_class'] = 'Analytics::CycleAnalytics::IncrementalWorker'
- Settings.cron_jobs['analytics_cycle_analytics_consistency_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['analytics_cycle_analytics_consistency_worker'] ||= {}
Settings.cron_jobs['analytics_cycle_analytics_consistency_worker']['cron'] ||= '*/30 * * * *'
Settings.cron_jobs['analytics_cycle_analytics_consistency_worker']['job_class'] = 'Analytics::CycleAnalytics::ConsistencyWorker'
- Settings.cron_jobs['analytics_cycle_analytics_reaggregation_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['analytics_cycle_analytics_reaggregation_worker'] ||= {}
Settings.cron_jobs['analytics_cycle_analytics_reaggregation_worker']['cron'] ||= '44 * * * *'
Settings.cron_jobs['analytics_cycle_analytics_reaggregation_worker']['job_class'] = 'Analytics::CycleAnalytics::ReaggregationWorker'
- Settings.cron_jobs['active_user_count_threshold_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['active_user_count_threshold_worker'] ||= {}
Settings.cron_jobs['active_user_count_threshold_worker']['cron'] ||= '0 12 * * *'
Settings.cron_jobs['active_user_count_threshold_worker']['job_class'] = 'ActiveUserCountThresholdWorker'
- Settings.cron_jobs['adjourned_group_deletion_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['adjourned_group_deletion_worker'] ||= {}
Settings.cron_jobs['adjourned_group_deletion_worker']['cron'] ||= '0 2 * * *'
Settings.cron_jobs['adjourned_group_deletion_worker']['job_class'] = 'AdjournedGroupDeletionWorker'
- Settings.cron_jobs['clear_shared_runners_minutes_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['clear_shared_runners_minutes_worker'] ||= {}
Settings.cron_jobs['clear_shared_runners_minutes_worker']['cron'] ||= '0 0 1 * *'
Settings.cron_jobs['clear_shared_runners_minutes_worker']['job_class'] = 'ClearSharedRunnersMinutesWorker'
- Settings.cron_jobs['adjourned_projects_deletion_cron_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['adjourned_projects_deletion_cron_worker'] ||= {}
Settings.cron_jobs['adjourned_projects_deletion_cron_worker']['cron'] ||= '0 7 * * *'
Settings.cron_jobs['adjourned_projects_deletion_cron_worker']['job_class'] = 'AdjournedProjectsDeletionCronWorker'
- Settings.cron_jobs['geo_verification_cron_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['geo_verification_cron_worker'] ||= {}
Settings.cron_jobs['geo_verification_cron_worker']['cron'] ||= '* * * * *'
Settings.cron_jobs['geo_verification_cron_worker']['job_class'] ||= 'Geo::VerificationCronWorker'
- Settings.cron_jobs['geo_sync_timeout_cron_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['geo_sync_timeout_cron_worker'] ||= {}
Settings.cron_jobs['geo_sync_timeout_cron_worker']['cron'] ||= '*/10 * * * *'
Settings.cron_jobs['geo_sync_timeout_cron_worker']['job_class'] ||= 'Geo::SyncTimeoutCronWorker'
- Settings.cron_jobs['geo_secondary_usage_data_cron_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['geo_secondary_usage_data_cron_worker'] ||= {}
Settings.cron_jobs['geo_secondary_usage_data_cron_worker']['cron'] ||= '0 0 * * 0'
Settings.cron_jobs['geo_secondary_usage_data_cron_worker']['job_class'] ||= 'Geo::SecondaryUsageDataCronWorker'
- Settings.cron_jobs['geo_registry_sync_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['geo_registry_sync_worker'] ||= {}
Settings.cron_jobs['geo_registry_sync_worker']['cron'] ||= '*/1 * * * *'
Settings.cron_jobs['geo_registry_sync_worker']['job_class'] ||= 'Geo::RegistrySyncWorker'
- Settings.cron_jobs['geo_repository_registry_sync_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['geo_repository_registry_sync_worker'] ||= {}
Settings.cron_jobs['geo_repository_registry_sync_worker']['cron'] ||= '*/1 * * * *'
Settings.cron_jobs['geo_repository_registry_sync_worker']['job_class'] ||= 'Geo::RepositoryRegistrySyncWorker'
- Settings.cron_jobs['geo_metrics_update_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['geo_metrics_update_worker'] ||= {}
Settings.cron_jobs['geo_metrics_update_worker']['cron'] ||= '*/1 * * * *'
Settings.cron_jobs['geo_metrics_update_worker']['job_class'] ||= 'Geo::MetricsUpdateWorker'
- Settings.cron_jobs['geo_prune_event_log_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['geo_prune_event_log_worker'] ||= {}
Settings.cron_jobs['geo_prune_event_log_worker']['cron'] ||= '*/5 * * * *'
Settings.cron_jobs['geo_prune_event_log_worker']['job_class'] ||= 'Geo::PruneEventLogWorker'
- Settings.cron_jobs['geo_repository_sync_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['geo_repository_sync_worker'] ||= {}
Settings.cron_jobs['geo_repository_sync_worker']['cron'] ||= '*/1 * * * *'
Settings.cron_jobs['geo_repository_sync_worker']['job_class'] ||= 'Geo::RepositorySyncWorker'
- Settings.cron_jobs['geo_secondary_registry_consistency_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['geo_secondary_registry_consistency_worker'] ||= {}
Settings.cron_jobs['geo_secondary_registry_consistency_worker']['cron'] ||= '* * * * *'
Settings.cron_jobs['geo_secondary_registry_consistency_worker']['job_class'] ||= 'Geo::Secondary::RegistryConsistencyWorker'
- Settings.cron_jobs['geo_repository_verification_primary_batch_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['geo_repository_verification_primary_batch_worker'] ||= {}
Settings.cron_jobs['geo_repository_verification_primary_batch_worker']['cron'] ||= '*/1 * * * *'
Settings.cron_jobs['geo_repository_verification_primary_batch_worker']['job_class'] ||= 'Geo::RepositoryVerification::Primary::BatchWorker'
- Settings.cron_jobs['geo_repository_verification_secondary_scheduler_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['geo_repository_verification_secondary_scheduler_worker'] ||= {}
Settings.cron_jobs['geo_repository_verification_secondary_scheduler_worker']['cron'] ||= '*/1 * * * *'
Settings.cron_jobs['geo_repository_verification_secondary_scheduler_worker']['job_class'] ||= 'Geo::RepositoryVerification::Secondary::SchedulerWorker'
- Settings.cron_jobs['historical_data_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['historical_data_worker'] ||= {}
Settings.cron_jobs['historical_data_worker']['cron'] ||= '0 12 * * *'
Settings.cron_jobs['historical_data_worker']['job_class'] = 'HistoricalDataWorker'
- Settings.cron_jobs['incident_sla_exceeded_check_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['incident_sla_exceeded_check_worker'] ||= {}
Settings.cron_jobs['incident_sla_exceeded_check_worker']['cron'] ||= '*/2 * * * *'
Settings.cron_jobs['incident_sla_exceeded_check_worker']['job_class'] = 'IncidentManagement::IncidentSlaExceededCheckWorker'
- Settings.cron_jobs['incident_management_persist_oncall_rotation_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['incident_management_persist_oncall_rotation_worker'] ||= {}
Settings.cron_jobs['incident_management_persist_oncall_rotation_worker']['cron'] ||= '*/5 * * * *'
Settings.cron_jobs['incident_management_persist_oncall_rotation_worker']['job_class'] = 'IncidentManagement::OncallRotations::PersistAllRotationsShiftsJob'
- Settings.cron_jobs['incident_management_schedule_escalation_check_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['incident_management_schedule_escalation_check_worker'] ||= {}
Settings.cron_jobs['incident_management_schedule_escalation_check_worker']['cron'] ||= '*/1 * * * *'
Settings.cron_jobs['incident_management_schedule_escalation_check_worker']['job_class'] = 'IncidentManagement::PendingEscalations::ScheduleCheckCronWorker'
- Settings.cron_jobs['import_software_licenses_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['import_software_licenses_worker'] ||= {}
Settings.cron_jobs['import_software_licenses_worker']['cron'] ||= '0 3 * * 0'
Settings.cron_jobs['import_software_licenses_worker']['job_class'] = 'ImportSoftwareLicensesWorker'
- Settings.cron_jobs['ldap_group_sync_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['ldap_group_sync_worker'] ||= {}
Settings.cron_jobs['ldap_group_sync_worker']['cron'] ||= '0 * * * *'
Settings.cron_jobs['ldap_group_sync_worker']['job_class'] = 'LdapAllGroupsSyncWorker'
- Settings.cron_jobs['ldap_sync_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['ldap_sync_worker'] ||= {}
Settings.cron_jobs['ldap_sync_worker']['cron'] ||= '30 1 * * *'
Settings.cron_jobs['ldap_sync_worker']['job_class'] = 'LdapSyncWorker'
- Settings.cron_jobs['update_max_seats_used_for_gitlab_com_subscriptions_worker'] ||= Settingslogic.new({})
- Settings.cron_jobs['update_max_seats_used_for_gitlab_com_subscriptions_worker']['cron'] ||= '0 12 * * *'
- Settings.cron_jobs['update_max_seats_used_for_gitlab_com_subscriptions_worker']['job_class'] = 'UpdateMaxSeatsUsedForGitlabComSubscriptionsWorker'
- Settings.cron_jobs['elastic_index_bulk_cron_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['open_ai_clear_conversations'] ||= {}
+ Settings.cron_jobs['open_ai_clear_conversations']['cron'] ||= '*/10 * * * *'
+ Settings.cron_jobs['open_ai_clear_conversations']['job_class'] = 'OpenAi::ClearConversationsWorker'
+ Settings.cron_jobs['elastic_index_bulk_cron_worker'] ||= {}
Settings.cron_jobs['elastic_index_bulk_cron_worker']['cron'] ||= '*/1 * * * *'
Settings.cron_jobs['elastic_index_bulk_cron_worker']['job_class'] ||= 'ElasticIndexBulkCronWorker'
- Settings.cron_jobs['elastic_index_initial_bulk_cron_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['elastic_index_initial_bulk_cron_worker'] ||= {}
Settings.cron_jobs['elastic_index_initial_bulk_cron_worker']['cron'] ||= '*/1 * * * *'
Settings.cron_jobs['elastic_index_initial_bulk_cron_worker']['job_class'] ||= 'ElasticIndexInitialBulkCronWorker'
- Settings.cron_jobs['elastic_cluster_reindexing_cron_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['elastic_cluster_reindexing_cron_worker'] ||= {}
Settings.cron_jobs['elastic_cluster_reindexing_cron_worker']['cron'] ||= '*/10 * * * *'
Settings.cron_jobs['elastic_cluster_reindexing_cron_worker']['job_class'] ||= 'ElasticClusterReindexingCronWorker'
- Settings.cron_jobs['elastic_remove_expired_namespace_subscriptions_from_index_cron_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['elastic_remove_expired_namespace_subscriptions_from_index_cron_worker'] ||= {}
Settings.cron_jobs['elastic_remove_expired_namespace_subscriptions_from_index_cron_worker']['cron'] ||= '10 3 * * *'
Settings.cron_jobs['elastic_remove_expired_namespace_subscriptions_from_index_cron_worker']['job_class'] ||= 'ElasticRemoveExpiredNamespaceSubscriptionsFromIndexCronWorker'
- Settings.cron_jobs['elastic_migration_worker'] ||= Settingslogic.new({})
- Settings.cron_jobs['elastic_migration_worker']['cron'] ||= '*/30 * * * *'
+ Settings.cron_jobs['elastic_migration_worker'] ||= {}
+ Settings.cron_jobs['elastic_migration_worker']['cron'] ||= '*/5 * * * *'
Settings.cron_jobs['elastic_migration_worker']['job_class'] ||= 'Elastic::MigrationWorker'
- Settings.cron_jobs['search_index_curation_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['search_index_curation_worker'] ||= {}
Settings.cron_jobs['search_index_curation_worker']['cron'] ||= '*/1 * * * *'
Settings.cron_jobs['search_index_curation_worker']['job_class'] ||= 'Search::IndexCurationWorker'
- Settings.cron_jobs['sync_seat_link_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['sync_seat_link_worker'] ||= {}
Settings.cron_jobs['sync_seat_link_worker']['cron'] ||= "#{rand(60)} #{rand(3..4)} * * * UTC"
Settings.cron_jobs['sync_seat_link_worker']['job_class'] = 'SyncSeatLinkWorker'
- Settings.cron_jobs['users_create_statistics_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['users_create_statistics_worker'] ||= {}
Settings.cron_jobs['users_create_statistics_worker']['cron'] ||= '2 15 * * *'
Settings.cron_jobs['users_create_statistics_worker']['job_class'] = 'Users::CreateStatisticsWorker'
- Settings.cron_jobs['iterations_update_status_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['iterations_update_status_worker'] ||= {}
Settings.cron_jobs['iterations_update_status_worker']['cron'] ||= '5 0 * * *'
Settings.cron_jobs['iterations_update_status_worker']['job_class'] = 'IterationsUpdateStatusWorker'
- Settings.cron_jobs['iterations_generator_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['iterations_generator_worker'] ||= {}
Settings.cron_jobs['iterations_generator_worker']['cron'] ||= '5 0 * * *'
Settings.cron_jobs['iterations_generator_worker']['job_class'] = 'Iterations::Cadences::ScheduleCreateIterationsWorker'
- Settings.cron_jobs['vulnerability_statistics_schedule_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['vulnerability_statistics_schedule_worker'] ||= {}
Settings.cron_jobs['vulnerability_statistics_schedule_worker']['cron'] ||= '15 1,20 * * *'
Settings.cron_jobs['vulnerability_statistics_schedule_worker']['job_class'] = 'Vulnerabilities::Statistics::ScheduleWorker'
- Settings.cron_jobs['vulnerability_historical_statistics_deletion_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['vulnerability_historical_statistics_deletion_worker'] ||= {}
Settings.cron_jobs['vulnerability_historical_statistics_deletion_worker']['cron'] ||= '15 3 * * *'
Settings.cron_jobs['vulnerability_historical_statistics_deletion_worker']['job_class'] = 'Vulnerabilities::HistoricalStatistics::DeletionWorker'
- Settings.cron_jobs['security_create_orchestration_policy_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['security_create_orchestration_policy_worker'] ||= {}
Settings.cron_jobs['security_create_orchestration_policy_worker']['cron'] ||= '*/10 * * * *'
Settings.cron_jobs['security_create_orchestration_policy_worker']['job_class'] = 'Security::CreateOrchestrationPolicyWorker'
- Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker'] ||= {}
Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker']['cron'] ||= '*/15 * * * *'
Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker']['job_class'] = 'Security::OrchestrationPolicyRuleScheduleWorker'
- Settings.cron_jobs['security_scans_purge_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['security_scans_purge_worker'] ||= {}
Settings.cron_jobs['security_scans_purge_worker']['cron'] ||= '0 */4 * * 6,0'
Settings.cron_jobs['security_scans_purge_worker']['job_class'] = 'Security::Scans::PurgeWorker'
- Settings.cron_jobs['app_sec_dast_profile_schedule_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['app_sec_dast_profile_schedule_worker'] ||= {}
Settings.cron_jobs['app_sec_dast_profile_schedule_worker']['cron'] ||= '7-59/15 * * * *'
Settings.cron_jobs['app_sec_dast_profile_schedule_worker']['job_class'] = 'AppSec::Dast::ProfileScheduleWorker'
- Settings.cron_jobs['ci_namespace_mirrors_consistency_check_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['ci_namespace_mirrors_consistency_check_worker'] ||= {}
Settings.cron_jobs['ci_namespace_mirrors_consistency_check_worker']['cron'] ||= '*/4 * * * *'
Settings.cron_jobs['ci_namespace_mirrors_consistency_check_worker']['job_class'] = 'Database::CiNamespaceMirrorsConsistencyCheckWorker'
- Settings.cron_jobs['ci_project_mirrors_consistency_check_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['ci_project_mirrors_consistency_check_worker'] ||= {}
Settings.cron_jobs['ci_project_mirrors_consistency_check_worker']['cron'] ||= '2-58/4 * * * *'
Settings.cron_jobs['ci_project_mirrors_consistency_check_worker']['job_class'] = 'Database::CiProjectMirrorsConsistencyCheckWorker'
- Settings.cron_jobs['arkose_blocked_users_report_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['arkose_blocked_users_report_worker'] ||= {}
Settings.cron_jobs['arkose_blocked_users_report_worker']['cron'] ||= '0 6 * * *'
Settings.cron_jobs['arkose_blocked_users_report_worker']['job_class'] = 'Arkose::BlockedUsersReportWorker'
- Settings.cron_jobs['ci_runners_stale_group_runners_prune_worker_cron'] ||= Settingslogic.new({})
+ Settings.cron_jobs['ci_runners_stale_group_runners_prune_worker_cron'] ||= {}
Settings.cron_jobs['ci_runners_stale_group_runners_prune_worker_cron']['cron'] ||= '30 * * * *'
Settings.cron_jobs['ci_runners_stale_group_runners_prune_worker_cron']['job_class'] = 'Ci::Runners::StaleGroupRunnersPruneCronWorker'
- Settings.cron_jobs['licenses_reset_submit_license_usage_data_banner'] ||= Settingslogic.new({})
+ Settings.cron_jobs['licenses_reset_submit_license_usage_data_banner'] ||= {}
Settings.cron_jobs['licenses_reset_submit_license_usage_data_banner']['cron'] ||= "0 0 * * *"
Settings.cron_jobs['licenses_reset_submit_license_usage_data_banner']['job_class'] = 'Licenses::ResetSubmitLicenseUsageDataBannerWorker'
- Settings.cron_jobs['abandoned_trial_emails'] ||= Settingslogic.new({})
+ Settings.cron_jobs['abandoned_trial_emails'] ||= {}
Settings.cron_jobs['abandoned_trial_emails']['cron'] ||= "0 1 * * *"
Settings.cron_jobs['abandoned_trial_emails']['job_class'] = 'Emails::AbandonedTrialEmailsCronWorker'
- Settings.cron_jobs['package_metadata_sync_worker'] ||= Settingslogic.new({})
- Settings.cron_jobs['package_metadata_sync_worker']['cron'] ||= "0 1 * * *"
+ Settings.cron_jobs['package_metadata_sync_worker'] ||= {}
+ Settings.cron_jobs['package_metadata_sync_worker']['cron'] ||= "*/5 * * * *"
Settings.cron_jobs['package_metadata_sync_worker']['job_class'] = 'PackageMetadata::SyncWorker'
+ Settings.cron_jobs['compliance_violations_consistency_worker'] ||= {}
+ Settings.cron_jobs['compliance_violations_consistency_worker']['cron'] ||= '0 1 * * *'
+ Settings.cron_jobs['compliance_violations_consistency_worker']['job_class'] = 'ComplianceManagement::MergeRequests::ComplianceViolationsConsistencyWorker'
Gitlab.com do
- Settings.cron_jobs['free_user_cap_backfill_notification_jobs_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['free_user_cap_backfill_notification_jobs_worker'] ||= {}
Settings.cron_jobs['free_user_cap_backfill_notification_jobs_worker']['cron'] ||= '*/5 * * * *'
Settings.cron_jobs['free_user_cap_backfill_notification_jobs_worker']['job_class'] = 'Namespaces::FreeUserCap::BackfillNotificationJobsWorker'
- Settings.cron_jobs['disable_legacy_open_source_license_for_inactive_projects'] ||= Settingslogic.new({})
+ Settings.cron_jobs['free_user_cap_backfill_clear_notified_flag'] ||= {}
+ Settings.cron_jobs['free_user_cap_backfill_clear_notified_flag']['cron'] ||= '*/5 * * * *'
+ Settings.cron_jobs['free_user_cap_backfill_clear_notified_flag']['job_class'] ||= 'Namespaces::FreeUserCap::BackfillNotificationClearingJobsWorker'
+ Settings.cron_jobs['disable_legacy_open_source_license_for_inactive_projects'] ||= {}
Settings.cron_jobs['disable_legacy_open_source_license_for_inactive_projects']['cron'] ||= "30 5 * * 0"
Settings.cron_jobs['disable_legacy_open_source_license_for_inactive_projects']['job_class'] = 'Projects::DisableLegacyOpenSourceLicenseForInactiveProjectsWorker'
- Settings.cron_jobs['notify_seats_exceeded_batch_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['notify_seats_exceeded_batch_worker'] ||= {}
Settings.cron_jobs['notify_seats_exceeded_batch_worker']['cron'] ||= '0 3 * * *'
Settings.cron_jobs['notify_seats_exceeded_batch_worker']['job_class'] ||= 'GitlabSubscriptions::NotifySeatsExceededBatchWorker'
- Settings.cron_jobs['gitlab_subscriptions_schedule_refresh_seats_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['gitlab_subscriptions_schedule_refresh_seats_worker'] ||= {}
Settings.cron_jobs['gitlab_subscriptions_schedule_refresh_seats_worker']['cron'] ||= "0 */6 * * *"
Settings.cron_jobs['gitlab_subscriptions_schedule_refresh_seats_worker']['job_class'] = 'GitlabSubscriptions::ScheduleRefreshSeatsWorker'
end
@@ -854,14 +862,14 @@ end
#
# Sidekiq
#
-Settings['sidekiq'] ||= Settingslogic.new({})
+Settings['sidekiq'] ||= {}
Settings['sidekiq']['log_format'] ||= 'default'
-Settings['sidekiq']['routing_rules'] ||= []
+Settings['sidekiq']['routing_rules'] = Settings.build_sidekiq_routing_rules(Settings['sidekiq']['routing_rules'])
#
# GitLab Shell
#
-Settings['gitlab_shell'] ||= Settingslogic.new({})
+Settings['gitlab_shell'] ||= {}
Settings.gitlab_shell['path'] = Settings.absolute(Settings.gitlab_shell['path'] || Settings.gitlab['user_home'] + '/gitlab-shell/')
Settings.gitlab_shell['hooks_path'] = :deprecated_use_gitlab_shell_path_instead
Settings.gitlab_shell['authorized_keys_file'] ||= File.join(Dir.home, '.ssh', 'authorized_keys')
@@ -881,13 +889,13 @@ ObjectStoreSettings.new(Settings).parse!
#
# Workhorse
#
-Settings['workhorse'] ||= Settingslogic.new({})
+Settings['workhorse'] ||= {}
Settings.workhorse['secret_file'] ||= Rails.root.join('.gitlab_workhorse_secret')
#
# GitLab KAS
#
-Settings['gitlab_kas'] ||= Settingslogic.new({})
+Settings['gitlab_kas'] ||= {}
Settings.gitlab_kas['enabled'] ||= false
Settings.gitlab_kas['secret_file'] ||= Rails.root.join('.gitlab_kas_secret')
Settings.gitlab_kas['external_url'] ||= 'wss://kas.example.com'
@@ -898,14 +906,14 @@ Settings.gitlab_kas['internal_url'] ||= 'grpc://localhost:8153'
# Suggested Reviewers
#
Gitlab.ee do
- Settings['suggested_reviewers'] ||= Settingslogic.new({})
+ Settings['suggested_reviewers'] ||= {}
Settings.suggested_reviewers['secret_file'] ||= Rails.root.join('.gitlab_suggested_reviewers_secret')
end
#
# Repositories
#
-Settings['repositories'] ||= Settingslogic.new({})
+Settings['repositories'] ||= {}
Settings.repositories['storages'] ||= {}
Settings.repositories.storages.each do |key, storage|
@@ -935,12 +943,12 @@ end
#
# Backup
#
-Settings['backup'] ||= Settingslogic.new({})
+Settings['backup'] ||= {}
Settings.backup['keep_time'] ||= 0
Settings.backup['pg_schema'] = nil
Settings.backup['path'] = Settings.absolute(Settings.backup['path'] || "tmp/backups/")
Settings.backup['archive_permissions'] ||= 0600
-Settings.backup['upload'] ||= Settingslogic.new({ 'remote_directory' => nil, 'connection' => nil })
+Settings.backup['upload'] ||= { 'remote_directory' => nil, 'connection' => nil }
Settings.backup['upload']['multipart_chunk_size'] ||= 104857600
Settings.backup['upload']['encryption'] ||= nil
Settings.backup['upload']['encryption_key'] ||= ENV['GITLAB_BACKUP_ENCRYPTION_KEY']
@@ -950,19 +958,19 @@ Settings.backup['gitaly_backup_path'] ||= Gitlab::Utils.which('gitaly-backup')
#
# Git
#
-Settings['git'] ||= Settingslogic.new({})
+Settings['git'] ||= {}
Settings.git['bin_path'] ||= '/usr/bin/git'
# Important: keep the satellites.path setting until GitLab 9.0 at
# least. This setting is fed to 'rm -rf' in
# db/migrate/20151023144219_remove_satellites.rb
-Settings['satellites'] ||= Settingslogic.new({})
+Settings['satellites'] ||= {}
Settings.satellites['path'] = Settings.absolute(Settings.satellites['path'] || "tmp/repo_satellites/")
#
# Microsoft Graph Mailer
#
-Settings['microsoft_graph_mailer'] ||= Settingslogic.new({})
+Settings['microsoft_graph_mailer'] ||= {}
Settings.microsoft_graph_mailer['enabled'] = false if Settings.microsoft_graph_mailer['enabled'].nil?
Settings.microsoft_graph_mailer['user_id'] ||= nil
Settings.microsoft_graph_mailer['tenant'] ||= nil
@@ -975,7 +983,7 @@ Settings.microsoft_graph_mailer['graph_endpoint'] ||= 'https://graph.microsoft.c
# Kerberos
#
Gitlab.ee do
- Settings['kerberos'] ||= Settingslogic.new({})
+ Settings['kerberos'] ||= {}
Settings.kerberos['enabled'] = false if Settings.kerberos['enabled'].nil?
Settings.kerberos['keytab'] = nil if Settings.kerberos['keytab'].blank? # nil means use default keytab
Settings.kerberos['simple_ldap_linking_allowed_realms'] = [] if Settings.kerberos['simple_ldap_linking_allowed_realms'].blank?
@@ -985,7 +993,7 @@ Gitlab.ee do
Settings.kerberos['port'] ||= Settings.kerberos.https ? 8443 : 8088
if Settings.kerberos['enabled'] && !Settings.omniauth.providers.map(&:name).include?('kerberos')
- Settings.omniauth.providers << Settingslogic.new({ 'name' => 'kerberos' })
+ Settings.omniauth.providers << GitlabSettings::Options.build({ 'name' => 'kerberos' })
end
end
@@ -993,7 +1001,7 @@ end
# Smartcard
#
Gitlab.ee do
- Settings['smartcard'] ||= Settingslogic.new({})
+ Settings['smartcard'] ||= {}
Settings.smartcard['enabled'] = false if Settings.smartcard['enabled'].nil?
Settings.smartcard['client_certificate_required_host'] = Settings.gitlab.host if Settings.smartcard['client_certificate_required_host'].nil?
Settings.smartcard['client_certificate_required_port'] = 3444 if Settings.smartcard['client_certificate_required_port'].nil?
@@ -1004,20 +1012,26 @@ end
#
# FortiAuthenticator
#
-Settings['forti_authenticator'] ||= Settingslogic.new({})
+Settings['forti_authenticator'] ||= {}
Settings.forti_authenticator['enabled'] = false if Settings.forti_authenticator['enabled'].nil?
Settings.forti_authenticator['port'] = 443 if Settings.forti_authenticator['port'].to_i == 0
#
# FortiToken Cloud
#
-Settings['forti_token_cloud'] ||= Settingslogic.new({})
+Settings['forti_token_cloud'] ||= {}
Settings.forti_token_cloud['enabled'] = false if Settings.forti_token_cloud['enabled'].nil?
#
+# DuoAuth
+#
+Settings['duo_auth'] ||= {}
+Settings.duo_auth['enabled'] = false if Settings.duo_auth['enabled'].nil?
+
+#
# Extra customization
#
-Settings['extra'] ||= Settingslogic.new({})
+Settings['extra'] ||= {}
Settings.extra['matomo_site_id'] ||= Settings.extra['piwik_site_id'] if Settings.extra['piwik_site_id'].present?
Settings.extra['matomo_url'] ||= Settings.extra['piwik_url'] if Settings.extra['piwik_url'].present?
Settings.extra['matomo_disable_cookies'] = false if Settings.extra['matomo_disable_cookies'].nil?
@@ -1026,8 +1040,8 @@ Settings.extra['maximum_text_highlight_size_kilobytes'] = Settings.extra.fetch('
#
# Rack::Attack settings
#
-Settings['rack_attack'] ||= Settingslogic.new({})
-Settings.rack_attack['git_basic_auth'] ||= Settingslogic.new({})
+Settings['rack_attack'] ||= {}
+Settings.rack_attack['git_basic_auth'] ||= {}
Settings.rack_attack.git_basic_auth['enabled'] = false if Settings.rack_attack.git_basic_auth['enabled'].nil?
Settings.rack_attack.git_basic_auth['ip_whitelist'] ||= %w{127.0.0.1}
Settings.rack_attack.git_basic_auth['maxretry'] ||= 10
@@ -1037,17 +1051,17 @@ Settings.rack_attack.git_basic_auth['bantime'] ||= 1.hour
#
# Gitaly
#
-Settings['gitaly'] ||= Settingslogic.new({})
+Settings['gitaly'] ||= {}
#
# Webpack settings
#
-Settings['webpack'] ||= Settingslogic.new({})
+Settings['webpack'] ||= {}
Settings.webpack['config_file'] ||= 'config/webpack.config.js'
Settings.webpack['output_dir'] ||= 'public/assets/webpack'
Settings.webpack['public_path'] ||= 'assets/webpack'
Settings.webpack['manifest_filename'] ||= 'manifest.json'
-Settings.webpack['dev_server'] ||= Settingslogic.new({})
+Settings.webpack['dev_server'] ||= {}
Settings.webpack.dev_server['enabled'] ||= false
Settings.webpack.dev_server['host'] ||= 'localhost'
Settings.webpack.dev_server['port'] ||= 3808
@@ -1056,10 +1070,10 @@ Settings.webpack.dev_server['https'] ||= false
#
# Monitoring settings
#
-Settings['monitoring'] ||= Settingslogic.new({})
+Settings['monitoring'] ||= {}
Settings.monitoring['ip_whitelist'] ||= ['127.0.0.1/8']
-Settings.monitoring['sidekiq_exporter'] ||= Settingslogic.new({})
+Settings.monitoring['sidekiq_exporter'] ||= {}
Settings.monitoring.sidekiq_exporter['enabled'] ||= false
Settings.monitoring.sidekiq_exporter['log_enabled'] ||= false
Settings.monitoring.sidekiq_exporter['address'] ||= 'localhost'
@@ -1068,12 +1082,12 @@ Settings.monitoring.sidekiq_exporter['tls_enabled'] ||= false
Settings.monitoring.sidekiq_exporter['tls_cert_path'] ||= nil
Settings.monitoring.sidekiq_exporter['tls_key_path'] ||= nil
-Settings.monitoring['sidekiq_health_checks'] ||= Settingslogic.new({})
+Settings.monitoring['sidekiq_health_checks'] ||= {}
Settings.monitoring.sidekiq_health_checks['enabled'] ||= false
Settings.monitoring.sidekiq_health_checks['address'] ||= 'localhost'
Settings.monitoring.sidekiq_health_checks['port'] ||= 8092
-Settings.monitoring['web_exporter'] ||= Settingslogic.new({})
+Settings.monitoring['web_exporter'] ||= {}
Settings.monitoring.web_exporter['enabled'] ||= false
Settings.monitoring.web_exporter['log_enabled'] ||= true
Settings.monitoring.web_exporter['address'] ||= 'localhost'
@@ -1085,20 +1099,20 @@ Settings.monitoring.web_exporter['tls_key_path'] ||= nil
#
# Prometheus settings
#
-Settings['prometheus'] ||= Settingslogic.new({})
+Settings['prometheus'] ||= {}
Settings.prometheus['enabled'] ||= false
Settings.prometheus['server_address'] ||= nil
#
# Bullet settings
#
-Settings['bullet'] ||= Settingslogic.new({})
+Settings['bullet'] ||= {}
Settings.bullet['enabled'] ||= Rails.env.development?
#
# Shutdown settings
#
-Settings['shutdown'] ||= Settingslogic.new({})
+Settings['shutdown'] ||= {}
Settings.shutdown['blackout_seconds'] ||= 10
#
diff --git a/config/initializers/7_redis.rb b/config/initializers/7_redis.rb
index 7773740fec4..85dee02cf01 100644
--- a/config/initializers/7_redis.rb
+++ b/config/initializers/7_redis.rb
@@ -5,6 +5,7 @@ require 'gitlab/redis'
Redis.raise_deprecations = true unless Rails.env.production?
Redis::Client.prepend(Gitlab::Instrumentation::RedisInterceptor)
+Redis::Cluster::NodeLoader.prepend(Gitlab::Patch::NodeLoader)
# Make sure we initialize a Redis connection pool before multi-threaded
# execution starts by
diff --git a/config/initializers/action_mailer_hooks.rb b/config/initializers/action_mailer_hooks.rb
index fb09ed34bf6..c6e6c717b7a 100644
--- a/config/initializers/action_mailer_hooks.rb
+++ b/config/initializers/action_mailer_hooks.rb
@@ -8,8 +8,8 @@ end
ActionMailer::Base.register_interceptors(
::Gitlab::Email::Hook::AdditionalHeadersInterceptor,
::Gitlab::Email::Hook::EmailTemplateInterceptor,
- ::Gitlab::Email::Hook::ValidateAddressesInterceptor,
- ::Gitlab::Email::Hook::DeliveryMetricsObserver
+ ::Gitlab::Email::Hook::DeliveryMetricsObserver,
+ ::Gitlab::Email::Hook::SilentModeInterceptor
)
ActionMailer::Base.register_observer(::Gitlab::Email::Hook::DeliveryMetricsObserver)
diff --git a/config/initializers/active_record_database_tasks.rb b/config/initializers/active_record_database_tasks.rb
index 8b231f4af14..4c08f0bbe1f 100644
--- a/config/initializers/active_record_database_tasks.rb
+++ b/config/initializers/active_record_database_tasks.rb
@@ -3,5 +3,5 @@
return unless Gitlab.ee?
ActiveSupport.on_load(:active_record) do
- Gitlab::Patch::GeoDatabaseTasks.patch!
+ Gitlab::Patch::AdditionalDatabaseTasks.patch!
end
diff --git a/config/initializers/active_record_migrations.rb b/config/initializers/active_record_migrations.rb
index d878a1b210b..6e5d519e11b 100644
--- a/config/initializers/active_record_migrations.rb
+++ b/config/initializers/active_record_migrations.rb
@@ -1,3 +1,5 @@
# frozen_string_literal: true
Gitlab::Database::Migrations::LockRetryMixin.patch!
+Gitlab::Database::Migrations::PgBackendPid.patch!
+Gitlab::Database::Migrations::RunnerBackoff::ActiveRecordMixin.patch!
diff --git a/config/initializers/active_record_preloader.rb b/config/initializers/active_record_preloader.rb
index 198c97cb849..19ca380a866 100644
--- a/config/initializers/active_record_preloader.rb
+++ b/config/initializers/active_record_preloader.rb
@@ -3,6 +3,17 @@
module ActiveRecord
module Associations
class Preloader
+ def initialize(records: nil, associations: nil)
+ super()
+
+ @records = records
+ @associations = associations
+ end
+
+ def call
+ preload(@records, @associations)
+ end
+
class NullPreloader
def self.new(*args, **kwargs)
self
diff --git a/config/initializers/active_record_transaction_observer.rb b/config/initializers/active_record_transaction_observer.rb
index 1dc7b55ed5a..a133c6b8be8 100644
--- a/config/initializers/active_record_transaction_observer.rb
+++ b/config/initializers/active_record_transaction_observer.rb
@@ -3,7 +3,20 @@
return unless Gitlab.com? || Gitlab.dev_or_test_env?
Gitlab::Application.configure do
- if Feature.feature_flags_available? && ::Feature.enabled?(:active_record_transactions_tracking, type: :ops)
+ # When the DBMS is not available, an exception (e.g. PG::ConnectionBad) is raised
+ active_db_connection = begin
+ ActiveRecord::Base.connection.active? # rubocop:disable Database/MultipleDatabases
+ rescue StandardError
+ false
+ end
+
+ feature_flags_available = begin
+ active_db_connection && Feature::FlipperFeature.table_exists?
+ rescue ActiveRecord::NoDatabaseError
+ false
+ end
+
+ if feature_flags_available && ::Feature.enabled?(:active_record_transactions_tracking, type: :ops)
Gitlab::Database::Transaction::Observer.register!
end
end
diff --git a/config/initializers/carrierwave_patch.rb b/config/initializers/carrierwave_patch.rb
index 6053154489f..449f4b4a607 100644
--- a/config/initializers/carrierwave_patch.rb
+++ b/config/initializers/carrierwave_patch.rb
@@ -22,7 +22,7 @@ module CarrierWave
# multithreaded uploads (https://github.com/fog/fog-aws/pull/579).
# Multithreaded uploads are essential for copying large amounts of data
# within the request timeout.
- if ::Feature.enabled?(:s3_multithreaded_uploads) && fog_provider == 'AWS'
+ if ::Feature.enabled?(:s3_multithreaded_uploads, type: :ops) && fog_provider == 'AWS'
# AWS SDK uses 10 threads by default and a multipart chunk size of 10 MB
file.concurrency = 10
file.multipart_chunk_size = 10485760
@@ -43,7 +43,7 @@ module CarrierWave
end
def authenticated_url(options = {})
- if %w[AWS Google Rackspace OpenStack AzureRM].include?(@uploader.fog_credentials[:provider])
+ if %w[AWS Google AzureRM].include?(@uploader.fog_credentials[:provider])
# avoid a get by using local references
local_directory = connection.directories.new(key: @uploader.fog_directory)
local_file = local_directory.files.new(key: path)
@@ -51,10 +51,6 @@ module CarrierWave
case @uploader.fog_credentials[:provider]
when 'AWS', 'Google', 'AzureRM'
local_file.url(expire_at, options)
- when 'Rackspace'
- connection.get_object_https_url(@uploader.fog_directory, path, expire_at, options)
- when 'OpenStack'
- connection.get_object_https_url(@uploader.fog_directory, path, expire_at)
else
local_file.url(expire_at)
end
diff --git a/config/initializers/circuitbox.rb b/config/initializers/circuitbox.rb
new file mode 100644
index 00000000000..966320265aa
--- /dev/null
+++ b/config/initializers/circuitbox.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+Gitlab.ee do
+ Circuitbox.configure do |config|
+ config.default_circuit_store = Gitlab::CircuitBreaker::Store.new
+ config.default_notifier = Gitlab::CircuitBreaker::Notifier.new
+ end
+end
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index d24c5431f53..918b2767c4d 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -121,17 +121,3 @@ Doorkeeper.configure do
# We might want to disable this in the future, see https://gitlab.com/gitlab-org/gitlab/-/issues/323615
skip_client_authentication_for_password_grant true
end
-
-module Doorkeeper
- class AccessToken
- # Doorkeeper OAuth Token refresh uses expires_in of refresh token for new token
- # https://github.com/doorkeeper-gem/doorkeeper/pull/1366
- # This override ensures that tokens with expires_in: nil do not create new
- # tokens with expires_in: nil during refresh flow.
- # Can be removed after https://gitlab.com/gitlab-org/gitlab/-/issues/386094 is
- # closed
- def expires_in
- super || 2.hours
- end
- end
-end
diff --git a/config/initializers/fog_core_patch.rb b/config/initializers/fog_core_patch.rb
index 053e0460a19..f7d81f26be5 100644
--- a/config/initializers/fog_core_patch.rb
+++ b/config/initializers/fog_core_patch.rb
@@ -27,12 +27,11 @@
# closed:
#
# fog-google: https://github.com/fog/fog-google/issues/421
-# fog-rackspace: https://github.com/fog/fog-rackspace/issues/29
# fog-aliyun: https://github.com/fog/fog-aliyun/issues/23
module Fog
module ServicesMixin
# Gems that have not yet updated with the new fog-core namespace
- LEGACY_FOG_PROVIDERS = %w(google rackspace aliyun).freeze
+ LEGACY_FOG_PROVIDERS = %w(google aliyun).freeze
# rubocop:disable Gitlab/ConstGetInheritFalse
def service_provider_constant(service_name, provider_name)
diff --git a/config/initializers/gettext_rails_i18n_patch.rb b/config/initializers/gettext_rails_i18n_patch.rb
deleted file mode 100644
index 3c994516b2d..00000000000
--- a/config/initializers/gettext_rails_i18n_patch.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-require 'gettext_i18n_rails_js/parser/javascript'
-require 'json'
-
-module GettextI18nRailsJs
- module Parser
- module Javascript
- # This is required to tell the `rake gettext:find` script to use the Javascript
- # parser for *.vue files.
- #
- # Overwrites: https://github.com/webhippie/gettext_i18n_rails_js/blob/46c58db6d2053a4f5f36a0eb024ea706ff5707cb/lib/gettext_i18n_rails_js/parser/javascript.rb#L36
- def target?(file)
- [
- ".js",
- ".jsx",
- ".vue"
- ].include? ::File.extname(file)
- end
-
- def collect_for(file)
- gettext_messages_by_file[file] || []
- end
-
- private
-
- def gettext_messages_by_file
- @gettext_messages_by_file ||= Gitlab::Json.parse(load_messages)
- end
-
- def load_messages
- `node scripts/frontend/extract_gettext_all.js --all`
- end
- end
- end
-end
-
-class PoToJson
- # This is required to modify the JS locale file output to our import needs
- # Overwrites: https://github.com/webhippie/po_to_json/blob/master/lib/po_to_json.rb#L46
- def generate_for_jed(language, overwrite = {})
- @options = parse_options(overwrite.merge(language: language))
- @parsed ||= inject_meta(parse_document)
-
- generated = build_json_for(build_jed_for(@parsed))
- [
- "window.translations = #{generated};"
- ].join(" ")
- end
-end
diff --git a/config/initializers/google_cloud_profiler.rb b/config/initializers/google_cloud_profiler.rb
new file mode 100644
index 00000000000..8254f6d0e02
--- /dev/null
+++ b/config/initializers/google_cloud_profiler.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+return unless Gitlab::Utils.to_boolean(ENV['GITLAB_GOOGLE_CLOUD_PROFILER_ENABLED'])
+return unless ENV['GITLAB_GOOGLE_CLOUD_PROFILER_PROJECT_ID']
+
+# For the initial iteration, we enable it only for `web`.
+# This is because we have global service accounts configured this way, details:
+# https://gitlab.com/gitlab-com/gl-infra/reliability/-/issues/17492#note_1303914983
+return unless Gitlab::Runtime.puma?
+
+Gitlab::Cluster::LifecycleEvents.on_worker_start do
+ require 'cloud_profiler_agent'
+
+ agent = CloudProfilerAgent::Agent.new(
+ service: 'gitlab-web',
+ project_id: ENV['GITLAB_GOOGLE_CLOUD_PROFILER_PROJECT_ID'],
+ logger: ::Gitlab::AppJsonLogger.build,
+ log_labels: {
+ message: 'Google Cloud Profiler Ruby',
+ pid: $$,
+ worker_id: ::Prometheus::PidProvider.worker_id
+ }
+ )
+ agent.start
+end
diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb
index 61e357808d9..5ea3b553713 100644
--- a/config/initializers/lograge.rb
+++ b/config/initializers/lograge.rb
@@ -8,7 +8,7 @@ unless Gitlab::Runtime.sidekiq?
Rails.application.configure do
config.lograge.enabled = true
# Store the lograge JSON files in a separate file
- config.lograge.keep_original_rails_log = Gitlab::Utils.to_boolean(ENV.fetch('UNSTRUCTURED_RAILS_LOG', 'true'))
+ config.lograge.keep_original_rails_log = Rails.env.development?
# Don't use the Logstash formatter since this requires logstash-event, an
# unmaintained gem that monkey patches `Time`
config.lograge.formatter = Lograge::Formatters::Json.new
diff --git a/config/initializers/mail_encoding_patch.rb b/config/initializers/mail_encoding_patch.rb
index f72d4814856..7447cd26dcd 100644
--- a/config/initializers/mail_encoding_patch.rb
+++ b/config/initializers/mail_encoding_patch.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-# Monkey patch mail 2.7.1 to fix quoted-printable issues with newlines
+# Monkey patch mail 2.8.1 to fix quoted-printable issues with newlines
# The issues upstream invalidate SMIME signatures under some conditions
# This was working properly in 2.6.6
#
@@ -8,22 +8,6 @@
# See https://github.com/mikel/mail/issues/1190
module Mail
- module Encodings
- # PATCH
- # This reverts https://github.com/mikel/mail/pull/1113, which solves some
- # encoding issues with binary attachments encoded in quoted-printable, but
- # unfortunately breaks re-encoding of messages
- class QuotedPrintable < SevenBit
- def self.decode(str)
- ::Mail::Utilities.to_lf str.gsub(/(?:=0D=0A|=0D|=0A)\r\n/, "\r\n").unpack1("M*")
- end
-
- def self.encode(str)
- ::Mail::Utilities.to_crlf([::Mail::Utilities.to_lf(str)].pack("M"))
- end
- end
- end
-
class Body
def encoded(transfer_encoding = nil, charset = nil)
# PATCH
diff --git a/config/initializers/mail_starttls_patch.rb b/config/initializers/mail_starttls_patch.rb
new file mode 100644
index 00000000000..c4fe102edfb
--- /dev/null
+++ b/config/initializers/mail_starttls_patch.rb
@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+require 'mail/network/delivery_methods/smtp'
+
+# Monkey patch mail 2.8.1 to make it possible to disable STARTTLS.
+# without having to change existing settings.
+# This brings in changes from https://github.com/mikel/mail/pull/1536,
+# which has not been released yet.
+module Mail
+ class SMTP
+ def initialize(values)
+ self.settings = DEFAULTS
+ settings[:enable_starttls_auto] = nil
+ settings.merge!(values)
+ end
+
+ private
+
+ # `key` is said to be provided when `settings` has a non-nil value for `key`.
+ def setting_provided?(key)
+ !settings[key].nil?
+ end
+
+ # Yields one of `:always`, `:auto` or `false` based on `enable_starttls` and `enable_starttls_auto` flags.
+ # Yields `false` when `smtp_tls?`.
+ def smtp_starttls
+ return false if smtp_tls?
+
+ if setting_provided?(:enable_starttls) && settings[:enable_starttls]
+ # enable_starttls: provided and truthy
+ case settings[:enable_starttls]
+ when :auto then :auto
+ when :always then :always
+ else
+ :always
+ end
+ elsif setting_provided?(:enable_starttls_auto)
+ # enable_starttls: not provided or false
+ settings[:enable_starttls_auto] ? :auto : false
+ else
+ # enable_starttls_auto: not provided
+ # enable_starttls: when provided then false
+ # use :auto when neither enable_starttls* provided
+ setting_provided?(:enable_starttls) ? false : :auto
+ end
+ end
+
+ def smtp_tls?
+ (setting_provided?(:tls) && settings[:tls]) || (setting_provided?(:ssl) && settings[:ssl])
+ end
+
+ def start_smtp_session(&block)
+ build_smtp_session.start(settings[:domain], settings[:user_name], settings[:password],
+ settings[:authentication], &block)
+ end
+
+ def build_smtp_session
+ if smtp_tls? && (settings[:enable_starttls] || settings[:enable_starttls_auto])
+ # rubocop:disable Layout/LineLength
+ raise ArgumentError,
+ ":enable_starttls and :tls are mutually exclusive. Set :tls if you're on an SMTPS connection. Set :enable_starttls if you're on an SMTP connection and using STARTTLS for secure TLS upgrade."
+ # rubocop:enable Layout/LineLength
+ end
+
+ Net::SMTP.new(settings[:address], settings[:port]).tap do |smtp|
+ if smtp_tls?
+ smtp.disable_starttls
+ smtp.enable_tls(ssl_context)
+ else
+ smtp.disable_tls
+
+ case smtp_starttls
+ when :always
+ smtp.enable_starttls(ssl_context)
+ when :auto
+ smtp.enable_starttls_auto(ssl_context)
+ else
+ smtp.disable_starttls
+ end
+ end
+
+ smtp.open_timeout = settings[:open_timeout] if settings[:open_timeout]
+ smtp.read_timeout = settings[:read_timeout] if settings[:read_timeout]
+ end
+ end
+ end
+end
diff --git a/config/initializers/mailer_retries.rb b/config/initializers/mailer_retries.rb
index 5980513af92..6812d3e5742 100644
--- a/config/initializers/mailer_retries.rb
+++ b/config/initializers/mailer_retries.rb
@@ -2,4 +2,6 @@
Rails.application.config.after_initialize do
ActionMailer::MailDeliveryJob.sidekiq_options retry: 3
+ ActionMailer::MailDeliveryJob.include(WorkerAttributes)
+ ActionMailer::MailDeliveryJob.data_consistency :delayed
end
diff --git a/config/initializers/net_http_patch.rb b/config/initializers/net_http_patch.rb
index a50ba7580cc..4f851d5ee6d 100644
--- a/config/initializers/net_http_patch.rb
+++ b/config/initializers/net_http_patch.rb
@@ -6,6 +6,10 @@
# See Ruby-lang issue https://bugs.ruby-lang.org/issues/17542
# See issue on GitLab https://gitlab.com/gitlab-org/gitlab/-/issues/289836
+# This file can be removed once Ruby 3.0 is no longer supported:
+# https://gitlab.com/gitlab-org/gitlab/-/issues/396223
+return if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new(3.1)
+
module Net
class HTTP < Protocol
def proxy_user
diff --git a/config/initializers/net_http_response_patch.rb b/config/initializers/net_http_response_patch.rb
index 4ffe227a3fd..4f3eaeec24a 100644
--- a/config/initializers/net_http_response_patch.rb
+++ b/config/initializers/net_http_response_patch.rb
@@ -24,10 +24,12 @@ module Net
line = line.sub(/\s{0,10}\z/, '')
break if line.empty?
if line[0] == ?\s or line[0] == ?\t and value
+ # rubocop:disable Gitlab/NoCodeCoverageComment
# :nocov:
value << ' ' unless value.empty?
value << line.strip
# :nocov:
+ # rubocop:enable Gitlab/NoCodeCoverageComment
else
yield key, value if key
key, value = line.strip.split(/\s{0,10}:\s{0,10}/, 2)
diff --git a/config/initializers/peek.rb b/config/initializers/peek.rb
index efd4594e64c..36e989bdba5 100644
--- a/config/initializers/peek.rb
+++ b/config/initializers/peek.rb
@@ -15,6 +15,7 @@ Peek.into Peek::Views::ActiveRecord
Peek.into Peek::Views::Gitaly
Peek.into Peek::Views::RedisDetailed
Peek.into Peek::Views::Elasticsearch
+Peek.into Peek::Views::Zoekt
Peek.into Peek::Views::Rugged
Peek.into Peek::Views::ExternalHttp
Peek.into Peek::Views::BulletDetailed if defined?(Bullet)
diff --git a/config/initializers/postgres_partitioning.rb b/config/initializers/postgres_partitioning.rb
index e7f29ee1a84..8891c5a8898 100644
--- a/config/initializers/postgres_partitioning.rb
+++ b/config/initializers/postgres_partitioning.rb
@@ -5,7 +5,8 @@ Gitlab::Database::Partitioning.register_models(
AuditEvent,
WebHookLog,
LooseForeignKeys::DeletedRecord,
- Gitlab::Database::BackgroundMigration::BatchedJobTransitionLog
+ Gitlab::Database::BackgroundMigration::BatchedJobTransitionLog,
+ Ci::RunnerManagerBuild
])
if Gitlab.ee?
@@ -13,7 +14,8 @@ if Gitlab.ee?
[
IncidentManagement::PendingEscalations::Alert,
IncidentManagement::PendingEscalations::Issue,
- Security::Finding
+ Security::Finding,
+ Analytics::ValueStreamDashboard::Count
])
else
Gitlab::Database::Partitioning.register_tables(
diff --git a/config/initializers/safe_session_store_patch.rb b/config/initializers/safe_session_store_patch.rb
new file mode 100644
index 00000000000..7d3b9d0ae36
--- /dev/null
+++ b/config/initializers/safe_session_store_patch.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+# The Rails and Rack session stores allow developers to store arbitrary
+# Ruby objects in the Hash, which gets serialized to Redis. However,
+# serializing objects may lead to multi-version incompatibilities
+# (https://docs.gitlab.com/ee/development/multi_version_compatibility.html)
+# because there is no guarantee that the Ruby object is present in an
+# older version.
+#
+# To safeguard against this problem, this patch checks that objects
+# stored in the session are in an allow list. Note that these checks are
+# restricted to test and development environments at the moment. Only
+# add to the allow list if you know that the object should be handled
+# gracefully in a mixed deployment.
+return unless Rails.env.test? || Rails.env.development?
+
+module Rack
+ module Session
+ module Abstract
+ class SessionHash
+ module BlockRubyObjectSerialization
+ ALLOWED_OBJECTS = [
+ Symbol, String, Integer, Float, NilClass, TrueClass, FalseClass, ActiveSupport::SafeBuffer,
+ # Used in app/controllers/import/bitbucket_controller.rb
+ ActiveSupport::Duration, ActiveSupport::TimeWithZone,
+ # Used in ee/app/controllers/groups/omniauth_callbacks_controller.rb
+ OmniAuth::AuthHash, OmniAuth::AuthHash::InfoHash, OneLogin::RubySaml::Attributes,
+ OneLogin::RubySaml::Response
+ ].freeze
+
+ def []=(key, value)
+ unless safe_object?(value)
+ # rubocop:disable Gitlab/DocUrl
+ raise "Session attempted to store type #{value.class} with key '#{key}': #{value.inspect}.\n" \
+ "Serializing novel Ruby objects can cause uninitialized constants in mixed deployments.\n" \
+ "See https://docs.gitlab.com/ee/development/multi_version_compatibility.html"
+ # rubocop:enable Gitlab/DocUrl
+ end
+
+ super
+ end
+
+ private
+
+ def safe_object?(value)
+ return allowed_mock?(value) if Rails.env.test? && value.is_a?(RSpec::Mocks::InstanceVerifyingDouble)
+
+ case value
+ when Array
+ value.all? { |entry| safe_object?(entry) }
+ when Hash
+ safe_hash?(value)
+ else
+ ALLOWED_OBJECTS.include?(value.class)
+ end
+ end
+
+ def safe_hash?(value)
+ value.each do |key, val|
+ return false unless safe_object?(key)
+ return false unless safe_object?(val)
+ end
+ end
+
+ def allowed_mock?(value)
+ doubled_module = value.to_s
+
+ # We don't have access to the @doubled_module variable, but the output
+ # string will be in the form: "#[InstanceDouble(OneLogin::RubySaml::Response) (anonymous)]"
+ ALLOWED_OBJECTS.any? { |allowed| doubled_module.include?("InstanceDouble(#{allowed})") }
+ end
+ end
+
+ prepend BlockRubyObjectSerialization
+ end
+ end
+ end
+end
+
+ActionDispatch::Request::Session.prepend(Rack::Session::Abstract::SessionHash::BlockRubyObjectSerialization)
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index cf8df814990..b2baccf886f 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -32,8 +32,6 @@ queues_config_hash = Gitlab::Redis::Queues.params
queues_config_hash[:namespace] = Gitlab::Redis::Queues::SIDEKIQ_NAMESPACE
enable_json_logs = Gitlab.config.sidekiq.log_format == 'json'
-enable_sidekiq_memory_killer = ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS'].to_i.nonzero? &&
- !Gitlab::Utils.to_boolean(ENV['GITLAB_MEMORY_WATCHDOG_ENABLED'], default: true)
Sidekiq.configure_server do |config|
config[:strict] = false
@@ -70,8 +68,6 @@ Sidekiq.configure_server do |config|
# To cancel job, it requires `SIDEKIQ_MONITOR_WORKER=1` to enable notification channel
Gitlab::SidekiqDaemon::Monitor.instance.start
- Gitlab::SidekiqDaemon::MemoryKiller.instance.start if enable_sidekiq_memory_killer
-
first_sidekiq_worker = !ENV['SIDEKIQ_WORKER_ID'] || ENV['SIDEKIQ_WORKER_ID'] == '0'
health_checks = Settings.monitoring.sidekiq_health_checks
diff --git a/config/initializers/tracing.rb b/config/initializers/tracing.rb
index 10b59a9e3d8..daa1e7b3c4b 100644
--- a/config/initializers/tracing.rb
+++ b/config/initializers/tracing.rb
@@ -6,14 +6,14 @@ if Labkit::Tracing.enabled?
config.middleware.insert_after Rack::MethodOverride, ::Labkit::Tracing::RackMiddleware
end
- # Instrument Redis
- Labkit::Tracing::Redis.instrument
+ # Instrument external calls
Labkit::Tracing::ExternalHttp.instrument
+ Labkit::Tracing::Redis.instrument if ENV['GITLAB_TRACING_TRACK_REDIS'].present?
# Instrument Rails
Labkit::Tracing::Rails::ActiveRecordSubscriber.instrument
Labkit::Tracing::Rails::ActionViewSubscriber.instrument
- Labkit::Tracing::Rails::ActiveSupportSubscriber.instrument
+ Labkit::Tracing::Rails::ActiveSupportSubscriber.instrument if ENV['GITLAB_TRACING_TRACK_CACHES'].present?
# In multi-processed clustered architectures (e.g. Puma cluster) don't
# start tracing until the worker processes are spawned. This works
diff --git a/config/initializers/warden.rb b/config/initializers/warden.rb
index 88f2a13df60..4aa5941747d 100644
--- a/config/initializers/warden.rb
+++ b/config/initializers/warden.rb
@@ -21,6 +21,8 @@ Rails.application.configure do |config|
Warden::Manager.after_authentication(scope: :user) do |user, auth, opts|
ActiveSession.cleanup(user)
+ # sets marketing cookie for active user session
+ ActiveSession.set_active_user_cookie(auth) if ::Gitlab.com?
Gitlab::AnonymousSession.new(auth.request.remote_ip).cleanup_session_per_ip_count
end
@@ -34,7 +36,8 @@ Rails.application.configure do |config|
Warden::Manager.before_logout(scope: :user) do |user, auth, opts|
user ||= auth.user
-
+ # deletes marketing cookie when user session ends
+ ActiveSession.unset_active_user_cookie(auth) if ::Gitlab.com?
# Rails CSRF protection may attempt to log out a user before that
# user even logs in
next unless user
diff --git a/config/initializers/zz_metrics.rb b/config/initializers/zz_metrics.rb
index 8ee6a055535..9074602a555 100644
--- a/config/initializers/zz_metrics.rb
+++ b/config/initializers/zz_metrics.rb
@@ -2,19 +2,7 @@
# This file was prefixed with zz_ because we want to load it the last!
# See: https://gitlab.com/gitlab-org/gitlab-foss/issues/55611
-
-# With prometheus enabled by default this breaks all specs
-# that stubs methods using `any_instance_of` for the models reloaded here.
-#
-# We should deprecate the usage of `any_instance_of` in the future
-# check: https://github.com/rspec/rspec-mocks#settings-mocks-or-stubs-on-any-instance-of-a-class
-#
-# Related issue: https://gitlab.com/gitlab-org/gitlab-foss/issues/33587
-#
-# In development mode, we turn off eager loading when we're running
-# `rails generate migration` because eager loading short-circuits the
-# loading of our custom migration templates.
-if Gitlab::Metrics.enabled? && !Rails.env.test? && !(Rails.env.development? && defined?(Rails::Generators))
+if Gitlab::Metrics.enabled? && Gitlab::Runtime.application?
require 'pathname'
require 'connection_pool'
diff --git a/config/initializers_before_autoloader/001_fast_gettext.rb b/config/initializers_before_autoloader/001_fast_gettext.rb
index 3d54ed8f32f..01aec95ce53 100644
--- a/config/initializers_before_autoloader/001_fast_gettext.rb
+++ b/config/initializers_before_autoloader/001_fast_gettext.rb
@@ -1,5 +1,6 @@
# frozen_string_literal: true
require_relative '../../lib/gitlab/i18n'
+require_relative '../../lib/gitlab/i18n/pluralization'
Gitlab::I18n.setup(domain: 'gitlab', default_locale: :en)
diff --git a/config/initializers_before_autoloader/004_zeitwerk.rb b/config/initializers_before_autoloader/004_zeitwerk.rb
index 8b3cdf1a80c..72e471d25f2 100644
--- a/config/initializers_before_autoloader/004_zeitwerk.rb
+++ b/config/initializers_before_autoloader/004_zeitwerk.rb
@@ -65,7 +65,6 @@ Rails.autoloaders.each do |autoloader|
'function_uri' => 'FunctionURI',
'uuid' => 'UUID',
'occurrence_uuid' => 'OccurrenceUUID',
- 'vulnerability_uuid' => 'VulnerabilityUUID',
- 'vs_code_extension_activity_unique_counter' => 'VSCodeExtensionActivityUniqueCounter'
+ 'vulnerability_uuid' => 'VulnerabilityUUID'
)
end
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index d6c5b3bbe98..2cea6dae6c5 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -69,6 +69,8 @@ en:
read_repository: Allows read-only access to the repository
write_repository: Allows read-write access to the repository
read_registry: Grants permission to read container registry images
+ read_observability: Allows read-only access to GitLab Observability
+ write_observability: Allows read-write access to GitLab Observability
openid: Authenticate using OpenID Connect
sudo: Perform API actions as any user in the system
profile: Allows read-only access to the user's personal information using OpenID Connect
@@ -88,6 +90,10 @@ en:
Grants read-only access to container registry images on private projects.
write_registry:
Grants write access to container registry images on private projects.
+ read_observability:
+ Grants read-only access to GitLab Observability.
+ write_observability:
+ Grants write access to GitLab Observability.
openid:
Grants permission to authenticate with GitLab using OpenID Connect. Also gives read-only access to the user's profile and group memberships.
sudo:
diff --git a/config/metrics/counts_28d/20210201124930_deployments.yml b/config/metrics/counts_28d/20210201124930_deployments.yml
index 56ea95bdb69..c2f9ecad3a5 100644
--- a/config/metrics/counts_28d/20210201124930_deployments.yml
+++ b/config/metrics/counts_28d/20210201124930_deployments.yml
@@ -5,7 +5,6 @@ description: Total deployments count for recent 28 days
product_section: ops
product_stage: release
product_group: ops_release
-product_category:
value_type: number
status: active
milestone: "13.2"
diff --git a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
index df64125b058..b6381d8342b 100644
--- a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
@@ -5,7 +5,6 @@ description: Unique visitors to any analytics feature by month
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: 28d
@@ -43,6 +42,7 @@ options:
- g_analytics_ci_cd_lead_time
- g_analytics_ci_cd_time_to_restore_service
- g_analytics_ci_cd_change_failure_rate
+ - g_metrics_comparison_page
distribution:
- ce
- ee
diff --git a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
index f053d0870ac..3f729590e1b 100644
--- a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /groups/:group/-/analytics/ci_cd by month
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
index c92230af6b8..1845052c271 100644
--- a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
+++ b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /:group/:project/-/value_stream_analytics by mon
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
index 553161c1470..c00d500f4d5 100644
--- a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
+++ b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
@@ -5,7 +5,6 @@ description: "Unique visitors to /-/instance_statistics/cohorts"
product_section: fulfillment
product_stage: fulfillment
product_group: utilization
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
index 2de313948aa..8171a552c67 100644
--- a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
+++ b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /admin/dev_ops_reports by month
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
index af4493b676b..f2716c0632c 100644
--- a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
@@ -5,7 +5,6 @@ description:
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
index 798c16fd68f..ce0bb54ab7f 100644
--- a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
+++ b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /admin/usage_trends by month
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
index 1f8175bd480..53c10d5f253 100644
--- a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: The number of unique users who visited any analytics feature by mon
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175055_merge_requests.yml b/config/metrics/counts_28d/20210216175055_merge_requests.yml
index a66896951f7..c71c83d7064 100644
--- a/config/metrics/counts_28d/20210216175055_merge_requests.yml
+++ b/config/metrics/counts_28d/20210216175055_merge_requests.yml
@@ -5,7 +5,6 @@ description: Count distinct authors of merge requests
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: removed
milestone_removed: '14.10'
diff --git a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
index 5db58dd93ae..f908bab1fc2 100644
--- a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -6,7 +6,6 @@ description: Count of the number of projects with setting to disable overriding
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
index 32a68c1de56..8577300a357 100644
--- a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -6,7 +6,6 @@ description: Count of the number of projects without setting to disable overridi
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
index 07ad35e45bf..6f55fa74cfc 100644
--- a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
+++ b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
@@ -5,9 +5,8 @@ description: Distinct count of users performing merge request actions like close
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
-status: active
+status: removed
time_frame: 28d
data_source: redis_hll
distribution:
@@ -17,7 +16,7 @@ tier:
- free
- premium
- ultimate
-performance_indicator_type:
-- gmau
-- paid_gmau
+performance_indicator_type: []
milestone: "<13.9"
+milestone_removed: "15.10"
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115037
diff --git a/config/metrics/counts_28d/20210216175109_suggestions.yml b/config/metrics/counts_28d/20210216175109_suggestions.yml
index 7f4e0569e25..d7e649ad7f8 100644
--- a/config/metrics/counts_28d/20210216175109_suggestions.yml
+++ b/config/metrics/counts_28d/20210216175109_suggestions.yml
@@ -6,7 +6,6 @@ description: Count of unique users per month who create suggestions in merge req
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
index 5a6150b21af..7ee99925c98 100644
--- a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users who perform an action on a merge request
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
index 1329aff088d..a1abd09c9a2 100644
--- a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
+++ b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users who use code intelligence
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
index 8d88ab365bd..5b7b8ae9ef2 100644
--- a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique merge requests per month with diffs viewed
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
index 263a59891b4..ed073e9d152 100644
--- a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month with diffs viewed file by file
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
index 8370eb21f36..46599f6913c 100644
--- a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique merge requests per month with diffs viewed file by
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
index a6bfeed7059..fbcacf73dfc 100644
--- a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
@@ -1,11 +1,10 @@
---
-data_category: optional
+data_category: operational
key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_monthly
description: Count of unique users per month who created a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
index c8f2386e908..171b4fcd522 100644
--- a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who closed a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
index 2f3c61f4f3c..4ce189e56d3 100644
--- a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who reopened a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
index de20c8fdc7a..a786737461f 100644
--- a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who merged a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
index 761683fe34f..8da0bf334ca 100644
--- a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who commented on a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
index 16351810c6f..9f035b35c0f 100644
--- a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who edited a comment on a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
index c15d962b0de..877d2caf905 100644
--- a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who removed a comment on a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
index d28e463dc1b..cc8846920e3 100644
--- a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who added a suggestion
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
index 6ed0515fec5..ea288e7213a 100644
--- a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who applied a suggestion
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
index 71304cdcc77..41383bbed2b 100644
--- a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
@@ -5,7 +5,7 @@ description: Count user ids from GitLab Managed clusters with Cert Manager enabl
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
index c772e7ba6cb..24e70eddbe5 100644
--- a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
+++ b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
@@ -5,7 +5,7 @@ description: Count user ids from GitLab Managed clusters with Helm enabled
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
index 0a36f99563f..3a846b8016a 100644
--- a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
+++ b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
@@ -5,7 +5,7 @@ description: Count user ids from GitLab Managed clusters with Ingress enabled
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
index e01b941912f..75e14e36b4d 100644
--- a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
+++ b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
@@ -5,7 +5,7 @@ description: Count user ids from GitLab Managed clusters with Knative enabled
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
index 708c1e64326..8ea669437ff 100644
--- a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
+++ b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
@@ -7,7 +7,7 @@ description: Number of Kubernetes clusters with clusters management project bein
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
index b91eed1c015..39f8bf477c5 100644
--- a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Number of user ids from GitLab Managed disabled clusters
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
index 2c56b369b49..50e38523ade 100644
--- a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Number of distict user ids from GitLab Managed clusters currently e
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
index 3b7c869c851..f9f7e4137c9 100644
--- a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
+++ b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
@@ -5,7 +5,7 @@ description: Number of user ids from GitLab Managed clusters provisioned with Gi
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
index b48556ca885..855b5f12fac 100644
--- a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
+++ b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
@@ -5,7 +5,7 @@ description: Number of user ids from GitLab Managed clusters provisioned with Gi
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
index f9e5657144c..7c0560448e7 100644
--- a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
+++ b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
@@ -5,7 +5,7 @@ description: Number of user ids from GitLab Managed clusters that are user provi
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
index 399046a2d6d..1946b6cc1a6 100644
--- a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Number of users from GitLab Managed disabled clusters attached to t
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
index 059e26a137b..139ca314e17 100644
--- a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Number of user ids from GitLab Managed enabled clusters attached to
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
index dbc86047521..284d0ebd945 100644
--- a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Number of user ids GitLab Managed disabled clusters attached to gro
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
index e1ff7306af0..8898c54989e 100644
--- a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Count disctinct user ids from GitLab Managed enabled clusters attac
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
index edf02be00dd..b0b2c0e76a5 100644
--- a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Number of user ids from GitLab Managed disabled clusters attached t
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
index 2b601bf2760..9000f412607 100644
--- a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Number of user ids from GitLab Managed enabled clusters attached to
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index 31c41332fed..3d2777aebea 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -5,7 +5,6 @@ description: Distinct users triggering jobs in a month
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
index 506abce6ce5..7a66d3dc1c9 100644
--- a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
@@ -5,7 +5,6 @@ description: Distinct users triggering pipelines in external repositories in a m
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
index 7ae086fbdcb..d91b965765d 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -5,7 +5,6 @@ description: Distinct users triggering pipelines in internal repositories in a m
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
index 6bda7c714d7..06f94fe09b2 100644
--- a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
@@ -5,7 +5,6 @@ description: Distinct users that ran an auto DevOps pipeline without a .gitlab-c
product_section: ops
product_stage: configure
product_group: configure
-product_category: auto_devops
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
index 5253731dcc8..341cc40bba4 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -5,7 +5,6 @@ description: Monthly count of unique users creating pipelines from CI files in t
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
index 8a57e5989c4..ed88363f2e4 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -1,11 +1,10 @@
---
-data_category: optional
+data_category: operational
key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_schedules
description: Distinct users creating pipeline schedules in a month
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
index da338611257..4cbd7791013 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -5,7 +5,6 @@ description: Distinct users triggering pipelines in a month
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216175556_ci_triggers.yml b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
index a7c21eba666..81419262a36 100644
--- a/config/metrics/counts_28d/20210216175556_ci_triggers.yml
+++ b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
@@ -5,7 +5,6 @@ description: Distinct users creating pipeline triggers in a month
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180308_personal_snippets.yml b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
index 3b036d022c7..99893caa053 100644
--- a/config/metrics/counts_28d/20210216180308_personal_snippets.yml
+++ b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
@@ -5,7 +5,6 @@ description: Monthly count of personal Snippets
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180310_project_snippets.yml b/config/metrics/counts_28d/20210216180310_project_snippets.yml
index 8dc9caee45b..a91e66d97ad 100644
--- a/config/metrics/counts_28d/20210216180310_project_snippets.yml
+++ b/config/metrics/counts_28d/20210216180310_project_snippets.yml
@@ -5,7 +5,6 @@ description: Monthly count of project Snippets
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180312_snippets.yml b/config/metrics/counts_28d/20210216180312_snippets.yml
index dfe24039f52..3f8acf0857f 100644
--- a/config/metrics/counts_28d/20210216180312_snippets.yml
+++ b/config/metrics/counts_28d/20210216180312_snippets.yml
@@ -1,11 +1,10 @@
---
-data_category: optional
+data_category: operational
key_path: counts_monthly.snippets
description: Monthly count of All Snippets
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180317_snippets.yml b/config/metrics/counts_28d/20210216180317_snippets.yml
index 21c1196f241..0b3cc1b3915 100644
--- a/config/metrics/counts_28d/20210216180317_snippets.yml
+++ b/config/metrics/counts_28d/20210216180317_snippets.yml
@@ -6,7 +6,6 @@ description: Count of distinct author_id from snippets for last 28 days
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
index dd66f4a3b47..e5757e6c0d0 100644
--- a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
@@ -5,9 +5,10 @@ description: Number of users editing using web IDE
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111351
+milestone_removed: 15.9
time_frame: 28d
data_source: redis_hll
distribution:
diff --git a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
index 8dbf5e5ba41..0716b6f397f 100644
--- a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
+++ b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
@@ -5,9 +5,10 @@ description: Number of users using single file editor
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113551
+milestone_removed: 15.10
time_frame: 28d
data_source: redis_hll
distribution:
diff --git a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
index 5a2d9c197ce..8167e44c015 100644
--- a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
+++ b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
@@ -5,9 +5,10 @@ description: Number of users using the snippet editor
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113551
+milestone_removed: 15.10
time_frame: 28d
data_source: redis_hll
distribution:
diff --git a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
index 79f1db5e730..9b263d39521 100644
--- a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
+++ b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
@@ -5,7 +5,6 @@ description: Number of users using the static site editor
product_section: dev
product_stage: create
product_group: editor
-product_category: static_site_editor
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
index 49da20e316e..33bb1b12c50 100644
--- a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
@@ -5,7 +5,6 @@ description: Number of unique users per month who edited a file from any web edi
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
index afd69a800cc..bd147983063 100644
--- a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
@@ -5,7 +5,6 @@ description: Number of users editing a file from the Web IDE
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
index 78622d0fc18..fa5b71b3ca3 100644
--- a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
+++ b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
@@ -1,11 +1,10 @@
---
-data_category: optional
+data_category: operational
key_path: redis_hll_counters.ide_edit.g_edit_by_sfe_monthly
description: Number of users editing a file from the single file editor
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
index 5e3ee643e07..f1faa6a45b8 100644
--- a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
@@ -5,7 +5,6 @@ description: Count of monthly edits to a snippet
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
index 1745055d11e..163821c571b 100644
--- a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who edited a file from the Web IDE
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
index 0d4a62696b7..3e92ec05e21 100644
--- a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
+++ b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to perform Basic or Advanced searches by mo
product_section: enablement
product_stage: enablement
product_group: global_search
-product_category: global_search
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
index a62b15af694..854c4407ce5 100644
--- a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
@@ -8,7 +8,6 @@ description: Total unique users for i_search_total, i_search_advanced, i_search_
product_section: enablement
product_stage: enablement
product_group: global_search
-product_category: global_search
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
index 3b61fb65911..f846944a18f 100644
--- a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month to take an action on an alert
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
index b5afcfa7ae6..4a020dd0742 100644
--- a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month to take an action on an incident
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
index 405a43b3766..6cfec1068bf 100644
--- a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
+++ b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
@@ -5,7 +5,6 @@ description: Count of unique projects with an incident created in the last month
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
index e0aa35fea62..ee7f226f63b 100644
--- a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
@@ -6,7 +6,6 @@ description: Count of unique projects with an incident from an alert created in
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml b/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
index e1c9d40715c..bb3aba1ea1c 100644
--- a/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users changing alert's status changes per month
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml b/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
index c3bacf2d529..fbb2c10e7ce 100644
--- a/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users assigning an alert per month
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml b/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
index 8d8239e5403..4e2f0996301 100644
--- a/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users adding alerts to the TODO list per month
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml b/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
index 3f6af2826c5..c2c0d3dad8a 100644
--- a/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users creating incidents per month
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml b/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
index 7684c4714d4..e476a14f13a 100644
--- a/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users reopening incidents per month
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml b/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
index b769652890b..7d64e5b3207 100644
--- a/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users closing incidents per month
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml b/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
index ac4aedc8be6..2f1fc2fe103 100644
--- a/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users assigning incidents per month
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml b/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
index 3cdfe2a3bf3..876d41f774c 100644
--- a/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users adding incidents to the TODO list per month
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml b/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
index cb6dd8ce5c2..dda9bc78e8d 100644
--- a/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users adding comments per month on incidents
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml b/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
index a4ecf832a9e..35b30aa260c 100644
--- a/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
+++ b/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users creating Zoom meetings about incidents per month
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml b/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
index b060d0c8c2a..99a2d5fc88a 100644
--- a/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
@@ -6,7 +6,6 @@ description: Count of unique users adding issues per month that are related to a
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml b/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
index af2b7b26610..3859db8db40 100644
--- a/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
+++ b/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users removing issues that are related to an incident per
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml b/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
index 92e2413f93a..d32b4e85d1b 100644
--- a/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users changing incidents to confidential per month
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
index 68335a034a1..5ee19950f49 100644
--- a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users performing events related with incidents per
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml b/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
index e8791ee4ea6..ad0cbac593e 100644
--- a/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
+++ b/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
@@ -6,7 +6,6 @@ description: Count of unique users per month to create an incident corresponding
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
index 6c2f8f75861..dd3fa6565a9 100644
--- a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
+++ b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from GitHub
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
index ca47e918461..63d43242477 100644
--- a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
+++ b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
@@ -5,7 +5,6 @@ description: Monthly active users for design management
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: design_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
index 2a9353caf6a..a7125a7f648 100644
--- a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
+++ b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
@@ -5,9 +5,10 @@ description: Unique monthly active users of the Wiki
product_section: dev
product_stage: create
product_group: editor
-product_category: wiki
value_type: number
-status: active
+status: removed
+milestone_removed: "15.10"
+removed_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114997"
time_frame: 28d
data_source: redis_hll
instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210216180814_events.yml b/config/metrics/counts_28d/20210216180814_events.yml
index 3d3d9015e57..e30babe377d 100644
--- a/config/metrics/counts_28d/20210216180814_events.yml
+++ b/config/metrics/counts_28d/20210216180814_events.yml
@@ -5,7 +5,6 @@ description: Number of distinct users who have generated a manage event by month
product_section: dev
product_stage: manage
product_group: manage
-product_category:
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180816_groups.yml b/config/metrics/counts_28d/20210216180816_groups.yml
index 806b78be7b6..f0d1bdc5382 100644
--- a/config/metrics/counts_28d/20210216180816_groups.yml
+++ b/config/metrics/counts_28d/20210216180816_groups.yml
@@ -5,7 +5,6 @@ description: Number of users who are group members for last 28 days
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category: subgroups
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180818_users_created.yml b/config/metrics/counts_28d/20210216180818_users_created.yml
index b4646b3e012..a99129a6a10 100644
--- a/config/metrics/counts_28d/20210216180818_users_created.yml
+++ b/config/metrics/counts_28d/20210216180818_users_created.yml
@@ -5,7 +5,6 @@ description: Number of users created in the month
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category: users
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
index bfbad28ff80..9faf6cf6a84 100644
--- a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
@@ -5,7 +5,6 @@ description: Projects with Prometheus alerting enabled
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: removed
milestone_removed: '14.0'
diff --git a/config/metrics/counts_28d/20210216180956_clusters.yml b/config/metrics/counts_28d/20210216180956_clusters.yml
index f5100e8a67e..33b35d0ad1c 100644
--- a/config/metrics/counts_28d/20210216180956_clusters.yml
+++ b/config/metrics/counts_28d/20210216180956_clusters.yml
@@ -5,7 +5,6 @@ description: Count users creating clusters in last 28 days.
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
index ce391200627..69939472df6 100644
--- a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
@@ -5,7 +5,6 @@ description: Users creating clusters with Prometheus enabled in last 28 days.
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
index 47321b7b6c9..56cb1df8724 100644
--- a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
@@ -5,7 +5,6 @@ description: Active users with enabled operations dashboard
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
index d0e433af157..ed10a481988 100644
--- a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
@@ -5,7 +5,6 @@ description: Projects with tracing enabled
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: tracing
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
index 0f6696d1666..76ff3d7a834 100644
--- a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
@@ -5,7 +5,6 @@ description: Count of users creating projects with error tracking enabled.
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
index 037da98e5fa..a4770212223 100644
--- a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
@@ -5,7 +5,6 @@ description: Active users with projects on operations dashboard
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181050_packages.yml b/config/metrics/counts_28d/20210216181050_packages.yml
index 39af30e7b21..f22005838be 100644
--- a/config/metrics/counts_28d/20210216181050_packages.yml
+++ b/config/metrics/counts_28d/20210216181050_packages.yml
@@ -5,7 +5,6 @@ description: A monthly count of packages published to the registry
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
index ff4a0887c01..a1e10881251 100644
--- a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
+++ b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
@@ -5,7 +5,6 @@ description: The total number of projects in a given month with at least one pac
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181139_issues.yml b/config/metrics/counts_28d/20210216181139_issues.yml
index 13b38a681b1..ffb7a16e611 100644
--- a/config/metrics/counts_28d/20210216181139_issues.yml
+++ b/config/metrics/counts_28d/20210216181139_issues.yml
@@ -5,7 +5,6 @@ description: Count of users creating Issues in last 28 days.
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181141_notes.yml b/config/metrics/counts_28d/20210216181141_notes.yml
index 3bb61debcc0..553c49bfcf7 100644
--- a/config/metrics/counts_28d/20210216181141_notes.yml
+++ b/config/metrics/counts_28d/20210216181141_notes.yml
@@ -5,7 +5,6 @@ description: Count of MAU commenting on an issuable
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181143_projects.yml b/config/metrics/counts_28d/20210216181143_projects.yml
index 4d9de3799ad..fbd2f683914 100644
--- a/config/metrics/counts_28d/20210216181143_projects.yml
+++ b/config/metrics/counts_28d/20210216181143_projects.yml
@@ -5,7 +5,6 @@ description: Count of MAU creating projects
product_section: dev
product_stage: plan
product_group: project_management
-product_category: projects
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181145_todos.yml b/config/metrics/counts_28d/20210216181145_todos.yml
index 9cffb8c2b35..cff427c9476 100644
--- a/config/metrics/counts_28d/20210216181145_todos.yml
+++ b/config/metrics/counts_28d/20210216181145_todos.yml
@@ -5,7 +5,6 @@ description: Count of MAU creating todos
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
index a2a3d0e297f..f45f7be3022 100644
--- a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
@@ -2,10 +2,9 @@
data_category: optional
key_path: usage_activity_by_stage_monthly.plan.service_desk_enabled_projects
description: Count creator ids from projects with service desk enabled
-product_section: dev
-product_stage: plan
-product_group: product_planning
-product_category: service_desk
+product_section: ops
+product_stage: monitor
+product_group: respond
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
index 8ca0b6a55c3..302dc04e16a 100644
--- a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
+++ b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
@@ -2,10 +2,9 @@
data_category: operational
key_path: usage_activity_by_stage_monthly.plan.service_desk_issues
description: Count of service desk issues
-product_section: dev
-product_stage: plan
-product_group: plan
-product_category:
+product_section: ops
+product_stage: monitor
+product_group: respond
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
index 6f687b89560..c0cbc111c6a 100644
--- a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
+++ b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
@@ -5,7 +5,6 @@ description: Distinct count of creator_id from projects with an active Jira inte
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
index ba6994ac23a..fdbcab9749d 100644
--- a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
@@ -6,7 +6,6 @@ description: Distinct count of creator_id from projects with an active Jira Clou
product_section: dev
product_stage: manage
product_group: integration
-product_category: integrations
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
index 3d327b17de0..0efd1ec9f52 100644
--- a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
@@ -6,7 +6,6 @@ description: Distinct count of creator_id from projects with an active Jira Serv
product_section: dev
product_stage: manage
product_group: integration
-product_category: integrations
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181158_epics.yml b/config/metrics/counts_28d/20210216181158_epics.yml
index 0c913b31f6d..d3f6b0805f5 100644
--- a/config/metrics/counts_28d/20210216181158_epics.yml
+++ b/config/metrics/counts_28d/20210216181158_epics.yml
@@ -5,7 +5,6 @@ description: Count distinct author ids from epics
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: epics
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181200_label_lists.yml b/config/metrics/counts_28d/20210216181200_label_lists.yml
index a35840cf395..c1d13515d21 100644
--- a/config/metrics/counts_28d/20210216181200_label_lists.yml
+++ b/config/metrics/counts_28d/20210216181200_label_lists.yml
@@ -5,7 +5,6 @@ description: Count of MAU creating label lists on Boards
product_section: dev
product_stage: plan
product_group: project_management
-product_category: boards
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
index b61909074df..ae28eb8e057 100644
--- a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU editing an issue title
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
index 7aa9aec3e83..e00b7c18176 100644
--- a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU editing an issue description
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
index a7ac8e5ff84..a548cf8ede7 100644
--- a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU changing issue assignees
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
index 10ce645e3c1..0ff91cc6f9e 100644
--- a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU making an issue confidential
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
index 5264a1b5d7f..764acfd1720 100644
--- a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
+++ b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU making an issue not confidential
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
index 9d8424e05f8..0389fe6a513 100644
--- a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU creating new issues
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
index 4c8177c17b3..962c8d85417 100644
--- a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU closing an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
index 4c09b7ee20c..6e1690afaba 100644
--- a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU re-opening a closed issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
index 3d50e6cd9b7..cbf3795eb4e 100644
--- a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU changing an issue's label
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
index af66e66109a..a653df04b24 100644
--- a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU changing an issue's milestone
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
index b1c9d8b9fde..c476a738721 100644
--- a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
+++ b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU referencing an issue from somewhere else
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
index 4b12bba4a5d..d7d432060d3 100644
--- a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
+++ b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU moving an issue to another project
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
index 0bd107cdaed..62d58bb6da1 100644
--- a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
+++ b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU relating an issue to another issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
index fe0942b44b5..39b482d859b 100644
--- a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
+++ b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU unrelating an issue to another issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
index 882eb5d1ac2..8d6bb063089 100644
--- a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU marking an issue as a duplicate
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
index b8eb3dcf218..290aa31ee18 100644
--- a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU locking an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
index 7260222961c..0f990ee8dcd 100644
--- a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU unlocking an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
index 6022e93b0a5..d7958ab29fe 100644
--- a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU adding a design to an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
index 95543c6093d..953dbd9f7f0 100644
--- a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
+++ b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU modifying a design on an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
index 85341debfb7..565f819fedb 100644
--- a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU removing a design from an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
index 60c293fd04d..cfdecbf45e2 100644
--- a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU changing an issue due date
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
index db15f121047..0e4892865e1 100644
--- a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU changing an issue time estimate
product_section: dev
product_stage: plan
product_group: project_management
-product_category: time_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
index 50dcf6156b1..c49dc9a076c 100644
--- a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU recording time spent on an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: time_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
index 38532866753..3062544003d 100644
--- a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU commenting on an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
index 944b706bdc5..cdf12de3a38 100644
--- a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU editing a comment on an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
index 201d9d5f169..4327a7e60d7 100644
--- a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU deleting a comment from an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
index 6aa874e0703..de4fc157b43 100644
--- a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
+++ b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU cloning an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
index bd654f16cd5..a9bc74e96e6 100644
--- a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: Aggregate count of MAU taking an action related to an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
index 3d6bb37de79..a27d6351c94 100644
--- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
+++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/approve` quick action
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
index c905cdcfb04..04836723d40 100644
--- a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
+++ b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/assign @user1` quick action to assign a si
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml b/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
index 3c2cad5831e..9a48aebf77f 100644
--- a/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
+++ b/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/assign @user1 @user2` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
index 89d0de2550f..7ed3a66af89 100644
--- a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
+++ b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/assign me` quick action to assign self to
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
index ef2778050b0..49e5f98fefb 100644
--- a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/assign_reviewer` or `request_reviewer` qui
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
index ac3ca60d777..0d522959439 100644
--- a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
+++ b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/award` quick action to set an award emoji
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
index 4f35a7dcd33..a28aa9018e4 100644
--- a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/board_move` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
index 235d6505438..90d0389c8b1 100644
--- a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/clone` quick action to clone an issue.
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
index d2ae2e53f38..abd86021fb8 100644
--- a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
+++ b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/close` quick action to close an issuable
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
index 9dca99be928..fa7bac6904b 100644
--- a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/confidential` quick action to set an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
index 1b8e52b127e..c313f5e5108 100644
--- a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/copy_metadata` quick action on a Merge Req
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
index 68d3b37035c..3baafede3c4 100644
--- a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/copy_metadata` quick action on an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
index ddcec1d9a86..993489a08c8 100644
--- a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/create_merge_request` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
index 725e369519d..d4b162a10a7 100644
--- a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
+++ b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/done` quick action to mark a todo as done
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
index 77a22a982d4..f0a957575b1 100644
--- a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/draft` quick action on a Merge Request
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
index aea158347d2..a50bd036ddb 100644
--- a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
+++ b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/due` quick action to change the due date o
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
index e79a1b5e869..e1a53fb0864 100644
--- a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/duplicate` quick action to mark an issue a
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
index e59d264fe1d..3de48247b40 100644
--- a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/estimate` quick action to set a time estim
product_section: dev
product_stage: plan
product_group: project_management
-product_category: time_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
index 5b34fee13fd..3c80afe9a4a 100644
--- a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
+++ b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/label` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
index 6c1d4bb8520..a0029941580 100644
--- a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/lock` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
index 524a75f84d4..f138833b198 100644
--- a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
+++ b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/merge` quick action
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
index 7e373fe2e13..fb8a1cc1168 100644
--- a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/milestone` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
index 88765db809e..f5d1a74e032 100644
--- a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/move` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
index 44d3d677dee..0b1c9d29c40 100644
--- a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
+++ b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/reassign @user1` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
index 061bcbbb6c0..0f931631431 100644
--- a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/reassign_reviewer` quick action
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
index ae3b9ae13c2..938af8fed5e 100644
--- a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
+++ b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/rebase` quick action on a Merge Request
product_section: dev
product_stage: source_code
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
index 4e3f6f53694..63722b97746 100644
--- a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
+++ b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/relabel` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
index 88b3d2c6c6d..763f8e2a7ed 100644
--- a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/relate` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
index ec0f16a09c2..73f14879e36 100644
--- a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
+++ b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/remove_due_date` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
index 831f9a93982..f58931e1523 100644
--- a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/remove_estimate` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: time_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
index aacd8916937..1e5453a643d 100644
--- a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/remove_milestone` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
index 13adfd63500..b70537d3065 100644
--- a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
+++ b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/remove_time_spent` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
index 4e0e679e4d8..b183df0c618 100644
--- a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/remove_zoom` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
index 8341b7f0179..a7c0758618a 100644
--- a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
+++ b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/reopen` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
index c711dff2df0..1d608f2fda3 100644
--- a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
+++ b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/shrug` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
index 7de55598d47..b431f76fce5 100644
--- a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
+++ b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/spend` quick action to subtract time spent
product_section: dev
product_stage: plan
product_group: project_management
-product_category: time_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
index 99f7aa98719..e0f66641c21 100644
--- a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
+++ b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/spend` quick action to add time spent
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
index 1e3fefbcfae..c63915124e9 100644
--- a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/submit_review` quick action on Merge Reque
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
index 9eca7c87963..e0f1f69cf29 100644
--- a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/subscribe` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
index 5280ed2fcbf..a833675082f 100644
--- a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/tableflip` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
index 15c89bcec88..0bca2bcb539 100644
--- a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
+++ b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/tag` quick action
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
index 21cb0a54942..b71a8507df7 100644
--- a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
+++ b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/target_branch` quick action on Merge Reque
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
index 82168bfe6ca..913dbb249dd 100644
--- a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/title` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
index 78a05e1003c..106303b165c 100644
--- a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/todo` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
index df49d1b427c..529f8250bf3 100644
--- a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/unassign @user1` quick action on Merge Req
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
index 426ab3bf763..e2a5bfd1f8e 100644
--- a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/unassign` quick action on Merge Requests
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
index 5cb2e620dc1..e70f32d865f 100644
--- a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/unassign_reviewer` or `/remove_reviewer` q
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
index 00aa10d9578..92ad608b17f 100644
--- a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
@@ -6,7 +6,6 @@ description: Count of MAU using the `/unlabel` or `/remove_label` quick action t
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
index 97e40c5a1b1..0b77381cfb9 100644
--- a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/unlabel` quick action to remove all labels
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
index 29c61e97726..f3a113c94e1 100644
--- a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/unlock` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
index 879a60fc8e7..f04053ccbe6 100644
--- a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/unsubscribe` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
index fcdc2e28030..3154dd769e5 100644
--- a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/wip` quick action on Merge Requests
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
index 5c346f40ebc..989754dd94c 100644
--- a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/zoom` quick action on Issues
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181923_successful_deployments.yml b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
index 27881c0975a..eb8b6df44e3 100644
--- a/config/metrics/counts_28d/20210216181923_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
@@ -5,7 +5,6 @@ description: Total successful deployments
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181924_failed_deployments.yml b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
index 1cd1a8a032a..a6e27b6e8e0 100644
--- a/config/metrics/counts_28d/20210216181924_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
@@ -5,7 +5,6 @@ description: Total failed deployments
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181935_deployments.yml b/config/metrics/counts_28d/20210216181935_deployments.yml
index 5e7ee9b1d50..a375dd5f7c9 100644
--- a/config/metrics/counts_28d/20210216181935_deployments.yml
+++ b/config/metrics/counts_28d/20210216181935_deployments.yml
@@ -5,7 +5,6 @@ description: Unique users triggering deployments
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181937_failed_deployments.yml b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
index adf373cde20..8099e8b4029 100644
--- a/config/metrics/counts_28d/20210216181937_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
@@ -5,7 +5,6 @@ description: Disinct users who initiated a failed deployment.
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181939_releases.yml b/config/metrics/counts_28d/20210216181939_releases.yml
index c2530b288b9..d1f7ba91094 100644
--- a/config/metrics/counts_28d/20210216181939_releases.yml
+++ b/config/metrics/counts_28d/20210216181939_releases.yml
@@ -5,7 +5,6 @@ description: Unique users creating release tags
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181941_successful_deployments.yml b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
index a2282df3e4f..98b65907aa6 100644
--- a/config/metrics/counts_28d/20210216181941_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
@@ -5,7 +5,6 @@ description: Disinct users who initiated a successful deployment.
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
index 9752c924a90..2509db0052d 100644
--- a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
+++ b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
@@ -5,7 +5,6 @@ description: Total GitLab Managed clusters with Runner enabled
product_section: ops
product_stage: verify
product_group: runner
-product_category: runner
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182034_deploy_keys.yml b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
index 22e30fd46cd..e59714e3587 100644
--- a/config/metrics/counts_28d/20210216182034_deploy_keys.yml
+++ b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
@@ -5,7 +5,6 @@ description: Count of users creating deploy keys in last 28 days.
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182036_keys.yml b/config/metrics/counts_28d/20210216182036_keys.yml
index 32debdcde5c..6125702b7f9 100644
--- a/config/metrics/counts_28d/20210216182036_keys.yml
+++ b/config/metrics/counts_28d/20210216182036_keys.yml
@@ -5,7 +5,6 @@ description: Count of users creating regular keys in last 28 days.
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
index 49a8bd129c4..7a44bba7f38 100644
--- a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
+++ b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
@@ -6,7 +6,6 @@ description: Count of users creating projects with remote mirrors. Includes both
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
index 4744976f4d1..308b55d9a90 100644
--- a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
+++ b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
@@ -5,7 +5,6 @@ description: Count of monthly active users who have performed any Git operation
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
index 153596352e7..aed69340dfa 100644
--- a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
+++ b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
@@ -5,7 +5,6 @@ description: Aggregated value for wiki, design, and project repo Git write actio
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182051_protected_branches.yml b/config/metrics/counts_28d/20210216182051_protected_branches.yml
index 30a3fdec69a..8f6589b5c37 100644
--- a/config/metrics/counts_28d/20210216182051_protected_branches.yml
+++ b/config/metrics/counts_28d/20210216182051_protected_branches.yml
@@ -6,7 +6,6 @@ description: Count of users creating projects with repositories making use of at
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
index 09aa1254bf7..56052ecb81a 100644
--- a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
@@ -3,9 +3,8 @@ data_category: optional
key_path: redis_hll_counters.source_code.wiki_action_monthly
description: Count of unique actions done on a wiki (create, edit, delete)
product_section: dev
-product_stage: create
-product_group: source_code
-product_category: source_code_management
+product_stage: plan
+product_group: knowledge
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
index 41157cef2fe..db0f7728aa3 100644
--- a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
@@ -5,7 +5,6 @@ description: Count of total design actions (upload, delete, comment, reply)
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
index d6fc28af969..3d873b1c955 100644
--- a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
@@ -6,7 +6,6 @@ description: Count of unique actions done on projects and related resources (cre
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182129_sast_pipeline.yml b/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
index 53f1d30f870..0babd0a456c 100644
--- a/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
@@ -5,7 +5,6 @@ description: Counts of Pipelines that have at least 1 SAST job
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: static_application_security_testing
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml b/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
index fee63f8d9fd..580ec1bd31e 100644
--- a/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
@@ -5,7 +5,6 @@ description: Counts of Pipelines that have at least 1 Secret Detection job
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: secret_detection
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
index 12b9e922a1c..7609b0d3bd7 100644
--- a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
+++ b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
@@ -5,8 +5,7 @@ description: Internal Tracking to count number of unit tests parsed for planning
future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
product_section: ops
product_stage: verify
-product_group: pipeline_insights
-product_category: code_testing
+product_group: pipeline_execution
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
index 37c12a1e9be..7557ba58c58 100644
--- a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
+++ b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
@@ -5,7 +5,6 @@ description: Monthly count of unique projects with HTTP alerting enabled
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
index d617f3dcebd..9602d8c8553 100644
--- a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
+++ b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
@@ -5,7 +5,6 @@ description: This was test metric used for purpose of assuring correct implement
product_section: analytics
product_stage: analytics
product_group: product_intelligence
-product_category: collection
value_type: number
status: removed
milestone_removed: '13.11'
diff --git a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
index b5c1114ddbb..e5a5db2f0ec 100644
--- a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
+++ b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
@@ -5,7 +5,6 @@ description: This was test metric used for purpose of assuring correct implement
product_section: analytics
product_stage: analytics
product_group: product_intelligence
-product_category: collection
value_type: number
status: removed
milestone_removed: '13.11'
diff --git a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
index b65141906e8..e7764661dad 100644
--- a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
+++ b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
@@ -5,7 +5,6 @@ description: List of unique OmniAuth providers
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category: authentication_and_authorization
value_type: object
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
index 4e6bb25cb13..4ea6f65de58 100644
--- a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
+++ b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
@@ -5,7 +5,6 @@ description: Number of unique users performing imports
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183640_gitlab.yml b/config/metrics/counts_28d/20210216183640_gitlab.yml
index 2c29feff047..491e71844fd 100644
--- a/config/metrics/counts_28d/20210216183640_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183640_gitlab.yml
@@ -5,7 +5,6 @@ description: REMOVED - Count of projects imported using bulk imports
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
index 6deb3c937b2..b84882770ab 100644
--- a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
+++ b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
@@ -5,7 +5,6 @@ description: Count of bulk imports - GitLab Migration
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183644_gitlab_project.yml b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
index 0b776822fcc..c10a3571086 100644
--- a/config/metrics/counts_28d/20210216183644_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using Project Import/Export
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183646_gitlab.yml b/config/metrics/counts_28d/20210216183646_gitlab.yml
index 73b7ae42466..0aa35644f9b 100644
--- a/config/metrics/counts_28d/20210216183646_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183646_gitlab.yml
@@ -5,9 +5,10 @@ description: Count of projects imported from GitLab using Project Export/Import
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
-status: active
+status: removed
+removed_by: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118891"
+milestone_removed: "16.0"
time_frame: 28d
data_source: database
instrumentation_class: CountImportedProjectsMetric
diff --git a/config/metrics/counts_28d/20210216183648_github.yml b/config/metrics/counts_28d/20210216183648_github.yml
index 159f0440bb8..9bb40312f62 100644
--- a/config/metrics/counts_28d/20210216183648_github.yml
+++ b/config/metrics/counts_28d/20210216183648_github.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from GitHub
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183650_bitbucket.yml b/config/metrics/counts_28d/20210216183650_bitbucket.yml
index 3ad9a26367e..7267b96f003 100644
--- a/config/metrics/counts_28d/20210216183650_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183650_bitbucket.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Bitbucket
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
index 87c88931a7c..324b918a726 100644
--- a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Bitbucket Server
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183653_gitea.yml b/config/metrics/counts_28d/20210216183653_gitea.yml
index f23380e1726..0757b6228cd 100644
--- a/config/metrics/counts_28d/20210216183653_gitea.yml
+++ b/config/metrics/counts_28d/20210216183653_gitea.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Gitea
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183655_git.yml b/config/metrics/counts_28d/20210216183655_git.yml
index e886cf6132b..77378e98233 100644
--- a/config/metrics/counts_28d/20210216183655_git.yml
+++ b/config/metrics/counts_28d/20210216183655_git.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Git
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183657_manifest.yml b/config/metrics/counts_28d/20210216183657_manifest.yml
index 316755c772f..fac22f07503 100644
--- a/config/metrics/counts_28d/20210216183657_manifest.yml
+++ b/config/metrics/counts_28d/20210216183657_manifest.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using Manifest file
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
index 413ccf6d2c0..ed3e8d8d6c0 100644
--- a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using GitLab Migration
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183701_jira.yml b/config/metrics/counts_28d/20210216183701_jira.yml
index dc7c6c925f2..5ea1a771531 100644
--- a/config/metrics/counts_28d/20210216183701_jira.yml
+++ b/config/metrics/counts_28d/20210216183701_jira.yml
@@ -5,7 +5,6 @@ description: Count of imports from Jira
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183703_fogbugz.yml b/config/metrics/counts_28d/20210216183703_fogbugz.yml
index 44acc1f7fdb..9b66555c478 100644
--- a/config/metrics/counts_28d/20210216183703_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183703_fogbugz.yml
@@ -5,7 +5,6 @@ description: Count of imports from Fogbugz
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183705_phabricator.yml b/config/metrics/counts_28d/20210216183705_phabricator.yml
index 69ea2a20a69..6eaeb55a3a7 100644
--- a/config/metrics/counts_28d/20210216183705_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183705_phabricator.yml
@@ -5,9 +5,10 @@ description: Count of imports from Phabricator
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
-status: active
+status: removed
+removed_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117649"
+milestone_removed: "16.0"
time_frame: 28d
data_source: database
instrumentation_class: CountImportedProjectsMetric
diff --git a/config/metrics/counts_28d/20210216183707_csv.yml b/config/metrics/counts_28d/20210216183707_csv.yml
index 5fd80dfd9a3..b1754f37f71 100644
--- a/config/metrics/counts_28d/20210216183707_csv.yml
+++ b/config/metrics/counts_28d/20210216183707_csv.yml
@@ -5,7 +5,6 @@ description: Count of (issue) imports from CSV file
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183709_group_import.yml b/config/metrics/counts_28d/20210216183709_group_import.yml
index 03ad489c40c..b1a35e1e6be 100644
--- a/config/metrics/counts_28d/20210216183709_group_import.yml
+++ b/config/metrics/counts_28d/20210216183709_group_import.yml
@@ -5,7 +5,6 @@ description: Number of group import states
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
index 8e44c933e6e..293c5502077 100644
--- a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
@@ -5,7 +5,6 @@ description: Count of groups imported using GitLab Migration
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183712_total.yml b/config/metrics/counts_28d/20210216183712_total.yml
index 0c97b73c81a..c9b916cf2bd 100644
--- a/config/metrics/counts_28d/20210216183712_total.yml
+++ b/config/metrics/counts_28d/20210216183712_total.yml
@@ -5,7 +5,6 @@ description: Count of all imported projects
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183714_gitlab_project.yml b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
index 9257e00455c..3b9642da6ac 100644
--- a/config/metrics/counts_28d/20210216183714_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using Project Import/Export
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183716_gitlab.yml b/config/metrics/counts_28d/20210216183716_gitlab.yml
index 0b9b9163ef1..0ac957a8b4b 100644
--- a/config/metrics/counts_28d/20210216183716_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183716_gitlab.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using Project Import/Export
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183718_github.yml b/config/metrics/counts_28d/20210216183718_github.yml
index b25a9b9266f..ad199ad3e30 100644
--- a/config/metrics/counts_28d/20210216183718_github.yml
+++ b/config/metrics/counts_28d/20210216183718_github.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from GitHub
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183720_bitbucket.yml b/config/metrics/counts_28d/20210216183720_bitbucket.yml
index 7ae5c83bc6c..04de804a4ac 100644
--- a/config/metrics/counts_28d/20210216183720_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183720_bitbucket.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Bitbucket
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
index dee0bcf6600..96aa85bd03d 100644
--- a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Bitbucket Server
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183724_gitea.yml b/config/metrics/counts_28d/20210216183724_gitea.yml
index cdb61b51634..ef967c52699 100644
--- a/config/metrics/counts_28d/20210216183724_gitea.yml
+++ b/config/metrics/counts_28d/20210216183724_gitea.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Gitea
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183726_git.yml b/config/metrics/counts_28d/20210216183726_git.yml
index 91e6a29d6fe..779485a9e3c 100644
--- a/config/metrics/counts_28d/20210216183726_git.yml
+++ b/config/metrics/counts_28d/20210216183726_git.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Git
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183728_manifest.yml b/config/metrics/counts_28d/20210216183728_manifest.yml
index 470aee68e76..822ea1f9bfa 100644
--- a/config/metrics/counts_28d/20210216183728_manifest.yml
+++ b/config/metrics/counts_28d/20210216183728_manifest.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Git using file Manifest
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183730_jira.yml b/config/metrics/counts_28d/20210216183730_jira.yml
index 04d2f7f19ad..2d54f765858 100644
--- a/config/metrics/counts_28d/20210216183730_jira.yml
+++ b/config/metrics/counts_28d/20210216183730_jira.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Jira
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183731_fogbugz.yml b/config/metrics/counts_28d/20210216183731_fogbugz.yml
index a11a386f014..83c8e3771c0 100644
--- a/config/metrics/counts_28d/20210216183731_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183731_fogbugz.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Fogbugz
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183733_phabricator.yml b/config/metrics/counts_28d/20210216183733_phabricator.yml
index 4237650388a..8108a98f4fd 100644
--- a/config/metrics/counts_28d/20210216183733_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183733_phabricator.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Phabricator
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183735_csv.yml b/config/metrics/counts_28d/20210216183735_csv.yml
index 4bceff8d3f6..a309a3d1f2d 100644
--- a/config/metrics/counts_28d/20210216183735_csv.yml
+++ b/config/metrics/counts_28d/20210216183735_csv.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from CSV file
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183737_groups_imported.yml b/config/metrics/counts_28d/20210216183737_groups_imported.yml
index 643b5010c09..79e39cb214e 100644
--- a/config/metrics/counts_28d/20210216183737_groups_imported.yml
+++ b/config/metrics/counts_28d/20210216183737_groups_imported.yml
@@ -5,7 +5,6 @@ description: Count of imported groups
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
index bd3b35ae0e9..9ecfd9625d6 100644
--- a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
@@ -8,7 +8,6 @@ description: Total unique users for i_search_total, i_search_advanced, i_search_
product_section: enablement
product_stage: enablement
product_group: global_search
-product_category: global_search
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
index 4225932b14b..15b1ac828f7 100644
--- a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
+++ b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
@@ -5,7 +5,6 @@ description: Number of user editing files using the Static Site Editor
product_section: dev
product_stage: create
product_group: editor
-product_category: static_site_editor
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
index d3dcfa28f58..fe89ff7ee4e 100644
--- a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique Git write actions
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
index 9c8ce1a1f06..c7667b902f2 100644
--- a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
@@ -13,14 +13,10 @@ instrumentation_class: RedisHLLMetric
options:
events:
- i_testing_test_case_parsed
- - i_testing_metrics_report_widget_total
- i_testing_group_code_coverage_visit_total
- i_testing_full_code_quality_report_total
- - i_testing_web_performance_widget_total
- i_testing_group_code_coverage_project_click_total
- - i_testing_load_performance_widget_total
- i_testing_metrics_report_artifact_uploaders
- - i_testing_summary_widget_total
- users_expanding_testing_code_quality_report
- users_expanding_testing_accessibility_report
distribution:
diff --git a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
index ffa7e442f40..abd475b4ba5 100644
--- a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
+++ b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly number of users viewing snippets
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
index 382c98ccbe2..7d222acb68f 100644
--- a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
+++ b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly active users of GitLab Managed Terraform states
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
index bbdead7be2e..d01b08ea827 100644
--- a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
+++ b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
@@ -6,7 +6,6 @@ description: Monthly unique user count doing commits which contains the CI confi
product_section: ops
product_stage: verify
product_group: pipeline_authoring
-product_category: pipeline_authoring
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
index f3b794bcc95..850a1b3113c 100644
--- a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
+++ b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_toggled_task_item_st
description: Count of unique users per month who toggled a task item in a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
index 7968c4cbba5..10075e0b60a 100644
--- a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_approve_mr_monthly
description: Count of unique users per month who approve a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
index 60a38d6fa8e..3d377fb013b 100644
--- a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_unapprove_mr_monthly
description: Count of unique users per month who unapprove a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
index e58f002071a..61bb424a1fc 100644
--- a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_resolve_thread_month
description: Count of unique users per month who resolve a thread in a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
index d19a8a9d711..4b518261894 100644
--- a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_unresolve_thread_mon
description: Count of unique users per month who unresolve a thread in a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
index 526a0da2dd8..bdbef148d43 100644
--- a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_edit_mr_title_monthly
description: Count of unique users per month who edit the title of a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
index 1df6ec58528..eafa238227e 100644
--- a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
+++ b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_edit_mr_desc_monthly
description: Count of unique users per month who edit the description of a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
index 144b0c4cd6a..c94e2898539 100644
--- a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
+++ b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who create a note as part of a merg
request review
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
index 33e9f1a2e66..e644c4a3423 100644
--- a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who publish their review as part of
merge request review
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
index 0d487ff783e..7a2945e1782 100644
--- a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who create a multiline comment in a
request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
index b430d20b4c5..5ae14b9b9fd 100644
--- a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who edit a multiline comment in a me
request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
index eaf0244a307..1c4010820b3 100644
--- a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who remove a multiline comment in a
request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
index b53f211203c..763afebb517 100644
--- a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_assigned_monthly
description: Count of unique users per month who are assigned to a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
index df3b27dae2e..c9a64b8fde8 100644
--- a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_marked_as_draft_mont
description: Count of unique users per month who mark a merge request as a draft
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
index 8257411194d..339066b471b 100644
--- a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_unmarked_as_draft_mo
description: Count of unique users per month who unmark a merge request as a draft
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
index e3c41d33dfc..0a01e27c5c1 100644
--- a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
+++ b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_review_requested_mon
description: Count of unique users per month who request a review of a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
index 475623aaa65..e183ef2c90e 100644
--- a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_added_
description: Count of unique users per month who add an approval rule to a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
index 23795ffbead..74bd2954a1d 100644
--- a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
+++ b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who delete an approval rule to a me
request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
index aa60572f00a..cbd08be25b4 100644
--- a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who delete an approval rule to a me
request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
index 3a94b3062e0..7003ddc400e 100644
--- a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_vs_code_api_request_
description: Count of unique users per month who use GitLab Workflow for VS Code
product_stage: create
product_group: code_review
-product_category: editor_extension
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
index a4133bbef1f..38776d15467 100644
--- a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_from_issue
description: Count of unique users per month who create a merge request from an issue
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
index 90c053612cf..9f1c46764f3 100644
--- a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
@@ -4,10 +4,11 @@ key_path: redis_hll_counters.code_review.code_review_total_unique_counts_monthly
description: Count of unique users per month who interact with a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113422
+milestone_removed: 15.10
time_frame: 28d
data_source: redis_hll
instrumentation_class: AggregatedMetric
diff --git a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
index 43a8a2340eb..19d4de90bdb 100644
--- a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
@@ -1,11 +1,10 @@
---
-data_category: optional
+data_category: operational
key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_monthly
description: Count of pipelines with implicit Auto DevOps runs
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
index 0143fa01995..0f713615c12 100644
--- a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit Auto Build runs
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: removed
milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
index ee1c9ff1694..db546cbb42f 100644
--- a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit Auto Deploy runs
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: removed
milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml b/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
index a26887fef7d..3fa025e908b 100644
--- a/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit SAST runs
product_section: ops
product_stage: verify
product_group: "static_analysis"
-product_category: SAST
value_type: number
status: active
milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml b/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
index 9e97dbe0bf2..1d01849bbd2 100644
--- a/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit Secret Detection runs
product_section: ops
product_stage: verify
product_group: "static_analysis"
-product_category: secret_detection
value_type: number
status: active
milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
index 6fd6f8eb080..c546fba8629 100644
--- a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
+++ b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
@@ -5,7 +5,6 @@ description: Number of projects using 5 min production app CI template in last 7
product_section: seg
product_stage: deploy
product_group: 5-min-app
-product_category: five_minute_production_app
value_type: number
status: removed
milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
index ac40f896b35..723776de6f8 100644
--- a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the Auto DevOps template
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
index 6da5d7822d2..12c46bcc065 100644
--- a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
@@ -6,7 +6,6 @@ description: Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: removed
milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
index 0ad5b9a9a5c..a787e944c81 100644
--- a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
@@ -6,7 +6,6 @@ description: Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
index a5e5b1239d4..05b81b18592 100644
--- a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the Auto Build template
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: removed
milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
index affc895a9ed..ccf0acd5af5 100644
--- a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the stable Auto Deploy template
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: removed
milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
index d1f300d4ab5..0e49b4668cc 100644
--- a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the latest Auto Deploy template
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: removed
milestone_removed: '14.6'
diff --git a/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml b/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
index 2d8d1f10866..080c18ae42b 100644
--- a/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with SAST runs
product_section: ops
product_stage: verify
product_group: "static_analysis"
-product_category: SAST
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml b/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
index b8114ecb647..89e27aba436 100644
--- a/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with Secret Detection runs
product_section: ops
product_stage: verify
product_group: "static_analysis"
-product_category: secret_detection
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
index 9774fc3a35e..1eb8b515254 100644
--- a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines that include the terraform base template from Gi
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index a5a6bcd1a93..aa50145225e 100755
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: Total count of pipelines runs
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: removed
milestone_removed: '14.3'
@@ -57,6 +56,8 @@ options:
- p_ci_templates_security_dependency_scanning
- p_ci_templates_security_api_fuzzing
- p_ci_templates_security_dast
+ - p_ci_templates_security_api_discovery
+ - p_ci_templates_security_bas_latest
- p_ci_templates_ios_fastlane
- p_ci_templates_composer
- p_ci_templates_c
diff --git a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
index fdd30477ed3..08e948b459e 100644
--- a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using one or more quick actions
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
index 1f68d5e5af8..18b26b32663 100644
--- a/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of Composer packages published to the registry usin
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
index 7f412de4467..9e06c9f114c 100644
--- a/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of Conan packages published to the registry using a
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
index d664a9fec80..3b7c46665cb 100644
--- a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of container images published to the registry using
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
index 20dbc97c7e8..745c2ee2e5b 100644
--- a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of Debian packages published to the registry using
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
index fb60d6165ba..99427e2e576 100644
--- a/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of generic packages published to the registry using
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
index e4c289fc23f..06d5ba1a1c9 100644
--- a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of Go modules published to the registry using a dep
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
index 5451a18cc82..1be7167e913 100644
--- a/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of Maven packages published to the registry using a
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
index 123df5707f8..f60511900e0 100644
--- a/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of npm packages published to the registry using a d
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
index b9f87e33fa9..3140804a1c2 100644
--- a/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of NuGet packages published to the registry using a
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
index 05e80915b60..d770f2b005d 100644
--- a/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of PyPI packages published to the registry using a
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
index a1409e87db2..cc15da4ab35 100644
--- a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of package tags published to the registry using a d
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
index 59427c74b0f..203a6a2a672 100644
--- a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of unique users who published packages to the regis
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml b/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
index f0fc010c722..9fcaf84fa69 100644
--- a/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of users that have published a Composer package to
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
index 7388ed8860b..645fa3e1845 100644
--- a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published a Conan package to the
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
index 5c7f1b30f44..e415623ff53 100644
--- a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of users that have published a container image to t
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
index f6a96c326c9..6b805cedbe4 100644
--- a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of users that have published a Debian package to th
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
index cce0c3d6a65..34576e8a5a1 100644
--- a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
@@ -6,7 +6,6 @@ description: A monthly count of users that have published a generic package to t
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
index b6df3cb30f2..3c7e09e69fd 100644
--- a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published a Go moduleto the regi
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
index d591e6ec5da..c68523cc4a9 100644
--- a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published a Maven package to the
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
index e9992148893..531a8c7c481 100644
--- a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published an npm package to the
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
index 0a77f2de550..885b99185ac 100644
--- a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published a NuGet package to the
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
index 6cc9645516a..9fab8ef2e0a 100644
--- a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published a PyPI package to the
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
index 9fc86ae712c..f7a7af76999 100644
--- a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published a package tag to the r
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
index 5223f5c746e..8e6c286aa32 100644
--- a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: A monthly count of users that have published a package to the regis
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
index d1b7a63db8e..5a4a030ec8b 100644
--- a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
@@ -5,7 +5,6 @@ description: Number of users closing Jira issues by month
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
index cea761bd778..7b29944abcb 100644
--- a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
+++ b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
@@ -5,7 +5,6 @@ description: Number of users that cross-referenced Jira issues by month
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
index 93be16fa2f4..1f84f98c8a0 100644
--- a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: Number of users for Jira and Slack by month
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml b/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
index ae717f7cc1e..4339600f952 100644
--- a/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
+++ b/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
@@ -5,7 +5,6 @@ description: Unique users using the /invite_email quick action to add a single e
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: issue_tracking
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml b/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
index ce22e3ad675..e26f47b3fee 100644
--- a/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
+++ b/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
@@ -5,7 +5,6 @@ description: Unique users using the /invite_email quick action to add a multiple
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: issue_tracking
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
index c8d329a777b..b9cde9eb3fc 100644
--- a/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who changed time estimate of a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
index aee5fb45c10..7bf47d2123b 100644
--- a/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who changed time spent on a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml b/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
index 9cc58cc7963..a9b237dbdf9 100644
--- a/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who locked a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml b/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
index 9474d1c8253..e67a57aa18a 100644
--- a/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who unlocked a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
index 25f6292cae0..f0efe925e5e 100644
--- a/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
+++ b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly unique user count having merge requests which contains the
product_section: ops
product_stage: verify
product_group: pipeline_authoring
-product_category: pipeline_authoring
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
index 2e23791ef95..2a846c2394b 100644
--- a/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who changed milestone of a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml b/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
index d93dd8e64a8..79d847ff7e7 100644
--- a/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who changed labels of a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml b/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
index e42d744b718..93a02122904 100644
--- a/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who changed assignees of a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml b/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
index 9bbee5ed9b6..fea49890def 100644
--- a/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who changed reviewers of a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml b/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
index 01e2b9d0059..0e57e05f2a5 100644
--- a/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml b/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
index d028a10c1a3..ae96872256b 100644
--- a/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing a
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml b/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
index 2b8f4166e6b..84016afca21 100644
--- a/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing a
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml b/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
index 7b5515f99a5..954e35e7085 100644
--- a/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml b/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
index 7229d9b0803..1402709d252 100644
--- a/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml b/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
index bd2269d1680..d663cb5abde 100644
--- a/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by creating a no
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml b/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
index 73fa05ac498..55ce46cd3be 100644
--- a/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing a
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml b/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
index 5cb154ad6e4..9d7b5c34ae7 100644
--- a/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by creating a co
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml b/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
index bcd3147e9ea..fc809736fcf 100644
--- a/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml b/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
index 6ca11514b09..9c30f6b619e 100644
--- a/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
@@ -5,7 +5,6 @@ description: Distinct count events for RubyGems packages published using a Deplo
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: '13.10'
diff --git a/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml b/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
index 2d5eda05a7f..88bfd28577a 100644
--- a/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
+++ b/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
@@ -5,7 +5,6 @@ description: Distinct user count of RubyGems packages published in recent 28 day
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: '13.10'
diff --git a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
index dfaff8de054..c7f0363f558 100644
--- a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
@@ -5,7 +5,6 @@ description: Count of expanding the security report widget
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: '13.11'
diff --git a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
index 65b9764cf10..a27a860039d 100644
--- a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
@@ -4,8 +4,7 @@ key_path: redis_hll_counters.testing.users_expanding_testing_code_quality_report
description: Count of expanding the code quality widget
product_section: ops
product_stage: verify
-product_group: pipeline_insights
-product_category: code_quality
+product_group: pipeline_execution
value_type: number
status: active
milestone: '13.11'
diff --git a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
index 601fc6fdab3..0096809d89e 100644
--- a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
@@ -4,8 +4,7 @@ key_path: redis_hll_counters.testing.users_expanding_testing_accessibility_repor
description: Count of expanding the accessibility report widget
product_section: ops
product_stage: verify
-product_group: pipeline_insights
-product_category: accessibility_testing
+product_group: pipeline_execution
value_type: number
status: active
milestone: '13.11'
diff --git a/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml b/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
index 64daea732c5..bb063f0097a 100644
--- a/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
@@ -3,9 +3,8 @@ data_category: optional
key_path: redis_hll_counters.deploy_token_packages.i_package_terraform_module_deploy_token_monthly
description: Number of distinct users authorized via deploy token creating Terraform Module packages in recent 28 days
product_section: ops
-product_stage: configure
-product_group: configure
-product_category: infrastructure_as_code
+product_stage: package
+product_group: package
value_type: number
status: active
milestone: '13.11'
diff --git a/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml b/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
index 070a0669d54..3e9ef0c0eb3 100644
--- a/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
+++ b/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
@@ -3,9 +3,8 @@ data_category: optional
key_path: redis_hll_counters.user_packages.i_package_terraform_module_user_monthly
description: Number of distinct users creating Terraform Module packages in recent 28 days
product_section: ops
-product_stage: configure
-product_group: configure
-product_category: infrastructure_as_code
+product_stage: package
+product_group: package
value_type: number
status: active
milestone: '13.11'
diff --git a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
index 49cab313fc8..76572f03b8f 100644
--- a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
+++ b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
@@ -4,12 +4,13 @@ key_path: redis_hll_counters.testing.i_testing_summary_widget_total_monthly
description: Unique users that expand the test summary merge request widget by month
product_section: ops
product_stage: verify
-product_group: pipeline_insights
-product_category: testing
+product_group: pipeline_execution
value_type: number
-status: active
+status: removed
milestone: "13.11"
+milestone_removed: "15.11"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59316
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114018
time_frame: 28d
data_source: redis_hll
instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml b/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
index 5557480f8fb..2ea622f3cdc 100644
--- a/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking single file mode setting
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml b/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
index e8e988a4523..b8897c1ebd1 100644
--- a/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking merge request file browser setting
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml b/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
index 483923397b5..0f22954faaa 100644
--- a/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking merge request whitespae setting
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml b/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
index bc628468e30..3b6ec8b69e4 100644
--- a/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
+++ b/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request view type as inline
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml b/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
index f1c431574f9..82de9d8ed4d 100644
--- a/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
+++ b/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request view type as parallel
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml b/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
index 75f0169692a..b4007b2da78 100644
--- a/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
+++ b/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request file tree setting
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml b/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
index ccd333ba13a..13bd280e7b9 100644
--- a/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
+++ b/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request file list setting
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml b/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
index 23dae4618b1..b87901678ef 100644
--- a/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
+++ b/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with show whitespace enabled
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml b/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
index 4a639d02565..b883ce9e41c 100644
--- a/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
+++ b/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with show whitespace disabled
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml b/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
index 8ae647ab1de..f5149c088e9 100644
--- a/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
+++ b/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with single file mode enabled
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml b/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
index f4aa1da6498..c51107d4177 100644
--- a/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
+++ b/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users with single mode disabled
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
index 8a0005a5c5c..51a688a5806 100644
--- a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
@@ -5,7 +5,6 @@ description: Unique users performing actions on code review events
product_section: dev
product_stage: create
product_group: code_review
-product_category:
value_type: number
status: active
milestone: "13.12"
@@ -16,7 +15,9 @@ tier:
- free
- premium
- ultimate
-performance_indicator_type: []
+performance_indicator_type:
+- gmau
+- paid_gmau
time_frame: 28d
instrumentation_class: AggregatedMetric
data_source: redis_hll
diff --git a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
index 379307a2f44..f5ab886d5cf 100644
--- a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
@@ -5,7 +5,6 @@ description: Number of users performing i_code_review_user_vs_code_api_request e
product_section: dev
product_stage: create
product_group: code_review
-product_category:
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
index 7ef2725f01c..16e077875d4 100644
--- a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
@@ -5,7 +5,6 @@ description: Number of users performing at least one of the code review events
product_section: dev
product_stage: create
product_group: code_review
-product_category:
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
index 698928834ed..be9f6bdb94c 100644
--- a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: Unique users doing commits or push MRs which contains CI cifig file
product_section: ops
product_stage: verify
product_group: pipeline_authoring
-product_category: pipeline_authoring
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml b/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
index f08a7bfd4d6..6cee7067b48 100644
--- a/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
+++ b/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
@@ -5,7 +5,6 @@ name: resolve_conflict
description: Count of unique users per week who attempt to resolve a conflict through the ui
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml b/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
index b8dc238e59f..b25a9344eda 100644
--- a/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
+++ b/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
@@ -5,7 +5,6 @@ name: load_conflict_ui
description: Count of unique users per week who load the conflict resolution page
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
index 9a6bf373cbe..2c17a6ec8f6 100644
--- a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
+++ b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
@@ -5,7 +5,6 @@ description: 'Count number of projects created monthly'
product_section: dev
product_stage: plan
product_group: project_management
-product_category: ''
value_type: number
status: active
milestone: "14.0"
diff --git a/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml b/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
index c0fd95f4be2..e6e7e2fbc1f 100644
--- a/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
@@ -5,7 +5,6 @@ description: Distinct Helm pakages deployed in recent 28 days
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: "14.0"
diff --git a/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml b/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
index 0e32bf86f68..c71312d7cc4 100644
--- a/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
+++ b/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
@@ -5,7 +5,6 @@ description: Distinct user count events for Helm packages in recent 28 days
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: "14.0"
diff --git a/config/metrics/counts_28d/20210520111133_total.yml b/config/metrics/counts_28d/20210520111133_total.yml
index 1a7437259f6..96136b2396b 100644
--- a/config/metrics/counts_28d/20210520111133_total.yml
+++ b/config/metrics/counts_28d/20210520111133_total.yml
@@ -5,7 +5,6 @@ description: Total count of projects imported
product_section: dev
product_stage: manage
product_group: import
-product_category:
value_type: number
status: active
milestone: "14.0"
diff --git a/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml b/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
index 28425f5f1cd..254734374e3 100644
--- a/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking diff view setting
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml b/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml
index 0efb03c9fe9..6d95f6b1be2 100644
--- a/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml
+++ b/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml
@@ -5,7 +5,6 @@ performance_indicator_type: []
product_section: ops
product_stage: release
product_group: 'release'
-product_category: Release Orchestration
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml b/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml
index 106ab05f6d5..c16a1885e4f 100644
--- a/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml
+++ b/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml
@@ -4,7 +4,6 @@ description: Count of users who search merge request diffs
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '14.2'
diff --git a/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml b/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
index eedece821d0..b5a83d81c0a 100644
--- a/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
+++ b/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
@@ -4,7 +4,6 @@ description: Count of MAU using the `/severity` quick action
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
milestone: "14.2"
diff --git a/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml b/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml
index 19bd4f54e5c..31609397e5e 100644
--- a/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml
+++ b/config/metrics/counts_28d/20210816143831_i_code_review_total_suggestions_added_monthly.yml
@@ -5,7 +5,6 @@ description: Total number of monthly suggestions
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml b/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml
index 97550aee80e..9ad967fd5f6 100644
--- a/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml
+++ b/config/metrics/counts_28d/20210816144453_i_code_review_total_suggestions_applied_monthly.yml
@@ -5,7 +5,6 @@ description: Total number of monthly suggestions applied
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_28d/20210901221242_p_ci_templates_terraform_base_monthly.yml b/config/metrics/counts_28d/20210901221242_p_ci_templates_terraform_base_monthly.yml
index c0c5de03d6f..44669cb8c83 100644
--- a/config/metrics/counts_28d/20210901221242_p_ci_templates_terraform_base_monthly.yml
+++ b/config/metrics/counts_28d/20210901221242_p_ci_templates_terraform_base_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221251_p_ci_templates_dotnet_monthly.yml b/config/metrics/counts_28d/20210901221251_p_ci_templates_dotnet_monthly.yml
index 5a9cff02906..9879f3123bf 100644
--- a/config/metrics/counts_28d/20210901221251_p_ci_templates_dotnet_monthly.yml
+++ b/config/metrics/counts_28d/20210901221251_p_ci_templates_dotnet_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221300_p_ci_templates_nodejs_monthly.yml b/config/metrics/counts_28d/20210901221300_p_ci_templates_nodejs_monthly.yml
index 41f112b57f1..b6d59480bab 100644
--- a/config/metrics/counts_28d/20210901221300_p_ci_templates_nodejs_monthly.yml
+++ b/config/metrics/counts_28d/20210901221300_p_ci_templates_nodejs_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221308_p_ci_templates_openshift_monthly.yml b/config/metrics/counts_28d/20210901221308_p_ci_templates_openshift_monthly.yml
index d95c9cbc109..53b88e04d27 100644
--- a/config/metrics/counts_28d/20210901221308_p_ci_templates_openshift_monthly.yml
+++ b/config/metrics/counts_28d/20210901221308_p_ci_templates_openshift_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221317_p_ci_templates_bash_monthly.yml b/config/metrics/counts_28d/20210901221317_p_ci_templates_bash_monthly.yml
index 98a953405aa..b459ce7f4ec 100644
--- a/config/metrics/counts_28d/20210901221317_p_ci_templates_bash_monthly.yml
+++ b/config/metrics/counts_28d/20210901221317_p_ci_templates_bash_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221326_p_ci_templates_rust_monthly.yml b/config/metrics/counts_28d/20210901221326_p_ci_templates_rust_monthly.yml
index 3f920a72e15..bad3c51bad6 100644
--- a/config/metrics/counts_28d/20210901221326_p_ci_templates_rust_monthly.yml
+++ b/config/metrics/counts_28d/20210901221326_p_ci_templates_rust_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221335_p_ci_templates_elixir_monthly.yml b/config/metrics/counts_28d/20210901221335_p_ci_templates_elixir_monthly.yml
index 555a6f890bb..4e198b52ced 100644
--- a/config/metrics/counts_28d/20210901221335_p_ci_templates_elixir_monthly.yml
+++ b/config/metrics/counts_28d/20210901221335_p_ci_templates_elixir_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221343_p_ci_templates_clojure_monthly.yml b/config/metrics/counts_28d/20210901221343_p_ci_templates_clojure_monthly.yml
index b5f6a658333..5a87530bee3 100644
--- a/config/metrics/counts_28d/20210901221343_p_ci_templates_clojure_monthly.yml
+++ b/config/metrics/counts_28d/20210901221343_p_ci_templates_clojure_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221352_p_ci_templates_crystal_monthly.yml b/config/metrics/counts_28d/20210901221352_p_ci_templates_crystal_monthly.yml
index 18ebe62b906..d5f06ef5388 100644
--- a/config/metrics/counts_28d/20210901221352_p_ci_templates_crystal_monthly.yml
+++ b/config/metrics/counts_28d/20210901221352_p_ci_templates_crystal_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221401_p_ci_templates_getting_started_monthly.yml b/config/metrics/counts_28d/20210901221401_p_ci_templates_getting_started_monthly.yml
index 09d24d2e7ba..0f0906a50d7 100644
--- a/config/metrics/counts_28d/20210901221401_p_ci_templates_getting_started_monthly.yml
+++ b/config/metrics/counts_28d/20210901221401_p_ci_templates_getting_started_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221410_p_ci_templates_code_quality_monthly.yml b/config/metrics/counts_28d/20210901221410_p_ci_templates_code_quality_monthly.yml
index 69d3c644a26..322b1251f7a 100644
--- a/config/metrics/counts_28d/20210901221410_p_ci_templates_code_quality_monthly.yml
+++ b/config/metrics/counts_28d/20210901221410_p_ci_templates_code_quality_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml
index e0613d891d0..e17ceeb00db 100644
--- a/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml b/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml
index 251818174b5..71dbfa2bc99 100644
--- a/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml
+++ b/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml b/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml
index 5af12fc9ae1..2419653655b 100644
--- a/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml
+++ b/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml b/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml
index 9baa924ab54..1404da33a1b 100644
--- a/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml
+++ b/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml b/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml
index d50535100b2..6ad88c0a492 100644
--- a/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221503_p_ci_templates_grails_monthly.yml b/config/metrics/counts_28d/20210901221503_p_ci_templates_grails_monthly.yml
index fa17dac5c95..95ba6abe48a 100644
--- a/config/metrics/counts_28d/20210901221503_p_ci_templates_grails_monthly.yml
+++ b/config/metrics/counts_28d/20210901221503_p_ci_templates_grails_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221511_p_ci_templates_security_dast_runner_validation_monthly.yml b/config/metrics/counts_28d/20210901221511_p_ci_templates_security_dast_runner_validation_monthly.yml
index ee5778aa20a..f5a92907ea6 100644
--- a/config/metrics/counts_28d/20210901221511_p_ci_templates_security_dast_runner_validation_monthly.yml
+++ b/config/metrics/counts_28d/20210901221511_p_ci_templates_security_dast_runner_validation_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221520_p_ci_templates_security_dast_on_demand_scan_monthly.yml b/config/metrics/counts_28d/20210901221520_p_ci_templates_security_dast_on_demand_scan_monthly.yml
index 25a8772f26c..a4602018c7b 100644
--- a/config/metrics/counts_28d/20210901221520_p_ci_templates_security_dast_on_demand_scan_monthly.yml
+++ b/config/metrics/counts_28d/20210901221520_p_ci_templates_security_dast_on_demand_scan_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221529_p_ci_templates_security_license_scanning_monthly.yml b/config/metrics/counts_28d/20210901221529_p_ci_templates_security_license_scanning_monthly.yml
index 52050daf8a5..0992cbe18b0 100644
--- a/config/metrics/counts_28d/20210901221529_p_ci_templates_security_license_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901221529_p_ci_templates_security_license_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221538_p_ci_templates_security_coverage_fuzzing_monthly.yml b/config/metrics/counts_28d/20210901221538_p_ci_templates_security_coverage_fuzzing_monthly.yml
index e04854b1ea2..6d643bf17e4 100644
--- a/config/metrics/counts_28d/20210901221538_p_ci_templates_security_coverage_fuzzing_monthly.yml
+++ b/config/metrics/counts_28d/20210901221538_p_ci_templates_security_coverage_fuzzing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221547_p_ci_templates_security_api_fuzzing_latest_monthly.yml b/config/metrics/counts_28d/20210901221547_p_ci_templates_security_api_fuzzing_latest_monthly.yml
index 511602c7c28..95c4a9ce621 100644
--- a/config/metrics/counts_28d/20210901221547_p_ci_templates_security_api_fuzzing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901221547_p_ci_templates_security_api_fuzzing_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml b/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml
index ae18f69469d..36e672b0295 100644
--- a/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml
+++ b/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221605_p_ci_templates_security_dast_api_monthly.yml b/config/metrics/counts_28d/20210901221605_p_ci_templates_security_dast_api_monthly.yml
index 84fae41c611..c72a28f0188 100644
--- a/config/metrics/counts_28d/20210901221605_p_ci_templates_security_dast_api_monthly.yml
+++ b/config/metrics/counts_28d/20210901221605_p_ci_templates_security_dast_api_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221614_p_ci_templates_security_container_scanning_monthly.yml b/config/metrics/counts_28d/20210901221614_p_ci_templates_security_container_scanning_monthly.yml
index 37440c240ec..0cfd3fb765d 100644
--- a/config/metrics/counts_28d/20210901221614_p_ci_templates_security_container_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901221614_p_ci_templates_security_container_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221623_p_ci_templates_security_dast_latest_monthly.yml b/config/metrics/counts_28d/20210901221623_p_ci_templates_security_dast_latest_monthly.yml
index ff73e16a84b..807dcdea3aa 100644
--- a/config/metrics/counts_28d/20210901221623_p_ci_templates_security_dast_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901221623_p_ci_templates_security_dast_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221632_p_ci_templates_security_dependency_scanning_monthly.yml b/config/metrics/counts_28d/20210901221632_p_ci_templates_security_dependency_scanning_monthly.yml
index 5015909a1be..3c16107b3f4 100644
--- a/config/metrics/counts_28d/20210901221632_p_ci_templates_security_dependency_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901221632_p_ci_templates_security_dependency_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221641_p_ci_templates_security_api_fuzzing_monthly.yml b/config/metrics/counts_28d/20210901221641_p_ci_templates_security_api_fuzzing_monthly.yml
index e21e7cbcaae..3a465bf837f 100644
--- a/config/metrics/counts_28d/20210901221641_p_ci_templates_security_api_fuzzing_monthly.yml
+++ b/config/metrics/counts_28d/20210901221641_p_ci_templates_security_api_fuzzing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221650_p_ci_templates_security_dast_monthly.yml b/config/metrics/counts_28d/20210901221650_p_ci_templates_security_dast_monthly.yml
index 6b5b028aa2d..97bf666f528 100644
--- a/config/metrics/counts_28d/20210901221650_p_ci_templates_security_dast_monthly.yml
+++ b/config/metrics/counts_28d/20210901221650_p_ci_templates_security_dast_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221659_p_ci_templates_security_cluster_image_scanning_monthly.yml b/config/metrics/counts_28d/20210901221659_p_ci_templates_security_cluster_image_scanning_monthly.yml
index 4e1407fd8e3..fa5e04aceb1 100644
--- a/config/metrics/counts_28d/20210901221659_p_ci_templates_security_cluster_image_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901221659_p_ci_templates_security_cluster_image_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone_removed: '15.0'
diff --git a/config/metrics/counts_28d/20210901221708_p_ci_templates_ios_fastlane_monthly.yml b/config/metrics/counts_28d/20210901221708_p_ci_templates_ios_fastlane_monthly.yml
index 7fa3decd102..bb0d3b2b82f 100644
--- a/config/metrics/counts_28d/20210901221708_p_ci_templates_ios_fastlane_monthly.yml
+++ b/config/metrics/counts_28d/20210901221708_p_ci_templates_ios_fastlane_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221717_p_ci_templates_composer_monthly.yml b/config/metrics/counts_28d/20210901221717_p_ci_templates_composer_monthly.yml
index 6f18d8f2be4..1f2eb751ccf 100644
--- a/config/metrics/counts_28d/20210901221717_p_ci_templates_composer_monthly.yml
+++ b/config/metrics/counts_28d/20210901221717_p_ci_templates_composer_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221726_p_ci_templates_c_monthly.yml b/config/metrics/counts_28d/20210901221726_p_ci_templates_c_monthly.yml
index a9646741a9e..ee49df0ab24 100644
--- a/config/metrics/counts_28d/20210901221726_p_ci_templates_c_monthly.yml
+++ b/config/metrics/counts_28d/20210901221726_p_ci_templates_c_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221735_p_ci_templates_python_monthly.yml b/config/metrics/counts_28d/20210901221735_p_ci_templates_python_monthly.yml
index 435cbb1f4ff..707c8db8202 100644
--- a/config/metrics/counts_28d/20210901221735_p_ci_templates_python_monthly.yml
+++ b/config/metrics/counts_28d/20210901221735_p_ci_templates_python_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221744_p_ci_templates_android_fastlane_monthly.yml b/config/metrics/counts_28d/20210901221744_p_ci_templates_android_fastlane_monthly.yml
index 356114d1182..5005ee2ed91 100644
--- a/config/metrics/counts_28d/20210901221744_p_ci_templates_android_fastlane_monthly.yml
+++ b/config/metrics/counts_28d/20210901221744_p_ci_templates_android_fastlane_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221754_p_ci_templates_django_monthly.yml b/config/metrics/counts_28d/20210901221754_p_ci_templates_django_monthly.yml
index 6f6f921d20b..3efa2b49546 100644
--- a/config/metrics/counts_28d/20210901221754_p_ci_templates_django_monthly.yml
+++ b/config/metrics/counts_28d/20210901221754_p_ci_templates_django_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221803_p_ci_templates_maven_monthly.yml b/config/metrics/counts_28d/20210901221803_p_ci_templates_maven_monthly.yml
index 883a844b26f..63a3dfef669 100644
--- a/config/metrics/counts_28d/20210901221803_p_ci_templates_maven_monthly.yml
+++ b/config/metrics/counts_28d/20210901221803_p_ci_templates_maven_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221812_p_ci_templates_flutter_monthly.yml b/config/metrics/counts_28d/20210901221812_p_ci_templates_flutter_monthly.yml
index 4ecf88abb14..ebbb87ead2b 100644
--- a/config/metrics/counts_28d/20210901221812_p_ci_templates_flutter_monthly.yml
+++ b/config/metrics/counts_28d/20210901221812_p_ci_templates_flutter_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221822_p_ci_templates_workflows_branch_pipelines_monthly.yml b/config/metrics/counts_28d/20210901221822_p_ci_templates_workflows_branch_pipelines_monthly.yml
index 7e4a493864c..473002dd3a6 100644
--- a/config/metrics/counts_28d/20210901221822_p_ci_templates_workflows_branch_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210901221822_p_ci_templates_workflows_branch_pipelines_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221831_p_ci_templates_workflows_mergerequest_pipelines_monthly.yml b/config/metrics/counts_28d/20210901221831_p_ci_templates_workflows_mergerequest_pipelines_monthly.yml
index 5b813f20ad9..ea4c9630a3d 100644
--- a/config/metrics/counts_28d/20210901221831_p_ci_templates_workflows_mergerequest_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210901221831_p_ci_templates_workflows_mergerequest_pipelines_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221840_p_ci_templates_laravel_monthly.yml b/config/metrics/counts_28d/20210901221840_p_ci_templates_laravel_monthly.yml
index 27ff46f6a35..37f59ffb929 100644
--- a/config/metrics/counts_28d/20210901221840_p_ci_templates_laravel_monthly.yml
+++ b/config/metrics/counts_28d/20210901221840_p_ci_templates_laravel_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221849_p_ci_templates_managed_cluster_applications_monthly.yml b/config/metrics/counts_28d/20210901221849_p_ci_templates_managed_cluster_applications_monthly.yml
index 6f98773d30a..1cafb328f1a 100644
--- a/config/metrics/counts_28d/20210901221849_p_ci_templates_managed_cluster_applications_monthly.yml
+++ b/config/metrics/counts_28d/20210901221849_p_ci_templates_managed_cluster_applications_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221857_p_ci_templates_php_monthly.yml b/config/metrics/counts_28d/20210901221857_p_ci_templates_php_monthly.yml
index d32a8f007b9..135e839e49c 100644
--- a/config/metrics/counts_28d/20210901221857_p_ci_templates_php_monthly.yml
+++ b/config/metrics/counts_28d/20210901221857_p_ci_templates_php_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221906_p_ci_templates_packer_monthly.yml b/config/metrics/counts_28d/20210901221906_p_ci_templates_packer_monthly.yml
index af9f85bf1e4..4b3147a9c99 100644
--- a/config/metrics/counts_28d/20210901221906_p_ci_templates_packer_monthly.yml
+++ b/config/metrics/counts_28d/20210901221906_p_ci_templates_packer_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221915_p_ci_templates_terraform_monthly.yml b/config/metrics/counts_28d/20210901221915_p_ci_templates_terraform_monthly.yml
index 743a1ec2013..3eb212b357e 100644
--- a/config/metrics/counts_28d/20210901221915_p_ci_templates_terraform_monthly.yml
+++ b/config/metrics/counts_28d/20210901221915_p_ci_templates_terraform_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221923_p_ci_templates_mono_monthly.yml b/config/metrics/counts_28d/20210901221923_p_ci_templates_mono_monthly.yml
index d4e4b37c93c..bd7fe7d8385 100644
--- a/config/metrics/counts_28d/20210901221923_p_ci_templates_mono_monthly.yml
+++ b/config/metrics/counts_28d/20210901221923_p_ci_templates_mono_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221932_p_ci_templates_serverless_monthly.yml b/config/metrics/counts_28d/20210901221932_p_ci_templates_serverless_monthly.yml
index c30375c57d4..8dbd1225aeb 100644
--- a/config/metrics/counts_28d/20210901221932_p_ci_templates_serverless_monthly.yml
+++ b/config/metrics/counts_28d/20210901221932_p_ci_templates_serverless_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221941_p_ci_templates_go_monthly.yml b/config/metrics/counts_28d/20210901221941_p_ci_templates_go_monthly.yml
index 25dce4f9013..7519e296bcb 100644
--- a/config/metrics/counts_28d/20210901221941_p_ci_templates_go_monthly.yml
+++ b/config/metrics/counts_28d/20210901221941_p_ci_templates_go_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221950_p_ci_templates_scala_monthly.yml b/config/metrics/counts_28d/20210901221950_p_ci_templates_scala_monthly.yml
index 2faeb424f2d..bf00ce648f6 100644
--- a/config/metrics/counts_28d/20210901221950_p_ci_templates_scala_monthly.yml
+++ b/config/metrics/counts_28d/20210901221950_p_ci_templates_scala_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901221958_p_ci_templates_latex_monthly.yml b/config/metrics/counts_28d/20210901221958_p_ci_templates_latex_monthly.yml
index c7d1ea576fc..89b82f0a5ba 100644
--- a/config/metrics/counts_28d/20210901221958_p_ci_templates_latex_monthly.yml
+++ b/config/metrics/counts_28d/20210901221958_p_ci_templates_latex_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222007_p_ci_templates_android_monthly.yml b/config/metrics/counts_28d/20210901222007_p_ci_templates_android_monthly.yml
index 2523dec8efd..894316bdf03 100644
--- a/config/metrics/counts_28d/20210901222007_p_ci_templates_android_monthly.yml
+++ b/config/metrics/counts_28d/20210901222007_p_ci_templates_android_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222016_p_ci_templates_indeni_cloudrail_monthly.yml b/config/metrics/counts_28d/20210901222016_p_ci_templates_indeni_cloudrail_monthly.yml
index 6841d54790a..9dabc5324f6 100644
--- a/config/metrics/counts_28d/20210901222016_p_ci_templates_indeni_cloudrail_monthly.yml
+++ b/config/metrics/counts_28d/20210901222016_p_ci_templates_indeni_cloudrail_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222025_p_ci_templates_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210901222025_p_ci_templates_deploy_ecs_monthly.yml
index 9b2ec95d2c5..639496b9dc3 100644
--- a/config/metrics/counts_28d/20210901222025_p_ci_templates_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210901222025_p_ci_templates_deploy_ecs_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222033_p_ci_templates_aws_cf_provision_and_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210901222033_p_ci_templates_aws_cf_provision_and_deploy_ec2_monthly.yml
index d195c569a75..15bb141e3d4 100644
--- a/config/metrics/counts_28d/20210901222033_p_ci_templates_aws_cf_provision_and_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210901222033_p_ci_templates_aws_cf_provision_and_deploy_ec2_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222042_p_ci_templates_gradle_monthly.yml b/config/metrics/counts_28d/20210901222042_p_ci_templates_gradle_monthly.yml
index c66530b37b7..34890a93278 100644
--- a/config/metrics/counts_28d/20210901222042_p_ci_templates_gradle_monthly.yml
+++ b/config/metrics/counts_28d/20210901222042_p_ci_templates_gradle_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222051_p_ci_templates_chef_monthly.yml b/config/metrics/counts_28d/20210901222051_p_ci_templates_chef_monthly.yml
index f9217f10ac6..2b5eb9be232 100644
--- a/config/metrics/counts_28d/20210901222051_p_ci_templates_chef_monthly.yml
+++ b/config/metrics/counts_28d/20210901222051_p_ci_templates_chef_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222100_p_ci_templates_jobs_dast_default_branch_deploy_monthly.yml b/config/metrics/counts_28d/20210901222100_p_ci_templates_jobs_dast_default_branch_deploy_monthly.yml
index 7efd539e992..63f25134d5a 100644
--- a/config/metrics/counts_28d/20210901222100_p_ci_templates_jobs_dast_default_branch_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210901222100_p_ci_templates_jobs_dast_default_branch_deploy_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml
index 851855e76b0..21193bc9205 100644
--- a/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222117_p_ci_templates_jobs_helm_2to3_monthly.yml b/config/metrics/counts_28d/20210901222117_p_ci_templates_jobs_helm_2to3_monthly.yml
index 057ce9ab19a..fc599157bf3 100644
--- a/config/metrics/counts_28d/20210901222117_p_ci_templates_jobs_helm_2to3_monthly.yml
+++ b/config/metrics/counts_28d/20210901222117_p_ci_templates_jobs_helm_2to3_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222126_p_ci_templates_jobs_sast_monthly.yml b/config/metrics/counts_28d/20210901222126_p_ci_templates_jobs_sast_monthly.yml
index 81b8196f348..ace0b49561f 100644
--- a/config/metrics/counts_28d/20210901222126_p_ci_templates_jobs_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210901222126_p_ci_templates_jobs_sast_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml b/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml
index 09de2ec628a..a9d0ebecc80 100644
--- a/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222144_p_ci_templates_jobs_code_intelligence_monthly.yml b/config/metrics/counts_28d/20210901222144_p_ci_templates_jobs_code_intelligence_monthly.yml
index 98c1d5c752f..a2bb6add9a2 100644
--- a/config/metrics/counts_28d/20210901222144_p_ci_templates_jobs_code_intelligence_monthly.yml
+++ b/config/metrics/counts_28d/20210901222144_p_ci_templates_jobs_code_intelligence_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222153_p_ci_templates_jobs_code_quality_monthly.yml b/config/metrics/counts_28d/20210901222153_p_ci_templates_jobs_code_quality_monthly.yml
index 2780fb76618..958d436bdc9 100644
--- a/config/metrics/counts_28d/20210901222153_p_ci_templates_jobs_code_quality_monthly.yml
+++ b/config/metrics/counts_28d/20210901222153_p_ci_templates_jobs_code_quality_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222202_p_ci_templates_jobs_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210901222202_p_ci_templates_jobs_deploy_ecs_monthly.yml
index 0595e6a6c2f..00225d132f0 100644
--- a/config/metrics/counts_28d/20210901222202_p_ci_templates_jobs_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210901222202_p_ci_templates_jobs_deploy_ecs_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222211_p_ci_templates_jobs_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210901222211_p_ci_templates_jobs_deploy_ec2_monthly.yml
index 701d6711c6b..ab750a54111 100644
--- a/config/metrics/counts_28d/20210901222211_p_ci_templates_jobs_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210901222211_p_ci_templates_jobs_deploy_ec2_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222220_p_ci_templates_jobs_deploy_monthly.yml b/config/metrics/counts_28d/20210901222220_p_ci_templates_jobs_deploy_monthly.yml
index 2c4f32e95dd..58cd656f7a2 100644
--- a/config/metrics/counts_28d/20210901222220_p_ci_templates_jobs_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210901222220_p_ci_templates_jobs_deploy_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222229_p_ci_templates_jobs_build_monthly.yml b/config/metrics/counts_28d/20210901222229_p_ci_templates_jobs_build_monthly.yml
index 2c582ae2d5d..0287d2c9bd8 100644
--- a/config/metrics/counts_28d/20210901222229_p_ci_templates_jobs_build_monthly.yml
+++ b/config/metrics/counts_28d/20210901222229_p_ci_templates_jobs_build_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml
index f3907820de0..c2926eef7b6 100644
--- a/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222246_p_ci_templates_jobs_test_monthly.yml b/config/metrics/counts_28d/20210901222246_p_ci_templates_jobs_test_monthly.yml
index d6b9a891d9c..ef09d4d97cf 100644
--- a/config/metrics/counts_28d/20210901222246_p_ci_templates_jobs_test_monthly.yml
+++ b/config/metrics/counts_28d/20210901222246_p_ci_templates_jobs_test_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222256_p_ci_templates_jobs_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210901222256_p_ci_templates_jobs_deploy_latest_monthly.yml
index 6a05970b675..375fbb76d52 100644
--- a/config/metrics/counts_28d/20210901222256_p_ci_templates_jobs_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901222256_p_ci_templates_jobs_deploy_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml b/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml
index a1c568a7ff9..c99a6789349 100644
--- a/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222313_p_ci_templates_jobs_cf_provision_monthly.yml b/config/metrics/counts_28d/20210901222313_p_ci_templates_jobs_cf_provision_monthly.yml
index 02fb579e03b..17e92e81059 100644
--- a/config/metrics/counts_28d/20210901222313_p_ci_templates_jobs_cf_provision_monthly.yml
+++ b/config/metrics/counts_28d/20210901222313_p_ci_templates_jobs_cf_provision_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222322_p_ci_templates_jobs_build_latest_monthly.yml b/config/metrics/counts_28d/20210901222322_p_ci_templates_jobs_build_latest_monthly.yml
index 856cb3d7431..80e9e5436c6 100644
--- a/config/metrics/counts_28d/20210901222322_p_ci_templates_jobs_build_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901222322_p_ci_templates_jobs_build_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222331_p_ci_templates_terraform_latest_monthly.yml b/config/metrics/counts_28d/20210901222331_p_ci_templates_terraform_latest_monthly.yml
index 920efea27ad..1208176e89b 100644
--- a/config/metrics/counts_28d/20210901222331_p_ci_templates_terraform_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901222331_p_ci_templates_terraform_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222341_p_ci_templates_swift_monthly.yml b/config/metrics/counts_28d/20210901222341_p_ci_templates_swift_monthly.yml
index d09907dc91b..0e3a161dacb 100644
--- a/config/metrics/counts_28d/20210901222341_p_ci_templates_swift_monthly.yml
+++ b/config/metrics/counts_28d/20210901222341_p_ci_templates_swift_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222707_p_ci_templates_pages_jekyll_monthly.yml b/config/metrics/counts_28d/20210901222707_p_ci_templates_pages_jekyll_monthly.yml
index 9271873d5a5..305b1ea780f 100644
--- a/config/metrics/counts_28d/20210901222707_p_ci_templates_pages_jekyll_monthly.yml
+++ b/config/metrics/counts_28d/20210901222707_p_ci_templates_pages_jekyll_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901222742_p_ci_templates_pages_harp_monthly.yml b/config/metrics/counts_28d/20210901222742_p_ci_templates_pages_harp_monthly.yml
index 1a1666d961e..5d2fe0ffdbb 100644
--- a/config/metrics/counts_28d/20210901222742_p_ci_templates_pages_harp_monthly.yml
+++ b/config/metrics/counts_28d/20210901222742_p_ci_templates_pages_harp_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223200_p_ci_templates_pages_octopress_monthly.yml b/config/metrics/counts_28d/20210901223200_p_ci_templates_pages_octopress_monthly.yml
index e393a28d402..25c34113482 100644
--- a/config/metrics/counts_28d/20210901223200_p_ci_templates_pages_octopress_monthly.yml
+++ b/config/metrics/counts_28d/20210901223200_p_ci_templates_pages_octopress_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223210_p_ci_templates_pages_brunch_monthly.yml b/config/metrics/counts_28d/20210901223210_p_ci_templates_pages_brunch_monthly.yml
index 3e15963a0e4..a3e5991c41a 100644
--- a/config/metrics/counts_28d/20210901223210_p_ci_templates_pages_brunch_monthly.yml
+++ b/config/metrics/counts_28d/20210901223210_p_ci_templates_pages_brunch_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223219_p_ci_templates_pages_doxygen_monthly.yml b/config/metrics/counts_28d/20210901223219_p_ci_templates_pages_doxygen_monthly.yml
index 3a847e76a4d..6c4efe579ec 100644
--- a/config/metrics/counts_28d/20210901223219_p_ci_templates_pages_doxygen_monthly.yml
+++ b/config/metrics/counts_28d/20210901223219_p_ci_templates_pages_doxygen_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223227_p_ci_templates_pages_hyde_monthly.yml b/config/metrics/counts_28d/20210901223227_p_ci_templates_pages_hyde_monthly.yml
index 18cd9350c18..c075b69a5c8 100644
--- a/config/metrics/counts_28d/20210901223227_p_ci_templates_pages_hyde_monthly.yml
+++ b/config/metrics/counts_28d/20210901223227_p_ci_templates_pages_hyde_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223236_p_ci_templates_pages_lektor_monthly.yml b/config/metrics/counts_28d/20210901223236_p_ci_templates_pages_lektor_monthly.yml
index 8359a8b94a4..97dbb45f821 100644
--- a/config/metrics/counts_28d/20210901223236_p_ci_templates_pages_lektor_monthly.yml
+++ b/config/metrics/counts_28d/20210901223236_p_ci_templates_pages_lektor_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223244_p_ci_templates_pages_jbake_monthly.yml b/config/metrics/counts_28d/20210901223244_p_ci_templates_pages_jbake_monthly.yml
index 8290dc0e832..a6834f97783 100644
--- a/config/metrics/counts_28d/20210901223244_p_ci_templates_pages_jbake_monthly.yml
+++ b/config/metrics/counts_28d/20210901223244_p_ci_templates_pages_jbake_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223253_p_ci_templates_pages_hexo_monthly.yml b/config/metrics/counts_28d/20210901223253_p_ci_templates_pages_hexo_monthly.yml
index 45768b15c10..4d43cac3a36 100644
--- a/config/metrics/counts_28d/20210901223253_p_ci_templates_pages_hexo_monthly.yml
+++ b/config/metrics/counts_28d/20210901223253_p_ci_templates_pages_hexo_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223302_p_ci_templates_pages_middleman_monthly.yml b/config/metrics/counts_28d/20210901223302_p_ci_templates_pages_middleman_monthly.yml
index c7615209431..116b7bf4730 100644
--- a/config/metrics/counts_28d/20210901223302_p_ci_templates_pages_middleman_monthly.yml
+++ b/config/metrics/counts_28d/20210901223302_p_ci_templates_pages_middleman_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223311_p_ci_templates_pages_hugo_monthly.yml b/config/metrics/counts_28d/20210901223311_p_ci_templates_pages_hugo_monthly.yml
index 951a61d56ae..fca3e8bd88e 100644
--- a/config/metrics/counts_28d/20210901223311_p_ci_templates_pages_hugo_monthly.yml
+++ b/config/metrics/counts_28d/20210901223311_p_ci_templates_pages_hugo_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223319_p_ci_templates_pages_pelican_monthly.yml b/config/metrics/counts_28d/20210901223319_p_ci_templates_pages_pelican_monthly.yml
index fe749f92436..d4a1a2e8182 100644
--- a/config/metrics/counts_28d/20210901223319_p_ci_templates_pages_pelican_monthly.yml
+++ b/config/metrics/counts_28d/20210901223319_p_ci_templates_pages_pelican_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223328_p_ci_templates_pages_nanoc_monthly.yml b/config/metrics/counts_28d/20210901223328_p_ci_templates_pages_nanoc_monthly.yml
index 37b49978853..f1df4d2242b 100644
--- a/config/metrics/counts_28d/20210901223328_p_ci_templates_pages_nanoc_monthly.yml
+++ b/config/metrics/counts_28d/20210901223328_p_ci_templates_pages_nanoc_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223337_p_ci_templates_pages_swaggerui_monthly.yml b/config/metrics/counts_28d/20210901223337_p_ci_templates_pages_swaggerui_monthly.yml
index da09183e928..f735c07b065 100644
--- a/config/metrics/counts_28d/20210901223337_p_ci_templates_pages_swaggerui_monthly.yml
+++ b/config/metrics/counts_28d/20210901223337_p_ci_templates_pages_swaggerui_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223346_p_ci_templates_pages_jigsaw_monthly.yml b/config/metrics/counts_28d/20210901223346_p_ci_templates_pages_jigsaw_monthly.yml
index 5fadb6ce074..0585c926f12 100644
--- a/config/metrics/counts_28d/20210901223346_p_ci_templates_pages_jigsaw_monthly.yml
+++ b/config/metrics/counts_28d/20210901223346_p_ci_templates_pages_jigsaw_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223354_p_ci_templates_pages_metalsmith_monthly.yml b/config/metrics/counts_28d/20210901223354_p_ci_templates_pages_metalsmith_monthly.yml
index 1f46fd06db7..1c01e508846 100644
--- a/config/metrics/counts_28d/20210901223354_p_ci_templates_pages_metalsmith_monthly.yml
+++ b/config/metrics/counts_28d/20210901223354_p_ci_templates_pages_metalsmith_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223403_p_ci_templates_pages_gatsby_monthly.yml b/config/metrics/counts_28d/20210901223403_p_ci_templates_pages_gatsby_monthly.yml
index 1132a4b95c2..7f3cb047a72 100644
--- a/config/metrics/counts_28d/20210901223403_p_ci_templates_pages_gatsby_monthly.yml
+++ b/config/metrics/counts_28d/20210901223403_p_ci_templates_pages_gatsby_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223412_p_ci_templates_pages_html_monthly.yml b/config/metrics/counts_28d/20210901223412_p_ci_templates_pages_html_monthly.yml
index 33ee3737f95..4f50ca1176d 100644
--- a/config/metrics/counts_28d/20210901223412_p_ci_templates_pages_html_monthly.yml
+++ b/config/metrics/counts_28d/20210901223412_p_ci_templates_pages_html_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223421_p_ci_templates_dart_monthly.yml b/config/metrics/counts_28d/20210901223421_p_ci_templates_dart_monthly.yml
index eb93f5910ed..69dd65a91e5 100644
--- a/config/metrics/counts_28d/20210901223421_p_ci_templates_dart_monthly.yml
+++ b/config/metrics/counts_28d/20210901223421_p_ci_templates_dart_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223430_p_ci_templates_docker_monthly.yml b/config/metrics/counts_28d/20210901223430_p_ci_templates_docker_monthly.yml
index 390d155415e..8cc5d9861cf 100644
--- a/config/metrics/counts_28d/20210901223430_p_ci_templates_docker_monthly.yml
+++ b/config/metrics/counts_28d/20210901223430_p_ci_templates_docker_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223439_p_ci_templates_julia_monthly.yml b/config/metrics/counts_28d/20210901223439_p_ci_templates_julia_monthly.yml
index 199718e6b1b..f860cc65e1c 100644
--- a/config/metrics/counts_28d/20210901223439_p_ci_templates_julia_monthly.yml
+++ b/config/metrics/counts_28d/20210901223439_p_ci_templates_julia_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223447_p_ci_templates_npm_monthly.yml b/config/metrics/counts_28d/20210901223447_p_ci_templates_npm_monthly.yml
index 47aa49e8fb4..48d833b8b36 100644
--- a/config/metrics/counts_28d/20210901223447_p_ci_templates_npm_monthly.yml
+++ b/config/metrics/counts_28d/20210901223447_p_ci_templates_npm_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223456_p_ci_templates_dotnet_core_monthly.yml b/config/metrics/counts_28d/20210901223456_p_ci_templates_dotnet_core_monthly.yml
index 5aadbcdd402..2be20e8915c 100644
--- a/config/metrics/counts_28d/20210901223456_p_ci_templates_dotnet_core_monthly.yml
+++ b/config/metrics/counts_28d/20210901223456_p_ci_templates_dotnet_core_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223505_p_ci_templates_5_minute_production_app_monthly.yml b/config/metrics/counts_28d/20210901223505_p_ci_templates_5_minute_production_app_monthly.yml
index 43851ae9fb3..e3c904eb379 100644
--- a/config/metrics/counts_28d/20210901223505_p_ci_templates_5_minute_production_app_monthly.yml
+++ b/config/metrics/counts_28d/20210901223505_p_ci_templates_5_minute_production_app_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223514_p_ci_templates_ruby_monthly.yml b/config/metrics/counts_28d/20210901223514_p_ci_templates_ruby_monthly.yml
index ce9d5065fc1..b90e11ecd33 100644
--- a/config/metrics/counts_28d/20210901223514_p_ci_templates_ruby_monthly.yml
+++ b/config/metrics/counts_28d/20210901223514_p_ci_templates_ruby_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223523_p_ci_templates_implicit_jobs_dast_default_branch_deploy_monthly.yml b/config/metrics/counts_28d/20210901223523_p_ci_templates_implicit_jobs_dast_default_branch_deploy_monthly.yml
index b52850bdca9..cab301492df 100644
--- a/config/metrics/counts_28d/20210901223523_p_ci_templates_implicit_jobs_dast_default_branch_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210901223523_p_ci_templates_implicit_jobs_dast_default_branch_deploy_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml
index 539781592bd..373fc6e596f 100644
--- a/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223541_p_ci_templates_implicit_jobs_helm_2to3_monthly.yml b/config/metrics/counts_28d/20210901223541_p_ci_templates_implicit_jobs_helm_2to3_monthly.yml
index 11c66d9dd11..fdfef5a8ef9 100644
--- a/config/metrics/counts_28d/20210901223541_p_ci_templates_implicit_jobs_helm_2to3_monthly.yml
+++ b/config/metrics/counts_28d/20210901223541_p_ci_templates_implicit_jobs_helm_2to3_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223550_p_ci_templates_implicit_jobs_sast_monthly.yml b/config/metrics/counts_28d/20210901223550_p_ci_templates_implicit_jobs_sast_monthly.yml
index e30f559b879..bd2c8096fa4 100644
--- a/config/metrics/counts_28d/20210901223550_p_ci_templates_implicit_jobs_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210901223550_p_ci_templates_implicit_jobs_sast_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223559_p_ci_templates_implicit_jobs_secret_detection_monthly.yml b/config/metrics/counts_28d/20210901223559_p_ci_templates_implicit_jobs_secret_detection_monthly.yml
index 7c56b16701b..3a29a9ccae3 100644
--- a/config/metrics/counts_28d/20210901223559_p_ci_templates_implicit_jobs_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210901223559_p_ci_templates_implicit_jobs_secret_detection_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223608_p_ci_templates_implicit_jobs_code_intelligence_monthly.yml b/config/metrics/counts_28d/20210901223608_p_ci_templates_implicit_jobs_code_intelligence_monthly.yml
index e52602a96c8..fd12f7e50be 100644
--- a/config/metrics/counts_28d/20210901223608_p_ci_templates_implicit_jobs_code_intelligence_monthly.yml
+++ b/config/metrics/counts_28d/20210901223608_p_ci_templates_implicit_jobs_code_intelligence_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223617_p_ci_templates_implicit_jobs_code_quality_monthly.yml b/config/metrics/counts_28d/20210901223617_p_ci_templates_implicit_jobs_code_quality_monthly.yml
index 05bcdade966..e6737e04c3f 100644
--- a/config/metrics/counts_28d/20210901223617_p_ci_templates_implicit_jobs_code_quality_monthly.yml
+++ b/config/metrics/counts_28d/20210901223617_p_ci_templates_implicit_jobs_code_quality_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223626_p_ci_templates_implicit_jobs_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210901223626_p_ci_templates_implicit_jobs_deploy_ecs_monthly.yml
index 4bc50406910..38c90a0b935 100644
--- a/config/metrics/counts_28d/20210901223626_p_ci_templates_implicit_jobs_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210901223626_p_ci_templates_implicit_jobs_deploy_ecs_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223635_p_ci_templates_implicit_jobs_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210901223635_p_ci_templates_implicit_jobs_deploy_ec2_monthly.yml
index 6c71d424338..2a3059806be 100644
--- a/config/metrics/counts_28d/20210901223635_p_ci_templates_implicit_jobs_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210901223635_p_ci_templates_implicit_jobs_deploy_ec2_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml
index 9c8f24f35b6..5f83aedbc50 100644
--- a/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223653_p_ci_templates_implicit_jobs_test_monthly.yml b/config/metrics/counts_28d/20210901223653_p_ci_templates_implicit_jobs_test_monthly.yml
index 4424cf72a53..2c7f1709af1 100644
--- a/config/metrics/counts_28d/20210901223653_p_ci_templates_implicit_jobs_test_monthly.yml
+++ b/config/metrics/counts_28d/20210901223653_p_ci_templates_implicit_jobs_test_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml b/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml
index d5dd0372093..75c180c2cc2 100644
--- a/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml b/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml
index f8f018a6a28..561a268a0e1 100644
--- a/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml
+++ b/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml b/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml
index 81a1a37e050..9f11e619fbb 100644
--- a/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml b/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml
index 49f7d1e9cf1..d7681de83f8 100644
--- a/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml
+++ b/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml b/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml
index b3deccc2520..f6f7dbaa1b6 100644
--- a/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml
+++ b/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223748_p_ci_templates_implicit_security_license_scanning_monthly.yml b/config/metrics/counts_28d/20210901223748_p_ci_templates_implicit_security_license_scanning_monthly.yml
index 0a22cf9e860..9979e069c17 100644
--- a/config/metrics/counts_28d/20210901223748_p_ci_templates_implicit_security_license_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901223748_p_ci_templates_implicit_security_license_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml b/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml
index ba4ec3b4fa3..ef58916d90c 100644
--- a/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml b/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml
index 176964c3cdc..c83b452c8eb 100644
--- a/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml b/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml
index 0c8001e6f77..0761177631b 100644
--- a/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml
+++ b/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml b/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml
index 9c22a733f84..707fda6a628 100644
--- a/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml
+++ b/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223832_p_ci_templates_implicit_security_container_scanning_monthly.yml b/config/metrics/counts_28d/20210901223832_p_ci_templates_implicit_security_container_scanning_monthly.yml
index c1281685678..d41df75db4c 100644
--- a/config/metrics/counts_28d/20210901223832_p_ci_templates_implicit_security_container_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901223832_p_ci_templates_implicit_security_container_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml b/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml
index de98bdd43b7..c1c7c7e5d1b 100644
--- a/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223850_p_ci_templates_implicit_security_dependency_scanning_monthly.yml b/config/metrics/counts_28d/20210901223850_p_ci_templates_implicit_security_dependency_scanning_monthly.yml
index 6e9ccb48983..0e222a4bd39 100644
--- a/config/metrics/counts_28d/20210901223850_p_ci_templates_implicit_security_dependency_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901223850_p_ci_templates_implicit_security_dependency_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml b/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml
index d0e9b20316b..1ee2bc2d08e 100644
--- a/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223907_p_ci_templates_implicit_security_dast_monthly.yml b/config/metrics/counts_28d/20210901223907_p_ci_templates_implicit_security_dast_monthly.yml
index 7b7ce070486..89c4c6d7f57 100644
--- a/config/metrics/counts_28d/20210901223907_p_ci_templates_implicit_security_dast_monthly.yml
+++ b/config/metrics/counts_28d/20210901223907_p_ci_templates_implicit_security_dast_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210901223916_p_ci_templates_implicit_security_cluster_image_scanning_monthly.yml b/config/metrics/counts_28d/20210901223916_p_ci_templates_implicit_security_cluster_image_scanning_monthly.yml
index 25c535315d2..88960e3587c 100644
--- a/config/metrics/counts_28d/20210901223916_p_ci_templates_implicit_security_cluster_image_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901223916_p_ci_templates_implicit_security_cluster_image_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone_removed: '15.0'
diff --git a/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml
index 3450683aaf3..66f66f4ef6a 100644
--- a/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20210902191057_i_quickactions_unapprove_monthly.yml b/config/metrics/counts_28d/20210902191057_i_quickactions_unapprove_monthly.yml
index 8611f03604e..ff9c86828ed 100644
--- a/config/metrics/counts_28d/20210902191057_i_quickactions_unapprove_monthly.yml
+++ b/config/metrics/counts_28d/20210902191057_i_quickactions_unapprove_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/unapprove` quick action
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_28d/20210908093509_p_ci_templates_android_latest_monthly.yml b/config/metrics/counts_28d/20210908093509_p_ci_templates_android_latest_monthly.yml
index f44d7a6c045..4a7ee8d1292 100644
--- a/config/metrics/counts_28d/20210908093509_p_ci_templates_android_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210908093509_p_ci_templates_android_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_28d/20210908150458_i_code_review_user_resolve_thread_in_issue_monthly.yml b/config/metrics/counts_28d/20210908150458_i_code_review_user_resolve_thread_in_issue_monthly.yml
index 5c2327fd50b..370c12cdc43 100644
--- a/config/metrics/counts_28d/20210908150458_i_code_review_user_resolve_thread_in_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210908150458_i_code_review_user_resolve_thread_in_issue_monthly.yml
@@ -5,7 +5,6 @@ description: The number of users who resolve a thread in a new issue through the
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
index 0ee3d694317..14914a140d4 100644
--- a/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
+++ b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
@@ -5,7 +5,6 @@ description: Number of unique user logins using two factor authentication for av
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category: authentication_and_authorization
value_type: object
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_28d/20210916080405_promoted_issues.yml b/config/metrics/counts_28d/20210916080405_promoted_issues.yml
index 5c1ad6446f0..444fa936b3d 100644
--- a/config/metrics/counts_28d/20210916080405_promoted_issues.yml
+++ b/config/metrics/counts_28d/20210916080405_promoted_issues.yml
@@ -5,7 +5,6 @@ description: Count of issues promoted to epics
product_section: analytics
product_stage: analytics
product_group: product_intelligence
-product_category: collection
value_type: number
status: removed
milestone: "14.3"
diff --git a/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml b/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml
index 1d3b7907c13..2b46ab92910 100644
--- a/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml
+++ b/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml
@@ -5,7 +5,6 @@ description: Users creating clusters with Prometheus integration enabled in last
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml b/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml
index a923fd255b7..487796a4e08 100644
--- a/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml
+++ b/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml
index 73141ddf341..3ab54fc3262 100644
--- a/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.4'
diff --git a/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml b/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml
index 13f3bb050db..d61059ac43f 100644
--- a/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml b/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml
index baa0b529d26..1ef3b19a9bf 100644
--- a/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml
+++ b/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that were enqueued to start monthy
product_section: dev
product_stage: manage
product_group: import
-product_category:
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml b/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml
index ca943ecad7f..4f1e01e0f2c 100644
--- a/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml
+++ b/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that were successful monthly
product_section: dev
product_stage: manage
product_group: import
-product_category:
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml b/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml
index fe97d6c0eeb..fd36259e74d 100644
--- a/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml
+++ b/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that failed monthly
product_section: dev
product_stage: manage
product_group: import
-product_category:
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml b/config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml
index eb03acc2476..fb9f7b97bdc 100644
--- a/config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml
+++ b/config/metrics/counts_28d/20211015154445_p_ci_templates_kaniko_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ops
product_stage: verify
product_group: pipeline_authoring
-product_category: pipeline_authoring
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml b/config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml
index e50780d378f..51e3dbcc9eb 100644
--- a/config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml
+++ b/config/metrics/counts_28d/20211102141250_i_quickactions_promote_to_incident_monthly.yml
@@ -4,7 +4,6 @@ description: Count of MAU using the `/promote_to_incident` quick action
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
milestone: "14.5"
diff --git a/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml
index 5f171c62bab..65f1eecc7e6 100644
--- a/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102205024_p_ci_templates_security_sast_iac_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the latest SAST IaC template
product_section: sec
product_stage: secure
product_group: "static_analysis"
-product_category: SAST
value_type: number
status: active
milestone: "14.5"
diff --git a/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml
index 781dbbe7b60..68db0a93e47 100644
--- a/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102205223_p_ci_templates_implicit_security_sast_iac_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines with implicit runs using the latest SAST IaC tem
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: SAST
value_type: number
status: removed
milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml
index 90f8eae91fe..33d7a214bf2 100644
--- a/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102213704_p_ci_templates_jobs_sast_iac_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the latest SAST IaC template
product_section: sec
product_stage: secure
product_group: "static_analysis"
-product_category: SAST
value_type: number
status: active
milestone: "14.5"
diff --git a/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml b/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml
index c676750d92d..a003d211cb5 100644
--- a/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211102213921_p_ci_templates_implicit_jobs_sast_iac_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines with implicit runs using the latest SAST IaC tem
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: SAST
value_type: number
status: removed
milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml b/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml
index d20b78cab9b..fca5481e70a 100644
--- a/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml
+++ b/config/metrics/counts_28d/20211104154357_i_code_review_widget_nothing_merge_click_new_file_monthly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the create file button in the nothing to m
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml b/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml
index f00f7cfafb9..64c8c78f3fb 100644
--- a/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml
+++ b/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml
@@ -4,7 +4,6 @@ description: Count of MAU using the `/add_contacts` quick action
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: service_desk
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml b/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml
index cdf2b6abf39..aae449dc7ff 100644
--- a/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml
+++ b/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml
@@ -4,7 +4,6 @@ description: Count of MAU using the `/remove_contacts` quick action
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: service_desk
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml b/config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml
index c944a82a373..9310459c466 100644
--- a/config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml
+++ b/config/metrics/counts_28d/20211111162103_i_code_review_post_merge_delete_branch_monthly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the delete source branch button after merg
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml b/config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml
index b01a6fe58f5..baca691621f 100644
--- a/config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml
+++ b/config/metrics/counts_28d/20211111162422_i_code_review_post_merge_click_revert_monthly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the revert button in the merge requet widg
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml b/config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml
index 40f5cac914c..e6cd861ec27 100644
--- a/config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml
+++ b/config/metrics/counts_28d/20211112102446_i_code_review_post_merge_click_cherry_pick_monthly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the cherry pick button in the merge requet
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml b/config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml
index 592f51e2e99..74f14aacdd8 100644
--- a/config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml
+++ b/config/metrics/counts_28d/20211112114333_i_code_review_post_merge_submit_revert_modal_monthly.yml
@@ -4,7 +4,6 @@ description: Count of users who submit the post merge revert modal
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml b/config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml
index 15d1bc80bb2..00e5281d224 100644
--- a/config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml
+++ b/config/metrics/counts_28d/20211112115144_i_code_review_post_merge_submit_cherry_pick_modal_monthly.yml
@@ -4,7 +4,6 @@ description: Count of users who submit the post merge revert modal
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml b/config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml
index ec67d0a713f..0cba55aa82e 100644
--- a/config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for DAST API latest CI template
product_section: sec
product_stage: secure
product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
value_type: number
status: removed
milestone: '14.6'
diff --git a/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml b/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
index c10bc664168..845500bff73 100644
--- a/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique visits to the project level CI CD Analytics pipelin
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
milestone: '14.6'
diff --git a/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
index 8cf5acd5b0c..d719ac3e5d1 100644
--- a/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
+++ b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique visits to the project level CI CD Analytics deploym
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
milestone: '14.6'
diff --git a/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
index 60dcee1d757..d0640d97d37 100644
--- a/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
+++ b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique visits to the project level CI CD Analytics lead ti
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
milestone: '14.6'
diff --git a/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml b/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml
index c353641bd6f..9ae9fde73dd 100644
--- a/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml
+++ b/config/metrics/counts_28d/20211201140658_users_expanding_testing_license_compliance_report_monthly.yml
@@ -5,7 +5,6 @@ description: Count of expanding the license compliance widget
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: '14.6'
diff --git a/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml b/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml
index 1f84c9f1788..ca82066ca10 100644
--- a/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml
+++ b/config/metrics/counts_28d/20211201154341_users_visiting_license_compliance_full_report_monthly.yml
@@ -5,7 +5,6 @@ description: Count of visiting the license compliance full report
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: '14.6'
diff --git a/config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml b/config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml
index cfcffe5caca..ee6037ab014 100644
--- a/config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml
+++ b/config/metrics/counts_28d/20211201194407_p_ci_templates_security_dast_api_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for DAST API latest CI template
product_section: sec
product_stage: secure
product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
value_type: number
status: active
milestone: "14.6"
diff --git a/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml b/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml
index a8fcd038e84..632379771ab 100644
--- a/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml
+++ b/config/metrics/counts_28d/20211202094237_users_visiting_manage_license_compliance_monthly.yml
@@ -5,7 +5,6 @@ description: Count of visiting the manage license compliance page
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: '14.6'
diff --git a/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml b/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml
index cd9132bbcfc..f98ded492df 100644
--- a/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml
+++ b/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking licence to visit external information websi
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: '14.7'
diff --git a/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml b/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml
index e26732ec916..7a9ea8e9467 100644
--- a/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml
+++ b/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml
@@ -4,7 +4,6 @@ description: ""
product_section: ""
product_stage: ""
product_group: ""
-product_category: ""
value_type: number
status: active
milestone: "14.7"
diff --git a/config/metrics/counts_28d/20220121140644_user_jetbrains_api_request_monthly.yml b/config/metrics/counts_28d/20220121140644_user_jetbrains_api_request_monthly.yml
index 2ca245c3c68..879818d59db 100644
--- a/config/metrics/counts_28d/20220121140644_user_jetbrains_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20220121140644_user_jetbrains_api_request_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique users per month who use GitLab plugin for JetBrains
product_section: dev
product_stage: create
product_group: code_review
-product_category: editor_extension
value_type: number
status: active
milestone: "14.8"
diff --git a/config/metrics/counts_28d/20220131143209_i_quickactions_attention_monthly.yml b/config/metrics/counts_28d/20220131143209_i_quickactions_attention_monthly.yml
index 7be45e79f51..dd534423ae5 100644
--- a/config/metrics/counts_28d/20220131143209_i_quickactions_attention_monthly.yml
+++ b/config/metrics/counts_28d/20220131143209_i_quickactions_attention_monthly.yml
@@ -4,7 +4,6 @@ description: Count of MAU using the `/attention` quick action
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: removed
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95241/
diff --git a/config/metrics/counts_28d/20220131153230_i_quickactions_remove_attention_monthly.yml b/config/metrics/counts_28d/20220131153230_i_quickactions_remove_attention_monthly.yml
index 2b002bc3790..45053ac7ad9 100644
--- a/config/metrics/counts_28d/20220131153230_i_quickactions_remove_attention_monthly.yml
+++ b/config/metrics/counts_28d/20220131153230_i_quickactions_remove_attention_monthly.yml
@@ -4,7 +4,6 @@ description: Count of MAU using the `/remove_attention` quick action
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: removed
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95241/
diff --git a/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml b/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
index ddc6907ee19..b88adb8bc0b 100644
--- a/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
+++ b/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts of times users have executed deployment jobs
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
milestone: "14.8"
diff --git a/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_monthly.yml b/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_monthly.yml
index 8f913307356..82f11d6dcd1 100644
--- a/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for implicit use of Dependency Scanning CI template
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: '14.8'
diff --git a/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_monthly.yml b/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_monthly.yml
index 2b776b28c5d..b1663d3fdce 100644
--- a/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for implicit use of License Scanning CI template (Jo
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: license_compliance
value_type: number
status: active
milestone: '14.8'
diff --git a/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_dependency_scanning_monthly.yml b/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_dependency_scanning_monthly.yml
index 6d166725a67..c1981ac4780 100644
--- a/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_dependency_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_dependency_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for Dependency Scanning CI template (Jobs folder)
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: '14.8'
diff --git a/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_license_scanning_monthly.yml b/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_license_scanning_monthly.yml
index db215d242e0..e20d4f08c05 100644
--- a/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_license_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20220210134101_p_ci_templates_jobs_license_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for License Scanning CI template (Jobs folder)
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: license_compliance
value_type: number
status: active
milestone: '14.8'
diff --git a/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml b/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
index cf711de79a9..084c8364ad4 100644
--- a/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
+++ b/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
@@ -1,7 +1,6 @@
---
key_path: redis_hll_counters.work_items.users_updating_work_item_title_monthly
description: Unique users updating a work item's title
-product_category: team planning
product_section: dev
product_stage: plan
product_group: project_management
diff --git a/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml b/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
index 82130118e43..775ac392583 100644
--- a/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
+++ b/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
@@ -1,7 +1,6 @@
---
key_path: redis_hll_counters.work_items.users_creating_work_items_monthly
description: Unique users creating work items
-product_category: team planning
product_section: dev
product_stage: plan
product_group: project_management
diff --git a/config/metrics/counts_28d/20220222215951_xmau_plan.yml b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
index 70cc27b801c..a70ee00e254 100644
--- a/config/metrics/counts_28d/20220222215951_xmau_plan.yml
+++ b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
@@ -1,7 +1,6 @@
---
key_path: counts_monthly.aggregated_metrics.xmau_plan
description: Unique users interacting with Plan features
-product_category: team planning
product_section: dev
product_stage: plan
product_group: project_management
diff --git a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
index 13a943c972c..fa4ca4719cb 100644
--- a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
+++ b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
@@ -1,7 +1,6 @@
---
key_path: counts_monthly.aggregated_metrics.xmau_project_management
description: Unique users interacting with Project Management features
-product_category: team planning
product_section: dev
product_stage: plan
product_group: project_management
diff --git a/config/metrics/counts_28d/20220222215955_users_work_items.yml b/config/metrics/counts_28d/20220222215955_users_work_items.yml
index cb3dc63035f..3ba2f8b0f50 100644
--- a/config/metrics/counts_28d/20220222215955_users_work_items.yml
+++ b/config/metrics/counts_28d/20220222215955_users_work_items.yml
@@ -1,7 +1,6 @@
---
key_path: counts_monthly.aggregated_metrics.users_work_items
description: Unique users interacting with work items
-product_category: team planning
product_section: dev
product_stage: plan
product_group: product_planning
diff --git a/config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml b/config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml
index 214c6504051..eebad4ce41f 100644
--- a/config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml
+++ b/config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml
@@ -4,7 +4,6 @@ description: ""
product_section: ""
product_stage: ""
product_group: ""
-product_category:
value_type: number
status: active
milestone: "14.9"
diff --git a/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml b/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml
index 219147def08..de4160c1d4e 100644
--- a/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220308234005_p_ci_templates_jobs_sast_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for SAST CI Latest template (Jobs folder)
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: static_application_security_testing
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml b/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml
index c0d4ba01f03..3e51bb0e4aa 100644
--- a/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220309001640_p_ci_templates_jobs_secret_detection_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Secret Detection CI Latest template (Security fol
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: static_application_security_testing
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220309183501_error_tracking_view_details_monthly.yml b/config/metrics/counts_28d/20220309183501_error_tracking_view_details_monthly.yml
index 3a25e0a5a4b..7f2f96839d4 100644
--- a/config/metrics/counts_28d/20220309183501_error_tracking_view_details_monthly.yml
+++ b/config/metrics/counts_28d/20220309183501_error_tracking_view_details_monthly.yml
@@ -4,7 +4,6 @@ description: Unique users viewing the error details page
product_section: ops
product_stage: monitor
product_group: respond
-product_category: error_tracking
value_type: number
status: active
milestone: "14.9"
diff --git a/config/metrics/counts_28d/20220309195504_error_tracking_view_list_monthly.yml b/config/metrics/counts_28d/20220309195504_error_tracking_view_list_monthly.yml
index c94cca65514..5eb32ad63d0 100644
--- a/config/metrics/counts_28d/20220309195504_error_tracking_view_list_monthly.yml
+++ b/config/metrics/counts_28d/20220309195504_error_tracking_view_list_monthly.yml
@@ -4,7 +4,6 @@ description: Unique users viewing the list of errors in the project
product_section: ops
product_stage: monitor
product_group: respond
-product_category: error_tracking
value_type: number
status: active
milestone: "14.9"
diff --git a/config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml b/config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml
index bd61f9ddc57..26a51a0b7f9 100644
--- a/config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml
+++ b/config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml
@@ -4,7 +4,6 @@ description: ""
product_section: ""
product_stage: ""
product_group: ""
-product_category: ""
value_type: number
status: active
milestone: "14.10"
diff --git a/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml b/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml
index 64f0bc79682..a29bcda2c6c 100644
--- a/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220310213320_p_ci_templates_implicit_jobs_secret_detection_latest_monthly.yml
@@ -5,7 +5,6 @@ description: Weekly counts for implicit use of Secret Detection CI Latest templa
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: static_application_security_testing
value_type: number
status: removed
milestone: '15.0'
diff --git a/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml b/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml
index e77e4044894..bd823775451 100644
--- a/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220310213749_p_ci_templates_implicit_jobs_sast_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for implicit use of SAST CI Latest template (Jobs fol
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: static_application_security_testing
value_type: number
status: removed
milestone: '15.0'
diff --git a/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
index 646260aa65e..ec083e28bee 100644
--- a/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
@@ -4,7 +4,6 @@ description: Total unique users accessing error tracking routes
product_section: ops
product_stage: monitor
product_group: respond
-product_category: error_tracking
value_type: number
status: active
milestone: "14.9"
diff --git a/config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml b/config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml
index 1496e9dd5e5..e2a58bd67e5 100644
--- a/config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique users per month who use the GitLab CLI
product_section: dev
product_stage: create
product_group: code_review
-product_category: editor_extension
value_type: number
status: active
milestone: "14.10"
diff --git a/config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml b/config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml
index 1ee10431b4d..921dbb2a7ed 100644
--- a/config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml
+++ b/config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: "14.10"
diff --git a/config/metrics/counts_28d/20220428154012_live_preview.yml b/config/metrics/counts_28d/20220428154012_live_preview.yml
index 23bfd9334bc..aa06bbcaaea 100644
--- a/config/metrics/counts_28d/20220428154012_live_preview.yml
+++ b/config/metrics/counts_28d/20220428154012_live_preview.yml
@@ -5,7 +5,6 @@ description: Count of monthly unique users that successfully connect to Live Pre
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85420
diff --git a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_commit_monthly.yml b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_commit_monthly.yml
index 87ee4ff392b..937c4039c27 100644
--- a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_commit_monthly.yml
+++ b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_commit_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly notes on ipynb commit diffs
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_monthly.yml b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_monthly.yml
index 8a5a50572d8..8f6435909ab 100644
--- a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_monthly.yml
+++ b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly notes on ipynb diffs
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_mr_monthly.yml b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_mr_monthly.yml
index 907c1459293..3d52754312e 100644
--- a/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_mr_monthly.yml
+++ b/config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_mr_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly notes on ipynb MR diffs
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_monthly.yml b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_monthly.yml
index e33149db20f..38face8ecd6 100644
--- a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_monthly.yml
+++ b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly unique users with notes on ipynb commit diffs
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_monthly.yml b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_monthly.yml
index b6f8e09039e..a04ec7b91b2 100644
--- a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_monthly.yml
+++ b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly unique users with notes on ipynb diffs
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_monthly.yml b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_monthly.yml
index 732124e34f0..133601115e0 100644
--- a/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_monthly.yml
+++ b/config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly unique users with notes on ipynb MR diffs
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml b/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml
index ddde77a1755..60d5c9ac054 100644
--- a/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml
+++ b/config/metrics/counts_28d/20220510024223_p_ci_templates_jobs_sast_iac_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the stable SAST IaC template
product_section: sec
product_stage: secure
product_group: "static_analysis"
-product_category: SAST
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml b/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml
index 7b817928c59..894da4185b0 100644
--- a/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml
+++ b/config/metrics/counts_28d/20220510024223_p_ci_templates_security_sast_iac_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the stable SAST IaC template
product_section: sec
product_stage: secure
product_group: "static_analysis"
-product_category: SAST
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml b/config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml
index a4042763c46..6fdaf8c5b2c 100644
--- a/config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml
@@ -2,7 +2,6 @@
key_path: counts_monthly.unique_active_users
name:
description: Users that have a last_activity_on date within the past 28 days
-product_category:
product_section: dev
product_stage: manage
product_group: manage
diff --git a/config/metrics/counts_28d/20220531145023_p_ci_templates_katalon_monthly.yml b/config/metrics/counts_28d/20220531145023_p_ci_templates_katalon_monthly.yml
index abbc30a5d10..64913e9645e 100644
--- a/config/metrics/counts_28d/20220531145023_p_ci_templates_katalon_monthly.yml
+++ b/config/metrics/counts_28d/20220531145023_p_ci_templates_katalon_monthly.yml
@@ -4,7 +4,6 @@ description: 'Monthly counts of times users have executed katalon_tests jobs'
product_section: 'ops'
product_stage: 'analytics'
product_group: 'pipeline_authoring'
-product_category: 'pipeline_authoring'
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml
index d379cf39983..e007180b831 100644
--- a/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml
@@ -5,7 +5,6 @@ description: Counts unique users for timeline events create, edit and delete eve
product_section: ops
product_stage: monitor
product_group: respond
-product_category: incident_management
value_type: number
status: active
milestone: "15.1"
diff --git a/config/metrics/counts_28d/20220622084700_p_analytics_ci_cd_time_to_restore_service_monthly.yml b/config/metrics/counts_28d/20220622084700_p_analytics_ci_cd_time_to_restore_service_monthly.yml
index a9a62b1aa79..4527fcd125a 100644
--- a/config/metrics/counts_28d/20220622084700_p_analytics_ci_cd_time_to_restore_service_monthly.yml
+++ b/config/metrics/counts_28d/20220622084700_p_analytics_ci_cd_time_to_restore_service_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique visits to the project level CI/CD Analytics Time to
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220627133135_i_code_review_submit_review_approve_monthly.yml b/config/metrics/counts_28d/20220627133135_i_code_review_submit_review_approve_monthly.yml
index 389b9d3ace5..0e144b0c486 100644
--- a/config/metrics/counts_28d/20220627133135_i_code_review_submit_review_approve_monthly.yml
+++ b/config/metrics/counts_28d/20220627133135_i_code_review_submit_review_approve_monthly.yml
@@ -3,7 +3,6 @@ key_path: redis_hll_counters.code_review.i_code_review_submit_review_approve_mon
description: Count of unique users per month who submit a review and approve
product_stage: create
product_group: code_review
-product_category: code_review
product_section: dev
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20220627134108_i_code_review_submit_review_comment_monthly.yml b/config/metrics/counts_28d/20220627134108_i_code_review_submit_review_comment_monthly.yml
index 1891191bdcd..cd37fa4c5ec 100644
--- a/config/metrics/counts_28d/20220627134108_i_code_review_submit_review_comment_monthly.yml
+++ b/config/metrics/counts_28d/20220627134108_i_code_review_submit_review_comment_monthly.yml
@@ -3,7 +3,6 @@ key_path: redis_hll_counters.code_review.i_code_review_submit_review_comment_mon
description: Count of unique users per month who submit a review with a comment
product_stage: create
product_group: code_review
-product_category: code_review
product_section: dev
value_type: number
status: active
diff --git a/config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml b/config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml
index 7abc7b63c84..78427581b47 100644
--- a/config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml
+++ b/config/metrics/counts_28d/20220706175117_ci_users_executing_verify_job_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts of times users have executed verify jobs
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml b/config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml
index 88fc09b6cc2..ce8f461d5a2 100644
--- a/config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml
@@ -2,7 +2,6 @@
key_path: redis_hll_counters.work_items.users_updating_weight_estimate_monthly
name: users_updating_weight_estimate_monthly
description: Unique users updating a work item's weight estimate
-product_category: team_planning
product_section: dev
product_stage: plan
product_group: project_management
diff --git a/config/metrics/counts_28d/20220707054530_p_analytics_ci_cd_change_failure_rate_monthly.yml b/config/metrics/counts_28d/20220707054530_p_analytics_ci_cd_change_failure_rate_monthly.yml
index 186011b35af..b63e7d6f535 100644
--- a/config/metrics/counts_28d/20220707054530_p_analytics_ci_cd_change_failure_rate_monthly.yml
+++ b/config/metrics/counts_28d/20220707054530_p_analytics_ci_cd_change_failure_rate_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique visits to the project level CI/CD Analytics Change
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220708162311_i_code_review_merge_request_widget_test_summary_view_monthly.yml b/config/metrics/counts_28d/20220708162311_i_code_review_merge_request_widget_test_summary_view_monthly.yml
index 07ba085063a..ede7a8fc89b 100644
--- a/config/metrics/counts_28d/20220708162311_i_code_review_merge_request_widget_test_summary_view_monthly.yml
+++ b/config/metrics/counts_28d/20220708162311_i_code_review_merge_request_widget_test_summary_view_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who were able to see the Test S
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220708163625_i_code_review_merge_request_widget_test_summary_full_report_clicked_monthly.yml b/config/metrics/counts_28d/20220708163625_i_code_review_merge_request_widget_test_summary_full_report_clicked_monthly.yml
index 1b27e018e5e..cb4c04c11aa 100644
--- a/config/metrics/counts_28d/20220708163625_i_code_review_merge_request_widget_test_summary_full_report_clicked_monthly.yml
+++ b/config/metrics/counts_28d/20220708163625_i_code_review_merge_request_widget_test_summary_full_report_clicked_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who clicked the Full Report but
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220708164545_i_code_review_merge_request_widget_test_summary_expand_monthly.yml b/config/metrics/counts_28d/20220708164545_i_code_review_merge_request_widget_test_summary_expand_monthly.yml
index 40134414c5b..422729f9667 100644
--- a/config/metrics/counts_28d/20220708164545_i_code_review_merge_request_widget_test_summary_expand_monthly.yml
+++ b/config/metrics/counts_28d/20220708164545_i_code_review_merge_request_widget_test_summary_expand_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Test Summary w
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220708165638_i_code_review_merge_request_widget_test_summary_expand_success_monthly.yml b/config/metrics/counts_28d/20220708165638_i_code_review_merge_request_widget_test_summary_expand_success_monthly.yml
index a6c08e49a5b..137b2e84600 100644
--- a/config/metrics/counts_28d/20220708165638_i_code_review_merge_request_widget_test_summary_expand_success_monthly.yml
+++ b/config/metrics/counts_28d/20220708165638_i_code_review_merge_request_widget_test_summary_expand_success_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Test Summary w
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220708170514_i_code_review_merge_request_widget_test_summary_expand_warning_monthly.yml b/config/metrics/counts_28d/20220708170514_i_code_review_merge_request_widget_test_summary_expand_warning_monthly.yml
index 7636ffae159..1ebee37078b 100644
--- a/config/metrics/counts_28d/20220708170514_i_code_review_merge_request_widget_test_summary_expand_warning_monthly.yml
+++ b/config/metrics/counts_28d/20220708170514_i_code_review_merge_request_widget_test_summary_expand_warning_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Test Summary w
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220708173741_i_code_review_merge_request_widget_test_summary_expand_failed_monthly.yml b/config/metrics/counts_28d/20220708173741_i_code_review_merge_request_widget_test_summary_expand_failed_monthly.yml
index 7b84436ad57..3f90b18daf7 100644
--- a/config/metrics/counts_28d/20220708173741_i_code_review_merge_request_widget_test_summary_expand_failed_monthly.yml
+++ b/config/metrics/counts_28d/20220708173741_i_code_review_merge_request_widget_test_summary_expand_failed_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Test Summary w
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_28d/20220715195415_p_ci_templates_security_fortify_fod_sast_monthly.yml b/config/metrics/counts_28d/20220715195415_p_ci_templates_security_fortify_fod_sast_monthly.yml
index 27c387dc423..f1d5a3e795c 100644
--- a/config/metrics/counts_28d/20220715195415_p_ci_templates_security_fortify_fod_sast_monthly.yml
+++ b/config/metrics/counts_28d/20220715195415_p_ci_templates_security_fortify_fod_sast_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the Fortify FoD SAST template
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: SAST
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220719133315_p_ci_templates_implicit_security_fortify_fod_sast_monthly.yml b/config/metrics/counts_28d/20220719133315_p_ci_templates_implicit_security_fortify_fod_sast_monthly.yml
index 574c9f41128..4a8d58800d3 100644
--- a/config/metrics/counts_28d/20220719133315_p_ci_templates_implicit_security_fortify_fod_sast_monthly.yml
+++ b/config/metrics/counts_28d/20220719133315_p_ci_templates_implicit_security_fortify_fod_sast_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines with implicit runs using the Fortify FoD SAST te
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: SAST
value_type: number
status: removed
milestone: '15.3'
diff --git a/config/metrics/counts_28d/20220725193059_users_updating_work_item_dates_monthly.yml b/config/metrics/counts_28d/20220725193059_users_updating_work_item_dates_monthly.yml
index 8e214153e9d..41a9f40eb63 100644
--- a/config/metrics/counts_28d/20220725193059_users_updating_work_item_dates_monthly.yml
+++ b/config/metrics/counts_28d/20220725193059_users_updating_work_item_dates_monthly.yml
@@ -1,7 +1,6 @@
---
key_path: redis_hll_counters.work_items.users_updating_work_item_dates_monthly
description: Unique users updating a work item's date
-product_category: team_planning
product_section: dev
product_stage: plan
product_group: project_management
diff --git a/config/metrics/counts_28d/20220725210913_i_code_review_merge_request_widget_accessibility_view_monthly.yml b/config/metrics/counts_28d/20220725210913_i_code_review_merge_request_widget_accessibility_view_monthly.yml
index aa17e1ccf55..62280cf5379 100644
--- a/config/metrics/counts_28d/20220725210913_i_code_review_merge_request_widget_accessibility_view_monthly.yml
+++ b/config/metrics/counts_28d/20220725210913_i_code_review_merge_request_widget_accessibility_view_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who were able to see the Access
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220725210919_i_code_review_merge_request_widget_accessibility_full_report_clicked_monthly.yml b/config/metrics/counts_28d/20220725210919_i_code_review_merge_request_widget_accessibility_full_report_clicked_monthly.yml
index ad86cccdf72..b69c7fb833d 100644
--- a/config/metrics/counts_28d/20220725210919_i_code_review_merge_request_widget_accessibility_full_report_clicked_monthly.yml
+++ b/config/metrics/counts_28d/20220725210919_i_code_review_merge_request_widget_accessibility_full_report_clicked_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who clicked the Full Report but
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220725210926_i_code_review_merge_request_widget_accessibility_expand_monthly.yml b/config/metrics/counts_28d/20220725210926_i_code_review_merge_request_widget_accessibility_expand_monthly.yml
index 2e1ca0c8e70..bbc44c48dc5 100644
--- a/config/metrics/counts_28d/20220725210926_i_code_review_merge_request_widget_accessibility_expand_monthly.yml
+++ b/config/metrics/counts_28d/20220725210926_i_code_review_merge_request_widget_accessibility_expand_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Accessibility
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220725210935_i_code_review_merge_request_widget_accessibility_expand_success_monthly.yml b/config/metrics/counts_28d/20220725210935_i_code_review_merge_request_widget_accessibility_expand_success_monthly.yml
index 79505bad72e..c75fb74c534 100644
--- a/config/metrics/counts_28d/20220725210935_i_code_review_merge_request_widget_accessibility_expand_success_monthly.yml
+++ b/config/metrics/counts_28d/20220725210935_i_code_review_merge_request_widget_accessibility_expand_success_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Accessibility
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220725210942_i_code_review_merge_request_widget_accessibility_expand_warning_monthly.yml b/config/metrics/counts_28d/20220725210942_i_code_review_merge_request_widget_accessibility_expand_warning_monthly.yml
index 78009cb34c3..e2ef4df5ee1 100644
--- a/config/metrics/counts_28d/20220725210942_i_code_review_merge_request_widget_accessibility_expand_warning_monthly.yml
+++ b/config/metrics/counts_28d/20220725210942_i_code_review_merge_request_widget_accessibility_expand_warning_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Accessibility
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220725210949_i_code_review_merge_request_widget_accessibility_expand_failed_monthly.yml b/config/metrics/counts_28d/20220725210949_i_code_review_merge_request_widget_accessibility_expand_failed_monthly.yml
index e4ba9b8f53b..d32607b0b09 100644
--- a/config/metrics/counts_28d/20220725210949_i_code_review_merge_request_widget_accessibility_expand_failed_monthly.yml
+++ b/config/metrics/counts_28d/20220725210949_i_code_review_merge_request_widget_accessibility_expand_failed_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Accessibility
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727020440_i_code_review_merge_request_widget_code_quality_view_monthly.yml b/config/metrics/counts_28d/20220727020440_i_code_review_merge_request_widget_code_quality_view_monthly.yml
index a73f6a919ea..c807c6c1778 100644
--- a/config/metrics/counts_28d/20220727020440_i_code_review_merge_request_widget_code_quality_view_monthly.yml
+++ b/config/metrics/counts_28d/20220727020440_i_code_review_merge_request_widget_code_quality_view_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who were able to see the Code Q
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727020446_i_code_review_merge_request_widget_code_quality_full_report_clicked_monthly.yml b/config/metrics/counts_28d/20220727020446_i_code_review_merge_request_widget_code_quality_full_report_clicked_monthly.yml
index 3fbd759deab..1aa25b27a64 100644
--- a/config/metrics/counts_28d/20220727020446_i_code_review_merge_request_widget_code_quality_full_report_clicked_monthly.yml
+++ b/config/metrics/counts_28d/20220727020446_i_code_review_merge_request_widget_code_quality_full_report_clicked_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who clicked the Full Report but
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727020452_i_code_review_merge_request_widget_code_quality_expand_monthly.yml b/config/metrics/counts_28d/20220727020452_i_code_review_merge_request_widget_code_quality_expand_monthly.yml
index 3b4686c28cc..b3e3e2f5009 100644
--- a/config/metrics/counts_28d/20220727020452_i_code_review_merge_request_widget_code_quality_expand_monthly.yml
+++ b/config/metrics/counts_28d/20220727020452_i_code_review_merge_request_widget_code_quality_expand_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Code Quality w
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727020457_i_code_review_merge_request_widget_code_quality_expand_success_monthly.yml b/config/metrics/counts_28d/20220727020457_i_code_review_merge_request_widget_code_quality_expand_success_monthly.yml
index e36a74550d4..7c493c4300d 100644
--- a/config/metrics/counts_28d/20220727020457_i_code_review_merge_request_widget_code_quality_expand_success_monthly.yml
+++ b/config/metrics/counts_28d/20220727020457_i_code_review_merge_request_widget_code_quality_expand_success_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Code Quality w
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727020503_i_code_review_merge_request_widget_code_quality_expand_warning_monthly.yml b/config/metrics/counts_28d/20220727020503_i_code_review_merge_request_widget_code_quality_expand_warning_monthly.yml
index 181c06ec06f..58b211aa5d2 100644
--- a/config/metrics/counts_28d/20220727020503_i_code_review_merge_request_widget_code_quality_expand_warning_monthly.yml
+++ b/config/metrics/counts_28d/20220727020503_i_code_review_merge_request_widget_code_quality_expand_warning_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Code Quality w
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727020509_i_code_review_merge_request_widget_code_quality_expand_failed_monthly.yml b/config/metrics/counts_28d/20220727020509_i_code_review_merge_request_widget_code_quality_expand_failed_monthly.yml
index 5e4e6221142..1856bdcba9a 100644
--- a/config/metrics/counts_28d/20220727020509_i_code_review_merge_request_widget_code_quality_expand_failed_monthly.yml
+++ b/config/metrics/counts_28d/20220727020509_i_code_review_merge_request_widget_code_quality_expand_failed_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Code Quality w
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727045317_i_code_review_merge_request_widget_terraform_view_monthly.yml b/config/metrics/counts_28d/20220727045317_i_code_review_merge_request_widget_terraform_view_monthly.yml
index c18e947f722..23ee2e35ef3 100644
--- a/config/metrics/counts_28d/20220727045317_i_code_review_merge_request_widget_terraform_view_monthly.yml
+++ b/config/metrics/counts_28d/20220727045317_i_code_review_merge_request_widget_terraform_view_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who were able to see the Terraf
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727045323_i_code_review_merge_request_widget_terraform_full_report_clicked_monthly.yml b/config/metrics/counts_28d/20220727045323_i_code_review_merge_request_widget_terraform_full_report_clicked_monthly.yml
index 1791ba6d4cf..9f80b3b97f6 100644
--- a/config/metrics/counts_28d/20220727045323_i_code_review_merge_request_widget_terraform_full_report_clicked_monthly.yml
+++ b/config/metrics/counts_28d/20220727045323_i_code_review_merge_request_widget_terraform_full_report_clicked_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who clicked the Full Report but
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727045330_i_code_review_merge_request_widget_terraform_expand_monthly.yml b/config/metrics/counts_28d/20220727045330_i_code_review_merge_request_widget_terraform_expand_monthly.yml
index 67f73ee4122..52c18d623dd 100644
--- a/config/metrics/counts_28d/20220727045330_i_code_review_merge_request_widget_terraform_expand_monthly.yml
+++ b/config/metrics/counts_28d/20220727045330_i_code_review_merge_request_widget_terraform_expand_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Terraform widg
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727045336_i_code_review_merge_request_widget_terraform_expand_success_monthly.yml b/config/metrics/counts_28d/20220727045336_i_code_review_merge_request_widget_terraform_expand_success_monthly.yml
index a374ed99263..a938d95c7c0 100644
--- a/config/metrics/counts_28d/20220727045336_i_code_review_merge_request_widget_terraform_expand_success_monthly.yml
+++ b/config/metrics/counts_28d/20220727045336_i_code_review_merge_request_widget_terraform_expand_success_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Terraform widg
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727045342_i_code_review_merge_request_widget_terraform_expand_warning_monthly.yml b/config/metrics/counts_28d/20220727045342_i_code_review_merge_request_widget_terraform_expand_warning_monthly.yml
index 909211e2a35..9fff51a7f3b 100644
--- a/config/metrics/counts_28d/20220727045342_i_code_review_merge_request_widget_terraform_expand_warning_monthly.yml
+++ b/config/metrics/counts_28d/20220727045342_i_code_review_merge_request_widget_terraform_expand_warning_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Terraform widg
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220727045349_i_code_review_merge_request_widget_terraform_expand_failed_monthly.yml b/config/metrics/counts_28d/20220727045349_i_code_review_merge_request_widget_terraform_expand_failed_monthly.yml
index a1d247d405f..2d974d06d43 100644
--- a/config/metrics/counts_28d/20220727045349_i_code_review_merge_request_widget_terraform_expand_failed_monthly.yml
+++ b/config/metrics/counts_28d/20220727045349_i_code_review_merge_request_widget_terraform_expand_failed_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Terraform widg
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml b/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml
index 8fc01895a1d..683fd308b0c 100644
--- a/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml
+++ b/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml
@@ -4,7 +4,7 @@ description: MAU of the Agent for Kubernetes CI/CD Tunnel
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_failed.yml b/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_failed.yml
index 3b19ef26a6a..88caf147407 100644
--- a/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_failed.yml
+++ b/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_failed.yml
@@ -5,7 +5,6 @@ description: Count of group entities with failed status in GitLab Migration
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_finished.yml b/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_finished.yml
index 72af0e3e18b..c0cedfc3147 100644
--- a/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_finished.yml
+++ b/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_finished.yml
@@ -5,7 +5,6 @@ description: Count of group entities with finished status in GitLab Migration
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_timeout.yml b/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_timeout.yml
index 079fc328d73..4f2107e22ed 100644
--- a/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_timeout.yml
+++ b/config/metrics/counts_28d/20220816202928_bulk_import_entities_group_timeout.yml
@@ -5,7 +5,6 @@ description: Count of group entities with timeout status in GitLab Migration
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20220823125645_bulk_import_entities_project_timeout.yml b/config/metrics/counts_28d/20220823125645_bulk_import_entities_project_timeout.yml
index a9ead88577d..b7772816df1 100644
--- a/config/metrics/counts_28d/20220823125645_bulk_import_entities_project_timeout.yml
+++ b/config/metrics/counts_28d/20220823125645_bulk_import_entities_project_timeout.yml
@@ -5,7 +5,6 @@ description: Count of project entities with timeout status in GitLab Migration
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20220823125924_bulk_import_entities_project_failed.yml b/config/metrics/counts_28d/20220823125924_bulk_import_entities_project_failed.yml
index 74c45c05641..2c2f80250ff 100644
--- a/config/metrics/counts_28d/20220823125924_bulk_import_entities_project_failed.yml
+++ b/config/metrics/counts_28d/20220823125924_bulk_import_entities_project_failed.yml
@@ -5,7 +5,6 @@ description: Count of project entities with failed status in GitLab Migration
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20220823130209_bulk_import_entities_project_finished.yml b/config/metrics/counts_28d/20220823130209_bulk_import_entities_project_finished.yml
index 228d6851020..557b502acfc 100644
--- a/config/metrics/counts_28d/20220823130209_bulk_import_entities_project_finished.yml
+++ b/config/metrics/counts_28d/20220823130209_bulk_import_entities_project_finished.yml
@@ -5,7 +5,6 @@ description: Count of project entities with finished status in GitLab Migration
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20220825142533_i_testing_test_report_uploaded_monthly.yml b/config/metrics/counts_28d/20220825142533_i_testing_test_report_uploaded_monthly.yml
index 341d3810318..3ac7f48069a 100644
--- a/config/metrics/counts_28d/20220825142533_i_testing_test_report_uploaded_monthly.yml
+++ b/config/metrics/counts_28d/20220825142533_i_testing_test_report_uploaded_monthly.yml
@@ -3,8 +3,7 @@ key_path: redis_hll_counters.testing.i_testing_test_report_uploaded_monthly
description: "MAU of junit test reports uploaded by customers per pipeline"
product_section: ops
product_stage: verify
-product_group: pipeline_insights
-product_category: testing
+product_group: pipeline_execution
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220825232557_count_user_auth.yml b/config/metrics/counts_28d/20220825232557_count_user_auth.yml
index dbcd665d616..f704340e439 100644
--- a/config/metrics/counts_28d/20220825232557_count_user_auth.yml
+++ b/config/metrics/counts_28d/20220825232557_count_user_auth.yml
@@ -4,7 +4,6 @@ description: Number of unique user logins
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category: system_access
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220830104453_i_code_review_merge_request_widget_license_compliance_view_monthly.yml b/config/metrics/counts_28d/20220830104453_i_code_review_merge_request_widget_license_compliance_view_monthly.yml
index 60567037303..f793b02ac94 100644
--- a/config/metrics/counts_28d/20220830104453_i_code_review_merge_request_widget_license_compliance_view_monthly.yml
+++ b/config/metrics/counts_28d/20220830104453_i_code_review_merge_request_widget_license_compliance_view_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who were able to see the Licens
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220830104500_i_code_review_merge_request_widget_license_compliance_full_report_clicked_monthly.yml b/config/metrics/counts_28d/20220830104500_i_code_review_merge_request_widget_license_compliance_full_report_clicked_monthly.yml
index 3b4c0012495..cbb4bb98bba 100644
--- a/config/metrics/counts_28d/20220830104500_i_code_review_merge_request_widget_license_compliance_full_report_clicked_monthly.yml
+++ b/config/metrics/counts_28d/20220830104500_i_code_review_merge_request_widget_license_compliance_full_report_clicked_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who clicked the Full Report but
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220830104507_i_code_review_merge_request_widget_license_compliance_expand_monthly.yml b/config/metrics/counts_28d/20220830104507_i_code_review_merge_request_widget_license_compliance_expand_monthly.yml
index 7b0ec9d0518..a6480b5a72f 100644
--- a/config/metrics/counts_28d/20220830104507_i_code_review_merge_request_widget_license_compliance_expand_monthly.yml
+++ b/config/metrics/counts_28d/20220830104507_i_code_review_merge_request_widget_license_compliance_expand_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the License Compli
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220830104514_i_code_review_merge_request_widget_license_compliance_expand_success_monthly.yml b/config/metrics/counts_28d/20220830104514_i_code_review_merge_request_widget_license_compliance_expand_success_monthly.yml
index c6b7689c844..cf6faec1463 100644
--- a/config/metrics/counts_28d/20220830104514_i_code_review_merge_request_widget_license_compliance_expand_success_monthly.yml
+++ b/config/metrics/counts_28d/20220830104514_i_code_review_merge_request_widget_license_compliance_expand_success_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the License Compli
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220830104521_i_code_review_merge_request_widget_license_compliance_expand_warning_monthly.yml b/config/metrics/counts_28d/20220830104521_i_code_review_merge_request_widget_license_compliance_expand_warning_monthly.yml
index 5e164b5c3bf..3f8f844948d 100644
--- a/config/metrics/counts_28d/20220830104521_i_code_review_merge_request_widget_license_compliance_expand_warning_monthly.yml
+++ b/config/metrics/counts_28d/20220830104521_i_code_review_merge_request_widget_license_compliance_expand_warning_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the License Compli
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220830104528_i_code_review_merge_request_widget_license_compliance_expand_failed_monthly.yml b/config/metrics/counts_28d/20220830104528_i_code_review_merge_request_widget_license_compliance_expand_failed_monthly.yml
index 69af6c70299..75046f9f927 100644
--- a/config/metrics/counts_28d/20220830104528_i_code_review_merge_request_widget_license_compliance_expand_failed_monthly.yml
+++ b/config/metrics/counts_28d/20220830104528_i_code_review_merge_request_widget_license_compliance_expand_failed_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the License Compli
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220905210112_users_visiting_environments_pages_monthly.yml b/config/metrics/counts_28d/20220905210112_users_visiting_environments_pages_monthly.yml
index 3eac5ca1c01..908f5137d7d 100644
--- a/config/metrics/counts_28d/20220905210112_users_visiting_environments_pages_monthly.yml
+++ b/config/metrics/counts_28d/20220905210112_users_visiting_environments_pages_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly count of unique users visiting environments pages
product_section: ops
product_stage: release
product_group: release
-product_category: environment_management
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220906065651_incident_management_timeline_event_created_monthly.yml b/config/metrics/counts_28d/20220906065651_incident_management_timeline_event_created_monthly.yml
index 86b11489af0..da2e3095db9 100644
--- a/config/metrics/counts_28d/20220906065651_incident_management_timeline_event_created_monthly.yml
+++ b/config/metrics/counts_28d/20220906065651_incident_management_timeline_event_created_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique users created timeline events
product_section: ops
product_stage: monitor
product_group: respond
-product_category: incident_management
value_type: number
status: active
milestone: "15.5"
diff --git a/config/metrics/counts_28d/20220906070355_incident_management_timeline_event_edited_monthly.yml b/config/metrics/counts_28d/20220906070355_incident_management_timeline_event_edited_monthly.yml
index 31815426918..171204036f9 100644
--- a/config/metrics/counts_28d/20220906070355_incident_management_timeline_event_edited_monthly.yml
+++ b/config/metrics/counts_28d/20220906070355_incident_management_timeline_event_edited_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique users edited timeline events
product_section: ops
product_stage: monitor
product_group: respond
-product_category: incident_management
value_type: number
status: active
milestone: "15.5"
diff --git a/config/metrics/counts_28d/20220906070634_incident_management_timeline_event_deleted_monthly.yml b/config/metrics/counts_28d/20220906070634_incident_management_timeline_event_deleted_monthly.yml
index dbc3ac61071..729c998f83e 100644
--- a/config/metrics/counts_28d/20220906070634_incident_management_timeline_event_deleted_monthly.yml
+++ b/config/metrics/counts_28d/20220906070634_incident_management_timeline_event_deleted_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique users deleted timeline events
product_section: ops
product_stage: monitor
product_group: respond
-product_category: incident_management
value_type: number
status: active
milestone: "15.5"
diff --git a/config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml b/config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml
index 943a1ba235c..05683fbce5f 100644
--- a/config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml
+++ b/config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml
@@ -4,7 +4,6 @@ description: Count of MAU using the `/ready` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
data_source: redis_hll
status: active
diff --git a/config/metrics/counts_28d/20220907080630_i_quickactions_timeline_monthly.yml b/config/metrics/counts_28d/20220907080630_i_quickactions_timeline_monthly.yml
index f3f9499e9d9..f738e97749a 100644
--- a/config/metrics/counts_28d/20220907080630_i_quickactions_timeline_monthly.yml
+++ b/config/metrics/counts_28d/20220907080630_i_quickactions_timeline_monthly.yml
@@ -5,7 +5,6 @@ description: Count of MAU using the `/timeline` quick action
product_section: ops
product_stage: monitor
product_group: respond
-product_category: incident_management
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220907084347_p_ci_templates_implicit_security_sast_iac_monthly.yml b/config/metrics/counts_28d/20220907084347_p_ci_templates_implicit_security_sast_iac_monthly.yml
index 47068af05e2..bdcf97602db 100644
--- a/config/metrics/counts_28d/20220907084347_p_ci_templates_implicit_security_sast_iac_monthly.yml
+++ b/config/metrics/counts_28d/20220907084347_p_ci_templates_implicit_security_sast_iac_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit SAST runs using the stable SAST Ia
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: SAST
value_type: number
status: removed
milestone: '15.4'
diff --git a/config/metrics/counts_28d/20220907102714_p_ci_templates_implicit_jobs_sast_iac_monthly.yml b/config/metrics/counts_28d/20220907102714_p_ci_templates_implicit_jobs_sast_iac_monthly.yml
index 0bcdad370ce..1f579aade8b 100644
--- a/config/metrics/counts_28d/20220907102714_p_ci_templates_implicit_jobs_sast_iac_monthly.yml
+++ b/config/metrics/counts_28d/20220907102714_p_ci_templates_implicit_jobs_sast_iac_monthly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit SAST jobs using the stable SAST Ia
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: SAST
value_type: number
status: removed
milestone: '15.4'
diff --git a/config/metrics/counts_28d/20220907202807_p_ci_templates_jobs_dependency_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220907202807_p_ci_templates_jobs_dependency_scanning_latest_monthly.yml
index 9cbfee008c3..ae659173c27 100644
--- a/config/metrics/counts_28d/20220907202807_p_ci_templates_jobs_dependency_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220907202807_p_ci_templates_jobs_dependency_scanning_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for Dependency Scanning CI Latest template (Jobs fol
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220907212005_p_ci_templates_security_container_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220907212005_p_ci_templates_security_container_scanning_latest_monthly.yml
index fbf263cd6bc..c5728388138 100644
--- a/config/metrics/counts_28d/20220907212005_p_ci_templates_security_container_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220907212005_p_ci_templates_security_container_scanning_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for Container Scanning CI Latest template (Security
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: container_scanning
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220907215635_p_ci_templates_jobs_license_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220907215635_p_ci_templates_jobs_license_scanning_latest_monthly.yml
index b78e5bc65fa..21d64a706de 100644
--- a/config/metrics/counts_28d/20220907215635_p_ci_templates_jobs_license_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220907215635_p_ci_templates_jobs_license_scanning_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for License Scanning CI Latest template (Jobs folder
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: license_scanning
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_28d/20220912161240_p_ci_templates_implicit_jobs_dependency_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220912161240_p_ci_templates_implicit_jobs_dependency_scanning_latest_monthly.yml
index 8e51d7e163a..230870b2fc5 100644
--- a/config/metrics/counts_28d/20220912161240_p_ci_templates_implicit_jobs_dependency_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220912161240_p_ci_templates_implicit_jobs_dependency_scanning_latest_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly counts for implicit Dependency Scanning CI Latest template
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: dependency_scanning
value_type: number
status: removed
milestone: '15.4'
diff --git a/config/metrics/counts_28d/20220912162308_p_ci_templates_implicit_jobs_license_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220912162308_p_ci_templates_implicit_jobs_license_scanning_latest_monthly.yml
index 8ad48955bea..5c5afa10f50 100644
--- a/config/metrics/counts_28d/20220912162308_p_ci_templates_implicit_jobs_license_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220912162308_p_ci_templates_implicit_jobs_license_scanning_latest_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly counts for implicit License Scanning CI Latest template (Jo
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: license_scanning
value_type: number
status: removed
milestone: '15.4'
diff --git a/config/metrics/counts_28d/20220912162752_p_ci_templates_implicit_security_container_scanning_latest_monthly.yml b/config/metrics/counts_28d/20220912162752_p_ci_templates_implicit_security_container_scanning_latest_monthly.yml
index 3d5db04c7b8..4b69fe42a39 100644
--- a/config/metrics/counts_28d/20220912162752_p_ci_templates_implicit_security_container_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220912162752_p_ci_templates_implicit_security_container_scanning_latest_monthly.yml
@@ -5,7 +5,6 @@ description: Monthly counts for implicit Container Scanning CI Latest template (
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: container_scanning
value_type: number
status: removed
milestone: '15.4'
diff --git a/config/metrics/counts_28d/20220913225020_p_ci_templates_security_coverage_fuzzing_latest_monthly.yml b/config/metrics/counts_28d/20220913225020_p_ci_templates_security_coverage_fuzzing_latest_monthly.yml
index c4fad8d7545..fe933e4c677 100644
--- a/config/metrics/counts_28d/20220913225020_p_ci_templates_security_coverage_fuzzing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220913225020_p_ci_templates_security_coverage_fuzzing_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for Coverage Fuzzing latest CI template
product_section: sec
product_stage: secure
product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
value_type: number
status: active
milestone: "15.5"
diff --git a/config/metrics/counts_28d/20220913225303_p_ci_templates_implicit_security_coverage_fuzzing_latest_monthly.yml b/config/metrics/counts_28d/20220913225303_p_ci_templates_implicit_security_coverage_fuzzing_latest_monthly.yml
index a66558a3537..5bd5653b1e3 100644
--- a/config/metrics/counts_28d/20220913225303_p_ci_templates_implicit_security_coverage_fuzzing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20220913225303_p_ci_templates_implicit_security_coverage_fuzzing_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for implicit Coverage Fuzzing latest CI template
product_section: sec
product_stage: secure
product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
value_type: number
status: removed
milestone: '15.5'
diff --git a/config/metrics/counts_28d/20220922042106_users_updating_work_item_iteration_monthly.yml b/config/metrics/counts_28d/20220922042106_users_updating_work_item_iteration_monthly.yml
index 4c19e4e3261..8ab0b5b4065 100644
--- a/config/metrics/counts_28d/20220922042106_users_updating_work_item_iteration_monthly.yml
+++ b/config/metrics/counts_28d/20220922042106_users_updating_work_item_iteration_monthly.yml
@@ -4,7 +4,6 @@ description: Unique users updating a work item's iteration
product_section: team planning
product_stage: dev
product_group: plan
-product_category: project_management
value_type: number
status: active
milestone: "15.5"
diff --git a/config/metrics/counts_28d/20221006065524_i_quickactions_link_monthly.yml b/config/metrics/counts_28d/20221006065524_i_quickactions_link_monthly.yml
index 52b75a90a03..ab17a29c2e6 100644
--- a/config/metrics/counts_28d/20221006065524_i_quickactions_link_monthly.yml
+++ b/config/metrics/counts_28d/20221006065524_i_quickactions_link_monthly.yml
@@ -4,7 +4,6 @@ description: Count of MAU using the `/link` quick action
product_section: ops
product_stage: monitor
product_group: respond
-product_category: incident_management
value_type: number
status: active
milestone: "15.5"
diff --git a/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml b/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml
index 5ebb56ea936..67156594fb7 100644
--- a/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml
+++ b/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml
@@ -1,7 +1,6 @@
---
key_path: redis_hll_counters.work_items.users_updating_work_item_labels_monthly
description: Unique users updating a work item's labels
-product_category: team_planning
product_section: dev
product_stage: plan
product_group: project_management
diff --git a/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml b/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml
index 02edb32765e..af4ef68c9ea 100644
--- a/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml
@@ -4,7 +4,6 @@ description: Unique users updating a work item's milestone
product_section: dev
product_stage: plan
product_group: project_management
-product_category: team_planning
value_type: number
status: active
milestone: "15.6"
diff --git a/config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml b/config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml
index ef51a24bc1e..65d0d439a90 100644
--- a/config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml
+++ b/config/metrics/counts_28d/20221101190915_i_testing_coverage_report_uploaded_monthly.yml
@@ -3,8 +3,7 @@ key_path: redis_hll_counters.testing.i_testing_coverage_report_uploaded_monthly
description: "MAU of coverage test reports uploaded by customers per pipeline"
product_section: ops
product_stage: verify
-product_group: pipeline_insights
-product_category: testing
+product_group: pipeline_execution
value_type: number
status: active
milestone: "15.6"
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_confidential_issue_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_confidential_issue_notification_monthly.yml
new file mode 100644
index 00000000000..6297705dd12
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_confidential_issue_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_confidential_issue_notification_monthly
+description: Calculated unique users to trigger a Slack message by performing an action on a confidential issue by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_confidential_issue_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_confidential_note_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_confidential_note_notification_monthly.yml
new file mode 100644
index 00000000000..2ff044f203b
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_confidential_note_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_confidential_note_notification_monthly
+description: Calculated unique users to trigger a Slack message by creating a confidential note by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_confidential_note_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_deployment_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_deployment_notification_monthly.yml
new file mode 100644
index 00000000000..a2cad64b205
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_deployment_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_deployment_notification_monthly
+description: Calculated unique users to trigger a Slack message by performing a deployment by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_deployment_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_issue_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_issue_notification_monthly.yml
new file mode 100644
index 00000000000..03f5ff49255
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_issue_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_issue_notification_monthly
+description: Calculated unique users to trigger a Slack message by performing an action on an issue by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_issue_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_merge_request_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_merge_request_notification_monthly.yml
new file mode 100644
index 00000000000..371bfd39149
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_merge_request_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_merge_request_notification_monthly
+description: Calculated unique users to trigger a Slack message by performing an action on a merge request by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_merge_request_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_note_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_note_notification_monthly.yml
new file mode 100644
index 00000000000..984c53a7186
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_note_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_note_notification_monthly
+description: Calculated unique users to trigger a Slack message by creating a note by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_note_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_push_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_push_notification_monthly.yml
new file mode 100644
index 00000000000..34ccbfd40ab
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_push_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_push_notification_monthly
+description: Calculated unique users to trigger a Slack message by performing a Git push by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_push_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_tag_push_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_tag_push_notification_monthly.yml
new file mode 100644
index 00000000000..457c23660b2
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_tag_push_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_tag_push_notification_monthly
+description: Calculated unique users to trigger a Slack message by performing a tag push by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_tag_push_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_wiki_page_notification_monthly.yml b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_wiki_page_notification_monthly.yml
new file mode 100644
index 00000000000..96824de717e
--- /dev/null
+++ b/config/metrics/counts_28d/20221101213234_integrations_gitlab_for_slack_app_wiki_page_notification_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_wiki_page_notification_monthly
+description: Calculated unique users to trigger a Slack message by performing an action on a wiki page by month
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_wiki_page_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml b/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml
index 62ce68dd4e6..88b514194b9 100644
--- a/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for implicit use of Container Scanning CI template (
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: container_scanning
value_type: number
status: active
milestone: '15.6'
diff --git a/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml
index df169b9eb48..e86498a3f85 100644
--- a/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml
+++ b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for Container Scanning CI Latest template (Jobs fold
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: container_scanning
value_type: number
status: active
milestone: '15.6'
diff --git a/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml
index 2abbb3f9b16..eabe049ea57 100644
--- a/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly counts for Container Scanning CI template (Jobs folder)
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: container_scanning
value_type: number
status: active
milestone: '15.6'
diff --git a/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml b/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml
index 4e9d58bddad..fe61039878c 100644
--- a/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml
+++ b/config/metrics/counts_28d/20221108101211_merge_request_authors_monthly.yml
@@ -4,7 +4,6 @@ description: Number of unique merge request authors
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: removed
milestone: "15.6"
diff --git a/config/metrics/counts_28d/20221121115622_i_code_review_merge_request_widget_security_reports_view_monthly.yml b/config/metrics/counts_28d/20221121115622_i_code_review_merge_request_widget_security_reports_view_monthly.yml
index 078da4a2768..40bf6f71a3d 100644
--- a/config/metrics/counts_28d/20221121115622_i_code_review_merge_request_widget_security_reports_view_monthly.yml
+++ b/config/metrics/counts_28d/20221121115622_i_code_review_merge_request_widget_security_reports_view_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who were able to see the Securi
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_expand_monthly.yml b/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_expand_monthly.yml
index 2b520e995d2..3760f8d8f3d 100644
--- a/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_expand_monthly.yml
+++ b/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_expand_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Security Repor
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_full_report_clicked_monthly.yml b/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_full_report_clicked_monthly.yml
index e18744673e4..d5ca0517079 100644
--- a/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_full_report_clicked_monthly.yml
+++ b/config/metrics/counts_28d/20221121115623_i_code_review_merge_request_widget_security_reports_full_report_clicked_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who clicked the Full Report but
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_28d/20221121115624_i_code_review_merge_request_widget_security_reports_expand_success_monthly.yml b/config/metrics/counts_28d/20221121115624_i_code_review_merge_request_widget_security_reports_expand_success_monthly.yml
index e604a3df3e6..b93b54535bf 100644
--- a/config/metrics/counts_28d/20221121115624_i_code_review_merge_request_widget_security_reports_expand_success_monthly.yml
+++ b/config/metrics/counts_28d/20221121115624_i_code_review_merge_request_widget_security_reports_expand_success_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Security Repor
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_failed_monthly.yml b/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_failed_monthly.yml
index f33f78961a9..6a86e5f21b6 100644
--- a/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_failed_monthly.yml
+++ b/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_failed_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Security Repor
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_warning_monthly.yml b/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_warning_monthly.yml
index 28763d81c88..20d69b68312 100644
--- a/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_warning_monthly.yml
+++ b/config/metrics/counts_28d/20221121115625_i_code_review_merge_request_widget_security_reports_expand_warning_monthly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (monthly) who expanded the Security Repor
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml b/config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml
index dca8545691a..252559b3b20 100644
--- a/config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml
+++ b/config/metrics/counts_28d/20221213182900_i_code_review_create_mr_monthly.yml
@@ -4,14 +4,13 @@ description: Count of unique merge requests created per month
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106869
time_frame: 28d
data_source: redis_hll
-data_category: optional
+data_category: operational
instrumentation_class: RedisHLLMetric
performance_indicator_type: []
options:
diff --git a/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml b/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
index 9c02ed98a82..dc62055774b 100644
--- a/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
+++ b/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
@@ -4,7 +4,6 @@ description: Count of unique users per month who removed a comment on a design
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: design_management
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml b/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml
index 8f73011a6ed..6cfede35f93 100644
--- a/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml
+++ b/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml
@@ -4,8 +4,7 @@ key_path: redis_hll_counters.testing.i_testing_active_user_monthly
description: Count of monthly active users for pipeline insights features
product_section: ops
product_stage: verify
-product_group: pipeline_insights
-product_category: testing
+product_group: pipeline_execution
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_28d/20230120094644_g_runner_fleet_read_jobs_statistics_monthly.yml b/config/metrics/counts_28d/20230120094644_g_runner_fleet_read_jobs_statistics_monthly.yml
index a99bcf9fdf4..d3e28450d1a 100644
--- a/config/metrics/counts_28d/20230120094644_g_runner_fleet_read_jobs_statistics_monthly.yml
+++ b/config/metrics/counts_28d/20230120094644_g_runner_fleet_read_jobs_statistics_monthly.yml
@@ -5,7 +5,6 @@ description: Count of unique users (monthly) who read runner job statistics
product_section: ops
product_stage: verify
product_group: runner
-product_category: runner_fleet
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_28d/20230123233604_i_ci_secrets_management_id_tokens_build_created_monthly.yml b/config/metrics/counts_28d/20230123233604_i_ci_secrets_management_id_tokens_build_created_monthly.yml
index ff1677e4857..bf7754b6c80 100644
--- a/config/metrics/counts_28d/20230123233604_i_ci_secrets_management_id_tokens_build_created_monthly.yml
+++ b/config/metrics/counts_28d/20230123233604_i_ci_secrets_management_id_tokens_build_created_monthly.yml
@@ -4,7 +4,6 @@ description: Monthly count of unique users who created a pipeline with id_tokens
product_section: ops
product_stage: verify
product_group: pipeline_authoring
-product_category: secrets_management
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_28d/20230129134935_i_container_registry_push_tag_user_monthly.yml b/config/metrics/counts_28d/20230129134935_i_container_registry_push_tag_user_monthly.yml
index 2c2bcc689a0..09dbf32cbe4 100644
--- a/config/metrics/counts_28d/20230129134935_i_container_registry_push_tag_user_monthly.yml
+++ b/config/metrics/counts_28d/20230129134935_i_container_registry_push_tag_user_monthly.yml
@@ -4,7 +4,6 @@ description: A monthly count of users that have pushed a tag to the registry
product_section: ops
product_stage: package
product_group: package
-product_category: container_registry
value_type: number
status: active
milestone: '15.9'
diff --git a/config/metrics/counts_28d/20230129135520_i_container_registry_delete_tag_user_monthly.yml b/config/metrics/counts_28d/20230129135520_i_container_registry_delete_tag_user_monthly.yml
index 177fc92f3f0..d78c6c8c4b7 100644
--- a/config/metrics/counts_28d/20230129135520_i_container_registry_delete_tag_user_monthly.yml
+++ b/config/metrics/counts_28d/20230129135520_i_container_registry_delete_tag_user_monthly.yml
@@ -4,7 +4,6 @@ description: A monthly count of users that have deleted a tag from the registry
product_section: ops
product_stage: package
product_group: package
-product_category: container_registry
value_type: number
status: active
milestone: '15.9'
diff --git a/config/metrics/counts_28d/20230129135748_i_container_registry_push_repository_user_monthly.yml b/config/metrics/counts_28d/20230129135748_i_container_registry_push_repository_user_monthly.yml
index 6aa8a0fc5cb..d252b406d42 100644
--- a/config/metrics/counts_28d/20230129135748_i_container_registry_push_repository_user_monthly.yml
+++ b/config/metrics/counts_28d/20230129135748_i_container_registry_push_repository_user_monthly.yml
@@ -4,7 +4,6 @@ description: A monthly count of users that have pushed a repository to the regis
product_section: ops
product_stage: package
product_group: package
-product_category: container_registry
value_type: number
status: active
milestone: '15.9'
diff --git a/config/metrics/counts_28d/20230129140646_i_container_registry_delete_repository_user_monthly.yml b/config/metrics/counts_28d/20230129140646_i_container_registry_delete_repository_user_monthly.yml
index 5dc8a351956..7ce612609c8 100644
--- a/config/metrics/counts_28d/20230129140646_i_container_registry_delete_repository_user_monthly.yml
+++ b/config/metrics/counts_28d/20230129140646_i_container_registry_delete_repository_user_monthly.yml
@@ -4,7 +4,6 @@ description: A monthly count of users that have deleted a repository from the re
product_section: ops
product_stage: package
product_group: package
-product_category: container_registry
value_type: number
status: active
milestone: '15.9'
diff --git a/config/metrics/counts_28d/20230129140954_i_container_registry_create_repository_user_monthly.yml b/config/metrics/counts_28d/20230129140954_i_container_registry_create_repository_user_monthly.yml
index a1789967986..6fc4f742570 100644
--- a/config/metrics/counts_28d/20230129140954_i_container_registry_create_repository_user_monthly.yml
+++ b/config/metrics/counts_28d/20230129140954_i_container_registry_create_repository_user_monthly.yml
@@ -4,7 +4,6 @@ description: A monthly count of users that have created a repository from the re
product_section: ops
product_stage: package
product_group: package
-product_category: container_registry
value_type: number
status: active
milestone: '15.9'
diff --git a/config/metrics/counts_28d/20230130074932_p_ci_templates_terraform_module_monthly.yml b/config/metrics/counts_28d/20230130074932_p_ci_templates_terraform_module_monthly.yml
index 2aa6bf583e0..35d4706c1ef 100644
--- a/config/metrics/counts_28d/20230130074932_p_ci_templates_terraform_module_monthly.yml
+++ b/config/metrics/counts_28d/20230130074932_p_ci_templates_terraform_module_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the Terraform Module template
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_28d/20230130075614_p_ci_templates_terraform_module_base_monthly.yml b/config/metrics/counts_28d/20230130075614_p_ci_templates_terraform_module_base_monthly.yml
index bf83a73330e..9e3d705d454 100644
--- a/config/metrics/counts_28d/20230130075614_p_ci_templates_terraform_module_base_monthly.yml
+++ b/config/metrics/counts_28d/20230130075614_p_ci_templates_terraform_module_base_monthly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the Terraform Module Base template
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_28d/20230215180530_p_ci_templates_security_api_discovery_monthly.yml b/config/metrics/counts_28d/20230215180530_p_ci_templates_security_api_discovery_monthly.yml
new file mode 100644
index 00000000000..13fd0f295ec
--- /dev/null
+++ b/config/metrics/counts_28d/20230215180530_p_ci_templates_security_api_discovery_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_api_discovery_monthly
+description: Monthly counts for API Discovery CI template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+value_type: number
+status: active
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110493
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+ events:
+ - p_ci_templates_security_api_discovery
diff --git a/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml b/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml
new file mode 100644
index 00000000000..acc9ae681f3
--- /dev/null
+++ b/config/metrics/counts_28d/20230217215050_ci_internal_pipelines.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts_monthly.ci_internal_pipelines
+description: Total monthly (28D) pipelines in Gitlab repositories for all project and project types
+product_section: ops
+product_stage: verify
+product_group: pipeline_execution
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112370
+time_frame: 28d
+data_source: database
+data_category: operational
+instrumentation_class: CountCiInternalPipelinesMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_with_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_with_failures.yml
new file mode 100644
index 00000000000..1edcf3d766e
--- /dev/null
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_with_failures.yml
@@ -0,0 +1,26 @@
+---
+data_category: optional
+key_path: usage_activity_by_stage_monthly.manage.group_imports.gitlab_migration_finished_with_failures
+description: Count of group entities with finished status and failures in GitLab Migration
+product_section: dev
+product_stage: manage
+product_group: import
+value_type: number
+status: active
+time_frame: 28d
+data_source: database
+instrumentation_class: CountBulkImportsEntitiesMetric
+options:
+ source_type: group_entity
+ status: 2
+ has_failures: true
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+milestone: "15.10"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112837"
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_without_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_without_failures.yml
new file mode 100644
index 00000000000..69f38deae6d
--- /dev/null
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_group_finished_without_failures.yml
@@ -0,0 +1,26 @@
+---
+data_category: optional
+key_path: usage_activity_by_stage_monthly.manage.group_imports.gitlab_migration_finished_without_failures
+description: Count of group entities with finished status and without failures in GitLab Migration
+product_section: dev
+product_stage: manage
+product_group: import
+value_type: number
+status: active
+time_frame: 28d
+data_source: database
+instrumentation_class: CountBulkImportsEntitiesMetric
+options:
+ source_type: group_entity
+ status: 2
+ has_failures: false
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+milestone: "15.10"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112837"
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_with_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_with_failures.yml
new file mode 100644
index 00000000000..4b771461d68
--- /dev/null
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_with_failures.yml
@@ -0,0 +1,26 @@
+---
+data_category: optional
+key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab_migration_finished_with_failures
+description: Count of project entities with finished status and failures in GitLab Migration
+product_section: dev
+product_stage: manage
+product_group: import
+value_type: number
+status: active
+time_frame: 28d
+data_source: database
+instrumentation_class: CountBulkImportsEntitiesMetric
+options:
+ source_type: project_entity
+ status: 2
+ has_failures: true
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+milestone: "15.10"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112837"
diff --git a/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_without_failures.yml b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_without_failures.yml
new file mode 100644
index 00000000000..80e3a2dfe7a
--- /dev/null
+++ b/config/metrics/counts_28d/20230224095530_bulk_import_entities_project_finished_without_failures.yml
@@ -0,0 +1,26 @@
+---
+data_category: optional
+key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab_migration_finished_without_failures
+description: Count of project entities with finished status and without failures in GitLab Migration
+product_section: dev
+product_stage: manage
+product_group: import
+value_type: number
+status: active
+time_frame: 28d
+data_source: database
+instrumentation_class: CountBulkImportsEntitiesMetric
+options:
+ source_type: project_entity
+ status: 2
+ has_failures: false
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+milestone: "15.10"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112837"
diff --git a/config/metrics/counts_28d/20230306134018_github_import_project_cancelled_monthly.yml b/config/metrics/counts_28d/20230306134018_github_import_project_cancelled_monthly.yml
new file mode 100644
index 00000000000..fff0745307b
--- /dev/null
+++ b/config/metrics/counts_28d/20230306134018_github_import_project_cancelled_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.importer.github_import_project_cancelled_monthly
+description: The number of github projects that were cancelled monthly
+product_section: dev
+product_stage: manage
+product_group: import
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113724
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - github_import_project_cancelled
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20230306134609_github_import_project_partially_completed_monthly.yml b/config/metrics/counts_28d/20230306134609_github_import_project_partially_completed_monthly.yml
new file mode 100644
index 00000000000..824cadc6d40
--- /dev/null
+++ b/config/metrics/counts_28d/20230306134609_github_import_project_partially_completed_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.importer.github_import_project_partially_completed_monthly
+description: The number of github projects that were partially completed monthly
+product_section: dev
+product_stage: manage
+product_group: import
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113724
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - github_import_project_partially_completed
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20230417064258_i_container_registry_writes_user_monthly.yml b/config/metrics/counts_28d/20230417064258_i_container_registry_writes_user_monthly.yml
new file mode 100644
index 00000000000..a114ce9fbaa
--- /dev/null
+++ b/config/metrics/counts_28d/20230417064258_i_container_registry_writes_user_monthly.yml
@@ -0,0 +1,32 @@
+---
+key_path: redis_hll_counters.user_container_registry.i_container_registry_writes_user_monthly
+description: A monthly count of unique users that have executed write operations to the registry
+product_section: ops
+product_stage: package
+product_group: package
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117779
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: AggregatedMetric
+options:
+ aggregate:
+ operator: OR
+ attribute: user_id
+ events:
+ - i_container_registry_push_tag_user
+ - i_container_registry_delete_tag_user
+ - i_container_registry_delete_repository_user
+ - i_container_registry_create_repository_user
+ - i_container_registry_push_repository_user
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20230420160442_i_quickactions_type_monthly.yml b/config/metrics/counts_28d/20230420160442_i_quickactions_type_monthly.yml
new file mode 100644
index 00000000000..f18f890904e
--- /dev/null
+++ b/config/metrics/counts_28d/20230420160442_i_quickactions_type_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_type_monthly
+description: Count of MAU using the `/type` quick action
+product_section: dev
+product_stage: plan
+product_group: product_planning
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118790
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_quickactions_type
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20230502171807_ci_interpolation_users.yml b/config/metrics/counts_28d/20230502171807_ci_interpolation_users.yml
new file mode 100644
index 00000000000..0edd2b2e582
--- /dev/null
+++ b/config/metrics/counts_28d/20230502171807_ci_interpolation_users.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.pipeline_authoring.ci_interpolation_users_monthly
+description: Monthly count of unique users who are using interpolation in their CI
+product_section: ops
+product_stage: verify
+product_group: pipeline_authoring
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118236
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+ events:
+ - ci_interpolation_users
diff --git a/config/metrics/counts_28d/20230509140528_p_ci_templates_security_bas_latest_monthly.yml b/config/metrics/counts_28d/20230509140528_p_ci_templates_security_bas_latest_monthly.yml
new file mode 100644
index 00000000000..b1ebcac1427
--- /dev/null
+++ b/config/metrics/counts_28d/20230509140528_p_ci_templates_security_bas_latest_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_bas_latest_monthly
+description: Count of pipelines using the latest Breach and Attack Simulation template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119981
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+ events:
+ - p_ci_templates_security_bas_latest
diff --git a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
index 8abe9b7e66f..a283ced7da8 100644
--- a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_change
description: Count of WAU editing an issue title
product_stage: plan
product_group: project_management
-product_category: issue_tracking
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml b/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml
index fad71037d79..3f888b83ba1 100644
--- a/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml
+++ b/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /:group/:project/pipelines/charts
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml b/config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml
index b575d7abf6d..9d28083dab2 100644
--- a/config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml
+++ b/config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /:group/:project/-/value_stream_analytics
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216174856_p_analytics_repo.yml b/config/metrics/counts_7d/20210216174856_p_analytics_repo.yml
index dd1b09ead42..da8bd8372e6 100644
--- a/config/metrics/counts_7d/20210216174856_p_analytics_repo.yml
+++ b/config/metrics/counts_7d/20210216174856_p_analytics_repo.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /:group/:project/-/graphs/master/charts
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml b/config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml
index 27f8887cf9b..70028d86185 100644
--- a/config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml
+++ b/config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /-/instance_statistics/cohorts
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml b/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
index 912386ac1c5..370cf7a3f50 100644
--- a/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
+++ b/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /-/instance_statistics/dev_ops_score
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml b/config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml
index a51c51fc6c2..8200576a27b 100644
--- a/config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml
+++ b/config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /groups/:group/-/analytics/merge_request_analyti
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: removed
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml b/config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml
index 9a5109f436c..d03347a0552 100644
--- a/config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml
+++ b/config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml
@@ -5,7 +5,6 @@ description: Unique visitors to/admin/usage_trends
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml b/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
index 424552f54e4..29953ab7de1 100644
--- a/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
+++ b/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
@@ -5,7 +5,6 @@ description: Unique visitors to any analytics feature by week
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: 7d
@@ -36,6 +35,7 @@ options:
- p_analytics_ci_cd_pipelines
- p_analytics_ci_cd_deployment_frequency
- p_analytics_ci_cd_lead_time
+ - g_metrics_comparison_page
distribution:
- ce
- ee
diff --git a/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
index eb85af4f7a0..9b9b83944bf 100644
--- a/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
+++ b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
@@ -5,7 +5,6 @@ description: Unique visitors to /admin/usage_trends by week
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
index 88ed638d23d..9745abf5408 100644
--- a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: The number of unique users who visited any analytics feature by wee
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
index b513b694165..9f5a7abbb21 100644
--- a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users who perform an action on a merge request
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
index 2db98f5087d..db9ec65fa31 100644
--- a/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
+++ b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users who use code intelligence
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
index 29b224c7aa4..2922e5de9da 100644
--- a/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique merge requests per week with diffs viewed
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
index 55957fe4c4b..67bf860518b 100644
--- a/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week with diffs viewed file by file
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
index bb698f7cad2..927053a592d 100644
--- a/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique merge requests per week with diffs viewed file by f
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
index a1275a7bbeb..ab96036053d 100644
--- a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who created a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
index 5ec666df078..461697c22a3 100644
--- a/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who closed a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
index 294a93a75d9..6c27af8605d 100644
--- a/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who reopened a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
index 7f2311f33ea..d372fe3ecbf 100644
--- a/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who merged a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
index 838fbf0e2d2..84755507b32 100644
--- a/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who commented on a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
index 5510109edda..ac664eb8b39 100644
--- a/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who edited a comment on a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
index b55bb571bd2..220be7e4ebd 100644
--- a/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per month who removed a comment on a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml b/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
index 6d3aafa428a..fa27b375a50 100644
--- a/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
+++ b/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who added a suggestion
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml b/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
index 7f4931eb125..5840707980d 100644
--- a/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
+++ b/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who applied a suggestion
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
index cd1bf837b3f..9244afc1249 100644
--- a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly number of users editing using the Web IDE
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
index 3995843b24a..ed66ba900bd 100644
--- a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
+++ b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly number of users editing from the single file editor
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
index 97e7b0b849e..e32159e0914 100644
--- a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly number of users editing Snippets
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
index 2b136ef96dd..c9ef8e978c8 100644
--- a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly number of users editing a file using the Web IDE
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180416_i_search_total.yml b/config/metrics/counts_7d/20210216180416_i_search_total.yml
index e2bdc40d887..f9ab259f9fa 100644
--- a/config/metrics/counts_7d/20210216180416_i_search_total.yml
+++ b/config/metrics/counts_7d/20210216180416_i_search_total.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to perform Basic or Advanced searches by we
product_section: enablement
product_stage: enablement
product_group: global_search
-product_category: global_search
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
index 01a2cdaee26..51e47331240 100644
--- a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
+++ b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to perform Basic or Advanced searches by we
product_section: enablement
product_stage: enablement
product_group: global_search
-product_category: global_search
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
index 4f55e279459..446ce10f04f 100644
--- a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to perform Basic or Advanced searches by we
product_section: enablement
product_stage: enablement
product_group: global_search
-product_category: global_search
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
index e4089d589cc..9189f688ca9 100644
--- a/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week to take an action on an alert
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
index 93228309855..466e1c3663d 100644
--- a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week to take an action on an incident
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml b/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
index faa01b2c14e..806f43bce17 100644
--- a/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users changing alert's status per week
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml b/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
index 88aae8134a4..8493e394a95 100644
--- a/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users assigning an alert per week
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml b/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
index 56b27038a3e..a7fb949f143 100644
--- a/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users adding alerts to the TODO list per week
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml b/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
index 40b42fd1be4..93cdf3305b0 100644
--- a/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users creating incidents per week
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml b/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
index 8453a7bf93b..e23e7554856 100644
--- a/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users reopening incidents per week
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml b/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
index ce7a34aaeb2..48ea4c288f2 100644
--- a/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users closing incidents per week
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml b/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
index 192e78b2675..e6078fbdf7d 100644
--- a/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users assiging incidents per week
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml b/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
index c15a71876c0..733866a55eb 100644
--- a/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users adding incidents to the TODO list per week
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml b/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
index 5d7e5408466..8135df8ea75 100644
--- a/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users adding comments on incidents per week
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml b/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
index 763e713cc23..3955cd66433 100644
--- a/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
+++ b/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users creating Zoom meetings about incidents per we
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml b/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
index 263d2d60274..0d4b71686d9 100644
--- a/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
@@ -6,7 +6,6 @@ description: Count of unique users adding issues per that are related to an inci
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml b/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
index 3bd90957bb9..3e5c43746f0 100644
--- a/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
+++ b/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
@@ -6,7 +6,6 @@ description: Count of unique users removing issue that are related to an inciden
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml b/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
index 9b7d216a18d..23d777530f4 100644
--- a/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users changing incidents to confidential per week
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
index 03ea343b1da..f0dbaae8c0c 100644
--- a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users performing events related to the incident man
product_section: ops
product_stage: monitor
product_group: monitor
-product_category:
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml b/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
index 7abfc39fb41..bca64798d7c 100644
--- a/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
+++ b/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
@@ -6,7 +6,6 @@ description: Count of unique users per week to create an incident corresponding
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
index c630b1bad72..2af4e6523f1 100644
--- a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU editing an issue description
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
index afd7ac16acc..933f1bf3e3b 100644
--- a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU changing issue assignees
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
index 4a7590fa63e..352c5e44d47 100644
--- a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU making an issue confidential
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
index eae4cf74b4f..41ba3cc3f79 100644
--- a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
+++ b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU making an issue not confidential
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
index b59d309e25b..e12d8240d5f 100644
--- a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU creating issues
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
index bce3c7466d5..0349cc014be 100644
--- a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU closing an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
index 8e7f0a92086..3d7bd3888f7 100644
--- a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU re-opening a closed issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
index 0a6436946a3..cb2f31a2c26 100644
--- a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU changing an issue's label
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
index 39909e9d2f6..bbe4d122847 100644
--- a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU changing an issue's milestone
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
index 1b20184f93f..b1c13ef367c 100644
--- a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
+++ b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU referencing an issue from somewhere else
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
index 1ef7e30cf80..f72c83ab3df 100644
--- a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
+++ b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU moving an issue to another project
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
index 7df346d1c0f..f42e99b4514 100644
--- a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
+++ b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU relating an issue to another issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
index e493200cb7e..e8b06010a17 100644
--- a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
+++ b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU unrelating an issue to another issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
index 7609355ef9e..13c783fd07f 100644
--- a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU marking an issue as a duplicate
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
index 04c1c33b614..6a07d05d9ec 100644
--- a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU locking an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
index 99a46162e24..69550cb65d1 100644
--- a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU unlocking an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
index 6c54cda8cca..1b686f6c0d4 100644
--- a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU adding a design to an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
index 50591b27826..06f3416d58e 100644
--- a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
+++ b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU modifying a design on an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
index f25c8fab470..9c573914f88 100644
--- a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU removing a design from an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
index 8fc70434d77..89e331307bc 100644
--- a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU changing an issue due date
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
index 66313eadfb5..c1e2d542cdc 100644
--- a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU changing an issue time estimate
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
index 2ad1a1fc35c..48f4175f084 100644
--- a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU recording time spent on an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
index ca24e7b8d2e..9303f4e69ff 100644
--- a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU commenting on an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
index 25d6d63f7b2..4bba82b80f6 100644
--- a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU editing a comment on an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
index a11431c52f3..6bbfe60613e 100644
--- a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU deleting a comment from an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
index 0421bd5e6f3..66b1fc7fb46 100644
--- a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
+++ b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU cloning an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
index 8fce94a17e2..a6fc0ddb086 100644
--- a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Aggregate count of WAU taking an action related to an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
index 8ba9912367b..ef6d014e491 100644
--- a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
+++ b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/approve` quick action
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
index ce8b74e809d..045a9f902a0 100644
--- a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
+++ b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/assign @user1` quick action to assign a si
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml b/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
index 3ca7b226545..7e431fdbec6 100644
--- a/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
+++ b/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/assign @user1 @user2` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
index e7a9da77a57..85c653b9807 100644
--- a/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
+++ b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/assign me` quick action to assign self to
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
index 2bb14fd86d6..a790645be79 100644
--- a/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/assign_reviewer` or `request_reviewer` qui
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
index f30c48afe27..5008c48922f 100644
--- a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
+++ b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/award` quick action to set an award emoji
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
index 2fcfd76f2cf..38ea07b6020 100644
--- a/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/board_move` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
index 56666aa5c27..24e8c851811 100644
--- a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/clone` quick action to clone an issue.
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
index 5f66e29d64d..6eb1d9bfd1c 100644
--- a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
+++ b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/close` quick action to close an issuable
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
index 7044ec1cee0..06fd4b538cb 100644
--- a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/confidential` quick action to set an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml b/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
index 477b01fe58a..a771810aeba 100644
--- a/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/copy_metadata` quick action on a Merge Req
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
index ba3122f506f..55b9720333a 100644
--- a/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/copy_metadata` quick action on an issue
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
index 2cbaad8e195..1db25e7826a 100644
--- a/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/create_merge_request` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
index 20a148487ed..97e12085fbe 100644
--- a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
+++ b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/done` quick action to mark a todo as done
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
index 1862579b010..7afa7363f33 100644
--- a/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/draft` quick action on a Merge Request
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
index 6d91df37fff..f20c0e36ab2 100644
--- a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
+++ b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/due` quick action to change the due date o
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
index 2aa366e6189..9c223c90a38 100644
--- a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/duplicate` quick action to mark an issue a
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
index 51a8b104c13..94753292f22 100644
--- a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/estimate` quick action to set a time estim
product_section: dev
product_stage: plan
product_group: project_management
-product_category: time_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
index 162ed402b2d..533e5ad8f85 100644
--- a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
+++ b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/label` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
index 6f2cd99e56b..08cd4a64365 100644
--- a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/lock` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
index aaeda7d38c7..130b6ffca0d 100644
--- a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
+++ b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/merge` quick action
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
index 5c9333b86cc..8eff93b562e 100644
--- a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/milestone` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
index 9b0298c05ef..92eda899a36 100644
--- a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/move` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
index 5f692ea8693..1bf03fc1339 100644
--- a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
+++ b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/reassign @user1` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
index bebba3c9c16..8da0f4a3774 100644
--- a/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/reassign_reviewer` quick action
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
index 332b4a9d49f..e8895b910e3 100644
--- a/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
+++ b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/rebase` quick action on a Merge Request
product_section: dev
product_stage: source_code
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
index 30b34915504..30444a60ad5 100644
--- a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
+++ b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/relabel` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
index 0676a68294c..3b293d9ad26 100644
--- a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/relate` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
index 851221e77a5..de974d4fa3f 100644
--- a/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
+++ b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/remove_due_date` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
index c61ef9beb0d..4dcc0843134 100644
--- a/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/remove_estimate` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: time_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
index 6b27c442b53..54db78851fc 100644
--- a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/remove_milestone` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
index 5e8b08a8b2f..64144163995 100644
--- a/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
+++ b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/remove_time_spent` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
index 1286451c093..8fa1cdbf48f 100644
--- a/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/remove_zoom` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
index 30230076606..73c4b090324 100644
--- a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
+++ b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/reopen` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
index 6dea3beeffb..263ea183d4e 100644
--- a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
+++ b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/shrug` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
index 747db90fc0c..14b38ffc69f 100644
--- a/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
+++ b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/spend` quick action to subtract time spent
product_section: dev
product_stage: plan
product_group: project_management
-product_category: time_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
index f0ef4fc1443..11785ba504a 100644
--- a/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
+++ b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/spend` quick action to add time spent
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml b/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
index d59582d77a4..b5ab2742f28 100644
--- a/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
+++ b/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/submit_review` quick action on Merge Reque
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
index 45f12337aed..25312a6b141 100644
--- a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/subscribe` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
index 2496a625ba4..f9c1aeb4c14 100644
--- a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/tableflip` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
index 8fa970a825c..735d81f6dc3 100644
--- a/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
+++ b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/tag` quick action
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml b/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
index 1cacf957c29..a58780072c3 100644
--- a/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
+++ b/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/target_branch` quick action on Merge Reque
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
index 7ed0c90fe63..33c21de6c3b 100644
--- a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/title` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
index e626eb20f0e..cc5a60ee233 100644
--- a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/todo` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml b/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
index c15a1a910e1..b287ea65b0a 100644
--- a/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
+++ b/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/unassign @user1` quick action on Merge Req
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml b/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
index ade389e3109..d1c2c52e337 100644
--- a/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
+++ b/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/unassign` quick action on Merge Requests
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
index df8989017e4..eb1dc8bd781 100644
--- a/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/unassign_reviewer` or `/remove_reviewer` q
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
index f9bcdfae4e0..a284a0d8431 100644
--- a/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
+++ b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
@@ -6,7 +6,6 @@ description: Count of WAU using the `/unlabel` or `/remove_label` quick action t
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
index 0b85ab538d8..77478783baf 100644
--- a/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
+++ b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/unlabel` quick action to remove all labels
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
index e0954fdb822..cc382ff215e 100644
--- a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/unlock` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
index a8c7c6d7f4a..7730da6efe3 100644
--- a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/unsubscribe` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
index b041898637a..433abc4a325 100644
--- a/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/wip` quick action on Merge Requests
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
index 6591335ab5c..b9d07941ac9 100644
--- a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/zoom` quick action on Issues
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
index 20bc1976170..3a79b0a0cfe 100644
--- a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique actions done on a wiki (create, edit, delete)
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
index b80ec9236a2..2f624977b6e 100644
--- a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
@@ -5,7 +5,6 @@ description: Count of total design actions (upload, delete, comment, reply)
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
index 7ecc4a9ffaa..d51581a30b6 100644
--- a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
@@ -6,7 +6,6 @@ description: Count of unique actions done on projects and related resources (cre
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
index 49d882f893b..da7c483899f 100644
--- a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
+++ b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
@@ -5,8 +5,7 @@ description: Internal Tracking to count number of unit tests parsed for planning
future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
product_section: ops
product_stage: verify
-product_group: pipeline_insights
-product_category: code_testing
+product_group: pipeline_execution
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
index 6d7b16b9f3d..09fb34084f7 100644
--- a/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
+++ b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
@@ -5,7 +5,6 @@ description: This was test metric used for purpose of assuring correct implement
product_section: analytics
product_stage: analytics
product_group: product_intelligence
-product_category: collection
value_type: number
status: removed
milestone_removed: '13.11'
diff --git a/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
index 46295dcdb00..805a168d407 100644
--- a/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
+++ b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
@@ -5,7 +5,6 @@ description: This was test metric used for purpose of assuring correct implement
product_section: analytics
product_stage: analytics
product_group: product_intelligence
-product_category: collection
value_type: number
status: removed
milestone_removed: '13.11'
diff --git a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
index 25deb6b9c3b..eaf2c4930a4 100644
--- a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
+++ b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly number of users editing using the Static Site Editor
product_section: dev
product_stage: create
product_group: editor
-product_category: static_site_editor
value_type: number
status: removed
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
index 66811db0a95..25a52ddb51d 100644
--- a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique Git write actions
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
index 3b84b959cdc..333deea8921 100644
--- a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
+++ b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly number of users viewing snippets
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml b/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
index 885f408188f..99cabcd6dc1 100644
--- a/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
+++ b/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
@@ -5,7 +5,6 @@ description: Monthly active users of GitLab Managed Terraform states
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
index 795acd44f85..fd639ed7840 100644
--- a/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
+++ b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly unique user count doing commits which contains the CI config
product_section: ops
product_stage: verify
product_group: pipeline_authoring
-product_category: pipeline_authoring
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
index a84d38cc106..e630943fdfc 100644
--- a/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
+++ b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_toggled_task_item_st
description: Count of unique users per week who toggled a task item in a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
index 2b013d9bd6f..ae050ed0ac6 100644
--- a/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_approve_mr_weekly
description: Count of unique users per week who approve a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
index cb199460b56..656337064d6 100644
--- a/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_unapprove_mr_weekly
description: Count of unique users per week who unapprove a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
index a4793165d84..b79a947b047 100644
--- a/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
+++ b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_resolve_thread_weekl
description: Count of unique users per week who resolve a thread in a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
index 2f7a8f95e60..99ebc05a614 100644
--- a/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
+++ b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_unresolve_thread_wee
description: Count of unique users per week who unresolve a thread in a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
index f274a3c84ee..0a67aee4a7e 100644
--- a/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_edit_mr_title_weekly
description: Count of unique users per week who edit the title of a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
index a33decb9829..a2f841eecc5 100644
--- a/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
+++ b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_edit_mr_desc_weekly
description: Count of unique users per week who edit the description of a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
index 2f973ca280c..2e4aa495841 100644
--- a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
+++ b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who create a note as part of a merge
review
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
index 12ab4d9e142..f8f180e6506 100644
--- a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
+++ b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who publish their review as part of
merge request review
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
index 42350e2ed46..c463cb7d5bc 100644
--- a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who create a multiline comment in a
request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
index e97a2d484a0..cf9f1169c1c 100644
--- a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who edit a multiline comment in a me
request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
index c3116458680..57a8467faae 100644
--- a/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who remove a multiline comment in a
request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
index 72a1a0d27cb..fc650755ef2 100644
--- a/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_assigned_weekly
description: Count of unique users per week who are assigned to a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
index 523df4fc166..10479d26c35 100644
--- a/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who mark a merge request as a draft
product_stage: create
product_group: code_review
product_section: 'TBD'
-product_category: code_review
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
index 85e3cb7fa2e..df6a63308a5 100644
--- a/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_unmarked_as_draft_we
description: Count of unique users per week who unmark a merge request as a draft
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
index d38e248ab3d..26102beb2f9 100644
--- a/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
+++ b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_review_requested_wee
description: Count of unique users per week who request a review of a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
index 3528cc2cdf5..cbb0885baa3 100644
--- a/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_added_
description: Count of unique users per week who add an approval rule to a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
index 5745700f3b4..5d3b53fff07 100644
--- a/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
+++ b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who delete an approval rule to a mer
request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
index 42b67c04587..d490f2ff877 100644
--- a/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_edited
description: Count of unique users per week who edit an approval rule to a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
index 4dbf661eaa0..99943b483ad 100644
--- a/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_vs_code_api_request_
description: Count of unique users per week who use GitLab Workflow for VS Code
product_stage: create
product_group: code_review
-product_category: editor_extension
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
index 4e7bd44586c..5f8ada9ac2f 100644
--- a/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
@@ -4,7 +4,6 @@ key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_from_issue
description: Count of unique users per week who create a merge request from an issue
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
index 07985c3e56e..154806d8d70 100644
--- a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
@@ -4,10 +4,11 @@ key_path: redis_hll_counters.code_review.code_review_total_unique_counts_weekly
description: Count of unique users per week who interact with a merge request
product_stage: create
product_group: code_review
-product_category: code_review
product_section: 'TBD'
value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113422
+milestone_removed: 15.10
time_frame: 7d
data_source: redis_hll
instrumentation_class: AggregatedMetric
diff --git a/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml b/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
index e00e435cf88..fa1b01b029e 100644
--- a/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
+++ b/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit Auto Build runs
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml b/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
index 3a522e9088e..f4e33e53c61 100644
--- a/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
+++ b/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit Auto Build runs
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: removed
milestone_removed: '14.6'
diff --git a/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml b/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
index 71ceb5f2b1c..25609e951fb 100644
--- a/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit Auto Deploy runs
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: removed
milestone_removed: '14.6'
diff --git a/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml b/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
index a9cc39612a2..f07cd2e046c 100644
--- a/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
+++ b/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit SAST runs
product_section: ops
product_stage: verify
product_group: "static_analysis"
-product_category: SAST
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml b/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
index 3d65b0c40e2..42fb95c6667 100644
--- a/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
+++ b/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit Secret Detection runs
product_section: ops
product_stage: verify
product_group: "static_analysis"
-product_category: secret_detection
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
index e6f8be30ffc..adf67977f9c 100644
--- a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
+++ b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
@@ -5,7 +5,6 @@ description: Number of projects using 5 min production app CI template in last 7
product_section: seg
product_stage: deploy
product_group: 5-min-app
-product_category: five_minute_production_app
value_type: number
status: removed
milestone_removed: '14.6'
diff --git a/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml b/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
index d3e606940ea..422ab92b81e 100644
--- a/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
+++ b/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the latest Auto Deploy template
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
index 5ef3202e2b7..7b2ebf820b1 100644
--- a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
@@ -6,7 +6,6 @@ description: Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: removed
milestone_removed: '14.6'
diff --git a/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
index 2cbe1cf6e69..8ef67ef48dc 100644
--- a/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
@@ -6,7 +6,6 @@ description: Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml b/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
index 64ed870d8ef..0ebcc00379b 100644
--- a/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the stable Auto Deploy template
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
index 681c013a387..34ef4ef374c 100644
--- a/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the latest Auto Deploy template
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: removed
milestone_removed: '14.6'
diff --git a/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml b/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
index e1898c66232..29a308e8d80 100644
--- a/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
+++ b/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with SAST runs
product_section: ops
product_stage: verify
product_group: "static_analysis"
-product_category: SAST
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml b/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
index e10586708bd..571530313a9 100644
--- a/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
+++ b/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with Secret Detection runs
product_section: ops
product_stage: verify
product_group: "static_analysis"
-product_category: secret_detection
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml b/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
index 103bb221b98..332e522c181 100644
--- a/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines that include the terraform base template from Gi
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
index 71c02fc5681..64ef9858a64 100755
--- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Total count of pipelines runs
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: removed
milestone_removed: '14.3'
@@ -57,6 +56,8 @@ options:
- p_ci_templates_security_dependency_scanning
- p_ci_templates_security_api_fuzzing
- p_ci_templates_security_dast
+ - p_ci_templates_security_api_discovery
+ - p_ci_templates_security_bas_latest
- p_ci_templates_ios_fastlane
- p_ci_templates_composer
- p_ci_templates_c
diff --git a/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
index 039e65bcbaa..0ed0342d8ed 100644
--- a/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using one or more quick actions
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
index d4bca957360..e5d08397792 100644
--- a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Composer packages published to the registry using
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
index 8c312a52af0..2abc15afbc1 100644
--- a/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Conan packages published to the registry using a
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
index 5e56465dbd4..57b851d7240 100644
--- a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of container images published to the registry using
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: removed
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
index 828e3662601..6a5f5010b3d 100644
--- a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Debian packages published to the registry using a
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
index 6233c2339de..7c0748dd38b 100644
--- a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of generic packages published to the registry using
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
index 3df457db03b..4b9d7df0c7c 100644
--- a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Go modules published to the registry using a depl
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
index 8485e4013f3..b2bcc111441 100644
--- a/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Maven packages published to the registry using a
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
index 7d8c3585aa2..e4fe75251dd 100644
--- a/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of npm packages published to the registry using a de
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
index f2a0460bc27..48a08d9924c 100644
--- a/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of NuGet packages published to the registry using a
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
index a0c74b4f002..84cbb71a20c 100644
--- a/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Python packages published to the registry using a
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
index 27863bdde3d..9478f660aac 100644
--- a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of users that have published a package tag to the re
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
index 967e8e5888e..ff92a09009a 100644
--- a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of unique users who published packages to the regist
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
index 85bacdd8f17..e7972ef2de0 100644
--- a/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of users that have published a Composer package to t
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
index 78e2ad69fe8..ef942bfa457 100644
--- a/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a Conan package to the
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
index 3ecf501dc1b..1ddb6cdbfa4 100644
--- a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of users that have published a container image to th
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: removed
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
index e71927d20ee..22e130b9969 100644
--- a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a Debian package to the
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
index fe0b86aaa07..34e43412396 100644
--- a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of users that have published a generic package to th
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
index cfda35c0968..32270cd0e3b 100644
--- a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a Go module to the regi
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
index fabc6d05016..9b838d2ff36 100644
--- a/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a Maven package to the
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
index f48c0a9a506..e8c047d80d6 100644
--- a/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published an npm package to the r
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
index bd4b8b006ec..900dbcbaa39 100644
--- a/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a NuGet package to the
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
index 5c52ee9137d..36959afc983 100644
--- a/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a Python package to the
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
index b934af222a8..6ab0f4f992e 100644
--- a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of users that have published a package with a tag to
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
index d5576772b91..f22a975b1ae 100644
--- a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a package to the regist
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
index b650f2ff5fa..90cceab86db 100644
--- a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
@@ -5,7 +5,6 @@ description: Number of users closing Jira issues by week
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
index 4058804272b..70a3b4b0fcb 100644
--- a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
+++ b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
@@ -5,7 +5,6 @@ description: Number of users that cross-referenced Jira issues by week
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
index 968525a9005..b0745520870 100644
--- a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Number of users performing actions on Jira issues by week
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: 7d
diff --git a/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
index 6ea3c5d8e46..e9409f8c4b7 100644
--- a/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
+++ b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly unique user count having merge requests which contains the C
product_section: ops
product_stage: verify
product_group: pipeline_authoring
-product_category: pipeline_authoring
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
index 3a7cee3cc4f..c96e9788e6d 100644
--- a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
index 78f3c6d3d4a..924270e9294 100644
--- a/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who changed time estimate of a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
index 6a5f5914ded..1e126b15d23 100644
--- a/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who changed time spent on a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
index 6c10ec49dfe..123d8077a66 100644
--- a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing a
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
index f26b088c356..4ae6853d08f 100644
--- a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing a
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
index dc0bf804080..bff00f4f5a7 100644
--- a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
index b27cec15caa..ef131a81f07 100644
--- a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
index d56eec656ae..4823a57f853 100644
--- a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by creating a no
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
index 671a2f4ac58..3d0123024c0 100644
--- a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing a
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
index 3a80c12cdd1..584b3daa51d 100644
--- a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by creating a co
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
index addaed1b2c1..f6a1f3c033d 100644
--- a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
@@ -5,7 +5,6 @@ description: Calculated unique users to trigger a Slack message by performing an
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml b/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
index a5f45d5ca39..d5feb708370 100644
--- a/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who unlocked a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml b/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
index 06b61434043..ecc0abe8b92 100644
--- a/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who locked a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
index 09d2a58fa35..be30d900c4c 100644
--- a/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who changed milestone of a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml b/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
index fc28f4ee95f..9a2c6c2fd0e 100644
--- a/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who changed labels of a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml b/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
index 687100f1572..1e06166acc9 100644
--- a/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who changed assignees of a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml b/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
index 9b8f57680e6..b6ddb3998f8 100644
--- a/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users per week who changed reviewers of a MR
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml b/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
index 84c514f2b4c..df87cbc7212 100644
--- a/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
+++ b/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
@@ -5,7 +5,6 @@ description: Unique users using the /invite_email quick action to add a single e
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: issue_tracking
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml b/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
index b4085cc431b..d79b4877cf7 100644
--- a/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
+++ b/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
@@ -5,7 +5,6 @@ description: Unique users using the /invite_email quick action to add a multiple
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: issue_tracking
value_type: number
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml b/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
index 4e22dafd1a2..9ef1c5a9fb1 100644
--- a/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of distinct RubyGems packages published using a depl
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: '13.10'
diff --git a/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml b/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
index 5fafa692102..a99033e7a44 100644
--- a/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
+++ b/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of distinct RubyGems packages published by a user
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: '13.10'
diff --git a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
index 41948e72b14..93eb662f656 100644
--- a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
@@ -5,7 +5,6 @@ description: Count of expanding the security report widget
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: '13.11'
diff --git a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
index a8686e59e13..9a67d5aa2e0 100644
--- a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
@@ -4,8 +4,7 @@ key_path: redis_hll_counters.testing.users_expanding_testing_code_quality_report
description: Count of expanding the code quality widget
product_section: ops
product_stage: verify
-product_group: pipeline_insights
-product_category: code_quality
+product_group: pipeline_execution
value_type: number
status: active
milestone: '13.11'
diff --git a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
index bbad1715f98..035730674ad 100644
--- a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
@@ -4,8 +4,7 @@ key_path: redis_hll_counters.testing.users_expanding_testing_accessibility_repor
description: Count of expanding the accessibility report widget
product_section: ops
product_stage: verify
-product_group: pipeline_insights
-product_category: accessibility_testing
+product_group: pipeline_execution
value_type: number
status: active
milestone: '13.11'
diff --git a/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
index 51cb976a888..814b6c3352c 100644
--- a/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
@@ -5,7 +5,6 @@ description: Number of distinct users authorized via deploy token creating Terra
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
milestone: '13.11'
diff --git a/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
index ad5002fe9b9..181d38b6fc7 100644
--- a/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
+++ b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
@@ -5,7 +5,6 @@ description: Number of distinct users creating Terraform Module packages in rece
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
milestone: '13.11'
diff --git a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
index f9c34ab4fe9..1182681fa8e 100644
--- a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
+++ b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
@@ -4,12 +4,13 @@ key_path: redis_hll_counters.testing.i_testing_summary_widget_total_weekly
description: Unique users that expand the test summary merge request widget by week
product_section: ops
product_stage: verify
-product_group: pipeline_insights
-product_category: testing
+product_group: pipeline_execution
value_type: number
-status: active
+status: removed
milestone: "13.11"
+milestone_removed: "15.11"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59316
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114018
time_frame: 7d
data_source: redis_hll
instrumentation_class: RedisHLLMetric
diff --git a/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml b/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
index 2822bc33d13..47f02104799 100644
--- a/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking single file mode setting
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml b/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
index 8e23a2aae8f..14804e70f4b 100644
--- a/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request file list setting
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml b/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
index 6a127785a51..0ef08b44129 100644
--- a/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking merge request whitespae setting
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml b/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
index e63400107c8..7a1ee16a32c 100644
--- a/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
+++ b/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request view type as inline
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml b/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
index 2968d582466..300cf506120 100644
--- a/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
+++ b/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request view type as parallel
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml b/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
index 62fb89aa5c5..906865d82c2 100644
--- a/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
+++ b/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request file tree setting
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml b/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
index ea0d1039057..da3eba5beac 100644
--- a/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
+++ b/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with merge request file list setting
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml b/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
index 0b791d84552..73bc515cd1f 100644
--- a/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
+++ b/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with show whitespace enabled
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml b/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
index f5ab68f120f..17ba249773e 100644
--- a/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
+++ b/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with show whitespace disabled
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml b/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
index 613368825ec..ef5ca0a03f8 100644
--- a/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
+++ b/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with single file mode enabled
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml b/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
index 6eb1c55d098..2933fd90dd3 100644
--- a/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
+++ b/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users with single mode disabled
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
index 02d537394f4..b6e1211d605 100644
--- a/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
+++ b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
@@ -5,7 +5,6 @@ description: Unique users viewing analytics devops adoption
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
milestone: "13.11"
diff --git a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
index f9acb05be3e..7743cfd2e0c 100644
--- a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
@@ -5,7 +5,6 @@ description: Number of users performing at least one of the code review events
product_section: dev
product_stage: create
product_group: code_review
-product_category:
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
index 6ceeef68c21..343e0105bf7 100644
--- a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
@@ -5,7 +5,6 @@ description: Unique users performing actions on code review events
product_section: dev
product_stage: create
product_group: code_review
-product_category:
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
index f5e8a10506f..2229e132eb4 100644
--- a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
@@ -5,7 +5,6 @@ description: Number of users performing code review extension_category events
product_section: dev
product_stage: create
product_group: code_review
-product_category:
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
index 3f688886a67..77bbceb7428 100644
--- a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Unique users doing commits or push MRs which contains CI cifig file
product_section: ops
product_stage: verify
product_group: pipeline_authoring
-product_category: pipeline_authoring
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml b/config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml
index 378637ab14b..d6813b33e39 100644
--- a/config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml
+++ b/config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml
@@ -6,7 +6,6 @@ description: Unique users viewing analytics group devops adoption
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml b/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
index 5e5f8012a25..556c1467b43 100644
--- a/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
+++ b/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
@@ -6,7 +6,6 @@ description: Count of unique users per week who load the conflict resolution pag
product_section: 'TBD'
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml b/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
index be7905f3908..cd4e487f982 100644
--- a/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
+++ b/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
@@ -6,7 +6,6 @@ description: Count of unique users per week who attempt to resolve a conflict th
product_section: 'TBD'
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml b/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
index 48a6f7b6f80..233d8eee381 100644
--- a/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
@@ -5,7 +5,6 @@ description: Distinct Helm pakages deployed in recent 7 days
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: "14.0"
diff --git a/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml b/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
index 2b144ddfea5..296a1a38b30 100644
--- a/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
+++ b/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
@@ -5,7 +5,6 @@ description: Distinct user count events for Helm packages in recent 7 days
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: "14.0"
diff --git a/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml b/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
index 9b8408c193a..f41b5e82f40 100644
--- a/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking diff view setting
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml b/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml
index 4f96db892f6..77e864afc95 100644
--- a/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml
+++ b/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml
@@ -4,7 +4,6 @@ description: Count of users who search merge request diffs
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '14.2'
diff --git a/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml b/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
index 68bae7212c5..a2c698ddf5b 100644
--- a/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
+++ b/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
@@ -4,7 +4,6 @@ description: Count of WAU using the `/severity` quick action
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
milestone: "14.2"
diff --git a/config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml b/config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml
index 485ad63052e..59b0cfbc6cb 100644
--- a/config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml
+++ b/config/metrics/counts_7d/20210816144119_i_code_review_total_suggestions_added_weekly.yml
@@ -5,7 +5,6 @@ description: Total number of weekly suggestions
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml b/config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml
index fa2952320ef..ae67e0bf6f5 100644
--- a/config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml
+++ b/config/metrics/counts_7d/20210816144247_i_code_review_total_suggestions_applied_weekly.yml
@@ -5,7 +5,6 @@ description: Total number of weekly suggestions applied
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml b/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml
index 4601cfb0860..453ed4a0a7a 100644
--- a/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml
+++ b/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml b/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml
index 8b2c8de3e40..f01d96f1292 100644
--- a/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml
+++ b/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml b/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml
index 3f10b6c28ef..d82b85be2a3 100644
--- a/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml
+++ b/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml b/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml
index 70f7ac7f736..3b25a67cf83 100644
--- a/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml
+++ b/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml b/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml
index 26d3d7780f4..6f58352d03e 100644
--- a/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml
+++ b/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml b/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml
index 5d22da58b33..bb12ebf8378 100644
--- a/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml
+++ b/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml b/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml
index f0bf840127f..be1e433ea87 100644
--- a/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml
+++ b/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml b/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml
index e191ce5b162..203d04e7c80 100644
--- a/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml
+++ b/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml b/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml
index 1659cb016ab..1206ac024d7 100644
--- a/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml
+++ b/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml b/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml
index 438f0eb337a..09cabad7dbb 100644
--- a/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml
+++ b/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml b/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml
index 33a4ec10464..f0363fa7f4e 100644
--- a/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml
+++ b/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml
index ca61949b607..407ab183d3c 100644
--- a/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml b/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml
index 1d4f411e4fa..5341e78877b 100644
--- a/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml
+++ b/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml b/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml
index 97cd0ecd07d..53104524987 100644
--- a/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml
+++ b/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml b/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml
index 0fb29c0c686..8b75aa27857 100644
--- a/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml
+++ b/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml b/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml
index 424aaebc483..b87657c5af2 100644
--- a/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml b/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml
index f6c5386cc45..46c8613b2ba 100644
--- a/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml
+++ b/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml b/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml
index 2947546da57..db6898b684d 100644
--- a/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml
+++ b/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml b/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml
index bfe8a69c98b..dceffd56578 100644
--- a/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml
+++ b/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml b/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml
index 589f51e1582..d542b08ce0a 100644
--- a/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml
index 89edc13d128..e9c424fe1c3 100644
--- a/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml b/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml
index b6925668794..21fe8bab6b4 100644
--- a/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml b/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml
index dbf739de6e3..c4491d08304 100644
--- a/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml
+++ b/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml b/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml
index 4718fe841d1..92c796ecadd 100644
--- a/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml
+++ b/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml b/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml
index 84f33f2548c..c69df0778d8 100644
--- a/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml b/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml
index 38c0485f8e1..c79d88ecd5f 100644
--- a/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml b/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml
index f4954107d43..70ba9d17d4f 100644
--- a/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml
index 8998597261b..59b0eeb67d8 100644
--- a/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml b/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml
index 6216a39d9f7..84a41a66490 100644
--- a/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml
+++ b/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml b/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml
index b7fd799f8a6..bfccf092dbd 100644
--- a/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone_removed: '15.0'
diff --git a/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml b/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml
index 0ff048bd50a..a7d65bf5c9e 100644
--- a/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml
+++ b/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml b/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml
index 91f7fd8a29f..91d5e7c871f 100644
--- a/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml
+++ b/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml b/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml
index 7e1a97b3d78..c4506a4c6c5 100644
--- a/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml
+++ b/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml b/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml
index 3a739ac16eb..29a7f26c3b4 100644
--- a/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml
+++ b/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml b/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml
index 12b2d3445e3..12724c83211 100644
--- a/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml
+++ b/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml b/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml
index 5161260f733..6a38808ac08 100644
--- a/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml
+++ b/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml b/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml
index 6771363d4f0..300e49eb20f 100644
--- a/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml
+++ b/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml b/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml
index f0597215cdb..378ab408e35 100644
--- a/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml
+++ b/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml b/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml
index e5ee6349a68..03f5b0e89e2 100644
--- a/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml
+++ b/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml b/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml
index c36507c86c1..bf2c2adb645 100644
--- a/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml
+++ b/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml b/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml
index 4f994b3b21e..b937905a07f 100644
--- a/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml
+++ b/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml b/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml
index b93751d3c30..df1e2f09f10 100644
--- a/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml
+++ b/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml b/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml
index b1dbd64ae25..efc6d93fbec 100644
--- a/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml
+++ b/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml b/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml
index 7b813f3c1c8..3b6a20534ff 100644
--- a/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml
+++ b/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml b/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml
index 833a103b424..fcb52d878fe 100644
--- a/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml
+++ b/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml b/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml
index 5ca5b632ed7..1842d0679e7 100644
--- a/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml
+++ b/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml b/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml
index 060893ca349..83929a5ff83 100644
--- a/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml
+++ b/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml b/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml
index b297836dbf5..292a5d6a0e0 100644
--- a/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml
+++ b/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml b/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml
index bdc019f53bc..5b81fbf7911 100644
--- a/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml
+++ b/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml b/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml
index 5eeb0b587f7..d43e4dabf23 100644
--- a/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml
+++ b/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml b/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml
index be803873da2..536ac4f3215 100644
--- a/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml
+++ b/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml b/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml
index 02848df7032..cb492c65d2f 100644
--- a/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml
+++ b/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml
index 31f8f31344f..f79d5d9ae90 100644
--- a/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml
index 1df7de7867f..ae5529149a4 100644
--- a/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml b/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml
index ffee4a62bef..c264b754d40 100644
--- a/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml
+++ b/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml b/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml
index b9601085fe1..f347141b4b5 100644
--- a/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml
+++ b/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml b/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml
index 3efb9e7e435..b2449cc62f3 100644
--- a/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml
index efdab0f1c35..df2b7395e18 100644
--- a/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml b/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml
index 878e5d1f08b..f2e7c316e21 100644
--- a/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml
+++ b/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml b/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml
index bc7c9914c31..18a68f4c026 100644
--- a/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml
+++ b/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml b/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml
index c627098b569..e4eddb4e80e 100644
--- a/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml
+++ b/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml
index 9997a733c84..7b1a3cf87fb 100644
--- a/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml
+++ b/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml b/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml
index 6286fb00725..ef42b0eeddc 100644
--- a/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml
+++ b/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml
index abe645e059a..9df544de7e7 100644
--- a/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml
index 3f3c491acf5..462ea74bde4 100644
--- a/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml b/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml
index f5036c5bd7c..9484d64ca90 100644
--- a/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml b/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml
index 80dfa5e52ee..e5f9d461145 100644
--- a/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml
+++ b/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml
index a0b5145dc32..e4896130935 100644
--- a/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml b/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml
index ffbac5590cc..2a4d00c417a 100644
--- a/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml
+++ b/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml
index c076bfed8f0..52782941af4 100644
--- a/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml b/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml
index 97d8bb1f7a8..020e9eebb38 100644
--- a/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml b/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml
index f14bd662bb4..93eb40f17bf 100644
--- a/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml
+++ b/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml b/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml
index 91e8e6d7126..694ba39e864 100644
--- a/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml b/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml
index 98d7cae5c2f..aa51bb8357e 100644
--- a/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml b/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml
index 8b2fb8cd127..bc2d67b0e66 100644
--- a/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml
+++ b/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml b/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml
index e641f623c60..7a5246477bd 100644
--- a/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml
+++ b/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml b/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml
index 1419e5894bb..97209c562ba 100644
--- a/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml
+++ b/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml b/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml
index d7d7e62b256..47baf8aa169 100644
--- a/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml
+++ b/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml b/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml
index 9a521247591..e5218cce3f6 100644
--- a/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml
+++ b/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml b/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml
index caca2d80d85..3271fbf5afa 100644
--- a/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml
+++ b/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml b/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml
index f87d5663cd0..ecdb7d8080f 100644
--- a/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml
+++ b/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml b/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml
index e5a5664aee3..7146f5fd802 100644
--- a/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml
+++ b/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml b/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml
index fa44a295b65..b0712342a6f 100644
--- a/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml
+++ b/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml b/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml
index 2adf9a396ef..dd0d9aabb5e 100644
--- a/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml
+++ b/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml b/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml
index a920ff72b7b..494714f0e7d 100644
--- a/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml
+++ b/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml b/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml
index 10183e79f80..b17e4e0a9a2 100644
--- a/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml
+++ b/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml b/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml
index 0d2e5ca9122..a000917f003 100644
--- a/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml
+++ b/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml b/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml
index 5cad30c5f0c..8eaf3968953 100644
--- a/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml
+++ b/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml b/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml
index 5fcd652a26a..188f8e0d48d 100644
--- a/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml
+++ b/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml b/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml
index f0f2afd434e..5b56c6d332a 100644
--- a/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml
+++ b/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml b/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml
index 3ca7a23618b..6a065c4c78b 100644
--- a/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml
+++ b/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml b/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml
index 6c8db9b7058..dcbc5f7d222 100644
--- a/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml
+++ b/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml b/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml
index 4a7c592cd09..42ce483cd1b 100644
--- a/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml
+++ b/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml b/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml
index d2942ef6f6b..b4c256d7642 100644
--- a/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml
+++ b/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml b/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml
index 307df73a622..c8428c46d2c 100644
--- a/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml
+++ b/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml b/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml
index 6624697c56c..3c9206498aa 100644
--- a/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml
+++ b/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml b/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml
index 97de705a4de..03d885facf3 100644
--- a/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml
+++ b/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml b/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml
index b89ef58fbc1..9497aaff0c4 100644
--- a/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml
+++ b/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml b/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml
index ee6c2eaa60b..eee672af685 100644
--- a/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml
+++ b/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml b/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml
index 414eb9bc7ff..9e2fc0a599f 100644
--- a/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml
+++ b/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml b/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml
index 982257506b1..16f237b436c 100644
--- a/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
index 41743fd820c..18376dbde05 100644
--- a/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml b/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml
index 4e2dfe4e7e7..d755076586a 100644
--- a/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml
+++ b/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml b/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml
index 13a7628fd56..73c08f38416 100644
--- a/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml
+++ b/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml b/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml
index 59bae76f3e5..ab071726082 100644
--- a/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml
+++ b/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml
index 0237f2914ae..f8c91d74954 100644
--- a/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml
+++ b/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml b/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml
index 05e1a9ab017..20d0506589b 100644
--- a/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml
+++ b/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml
index 88c9db04884..d6ef6ee1593 100644
--- a/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml
index 060f5b70ca8..7b2b26914bf 100644
--- a/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml
index 67d2a02358a..77875093c00 100644
--- a/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml b/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml
index f5ceb651ef1..3ac1980db0c 100644
--- a/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml
+++ b/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml b/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
index 9fe2fcedc8f..b485355d040 100644
--- a/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml b/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml
index 4bbe644cf05..87c43f783b6 100644
--- a/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml
+++ b/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml b/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml
index 8b997583966..c409047d921 100644
--- a/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml b/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml
index 2b9e53aec36..6a760e2a7e3 100644
--- a/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml
+++ b/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml b/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml
index d45893a2022..8dcb1af53db 100644
--- a/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml
+++ b/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml b/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml
index 9655f006c44..d026fb769ff 100644
--- a/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml
index 952afc72aec..28e5c92b6e3 100644
--- a/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml b/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml
index e08cb7f719f..14da0dacab4 100644
--- a/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml b/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
index 5b2d521fb07..09c37602d26 100644
--- a/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
+++ b/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml b/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml
index b10780260cd..a50e3b025b2 100644
--- a/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml
+++ b/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml b/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml
index 5e40e73ec83..94e7d93ee91 100644
--- a/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml b/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml
index 37d4e3760d0..bc594a534c4 100644
--- a/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml b/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml
index 777413e4f5f..cbeb90bd7ad 100644
--- a/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml
index 450574ee2ef..fb4ec2a4f3e 100644
--- a/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml b/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml
index 2ba2a04de1c..0a84eb4f2c5 100644
--- a/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml
+++ b/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml b/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml
index 04ba99db306..34b6c010b66 100644
--- a/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone_removed: '15.0'
diff --git a/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml
index 9afd7e8e3f8..de6e5b504fe 100644
--- a/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the latest Auto Deploy template
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: removed
milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210902191054_i_quickactions_unapprove_weekly.yml b/config/metrics/counts_7d/20210902191054_i_quickactions_unapprove_weekly.yml
index bba2b2bcfaf..ec8321e986a 100644
--- a/config/metrics/counts_7d/20210902191054_i_quickactions_unapprove_weekly.yml
+++ b/config/metrics/counts_7d/20210902191054_i_quickactions_unapprove_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/unapprove` quick action
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml b/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml
index 6fcf7df4c9b..b3b3f4edfe6 100644
--- a/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_7d/20210908151645_i_code_review_user_resolve_thread_in_issue_weekly.yml b/config/metrics/counts_7d/20210908151645_i_code_review_user_resolve_thread_in_issue_weekly.yml
index 7fdce381a55..fd4284a8a3b 100644
--- a/config/metrics/counts_7d/20210908151645_i_code_review_user_resolve_thread_in_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210908151645_i_code_review_user_resolve_thread_in_issue_weekly.yml
@@ -5,7 +5,6 @@ description: The number of users who resolve a thread in a new issue through the
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml b/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml
index 06952dd2050..084286a3a70 100644
--- a/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml
@@ -5,7 +5,6 @@ description: Count templates with active slack application
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone: "14.3"
diff --git a/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml b/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml
index f13174a4af6..a80d43b4d0f 100644
--- a/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml
+++ b/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml
index 5f107f95479..3278ecdd07a 100644
--- a/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: removed
milestone: '14.4'
diff --git a/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml b/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml
index 964b57c65be..ed38ecd50d5 100644
--- a/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml b/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml
index 4d75becbbc3..88c0de0e3e0 100644
--- a/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml
+++ b/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that were enqueued to start weekly
product_section: dev
product_stage: manage
product_group: import
-product_category:
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml b/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml
index 19188213132..98c28c4ab98 100644
--- a/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml
+++ b/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that were successful weekly
product_section: dev
product_stage: manage
product_group: import
-product_category:
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml b/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml
index db77985ad5e..9126a817cc0 100644
--- a/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml
+++ b/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml
@@ -4,7 +4,6 @@ description: The number of github projects that failed weekly
product_section: dev
product_stage: manage
product_group: import
-product_category:
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml b/config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml
index 0234ff62765..ff3360c90fb 100644
--- a/config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml
+++ b/config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml b/config/metrics/counts_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml
index ee086b844cc..9b767fd27d6 100644
--- a/config/metrics/counts_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml
+++ b/config/metrics/counts_7d/20211102141244_i_quickactions_promote_to_incident_weekly.yml
@@ -4,7 +4,6 @@ description: Count of WAU using the `/severity` quick action
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
milestone: "14.5"
diff --git a/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml
index 371e684e406..e3c9e71392a 100644
--- a/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102202454_p_ci_templates_security_sast_iac_latest_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines using the latest SAST IaC template
product_section: sec
product_stage: secure
product_group: "static_analysis"
-product_category: SAST
value_type: number
status: active
milestone: "14.5"
diff --git a/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml
index c27caf6248e..8098f1f248c 100644
--- a/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102204352_p_ci_templates_implicit_security_sast_iac_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines with implicit runs using the latest SAST IaC tem
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: SAST
value_type: number
status: removed
milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml
index 5b419846d35..7d0143c736e 100644
--- a/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102213112_p_ci_templates_jobs_sast_iac_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the latest SAST IaC template
product_section: sec
product_stage: secure
product_group: "static_analysis"
-product_category: SAST
value_type: number
status: active
milestone: "14.5"
diff --git a/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml b/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml
index 5f91c203d6f..fa71e7cc8b3 100644
--- a/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211102213417_p_ci_templates_implicit_jobs_sast_iac_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines with implicit runs using the latest SAST IaC tem
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: SAST
value_type: number
status: removed
milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml b/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml
index 7e1e436142a..6b806f1acb3 100644
--- a/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml
+++ b/config/metrics/counts_7d/20211104154352_i_code_review_widget_nothing_merge_click_new_file_weekly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the create file button in the nothing to m
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml b/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml
index cfab4e79963..23843626b34 100644
--- a/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml
+++ b/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml
@@ -4,7 +4,6 @@ description: Count of WAU using the `/add_contacts` quick action
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: service_desk
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml b/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml
index 81c0740dba6..7560e92696f 100644
--- a/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml
+++ b/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml
@@ -4,7 +4,6 @@ description: Count of WAU using the `/remove_contacts` quick action
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: service_desk
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.yml b/config/metrics/counts_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.yml
index 78a318cba53..cdd078b6c6f 100644
--- a/config/metrics/counts_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.yml
+++ b/config/metrics/counts_7d/20211111162058_i_code_review_post_merge_delete_branch_weekly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the delete source branch button after merg
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml b/config/metrics/counts_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml
index 6a687646417..6c5aa0d1054 100644
--- a/config/metrics/counts_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml
+++ b/config/metrics/counts_7d/20211111162417_i_code_review_post_merge_click_revert_weekly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the revert button in the merge requet widg
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.yml b/config/metrics/counts_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.yml
index a6221b0a1dc..c664f4f10b2 100644
--- a/config/metrics/counts_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.yml
+++ b/config/metrics/counts_7d/20211112102440_i_code_review_post_merge_click_cherry_pick_weekly.yml
@@ -4,7 +4,6 @@ description: Count of users who click the cherry pick button in the merge requet
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.yml b/config/metrics/counts_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.yml
index 4761f07cf17..31feab6ef77 100644
--- a/config/metrics/counts_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.yml
+++ b/config/metrics/counts_7d/20211112114327_i_code_review_post_merge_submit_revert_modal_weekly.yml
@@ -4,7 +4,6 @@ description: Count of users who submit the post merge revert modal
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.yml b/config/metrics/counts_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.yml
index 344f60897bd..90c0d90d4eb 100644
--- a/config/metrics/counts_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.yml
+++ b/config/metrics/counts_7d/20211112115138_i_code_review_post_merge_submit_cherry_pick_modal_weekly.yml
@@ -4,7 +4,6 @@ description: Count of users who submit the post merge revert modal
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '14.5'
diff --git a/config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml b/config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml
index 8b9b17b3519..52ab17805b1 100644
--- a/config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211122134101_p_ci_templates_implicit_security_dast_api_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for DAST API latest CI template
product_section: sec
product_stage: secure
product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
value_type: number
status: removed
milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml b/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
index ead9799711b..24b2e2c7ca0 100644
--- a/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
+++ b/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique visits to the project level CI CD Analytics pipelin
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml b/config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml
index 4afd72d630a..3e8c119b695 100644
--- a/config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml
+++ b/config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml
@@ -5,7 +5,6 @@ description: Count of unique visits to the project level CI CD Analytics pipelin
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml b/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
index 1f7be3ded22..a7d8d75e23f 100644
--- a/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
+++ b/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
@@ -5,7 +5,6 @@ description: Count of unique visits to the project level CI CD Analytics deploym
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml b/config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml
index 4d74fb08f1b..9d536617030 100644
--- a/config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml
+++ b/config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml
@@ -5,7 +5,6 @@ description: Count of unique visits to the project level CI CD Analytics lead ti
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml b/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
index 6826e082e79..1f7cd61e3cd 100644
--- a/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
+++ b/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique visits to the project level CI CD Analytics deploym
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml b/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
index ba1b01f2e9c..164ecf8134f 100644
--- a/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
+++ b/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique visits to the project level CI CD Analytics lead ti
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml b/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml
index 6677e5d3b56..9e48535077d 100644
--- a/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml
+++ b/config/metrics/counts_7d/20211126154206_users_expanding_testing_license_compliance_report_weekly.yml
@@ -5,7 +5,6 @@ description: Count of expanding the license compliance widget
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml b/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml
index fc5dceec67d..2d49c59fe35 100644
--- a/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml
+++ b/config/metrics/counts_7d/20211201154118_users_visiting_license_compliance_full_report_weekly.yml
@@ -5,7 +5,6 @@ description: Count of visiting the license compliance full report
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml b/config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml
index 1d4f024b361..efc0d42ce6e 100644
--- a/config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml
+++ b/config/metrics/counts_7d/20211201194402_p_ci_templates_security_dast_api_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for DAST API latest CI template
product_section: sec
product_stage: secure
product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
value_type: number
status: active
milestone: "14.6"
diff --git a/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml b/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml
index 07375b2d712..4066cecfbc2 100644
--- a/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml
+++ b/config/metrics/counts_7d/20211202094430_users_visiting_manage_license_compliance_weekly.yml
@@ -5,7 +5,6 @@ description: Count of visiting the manage license compliance page
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: '14.6'
diff --git a/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml b/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml
index 3cc1e18c738..e88c4016f6b 100644
--- a/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml
+++ b/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml
@@ -5,7 +5,6 @@ description: Count of users clicking licence to visit external information websi
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: '14.7'
diff --git a/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml b/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml
index e5003f969eb..b0e65aff36b 100644
--- a/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml
+++ b/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml
@@ -4,7 +4,6 @@ description: ""
product_section: ""
product_stage: ""
product_group: ""
-product_category: ""
value_type: number
status: active
milestone: "14.7"
diff --git a/config/metrics/counts_7d/20220121140634_user_jetbrains_api_request_weekly.yml b/config/metrics/counts_7d/20220121140634_user_jetbrains_api_request_weekly.yml
index b98c4aefe7b..81ce3bde808 100644
--- a/config/metrics/counts_7d/20220121140634_user_jetbrains_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20220121140634_user_jetbrains_api_request_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique users per month who use GitLab plugin for JetBrains
product_section: dev
product_stage: create
product_group: code_review
-product_category: editor_extension
value_type: number
status: active
milestone: "14.8"
diff --git a/config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml b/config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml
index ec725e331e9..0af017112ed 100644
--- a/config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml
+++ b/config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml
@@ -4,7 +4,6 @@ description: Count of WAU using the `/attention` quick action
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: removed
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95241/
diff --git a/config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml b/config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml
index 275776eb793..636b0946dea 100644
--- a/config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml
+++ b/config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml
@@ -4,7 +4,6 @@ description: Count of WAU using the `/remove_attention` quick action
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: removed
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95241/
diff --git a/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml b/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml
index e3b9e3623a5..9608fc0138e 100644
--- a/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml
+++ b/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts of times users have executed deployment jobs
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
milestone: "14.8"
diff --git a/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_weekly.yml b/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_weekly.yml
index cc04ade9317..f41d8d24092 100644
--- a/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_dependency_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for implicit use of Dependency Scanning CI template (
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: '14.8'
diff --git a/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_weekly.yml b/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_weekly.yml
index 78256aeeea8..0970fdd8740 100644
--- a/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20220210134101_p_ci_templates_implicit_jobs_license_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for implicit use of License Scanning CI template (Job
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: license_compliance
value_type: number
status: active
milestone: '14.8'
diff --git a/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_dependency_scanning_weekly.yml b/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_dependency_scanning_weekly.yml
index 19bf2cf65ba..40f18a447bf 100644
--- a/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_dependency_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_dependency_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Dependency Scanning CI template (Jobs folder)
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: '14.8'
diff --git a/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_license_scanning_weekly.yml b/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_license_scanning_weekly.yml
index c8977d75e9c..4b97f76578b 100644
--- a/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_license_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20220210134101_p_ci_templates_jobs_license_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for License Scanning CI template (Jobs folder)
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: license_compliance
value_type: number
status: active
milestone: '14.8'
diff --git a/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml b/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
index e533d2a309e..8a0200f6bf3 100644
--- a/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
+++ b/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
@@ -1,7 +1,6 @@
---
key_path: redis_hll_counters.work_items.users_updating_work_item_title_weekly
description: Unique users updating a work item's title
-product_category: team planning
product_section: dev
product_stage: plan
product_group: project_management
diff --git a/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml b/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
index fbc8e23b018..d5c0eb786a5 100644
--- a/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
+++ b/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
@@ -1,7 +1,6 @@
---
key_path: redis_hll_counters.work_items.users_creating_work_items_weekly
description: Unique users creating work items
-product_category: team planning
product_section: dev
product_stage: plan
product_group: project_management
diff --git a/config/metrics/counts_7d/20220222215851_xmau_plan.yml b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
index 4520652ddf1..4443e46fb8d 100644
--- a/config/metrics/counts_7d/20220222215851_xmau_plan.yml
+++ b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
@@ -1,7 +1,6 @@
---
key_path: counts_weekly.aggregated_metrics.xmau_plan
description: Unique users interacting with Plan features
-product_category: team planning
product_section: dev
product_stage: plan
product_group: project_management
diff --git a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
index 59543e71dcb..3064b209b7a 100644
--- a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
+++ b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
@@ -1,7 +1,6 @@
---
key_path: counts_weekly.aggregated_metrics.xmau_project_management
description: Unique users interacting with Project Management features
-product_category: team planning
product_section: dev
product_stage: plan
product_group: project_management
diff --git a/config/metrics/counts_7d/20220222215855_users_work_items.yml b/config/metrics/counts_7d/20220222215855_users_work_items.yml
index 6dc426231e9..9ddca3845cd 100644
--- a/config/metrics/counts_7d/20220222215855_users_work_items.yml
+++ b/config/metrics/counts_7d/20220222215855_users_work_items.yml
@@ -1,7 +1,6 @@
---
key_path: counts_weekly.aggregated_metrics.users_work_items
description: Unique users interacting with work items
-product_category: team planning
product_section: dev
product_stage: plan
product_group: product_planning
diff --git a/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml b/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml
index c47c1fb51d5..b00923c21ea 100644
--- a/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml
+++ b/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml
@@ -4,7 +4,6 @@ description: ""
product_section: ""
product_stage: ""
product_group: ""
-product_category: ""
value_type: number
status: active
milestone: "14.9"
diff --git a/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml b/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml
index da30c60b823..82a80a35634 100644
--- a/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for SAST CI Latest template (Jobs folder)
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: static_application_security_testing
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml b/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml
index f60936e8492..dc0a6a2df22 100644
--- a/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Secret Detection CI Latest template (Jobs folder)
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: static_application_security_testing
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220309183454_error_tracking_view_details_weekly.yml b/config/metrics/counts_7d/20220309183454_error_tracking_view_details_weekly.yml
index bb487abef6d..b15383bb930 100644
--- a/config/metrics/counts_7d/20220309183454_error_tracking_view_details_weekly.yml
+++ b/config/metrics/counts_7d/20220309183454_error_tracking_view_details_weekly.yml
@@ -4,7 +4,6 @@ description: Unique users viewing the error details page
product_section: ops
product_stage: monitor
product_group: respond
-product_category: error_tracking
value_type: number
status: active
milestone: "14.9"
diff --git a/config/metrics/counts_7d/20220309195457_error_tracking_view_list_weekly.yml b/config/metrics/counts_7d/20220309195457_error_tracking_view_list_weekly.yml
index e75e6a20c81..61f16f3dd98 100644
--- a/config/metrics/counts_7d/20220309195457_error_tracking_view_list_weekly.yml
+++ b/config/metrics/counts_7d/20220309195457_error_tracking_view_list_weekly.yml
@@ -4,7 +4,6 @@ description: Unique users viewing the list of errors in the project
product_section: ops
product_stage: monitor
product_group: respond
-product_category: error_tracking
value_type: number
status: active
milestone: "14.9"
diff --git a/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml b/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml
index 0642003f672..7f6c1d24617 100644
--- a/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml
+++ b/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml
@@ -4,7 +4,6 @@ description: ""
product_section: ""
product_stage: ""
product_group: ""
-product_category: ""
value_type: number
status: active
milestone: "14.10"
diff --git a/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml b/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml
index 75b4e85a2db..387fd073cff 100644
--- a/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly counts for implicit use of Secret Detection CI Latest templa
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: static_application_security_testing
value_type: number
status: removed
milestone: '15.0'
diff --git a/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml b/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml
index 81ee9ea1a68..ee3338f8b75 100644
--- a/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for implicit use of SAST CI Latest template (Jobs fol
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: static_application_security_testing
value_type: number
status: removed
milestone: '15.0'
diff --git a/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
index e40a7d4cba6..3cdbd2976e0 100644
--- a/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
@@ -4,7 +4,6 @@ description: Total unique users accessing error tracking routes
product_section: ops
product_stage: monitor
product_group: respond
-product_category: error_tracking
value_type: number
status: active
milestone: "14.9"
diff --git a/config/metrics/counts_7d/20220322194922_users_gitlab_cli_api_request_weekly.yml b/config/metrics/counts_7d/20220322194922_users_gitlab_cli_api_request_weekly.yml
index 272bd61d336..61d62e265c4 100644
--- a/config/metrics/counts_7d/20220322194922_users_gitlab_cli_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20220322194922_users_gitlab_cli_api_request_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique users per week who use the GitLab CLI
product_section: dev
product_stage: create
product_group: code_review
-product_category: editor_extension
value_type: number
status: active
milestone: "14.10"
diff --git a/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml b/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml
index e464f1ee198..a13c9d88d28 100644
--- a/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml
+++ b/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml
@@ -4,7 +4,6 @@ description: ''
product_section: ''
product_stage: ''
product_group: ''
-product_category: ''
value_type: number
status: active
milestone: "14.10"
diff --git a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml
index b59129cea27..b84da226e29 100644
--- a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml
+++ b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly notes on ipynb commit diffs
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml
index 30947b412fe..9d88e9729dd 100644
--- a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml
+++ b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly notes on ipynb MR diffs
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml
index d1f331ac1e1..16ef1a12d45 100644
--- a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml
+++ b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly notes on ipynb diffs
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml
index d57c100ec1e..898355e90ff 100644
--- a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml
+++ b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly unique users with notes on ipynb commit diffs
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml
index 64d856782c2..a826b41f7d7 100644
--- a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml
+++ b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly unique users with notes on ipynb MR diffs
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml
index 3d01988de75..dfc5b66a064 100644
--- a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml
+++ b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly unique users with notes on ipynb diffs
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml b/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml
index 55f2b54a373..48e617560fe 100644
--- a/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml
+++ b/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the stable SAST IaC template
product_section: sec
product_stage: secure
product_group: "static_analysis"
-product_category: SAST
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml b/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml
index 0ce53e6433e..b10aa57097f 100644
--- a/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml
+++ b/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the stable SAST IaC template
product_section: sec
product_stage: secure
product_group: "static_analysis"
-product_category: SAST
value_type: number
status: active
milestone: "15.0"
diff --git a/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml b/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml
index f668646eacb..7a58d4a00dd 100644
--- a/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml
+++ b/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml
@@ -4,7 +4,6 @@ description: 'Weekly counts of times users have executed katalon_tests jobs'
product_section: 'ops'
product_stage: 'analytics'
product_group: 'pipeline_authoring'
-product_category: 'pipeline_authoring'
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
index 9146e2c7c8b..1c2ed03537f 100644
--- a/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: Counts unique users for timeline events create, edit and delete eve
product_section: ops
product_stage: monitor
product_group: respond
-product_category: incident_management
value_type: number
status: active
milestone: "15.1"
diff --git a/config/metrics/counts_7d/20220622084654_p_analytics_ci_cd_time_to_restore_service_weekly.yml b/config/metrics/counts_7d/20220622084654_p_analytics_ci_cd_time_to_restore_service_weekly.yml
index 681fed23d11..a06e08f99bf 100644
--- a/config/metrics/counts_7d/20220622084654_p_analytics_ci_cd_time_to_restore_service_weekly.yml
+++ b/config/metrics/counts_7d/20220622084654_p_analytics_ci_cd_time_to_restore_service_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique visits to the project level CI/CD Analytics Time to
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220627133128_i_code_review_submit_review_approve_weekly.yml b/config/metrics/counts_7d/20220627133128_i_code_review_submit_review_approve_weekly.yml
index 2275bf185d8..1ecabfa8fcb 100644
--- a/config/metrics/counts_7d/20220627133128_i_code_review_submit_review_approve_weekly.yml
+++ b/config/metrics/counts_7d/20220627133128_i_code_review_submit_review_approve_weekly.yml
@@ -3,7 +3,6 @@ key_path: redis_hll_counters.code_review.i_code_review_submit_review_approve_wee
description: Count of unique users per week who submit a review and approve
product_stage: create
product_group: code_review
-product_category: code_review
product_section: dev
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20220627134100_i_code_review_submit_review_comment_weekly.yml b/config/metrics/counts_7d/20220627134100_i_code_review_submit_review_comment_weekly.yml
index 16029f05626..8819a7206b3 100644
--- a/config/metrics/counts_7d/20220627134100_i_code_review_submit_review_comment_weekly.yml
+++ b/config/metrics/counts_7d/20220627134100_i_code_review_submit_review_comment_weekly.yml
@@ -3,7 +3,6 @@ key_path: redis_hll_counters.code_review.i_code_review_submit_review_comment_wee
description: Count of unique users per week who submit a review with a comment
product_stage: create
product_group: code_review
-product_category: code_review
product_section: dev
value_type: number
status: active
diff --git a/config/metrics/counts_7d/20220706175117_ci_users_executing_verify_job_weekly.yml b/config/metrics/counts_7d/20220706175117_ci_users_executing_verify_job_weekly.yml
index 032ecc838b4..aa3a3226909 100644
--- a/config/metrics/counts_7d/20220706175117_ci_users_executing_verify_job_weekly.yml
+++ b/config/metrics/counts_7d/20220706175117_ci_users_executing_verify_job_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts of times users have executed verify jobs
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml b/config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml
index 17486482ad1..e3f0768417b 100644
--- a/config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml
@@ -2,7 +2,6 @@
key_path: redis_hll_counters.work_items.users_updating_weight_estimate_weekly
name: users_updating_weight_estimate_weekly
description: Unique users updating a work item's weight estimate
-product_category: team_planning
product_section: dev
product_stage: plan
product_group: project_management
diff --git a/config/metrics/counts_7d/20220707054526_p_analytics_ci_cd_change_failure_rate_weekly.yml b/config/metrics/counts_7d/20220707054526_p_analytics_ci_cd_change_failure_rate_weekly.yml
index 2a4889cc3ac..5bc4d01026b 100644
--- a/config/metrics/counts_7d/20220707054526_p_analytics_ci_cd_change_failure_rate_weekly.yml
+++ b/config/metrics/counts_7d/20220707054526_p_analytics_ci_cd_change_failure_rate_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique visits to the project level CI/CD Analytics Change
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220708162305_i_code_review_merge_request_widget_test_summary_view_weekly.yml b/config/metrics/counts_7d/20220708162305_i_code_review_merge_request_widget_test_summary_view_weekly.yml
index a1cf41b62f0..c2a18809ae9 100644
--- a/config/metrics/counts_7d/20220708162305_i_code_review_merge_request_widget_test_summary_view_weekly.yml
+++ b/config/metrics/counts_7d/20220708162305_i_code_review_merge_request_widget_test_summary_view_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who were able to see the Test Su
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220708163619_i_code_review_merge_request_widget_test_summary_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20220708163619_i_code_review_merge_request_widget_test_summary_full_report_clicked_weekly.yml
index 73c5799d984..ddd4e5d7208 100644
--- a/config/metrics/counts_7d/20220708163619_i_code_review_merge_request_widget_test_summary_full_report_clicked_weekly.yml
+++ b/config/metrics/counts_7d/20220708163619_i_code_review_merge_request_widget_test_summary_full_report_clicked_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who clicked the Full Report butt
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220708164539_i_code_review_merge_request_widget_test_summary_expand_weekly.yml b/config/metrics/counts_7d/20220708164539_i_code_review_merge_request_widget_test_summary_expand_weekly.yml
index a3616e92e6f..5f2b0fbe225 100644
--- a/config/metrics/counts_7d/20220708164539_i_code_review_merge_request_widget_test_summary_expand_weekly.yml
+++ b/config/metrics/counts_7d/20220708164539_i_code_review_merge_request_widget_test_summary_expand_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Test Summary wi
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220708165632_i_code_review_merge_request_widget_test_summary_expand_success_weekly.yml b/config/metrics/counts_7d/20220708165632_i_code_review_merge_request_widget_test_summary_expand_success_weekly.yml
index 728ca303438..32052c94df1 100644
--- a/config/metrics/counts_7d/20220708165632_i_code_review_merge_request_widget_test_summary_expand_success_weekly.yml
+++ b/config/metrics/counts_7d/20220708165632_i_code_review_merge_request_widget_test_summary_expand_success_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Test Summary wi
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220708170508_i_code_review_merge_request_widget_test_summary_expand_warning_weekly.yml b/config/metrics/counts_7d/20220708170508_i_code_review_merge_request_widget_test_summary_expand_warning_weekly.yml
index 70a2bab68d8..0c1c24572fa 100644
--- a/config/metrics/counts_7d/20220708170508_i_code_review_merge_request_widget_test_summary_expand_warning_weekly.yml
+++ b/config/metrics/counts_7d/20220708170508_i_code_review_merge_request_widget_test_summary_expand_warning_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Test Summary wi
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220708173736_i_code_review_merge_request_widget_test_summary_expand_failed_weekly.yml b/config/metrics/counts_7d/20220708173736_i_code_review_merge_request_widget_test_summary_expand_failed_weekly.yml
index a25ac7de33c..a3ab147f95a 100644
--- a/config/metrics/counts_7d/20220708173736_i_code_review_merge_request_widget_test_summary_expand_failed_weekly.yml
+++ b/config/metrics/counts_7d/20220708173736_i_code_review_merge_request_widget_test_summary_expand_failed_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Test Summary wi
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_7d/20220715195411_p_ci_templates_security_fortify_fod_sast_weekly.yml b/config/metrics/counts_7d/20220715195411_p_ci_templates_security_fortify_fod_sast_weekly.yml
index 6ee30064f91..19a5bf2565c 100644
--- a/config/metrics/counts_7d/20220715195411_p_ci_templates_security_fortify_fod_sast_weekly.yml
+++ b/config/metrics/counts_7d/20220715195411_p_ci_templates_security_fortify_fod_sast_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the Fortify FoD SAST template
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: SAST
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220719133311_p_ci_templates_implicit_security_fortify_fod_sast_weekly.yml b/config/metrics/counts_7d/20220719133311_p_ci_templates_implicit_security_fortify_fod_sast_weekly.yml
index a234b29127d..29c15c8c6c0 100644
--- a/config/metrics/counts_7d/20220719133311_p_ci_templates_implicit_security_fortify_fod_sast_weekly.yml
+++ b/config/metrics/counts_7d/20220719133311_p_ci_templates_implicit_security_fortify_fod_sast_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines with implicit runs using the Fortify FoD SAST te
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: SAST
value_type: number
status: removed
milestone: '15.3'
diff --git a/config/metrics/counts_7d/20220725201348_users_updating_work_item_dates_weekly.yml b/config/metrics/counts_7d/20220725201348_users_updating_work_item_dates_weekly.yml
index eaed8420bdb..d9cf5c6fb15 100644
--- a/config/metrics/counts_7d/20220725201348_users_updating_work_item_dates_weekly.yml
+++ b/config/metrics/counts_7d/20220725201348_users_updating_work_item_dates_weekly.yml
@@ -1,7 +1,6 @@
---
key_path: redis_hll_counters.work_items.users_updating_work_item_dates_weekly
description: Unique users updating a work item's date
-product_category: team_planning
product_section: dev
product_stage: plan
product_group: project_management
diff --git a/config/metrics/counts_7d/20220725210831_i_code_review_merge_request_widget_accessibility_view_weekly.yml b/config/metrics/counts_7d/20220725210831_i_code_review_merge_request_widget_accessibility_view_weekly.yml
index 72b59b312e3..aef0583ef2f 100644
--- a/config/metrics/counts_7d/20220725210831_i_code_review_merge_request_widget_accessibility_view_weekly.yml
+++ b/config/metrics/counts_7d/20220725210831_i_code_review_merge_request_widget_accessibility_view_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who were able to see the Accessi
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220725210838_i_code_review_merge_request_widget_accessibility_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20220725210838_i_code_review_merge_request_widget_accessibility_full_report_clicked_weekly.yml
index 3d247a80f1e..a0793d16dba 100644
--- a/config/metrics/counts_7d/20220725210838_i_code_review_merge_request_widget_accessibility_full_report_clicked_weekly.yml
+++ b/config/metrics/counts_7d/20220725210838_i_code_review_merge_request_widget_accessibility_full_report_clicked_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who clicked the Full Report butt
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220725210845_i_code_review_merge_request_widget_accessibility_expand_weekly.yml b/config/metrics/counts_7d/20220725210845_i_code_review_merge_request_widget_accessibility_expand_weekly.yml
index 7dc508c1faf..88f1e6fba0a 100644
--- a/config/metrics/counts_7d/20220725210845_i_code_review_merge_request_widget_accessibility_expand_weekly.yml
+++ b/config/metrics/counts_7d/20220725210845_i_code_review_merge_request_widget_accessibility_expand_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Accessibility w
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220725210851_i_code_review_merge_request_widget_accessibility_expand_success_weekly.yml b/config/metrics/counts_7d/20220725210851_i_code_review_merge_request_widget_accessibility_expand_success_weekly.yml
index f8f7f01b4bd..aed7b029607 100644
--- a/config/metrics/counts_7d/20220725210851_i_code_review_merge_request_widget_accessibility_expand_success_weekly.yml
+++ b/config/metrics/counts_7d/20220725210851_i_code_review_merge_request_widget_accessibility_expand_success_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Accessibility w
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220725210858_i_code_review_merge_request_widget_accessibility_expand_warning_weekly.yml b/config/metrics/counts_7d/20220725210858_i_code_review_merge_request_widget_accessibility_expand_warning_weekly.yml
index ad7e54291b5..36672eeb8de 100644
--- a/config/metrics/counts_7d/20220725210858_i_code_review_merge_request_widget_accessibility_expand_warning_weekly.yml
+++ b/config/metrics/counts_7d/20220725210858_i_code_review_merge_request_widget_accessibility_expand_warning_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Accessibility w
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220725210906_i_code_review_merge_request_widget_accessibility_expand_failed_weekly.yml b/config/metrics/counts_7d/20220725210906_i_code_review_merge_request_widget_accessibility_expand_failed_weekly.yml
index e617afa70f6..4e4dfa3a8fe 100644
--- a/config/metrics/counts_7d/20220725210906_i_code_review_merge_request_widget_accessibility_expand_failed_weekly.yml
+++ b/config/metrics/counts_7d/20220725210906_i_code_review_merge_request_widget_accessibility_expand_failed_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Accessibility w
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727020407_i_code_review_merge_request_widget_code_quality_view_weekly.yml b/config/metrics/counts_7d/20220727020407_i_code_review_merge_request_widget_code_quality_view_weekly.yml
index 029103609cd..8247cd8cadf 100644
--- a/config/metrics/counts_7d/20220727020407_i_code_review_merge_request_widget_code_quality_view_weekly.yml
+++ b/config/metrics/counts_7d/20220727020407_i_code_review_merge_request_widget_code_quality_view_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who were able to see the Code Qu
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727020413_i_code_review_merge_request_widget_code_quality_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20220727020413_i_code_review_merge_request_widget_code_quality_full_report_clicked_weekly.yml
index d6e9d88d395..27320d37f4c 100644
--- a/config/metrics/counts_7d/20220727020413_i_code_review_merge_request_widget_code_quality_full_report_clicked_weekly.yml
+++ b/config/metrics/counts_7d/20220727020413_i_code_review_merge_request_widget_code_quality_full_report_clicked_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who clicked the Full Report butt
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727020419_i_code_review_merge_request_widget_code_quality_expand_weekly.yml b/config/metrics/counts_7d/20220727020419_i_code_review_merge_request_widget_code_quality_expand_weekly.yml
index 7d35f90ff4d..8c36519531b 100644
--- a/config/metrics/counts_7d/20220727020419_i_code_review_merge_request_widget_code_quality_expand_weekly.yml
+++ b/config/metrics/counts_7d/20220727020419_i_code_review_merge_request_widget_code_quality_expand_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Code Quality wi
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727020424_i_code_review_merge_request_widget_code_quality_expand_success_weekly.yml b/config/metrics/counts_7d/20220727020424_i_code_review_merge_request_widget_code_quality_expand_success_weekly.yml
index a0c94702a5f..5241eb56f45 100644
--- a/config/metrics/counts_7d/20220727020424_i_code_review_merge_request_widget_code_quality_expand_success_weekly.yml
+++ b/config/metrics/counts_7d/20220727020424_i_code_review_merge_request_widget_code_quality_expand_success_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Code Quality wi
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727020429_i_code_review_merge_request_widget_code_quality_expand_warning_weekly.yml b/config/metrics/counts_7d/20220727020429_i_code_review_merge_request_widget_code_quality_expand_warning_weekly.yml
index c88c435eaf2..57576f84cd6 100644
--- a/config/metrics/counts_7d/20220727020429_i_code_review_merge_request_widget_code_quality_expand_warning_weekly.yml
+++ b/config/metrics/counts_7d/20220727020429_i_code_review_merge_request_widget_code_quality_expand_warning_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Code Quality wi
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727020435_i_code_review_merge_request_widget_code_quality_expand_failed_weekly.yml b/config/metrics/counts_7d/20220727020435_i_code_review_merge_request_widget_code_quality_expand_failed_weekly.yml
index 4ef43c77c5d..8fbb2458272 100644
--- a/config/metrics/counts_7d/20220727020435_i_code_review_merge_request_widget_code_quality_expand_failed_weekly.yml
+++ b/config/metrics/counts_7d/20220727020435_i_code_review_merge_request_widget_code_quality_expand_failed_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Code Quality wi
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727045240_i_code_review_merge_request_widget_terraform_view_weekly.yml b/config/metrics/counts_7d/20220727045240_i_code_review_merge_request_widget_terraform_view_weekly.yml
index 26d4709a35b..462b47df3fa 100644
--- a/config/metrics/counts_7d/20220727045240_i_code_review_merge_request_widget_terraform_view_weekly.yml
+++ b/config/metrics/counts_7d/20220727045240_i_code_review_merge_request_widget_terraform_view_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who were able to see the Terrafo
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727045246_i_code_review_merge_request_widget_terraform_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20220727045246_i_code_review_merge_request_widget_terraform_full_report_clicked_weekly.yml
index 85017ed6ae4..7c6c702856e 100644
--- a/config/metrics/counts_7d/20220727045246_i_code_review_merge_request_widget_terraform_full_report_clicked_weekly.yml
+++ b/config/metrics/counts_7d/20220727045246_i_code_review_merge_request_widget_terraform_full_report_clicked_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who clicked the Full Report butt
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727045252_i_code_review_merge_request_widget_terraform_expand_weekly.yml b/config/metrics/counts_7d/20220727045252_i_code_review_merge_request_widget_terraform_expand_weekly.yml
index 7a73af7a042..34811b295ec 100644
--- a/config/metrics/counts_7d/20220727045252_i_code_review_merge_request_widget_terraform_expand_weekly.yml
+++ b/config/metrics/counts_7d/20220727045252_i_code_review_merge_request_widget_terraform_expand_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Terraform widge
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727045258_i_code_review_merge_request_widget_terraform_expand_success_weekly.yml b/config/metrics/counts_7d/20220727045258_i_code_review_merge_request_widget_terraform_expand_success_weekly.yml
index b9c2593f3cc..1ed68b3bc62 100644
--- a/config/metrics/counts_7d/20220727045258_i_code_review_merge_request_widget_terraform_expand_success_weekly.yml
+++ b/config/metrics/counts_7d/20220727045258_i_code_review_merge_request_widget_terraform_expand_success_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Terraform widge
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727045304_i_code_review_merge_request_widget_terraform_expand_warning_weekly.yml b/config/metrics/counts_7d/20220727045304_i_code_review_merge_request_widget_terraform_expand_warning_weekly.yml
index 8eaff0bd1ea..d892ae32cff 100644
--- a/config/metrics/counts_7d/20220727045304_i_code_review_merge_request_widget_terraform_expand_warning_weekly.yml
+++ b/config/metrics/counts_7d/20220727045304_i_code_review_merge_request_widget_terraform_expand_warning_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Terraform widge
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220727045311_i_code_review_merge_request_widget_terraform_expand_failed_weekly.yml b/config/metrics/counts_7d/20220727045311_i_code_review_merge_request_widget_terraform_expand_failed_weekly.yml
index 55de00b858c..18488c3bc24 100644
--- a/config/metrics/counts_7d/20220727045311_i_code_review_merge_request_widget_terraform_expand_failed_weekly.yml
+++ b/config/metrics/counts_7d/20220727045311_i_code_review_merge_request_widget_terraform_expand_failed_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Terraform widge
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml b/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml
index cd18a2433de..efb97bc1b95 100644
--- a/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml
+++ b/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml
@@ -4,7 +4,6 @@ description: WAU of the Agent for Kubernetes CI/CD Tunnel
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml b/config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml
index 814a50554c1..2b23d491c5e 100644
--- a/config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml
+++ b/config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml
@@ -3,8 +3,7 @@ key_path: redis_hll_counters.testing.i_testing_test_report_uploaded_weekly
description: "MAU of junit test reports uploaded by customers per pipeline"
product_section: ops
product_stage: verify
-product_group: pipeline_insights
-product_category: testing
+product_group: pipeline_execution
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml b/config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml
index 6e9415bdc42..6f8434b6ef0 100644
--- a/config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml
+++ b/config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who were able to see the License
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml
index c3a8d7bfdfb..8523b7c3b1e 100644
--- a/config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml
+++ b/config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who clicked the Full Report butt
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml b/config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml
index 69083c5ca2c..d7603755145 100644
--- a/config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml
+++ b/config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the License Complia
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml b/config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml
index d145ae31f38..e2eee89bf6c 100644
--- a/config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml
+++ b/config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the License Complia
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml b/config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml
index 58c3d89497f..0ca921f7bb0 100644
--- a/config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml
+++ b/config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the License Complia
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml b/config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml
index d8d9637f920..b68cfe16273 100644
--- a/config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml
+++ b/config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the License Complia
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220906065645_incident_management_timeline_event_created_weekly.yml b/config/metrics/counts_7d/20220906065645_incident_management_timeline_event_created_weekly.yml
index e249dade5ca..c00883ab558 100644
--- a/config/metrics/counts_7d/20220906065645_incident_management_timeline_event_created_weekly.yml
+++ b/config/metrics/counts_7d/20220906065645_incident_management_timeline_event_created_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique users created timeline events
product_section: ops
product_stage: monitor
product_group: respond
-product_category: incident_management
value_type: number
status: active
milestone: "15.5"
diff --git a/config/metrics/counts_7d/20220906070351_incident_management_timeline_event_edited_weekly.yml b/config/metrics/counts_7d/20220906070351_incident_management_timeline_event_edited_weekly.yml
index 82be8c1d859..3abcf82534b 100644
--- a/config/metrics/counts_7d/20220906070351_incident_management_timeline_event_edited_weekly.yml
+++ b/config/metrics/counts_7d/20220906070351_incident_management_timeline_event_edited_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique users edited timeline events
product_section: ops
product_stage: monitor
product_group: respond
-product_category: incident_management
value_type: number
status: active
milestone: "15.5"
diff --git a/config/metrics/counts_7d/20220906070629_incident_management_timeline_event_deleted_weekly.yml b/config/metrics/counts_7d/20220906070629_incident_management_timeline_event_deleted_weekly.yml
index dbe8ad10298..1491b37916a 100644
--- a/config/metrics/counts_7d/20220906070629_incident_management_timeline_event_deleted_weekly.yml
+++ b/config/metrics/counts_7d/20220906070629_incident_management_timeline_event_deleted_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique users deleted timeline events
product_section: ops
product_stage: monitor
product_group: respond
-product_category: incident_management
value_type: number
status: active
milestone: "15.5"
diff --git a/config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml b/config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml
index 4e1ec52769e..d3a774495b9 100644
--- a/config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml
+++ b/config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml
@@ -4,7 +4,6 @@ description: Count of WAU using the `/ready` quick action
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
data_source: redis_hll
status: active
diff --git a/config/metrics/counts_7d/20220907080626_i_quickactions_timeline_weekly.yml b/config/metrics/counts_7d/20220907080626_i_quickactions_timeline_weekly.yml
index 5b10a9a93d4..eec7b533960 100644
--- a/config/metrics/counts_7d/20220907080626_i_quickactions_timeline_weekly.yml
+++ b/config/metrics/counts_7d/20220907080626_i_quickactions_timeline_weekly.yml
@@ -5,7 +5,6 @@ description: Count of WAU using the `/timeline` quick action
product_section: ops
product_stage: monitor
product_group: respond
-product_category: incident_management
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml b/config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml
index 5a07581ac29..522d7db9f1c 100644
--- a/config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml
+++ b/config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit SAST runs using the stable SAST Ia
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: SAST
value_type: number
status: removed
milestone: '15.4'
diff --git a/config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml b/config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml
index 07ad434778f..4703f559f9c 100644
--- a/config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml
+++ b/config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml
@@ -5,7 +5,6 @@ description: Count of pipelines with implicit SAST jobs using the stable SAST Ia
product_section: sec
product_stage: secure
product_group: static_analysis
-product_category: SAST
value_type: number
status: removed
milestone: '15.4'
diff --git a/config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml
index c2a9f72ec8b..48fbe12bfcc 100644
--- a/config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Dependency Scanning CI Latest template (Jobs fold
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: dependency_scanning
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml
index 8e7c6e8cbaf..e08a28e4d6c 100644
--- a/config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Container Scanning CI Latest template (Security f
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: container_scanning
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml
index f3cb628da5a..dba0530dc70 100644
--- a/config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for License Scanning CI Latest template (Jobs folder)
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: license_scanning
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_7d/20220909143617_i_package_rpm_user_weekly.yml b/config/metrics/counts_7d/20220909143617_i_package_rpm_user_weekly.yml
index 895e6c3cf91..a1709e34511 100644
--- a/config/metrics/counts_7d/20220909143617_i_package_rpm_user_weekly.yml
+++ b/config/metrics/counts_7d/20220909143617_i_package_rpm_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published an rpm package to the r
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: '15.6'
diff --git a/config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml
index baa9796fff0..b77aafc4f38 100644
--- a/config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly counts for implicit Dependency Scanning CI Latest template (
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: dependency_scanning
value_type: number
status: removed
milestone: '15.4'
diff --git a/config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml
index cf4727f2da4..67c3de71112 100644
--- a/config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly counts for implicit License Scanning CI Latest template (Job
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: license_scanning
value_type: number
status: removed
milestone: '15.4'
diff --git a/config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml
index e4901cfa05a..a445657c004 100644
--- a/config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml
@@ -5,7 +5,6 @@ description: Weekly counts for implicit Container Scanning CI Latest template (S
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: container_scanning
value_type: number
status: removed
milestone: '15.4'
diff --git a/config/metrics/counts_7d/20220913104805_i_package_rpm_deploy_token_weekly.yml b/config/metrics/counts_7d/20220913104805_i_package_rpm_deploy_token_weekly.yml
index 37f539d1ec4..5d4d15d465f 100644
--- a/config/metrics/counts_7d/20220913104805_i_package_rpm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20220913104805_i_package_rpm_deploy_token_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of RPM packages published to the registry using a de
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: '15.6'
diff --git a/config/metrics/counts_7d/20220913225013_p_ci_templates_security_coverage_fuzzing_latest_weekly.yml b/config/metrics/counts_7d/20220913225013_p_ci_templates_security_coverage_fuzzing_latest_weekly.yml
index 768390de49d..58e9a95abe2 100644
--- a/config/metrics/counts_7d/20220913225013_p_ci_templates_security_coverage_fuzzing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220913225013_p_ci_templates_security_coverage_fuzzing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Coverage Fuzzing latest CI template
product_section: sec
product_stage: secure
product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
value_type: number
status: active
milestone: "15.5"
diff --git a/config/metrics/counts_7d/20220913225257_p_ci_templates_implicit_security_coverage_fuzzing_latest_weekly.yml b/config/metrics/counts_7d/20220913225257_p_ci_templates_implicit_security_coverage_fuzzing_latest_weekly.yml
index ea231267825..0ddba8f0bf4 100644
--- a/config/metrics/counts_7d/20220913225257_p_ci_templates_implicit_security_coverage_fuzzing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20220913225257_p_ci_templates_implicit_security_coverage_fuzzing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for implicit Coverage Fuzzing latest CI template
product_section: sec
product_stage: secure
product_group: dynamic_analysis
-product_category: dynamic_application_security_testing
value_type: number
status: removed
milestone: '15.5'
diff --git a/config/metrics/counts_7d/20220922042528_users_updating_work_item_iteration_weekly.yml b/config/metrics/counts_7d/20220922042528_users_updating_work_item_iteration_weekly.yml
index aad949867cf..bef6622bfdd 100644
--- a/config/metrics/counts_7d/20220922042528_users_updating_work_item_iteration_weekly.yml
+++ b/config/metrics/counts_7d/20220922042528_users_updating_work_item_iteration_weekly.yml
@@ -4,7 +4,6 @@ description: Unique users updating a work item's iteration
product_section: team planning
product_stage: dev
product_group: plan
-product_category: project_management
value_type: number
status: active
milestone: "15.5"
diff --git a/config/metrics/counts_7d/20221006065521_i_quickactions_link_weekly.yml b/config/metrics/counts_7d/20221006065521_i_quickactions_link_weekly.yml
index c136840fccf..50a6e17a902 100644
--- a/config/metrics/counts_7d/20221006065521_i_quickactions_link_weekly.yml
+++ b/config/metrics/counts_7d/20221006065521_i_quickactions_link_weekly.yml
@@ -4,7 +4,6 @@ description: Count of WAU using the `/link` quick action
product_section: ops
product_stage: monitor
product_group: respond
-product_category: incident_management
value_type: number
status: active
milestone: "15.5"
diff --git a/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml b/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml
index 55e651328e6..3f7ab5e152e 100644
--- a/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml
+++ b/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml
@@ -1,7 +1,6 @@
---
key_path: redis_hll_counters.work_items.users_updating_work_item_labels_weekly
description: Unique users updating a work item's labels
-product_category: team_planning
product_section: dev
product_stage: plan
product_group: project_management
diff --git a/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml b/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml
index a06f0a5bdbe..0d3e375fa83 100644
--- a/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml
@@ -4,7 +4,6 @@ description: Unique users updating a work item's milestone
product_section: dev
product_stage: plan
product_group: project_management
-product_category: team_planning
value_type: number
status: active
milestone: "15.6"
diff --git a/config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml b/config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml
index be6ba98c10c..900c298f7b2 100644
--- a/config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml
+++ b/config/metrics/counts_7d/20221101190913_i_testing_coverage_report_uploaded_weekly.yml
@@ -3,8 +3,7 @@ key_path: redis_hll_counters.testing.i_testing_coverage_report_uploaded_weekly
description: "MAU of coverage test reports uploaded by customers per pipeline"
product_section: ops
product_stage: verify
-product_group: pipeline_insights
-product_category: testing
+product_group: pipeline_execution
value_type: number
status: active
milestone: "15.6"
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_issue_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_issue_notification_weekly.yml
new file mode 100644
index 00000000000..35d643068ca
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_issue_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_confidential_issue_notification_weekly
+description: Calculated unique users to trigger a Slack message by performing an action on a confidential issue by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_confidential_issue_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_note_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_note_notification_weekly.yml
new file mode 100644
index 00000000000..5abf36162e4
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_note_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_confidential_note_notification_weekly
+description: Calculated unique users to trigger a Slack message by creating a confidential note by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_confidential_note_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_deployment_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_deployment_notification_weekly.yml
new file mode 100644
index 00000000000..9c3e41827e9
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_deployment_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_deployment_notification_weekly
+description: Calculated unique users to trigger a Slack message by performing a deployment by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_deployment_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_issue_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_issue_notification_weekly.yml
new file mode 100644
index 00000000000..417308db301
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_issue_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_issue_notification_weekly
+description: Calculated unique users to trigger a Slack message by performing an action on an issue by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_issue_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_merge_request_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_merge_request_notification_weekly.yml
new file mode 100644
index 00000000000..f74bf9e4877
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_merge_request_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_merge_request_notification_weekly
+description: Calculated unique users to trigger a Slack message by performing an action on a merge request by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_merge_request_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_note_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_note_notification_weekly.yml
new file mode 100644
index 00000000000..951954de37b
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_note_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_note_notification_weekly
+description: Calculated unique users to trigger a Slack message by creating a note by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_note_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_push_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_push_notification_weekly.yml
new file mode 100644
index 00000000000..5ad2211cf02
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_push_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_push_notification_weekly
+description: Calculated unique users to trigger a Slack message by performing a Git push by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_push_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_tag_push_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_tag_push_notification_weekly.yml
new file mode 100644
index 00000000000..db2e093039f
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_tag_push_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_tag_push_notification_weekly
+description: Calculated unique users to trigger a Slack message by performing a tag push by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_tag_push_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_wiki_page_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_wiki_page_notification_weekly.yml
new file mode 100644
index 00000000000..6fc9cfa31b7
--- /dev/null
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_wiki_page_notification_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_wiki_page_notification_weekly
+description: Calculated unique users to trigger a Slack message by performing an action on a wiki page by week
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102249
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_integrations_gitlab_for_slack_app_wiki_page_notification
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml b/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml
index 8c081dd8a77..f1bf2780288 100644
--- a/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for implicit use of Container Scanning CI template (J
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: container_scanning
value_type: number
status: active
milestone: '15.6'
diff --git a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml
index 7535ebc57a2..577fdbc16c1 100644
--- a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml
+++ b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Container Scanning CI Latest template (Jobs folde
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: container_scanning
value_type: number
status: active
milestone: '15.6'
diff --git a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml
index 4f79b514af5..f933295c3c0 100644
--- a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly counts for Container Scanning CI template (Jobs folder)
product_section: sec
product_stage: secure
product_group: composition_analysis
-product_category: container_scanning
value_type: number
status: active
milestone: '15.6'
diff --git a/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml b/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml
index 751337d22d3..9a7b2ae4b8c 100644
--- a/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml
+++ b/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who were able to see the Securit
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml
index 1f123bb8c68..02fb440839d 100644
--- a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml
+++ b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Security Report
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml
index 925b2730c2c..307022719ba 100644
--- a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml
+++ b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who clicked the Full Report butt
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml b/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml
index 84163e934cb..65962e2fd05 100644
--- a/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml
+++ b/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Security Report
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml
index b5729bc1ec9..7dc18545ecf 100644
--- a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml
+++ b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Security Report
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml
index 061b3a0fb30..e42e0949b07 100644
--- a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml
+++ b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml
@@ -4,7 +4,6 @@ description: The count of unique users (weekly) who expanded the Security Report
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml b/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml
index 43405d5bd2c..99dd2788825 100644
--- a/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml
+++ b/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml
@@ -4,14 +4,13 @@ description: Count of unique merge requests created per week
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106869
time_frame: 7d
data_source: redis_hll
-data_category: optional
+data_category: operational
instrumentation_class: RedisHLLMetric
performance_indicator_type: []
options:
diff --git a/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml b/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
index 138638a0f45..e1d899d5193 100644
--- a/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
+++ b/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
@@ -4,7 +4,6 @@ description: Count of unique users per week who removed a comment on a design
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: design_management
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml b/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml
index d1c553601e6..b3b80ca1c98 100644
--- a/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml
+++ b/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml
@@ -4,8 +4,7 @@ key_path: redis_hll_counters.testing.i_testing_active_user_weekly
description: Count of weekly active users for pipeline insights features
product_section: ops
product_stage: verify
-product_group: pipeline_insights
-product_category: testing
+product_group: pipeline_execution
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_7d/20230120094643_g_runner_fleet_read_jobs_statistics_weekly.yml b/config/metrics/counts_7d/20230120094643_g_runner_fleet_read_jobs_statistics_weekly.yml
index 97659c7ed63..20e1bb4cb8a 100644
--- a/config/metrics/counts_7d/20230120094643_g_runner_fleet_read_jobs_statistics_weekly.yml
+++ b/config/metrics/counts_7d/20230120094643_g_runner_fleet_read_jobs_statistics_weekly.yml
@@ -5,7 +5,6 @@ description: Count of unique users (weekly) who read runner job statistics
product_section: ops
product_stage: verify
product_group: runner
-product_category: runner_fleet
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_7d/20230123233604_i_ci_secrets_management_id_tokens_build_created_weekly.yml b/config/metrics/counts_7d/20230123233604_i_ci_secrets_management_id_tokens_build_created_weekly.yml
index cbbd4f7cc2c..c852516c5fa 100644
--- a/config/metrics/counts_7d/20230123233604_i_ci_secrets_management_id_tokens_build_created_weekly.yml
+++ b/config/metrics/counts_7d/20230123233604_i_ci_secrets_management_id_tokens_build_created_weekly.yml
@@ -4,7 +4,6 @@ description: Weekly count of unique users who created a pipeline with id_tokens
product_section: ops
product_stage: verify
product_group: pipeline_authoring
-product_category: secrets_management
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_7d/20230129032841_i_container_registry_push_tag_user_weekly.yml b/config/metrics/counts_7d/20230129032841_i_container_registry_push_tag_user_weekly.yml
index d9c150f4b62..29c19241e6b 100644
--- a/config/metrics/counts_7d/20230129032841_i_container_registry_push_tag_user_weekly.yml
+++ b/config/metrics/counts_7d/20230129032841_i_container_registry_push_tag_user_weekly.yml
@@ -4,7 +4,6 @@ description: A weekly count of users that have pushed a tag to the registry
product_section: ops
product_stage: package
product_group: package
-product_category: container_registry
value_type: number
status: active
milestone: '15.9'
diff --git a/config/metrics/counts_7d/20230129034513_i_container_registry_delete_tag_user_weekly.yml b/config/metrics/counts_7d/20230129034513_i_container_registry_delete_tag_user_weekly.yml
index 19e3866d862..0424c54e4f8 100644
--- a/config/metrics/counts_7d/20230129034513_i_container_registry_delete_tag_user_weekly.yml
+++ b/config/metrics/counts_7d/20230129034513_i_container_registry_delete_tag_user_weekly.yml
@@ -4,7 +4,6 @@ description: A weekly count of users that have deleted a tag from the registry
product_section: ops
product_stage: package
product_group: package
-product_category: container_registry
value_type: number
status: active
milestone: '15.9'
diff --git a/config/metrics/counts_7d/20230129034950_i_container_registry_push_repository_user_weekly.yml b/config/metrics/counts_7d/20230129034950_i_container_registry_push_repository_user_weekly.yml
index e719ca0abda..9bf92728540 100644
--- a/config/metrics/counts_7d/20230129034950_i_container_registry_push_repository_user_weekly.yml
+++ b/config/metrics/counts_7d/20230129034950_i_container_registry_push_repository_user_weekly.yml
@@ -4,7 +4,6 @@ description: A weekly count of users that have pushed a repository to the regist
product_section: ops
product_stage: package
product_group: package
-product_category: container_registry
value_type: number
status: active
milestone: '15.9'
diff --git a/config/metrics/counts_7d/20230129035454_i_container_registry_delete_repository_user_weekly.yml b/config/metrics/counts_7d/20230129035454_i_container_registry_delete_repository_user_weekly.yml
index 46f66db821a..a2e34093b66 100644
--- a/config/metrics/counts_7d/20230129035454_i_container_registry_delete_repository_user_weekly.yml
+++ b/config/metrics/counts_7d/20230129035454_i_container_registry_delete_repository_user_weekly.yml
@@ -4,7 +4,6 @@ description: A weekly count of users that have deleted a repository from the reg
product_section: ops
product_stage: package
product_group: package
-product_category: container_registry
value_type: number
status: active
milestone: '15.9'
diff --git a/config/metrics/counts_7d/20230129035748_i_container_registry_create_repository_user_weekly.yml b/config/metrics/counts_7d/20230129035748_i_container_registry_create_repository_user_weekly.yml
index 0b20ec93c71..c4f217ae068 100644
--- a/config/metrics/counts_7d/20230129035748_i_container_registry_create_repository_user_weekly.yml
+++ b/config/metrics/counts_7d/20230129035748_i_container_registry_create_repository_user_weekly.yml
@@ -4,7 +4,6 @@ description: A weekly count of users that have created a repository from the reg
product_section: ops
product_stage: package
product_group: package
-product_category: container_registry
value_type: number
status: active
milestone: '15.9'
diff --git a/config/metrics/counts_7d/20230130074931_p_ci_templates_terraform_module_weekly.yml b/config/metrics/counts_7d/20230130074931_p_ci_templates_terraform_module_weekly.yml
index f38588a1443..3d2ccd4083a 100644
--- a/config/metrics/counts_7d/20230130074931_p_ci_templates_terraform_module_weekly.yml
+++ b/config/metrics/counts_7d/20230130074931_p_ci_templates_terraform_module_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the Terraform Module template
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_7d/20230130075613_p_ci_templates_terraform_module_base_weekly.yml b/config/metrics/counts_7d/20230130075613_p_ci_templates_terraform_module_base_weekly.yml
index 3f5fbfdcb86..4f307e94be7 100644
--- a/config/metrics/counts_7d/20230130075613_p_ci_templates_terraform_module_base_weekly.yml
+++ b/config/metrics/counts_7d/20230130075613_p_ci_templates_terraform_module_base_weekly.yml
@@ -4,7 +4,6 @@ description: Count of pipelines using the Terraform Module Base template
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_7d/20230215180530_p_ci_templates_security_api_discovery_weekly.yml b/config/metrics/counts_7d/20230215180530_p_ci_templates_security_api_discovery_weekly.yml
new file mode 100644
index 00000000000..6d478b648ce
--- /dev/null
+++ b/config/metrics/counts_7d/20230215180530_p_ci_templates_security_api_discovery_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_api_discovery_weekly
+description: Weekly counts for API Discovery CI template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+value_type: number
+status: active
+milestone: "15.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110493
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+ events:
+ - p_ci_templates_security_api_discovery
diff --git a/config/metrics/counts_7d/20230306133608_github_import_project_cancelled_weekly.yml b/config/metrics/counts_7d/20230306133608_github_import_project_cancelled_weekly.yml
new file mode 100644
index 00000000000..b610e168631
--- /dev/null
+++ b/config/metrics/counts_7d/20230306133608_github_import_project_cancelled_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.importer.github_import_project_cancelled_weekly
+description: The number of github projects that were cancelled weekly
+product_section: dev
+product_stage: manage
+product_group: import
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113724
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - github_import_project_cancelled
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20230306134308_github_import_project_partially_completed_weekly.yml b/config/metrics/counts_7d/20230306134308_github_import_project_partially_completed_weekly.yml
new file mode 100644
index 00000000000..1ffbd56f578
--- /dev/null
+++ b/config/metrics/counts_7d/20230306134308_github_import_project_partially_completed_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.importer.github_import_project_partially_completed_weekly
+description: The number of github projects that were partially completed weekly
+product_section: dev
+product_stage: manage
+product_group: import
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113724
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - github_import_project_partially_completed
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20230417063146_i_container_registry_writes_user_weekly.yml b/config/metrics/counts_7d/20230417063146_i_container_registry_writes_user_weekly.yml
new file mode 100644
index 00000000000..5d521a7840a
--- /dev/null
+++ b/config/metrics/counts_7d/20230417063146_i_container_registry_writes_user_weekly.yml
@@ -0,0 +1,32 @@
+---
+key_path: redis_hll_counters.user_container_registry.i_container_registry_writes_user_weekly
+description: A weekly count of unique users that have executed write operations to the registry
+product_section: ops
+product_stage: package
+product_group: package
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117779
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: AggregatedMetric
+options:
+ aggregate:
+ operator: OR
+ attribute: user_id
+ events:
+ - i_container_registry_push_tag_user
+ - i_container_registry_delete_tag_user
+ - i_container_registry_delete_repository_user
+ - i_container_registry_create_repository_user
+ - i_container_registry_push_repository_user
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20230420160441_i_quickactions_type_weekly.yml b/config/metrics/counts_7d/20230420160441_i_quickactions_type_weekly.yml
new file mode 100644
index 00000000000..0e7e540885c
--- /dev/null
+++ b/config/metrics/counts_7d/20230420160441_i_quickactions_type_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_type_weekly
+description: Count of MAU using the `/type` quick action
+product_section: dev
+product_stage: plan
+product_group: product_planning
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118790
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_quickactions_type
+performance_indicator_type: []
+distribution:
+ - ce
+ - ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20230502171807_ci_interpolation_users.yml b/config/metrics/counts_7d/20230502171807_ci_interpolation_users.yml
new file mode 100644
index 00000000000..84690231901
--- /dev/null
+++ b/config/metrics/counts_7d/20230502171807_ci_interpolation_users.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.pipeline_authoring.ci_interpolation_users_weekly
+description: Weekly count of unique users who are using interpolation in their CI
+product_section: ops
+product_stage: verify
+product_group: pipeline_authoring
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118236
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+ events:
+ - ci_interpolation_users
diff --git a/config/metrics/counts_7d/20230509085219_i_quickactions_blocked_by_weekly.yml b/config/metrics/counts_7d/20230509085219_i_quickactions_blocked_by_weekly.yml
new file mode 100644
index 00000000000..d4406527dbd
--- /dev/null
+++ b/config/metrics/counts_7d/20230509085219_i_quickactions_blocked_by_weekly.yml
@@ -0,0 +1,23 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_blocked_by_weekly
+name: quickactions_blocked_by_weekly
+description: Count of MAU using the `/blocked_by` quick action
+product_section: dev
+product_stage: plan
+product_group: product_planning
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120006
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_quickactions_blocked_by
+performance_indicator_type: []
+distribution:
+- ee
+tier:
+- starter
diff --git a/config/metrics/counts_7d/20230509090906_i_quickactions_blocks_weekly.yml b/config/metrics/counts_7d/20230509090906_i_quickactions_blocks_weekly.yml
new file mode 100644
index 00000000000..3d5b8ed6ce2
--- /dev/null
+++ b/config/metrics/counts_7d/20230509090906_i_quickactions_blocks_weekly.yml
@@ -0,0 +1,23 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_blocks_weekly
+name: quickactions_blocks_weekly
+description: Count of MAU using the `/blocks` quick action
+product_section: dev
+product_stage: plan
+product_group: product_planning
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120006
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_quickactions_blocks
+performance_indicator_type: []
+distribution:
+- ee
+tier:
+- starter
diff --git a/config/metrics/counts_7d/20230509140526_p_ci_templates_security_bas_latest_weekly.yml b/config/metrics/counts_7d/20230509140526_p_ci_templates_security_bas_latest_weekly.yml
new file mode 100644
index 00000000000..fe44c289e94
--- /dev/null
+++ b/config/metrics/counts_7d/20230509140526_p_ci_templates_security_bas_latest_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_bas_latest_weekly
+description: Count of pipelines using the latest Breach and Attack Simulation template
+product_section: sec
+product_stage: secure
+product_group: dynamic_analysis
+value_type: number
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119981
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+ events:
+ - p_ci_templates_security_bas_latest
diff --git a/config/metrics/counts_all/20210204124930_servers.yml b/config/metrics/counts_all/20210204124930_servers.yml
index 7e5f41d54f5..84a039c330e 100644
--- a/config/metrics/counts_all/20210204124930_servers.yml
+++ b/config/metrics/counts_all/20210204124930_servers.yml
@@ -5,7 +5,6 @@ description: Total Gitalty Servers
product_section: dev
product_stage: create
product_group: gitaly
-product_category: gitaly
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210204124932_clusters.yml b/config/metrics/counts_all/20210204124932_clusters.yml
index 0e37a6c19b5..54011fb87ce 100644
--- a/config/metrics/counts_all/20210204124932_clusters.yml
+++ b/config/metrics/counts_all/20210204124932_clusters.yml
@@ -5,7 +5,6 @@ description: Total GitLab Managed clusters both enabled and disabled
product_section: dev
product_stage: create
product_group: gitaly
-product_category: gitaly
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
index 8f3749cc481..74fba616287 100644
--- a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
+++ b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
@@ -5,7 +5,6 @@ description: Total visits to VSA (both group- and project-level) all time
product_section: dev
product_stage: manage
product_group: optimize
-product_category:
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
index e0f5b6d986d..8b0fb9db517 100644
--- a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
@@ -5,7 +5,6 @@ description: Projects with Prometheus alerting enabled
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: removed
milestone_removed: '14.0'
diff --git a/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml b/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
index b824d0a5467..676308f9fc4 100644
--- a/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
+++ b/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
@@ -5,7 +5,6 @@ description: Count the total number of log views
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: logging
value_type: number
status: removed
milestone_removed: '14.0'
diff --git a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
index 24d6586559a..f81fb42db96 100644
--- a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
@@ -2,10 +2,9 @@
data_category: optional
key_path: counts.service_desk_enabled_projects
description: Count of service desk enabled projects
-product_section: dev
-product_stage: plan
-product_group: certify
-product_category: service_desk
+product_section: ops
+product_stage: monitor
+product_group: respond
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175026_service_desk_issues.yml b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
index f0045c46d56..3106b6bf7bb 100644
--- a/config/metrics/counts_all/20210216175026_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
@@ -2,10 +2,9 @@
data_category: operational
key_path: counts.service_desk_issues
description: Count of service desk issues
-product_section: dev
-product_stage: plan
-product_group: certify
-product_category: service_desk
+product_section: ops
+product_stage: monitor
+product_group: respond
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175037_suggestions.yml b/config/metrics/counts_all/20210216175037_suggestions.yml
index 0cb2d37cbf3..7a2aa8e3639 100644
--- a/config/metrics/counts_all/20210216175037_suggestions.yml
+++ b/config/metrics/counts_all/20210216175037_suggestions.yml
@@ -5,7 +5,6 @@ description: Count of all comments that contain suggested changes
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175039_merge_requests.yml b/config/metrics/counts_all/20210216175039_merge_requests.yml
index fb465ace311..a08f20261ce 100644
--- a/config/metrics/counts_all/20210216175039_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175039_merge_requests.yml
@@ -5,7 +5,6 @@ description: Count of the number of merge requests
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175041_merge_request_comment.yml b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
index 3713aafe259..312f486aa67 100644
--- a/config/metrics/counts_all/20210216175041_merge_request_comment.yml
+++ b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
@@ -5,7 +5,6 @@ description: Count of the number of merge request comments
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175043_merge_request_create.yml b/config/metrics/counts_all/20210216175043_merge_request_create.yml
index c71cfdcc3c0..2f524d9030a 100644
--- a/config/metrics/counts_all/20210216175043_merge_request_create.yml
+++ b/config/metrics/counts_all/20210216175043_merge_request_create.yml
@@ -5,7 +5,6 @@ description: Count of the number of merge requests created
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175045_merge_requests.yml b/config/metrics/counts_all/20210216175045_merge_requests.yml
index 5cf80a4b438..0b10593be23 100644
--- a/config/metrics/counts_all/20210216175045_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175045_merge_requests.yml
@@ -5,7 +5,6 @@ description: Count of the number of users creating merge requests
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: removed
milestone_removed: '14.10'
diff --git a/config/metrics/counts_all/20210216175053_suggestions.yml b/config/metrics/counts_all/20210216175053_suggestions.yml
index 594832cae4f..f42c47d9142 100644
--- a/config/metrics/counts_all/20210216175053_suggestions.yml
+++ b/config/metrics/counts_all/20210216175053_suggestions.yml
@@ -5,7 +5,6 @@ description: Count of unique users who create suggestions in merge request comme
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
index 0ab6b1178da..a03db93064d 100644
--- a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
+++ b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
@@ -6,7 +6,6 @@ description: Projects with Auto DevOps template enabled (excluding implicit Auto
product_section: ops
product_stage: configure
product_group: configure
-product_category: auto_devops
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
index b4f194b147d..1dbdd608c38 100644
--- a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
+++ b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
@@ -5,7 +5,6 @@ description: Projects with Auto DevOps template disabled
product_section: ops
product_stage: configure
product_group: configure
-product_category: auto_devops
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175232_clusters.yml b/config/metrics/counts_all/20210216175232_clusters.yml
index 81714863df8..ff1174d0c26 100644
--- a/config/metrics/counts_all/20210216175232_clusters.yml
+++ b/config/metrics/counts_all/20210216175232_clusters.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters both enabled and disabled
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175234_clusters_enabled.yml b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
index 35f4706cfa5..2fc86649c4b 100644
--- a/config/metrics/counts_all/20210216175234_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Number of Kubernetes clusters attached to GitLab currently enabled
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
index c7b45d0cdb6..d6d5228d0fe 100644
--- a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters attached to projects
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
index 1e660cc2623..6c818d48782 100644
--- a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters attached to groups
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
index fb335e9811c..804e25da11c 100644
--- a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters attached to the instance
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175242_clusters_disabled.yml b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
index 67e21b57030..c4d4f14fc2c 100644
--- a/config/metrics/counts_all/20210216175242_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Number of Kubernetes clusters attached to GitLab currently disabled
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
index fc22e4deb5d..8ebcf09d7a2 100644
--- a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed disabled clusters previously attached to proje
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
index 154926ce1cb..59b42f1cabe 100644
--- a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed disabled clusters previously attached to group
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
index bd91e116f6b..c9afefabf6c 100644
--- a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed disabled clusters previously attached to the i
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
index f3ba6bb42dc..6e9c86ea00f 100644
--- a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
index 7c0df4a79fb..9d909701fe8 100644
--- a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
index b56a1e17984..4c073d61844 100644
--- a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters that are user provisioned
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
index 4d727e9c7d7..075cddb387e 100644
--- a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
index e59c89952aa..cb308890bd4 100644
--- a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Ingress insta
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
index b42537dab1c..cad1d25e732 100644
--- a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
index 2ffd21a39a4..e7ab1a3f950 100644
--- a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
+++ b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Crossplane in
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
index 0735993d627..033d912d880 100644
--- a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Prometheus in
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
index c3a30bf8452..a460b40ed81 100644
--- a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Runner instal
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
index 08f543609b5..bc142676e6a 100644
--- a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Knative insta
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
index 7a303ed2f1e..54c96b5bea7 100644
--- a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
+++ b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Elastic Stack
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
index d4870126fb0..b7d202d4c33 100644
--- a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
+++ b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Jupyter insta
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
index 415c9fc7811..bd067804cbb 100644
--- a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
+++ b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Cilium instal
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216175314_clusters_management_project.yml b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
index b0fa6e65e07..3e4a4c6a7af 100644
--- a/config/metrics/counts_all/20210216175314_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with defined cluster management proje
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175316_kubernetes_agents.yml b/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
index 7c97d38a300..537d29f11fa 100644
--- a/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
+++ b/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
@@ -5,7 +5,7 @@ description: Count of Kubernetes registered agents
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml b/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
index c96ab785fbb..143ebaa5b0d 100644
--- a/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
+++ b/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
@@ -5,7 +5,7 @@ description: Count of Kubernetes agents with at least one token
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
index 490d267a856..8a66dd6ffe5 100644
--- a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
@@ -5,7 +5,6 @@ description: Count of projects with Terraform MR reports
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
index 27c1087a3a7..b189d0c66a3 100644
--- a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
@@ -5,7 +5,6 @@ description: Count of projects with GitLab Managed Terraform State
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175324_terraform_reports.yml b/config/metrics/counts_all/20210216175324_terraform_reports.yml
index eed669c8583..82eb2fb5998 100644
--- a/config/metrics/counts_all/20210216175324_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175324_terraform_reports.yml
@@ -5,7 +5,6 @@ description: Count of Terraform MR reports generated
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175326_terraform_states.yml b/config/metrics/counts_all/20210216175326_terraform_states.yml
index 3540b0bf02a..746bb8bf3e4 100644
--- a/config/metrics/counts_all/20210216175326_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175326_terraform_states.yml
@@ -5,7 +5,6 @@ description: Count of GitLab Managed Terraform States
product_section: ops
product_stage: configure
product_group: configure
-product_category: infrastructure_as_code
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
index 43731d35061..82bfacffaf3 100644
--- a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
index d044a7bfbe2..52c023961f9 100644
--- a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
index dd80a467825..8d9897318a4 100644
--- a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Ingress insta
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
index d0bd9329b6f..1cab6eeee45 100644
--- a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with GitLab Managed App:Knative insta
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216175337_clusters_management_project.yml b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
index 958760f57e6..0a8899be1a3 100644
--- a/config/metrics/counts_all/20210216175337_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters with defined cluster management proje
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175339_clusters_disabled.yml b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
index 63fd19ddff2..510b66c02a2 100644
--- a/config/metrics/counts_all/20210216175339_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed disabled clusters
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175341_clusters_enabled.yml b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
index 6e8761ae414..be4ca306eff 100644
--- a/config/metrics/counts_all/20210216175341_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters currently enabled
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
index 02730ce5bc2..41a546f73ab 100644
--- a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
index ad7c5dd99c9..1711589636d 100644
--- a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
index fc7710bc490..ed86490ef9c 100644
--- a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed clusters that are user provisioned
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
index 6a621914e27..8007b2fc277 100644
--- a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed disabled clusters attached to the instance
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
index 5f81b41a670..bfe2a41c6ef 100644
--- a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed enabled clusters attached to the instance
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
index a16a70d822e..92e39a8aa36 100644
--- a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed disabled clusters attached to groups
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
index c036e3ea7b0..263102b5a3b 100644
--- a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed enabled clusters attached to groups
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
index a36f8deebfc..741036b7cd3 100644
--- a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed disabled clusters attached to projects
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
index 1a189b8d0da..7afa52d0aa5 100644
--- a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
@@ -5,7 +5,7 @@ description: Total GitLab Managed enabled clusters attached to projects
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
index b443721868c..4192eb5c3f8 100644
--- a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
@@ -5,7 +5,7 @@ description: Projects with Prometheus alerting enabled
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
milestone_removed: '14.0'
diff --git a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
index 7e82df12c95..6e39dfdcfc9 100644
--- a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
+++ b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
@@ -6,7 +6,6 @@ description: Cumulative count of packets processed by ModSecurity since Usage Pi
product_section: sec
product_stage: protect_stage_was_removed
product_group: container_security_group_was_removed
-product_category: web_firewall_category_was_removed
value_type: number
status: removed
milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
index c034d791224..23485e5d7d2 100644
--- a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
+++ b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
@@ -6,7 +6,6 @@ description: Cumulative count of packets identified as anomalous by ModSecurity
product_section: sec
product_stage: protect_stage_was_removed
product_group: container_security_group_was_removed
-product_category: web_firewall_category_was_removed
value_type: number
status: removed
milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
index cbdd3ce0261..b1141edc39c 100644
--- a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
+++ b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
@@ -6,7 +6,6 @@ description: Cumulative count of packets forwarded by Cilium (Container Network
product_section: sec
product_stage: protect_stage_was_removed
product_group: container_security_group_was_removed
-product_category: container_network_security_category_was_removed
value_type: number
status: removed
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86351
diff --git a/config/metrics/counts_all/20210216175448_network_policy_drops.yml b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
index 2b1dc57255d..28bf9101656 100644
--- a/config/metrics/counts_all/20210216175448_network_policy_drops.yml
+++ b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
@@ -6,7 +6,6 @@ description: Cumulative count of packets dropped by Cilium (Container Network Se
product_section: sec
product_stage: protect_stage_was_removed
product_group: container_security_group_was_removed
-product_category: container_network_security_category_was_removed
value_type: number
status: removed
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86351
diff --git a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
index 1dce2aa9922..3b28b7e3c93 100644
--- a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
+++ b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
@@ -5,7 +5,6 @@ description: Whether or not ModSecurity is set to logging mode
product_section: sec
product_stage: protect_stage_was_removed
product_group: container_security_group_was_removed
-product_category: web_firewall_category_was_removed
value_type: number
status: removed
milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
index 2b1a487838e..5bc509d3b12 100644
--- a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
+++ b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
@@ -5,7 +5,6 @@ description: Whether or not ModSecurity is set to blocking mode
product_section: sec
product_stage: protect_stage_was_removed
product_group: container_security_group_was_removed
-product_category: web_firewall_category_was_removed
value_type: number
status: removed
milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
index 8794bfec930..a440204f0aa 100644
--- a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
+++ b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
@@ -5,7 +5,6 @@ description: Whether or not ModSecurity is disabled within Ingress
product_section: sec
product_stage: protect_stage_was_removed
product_group: container_security_group_was_removed
-product_category: web_firewall_category_was_removed
value_type: number
status: removed
milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
index 9781fa90536..27ed192f1cc 100644
--- a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
+++ b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
@@ -5,7 +5,6 @@ description: Whether or not ModSecurity has not been installed into the cluster
product_section: sec
product_stage: protect_stage_was_removed
product_group: container_security_group_was_removed
-product_category: web_firewall_category_was_removed
value_type: number
status: removed
milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175510_ci_builds.yml b/config/metrics/counts_all/20210216175510_ci_builds.yml
index ee7f91cd1e8..e8ea8707f0f 100644
--- a/config/metrics/counts_all/20210216175510_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175510_ci_builds.yml
@@ -5,7 +5,6 @@ description: Unique builds in project
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
index 0192d7846b0..773fe5b7844 100644
--- a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
@@ -5,7 +5,6 @@ description: Total pipelines in GitLab repositories
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
index 03958d43d99..b2c70204679 100644
--- a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
@@ -5,7 +5,6 @@ description: Total pipelines in external repositories
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
index 1b4c8cfc73b..0fee8cceb9b 100644
--- a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
@@ -5,7 +5,6 @@ description: Total pipelines from an Auto DevOps template
product_section: ops
product_stage: configure
product_group: configure
-product_category: auto_devops
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
index 12ec851fef7..4f78883ef1e 100644
--- a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
@@ -5,7 +5,6 @@ description: Total Pipelines from CI files in repository
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175520_ci_runners.yml b/config/metrics/counts_all/20210216175520_ci_runners.yml
index f3f13553663..f701a312446 100644
--- a/config/metrics/counts_all/20210216175520_ci_runners.yml
+++ b/config/metrics/counts_all/20210216175520_ci_runners.yml
@@ -5,7 +5,6 @@ description: Total configured Runners of all types
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: all
@@ -19,3 +18,4 @@ tier:
- ultimate
performance_indicator_type: []
milestone: "<13.9"
+instrumentation_class: CountCiRunnersMetric
diff --git a/config/metrics/counts_all/20210216175521_ci_triggers.yml b/config/metrics/counts_all/20210216175521_ci_triggers.yml
index 14a305c5c4d..987329530c4 100644
--- a/config/metrics/counts_all/20210216175521_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175521_ci_triggers.yml
@@ -5,7 +5,6 @@ description: Total configured Triggers in project
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
index a498f4d0e6f..3f736cf96d6 100644
--- a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
@@ -5,7 +5,6 @@ description: Pipeline schedules in GitLab
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175525_ci_builds.yml b/config/metrics/counts_all/20210216175525_ci_builds.yml
index bae726ec222..c44a35960c4 100644
--- a/config/metrics/counts_all/20210216175525_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175525_ci_builds.yml
@@ -5,7 +5,6 @@ description: Distinct users triggering jobs
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
index c0ba52c36fa..78a0f008141 100644
--- a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
@@ -5,7 +5,6 @@ description: Distinct users triggering pipelines in external repositories
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
index 4b126eb82b9..3ff3cfacef9 100644
--- a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
@@ -5,7 +5,6 @@ description: Distinct users triggering pipelines in internal repositories
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
index abdb32a404f..033b680f496 100644
--- a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
@@ -5,7 +5,6 @@ description: Total pipelines from an Auto DevOps template
product_section: ops
product_stage: configure
product_group: configure
-product_category: auto_devops
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
index e43db505fb3..ebb0e3584c3 100644
--- a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
@@ -5,7 +5,6 @@ description: Total count of unique users creating pipelines from CI files in the
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
index df4fad9881a..7b78b52d913 100644
--- a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
@@ -5,7 +5,6 @@ description: Distinct users creating pipeline schedules
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175537_ci_pipelines.yml b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
index bfd90a78524..8a9a3ce892a 100644
--- a/config/metrics/counts_all/20210216175537_ci_pipelines.yml
+++ b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
@@ -5,7 +5,6 @@ description: Distinct Users triggering Total pipelines
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175539_ci_triggers.yml b/config/metrics/counts_all/20210216175539_ci_triggers.yml
index 485d965a428..f2260737c7e 100644
--- a/config/metrics/counts_all/20210216175539_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175539_ci_triggers.yml
@@ -5,7 +5,6 @@ description: Distinct users creating pipeline triggers
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175621_web_hooks.yml b/config/metrics/counts_all/20210216175621_web_hooks.yml
index 416c4f739e9..19b165263a0 100644
--- a/config/metrics/counts_all/20210216175621_web_hooks.yml
+++ b/config/metrics/counts_all/20210216175621_web_hooks.yml
@@ -5,7 +5,6 @@ description: Count of web hooks
product_section: dev
product_stage: manage
product_group: integrations
-product_category:
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175623_projects_asana_active.yml b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
index f5d77814ff9..3f334dc72f6 100644
--- a/config/metrics/counts_all/20210216175623_projects_asana_active.yml
+++ b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Asana
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175625_groups_asana_active.yml b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
index e2ee8440616..0e88289e9b8 100644
--- a/config/metrics/counts_all/20210216175625_groups_asana_active.yml
+++ b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Asana
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175627_templates_asana_active.yml b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
index 0fc5c5321ef..78fcd3d5a17 100644
--- a/config/metrics/counts_all/20210216175627_templates_asana_active.yml
+++ b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Asana
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175628_instances_asana_active.yml b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
index 70047243025..ad5d520f239 100644
--- a/config/metrics/counts_all/20210216175628_instances_asana_active.yml
+++ b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Asana
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
index e5bd8119cef..4bfbcbea97d 100644
--- a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Asana
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
index df2237ce08d..992f8a021c8 100644
--- a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Asana
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
index d5e61e86f48..389f7c60088 100644
--- a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Assembla
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
index d3b8252b5bf..390f5de3b10 100644
--- a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Assembla
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
index 0faa5a7f435..04dde10ae73 100644
--- a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Assembla
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
index 1fcf673aba2..e6506b521c4 100644
--- a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Assembla
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
index f1d8dd731dd..6f5071302f5 100644
--- a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Assembla
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
index ebbdba6c097..be8f1922b55 100644
--- a/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Assembla
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
index 7e1530aa6e6..0e4fee17e6a 100644
--- a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Bamboo CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
index cfc1d7d7f39..127ca2540cd 100644
--- a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Bamboo CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
index 8965c65ed6f..30e1af14ed4 100644
--- a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Bamboo CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
index b07649a858c..de283cc42ea 100644
--- a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Bamboo CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
index 1fcd94588bf..dae517f9711 100644
--- a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Bamboo CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
index b2216f34b48..171d6defe06 100644
--- a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Bamboo CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
index c6a0e9c4654..4ff1b059d68 100644
--- a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Bugzilla
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
index 1c4be08b4da..de93b1c1b52 100644
--- a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Bugzilla
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
index 41a36dfede4..a520b0b0eff 100644
--- a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Bugzilla
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
index bc9cc8c78c2..85448689f4c 100644
--- a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Bugzilla
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
index d034b007408..9a545dd1add 100644
--- a/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Bugzilla
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
index b9b92f72f02..b1991a2159c 100644
--- a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Bugzilla
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
index 0c359862309..f37202ab991 100644
--- a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Buildkite
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
index 363671ad07e..b1b1d2dec23 100644
--- a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Buildkite
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
index 14ffea5ffb4..f8a8d5e7c8d 100644
--- a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Buildkite
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
index 39451d3ae53..c1ff1a6706e 100644
--- a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Buildkite
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
index a789fc50df4..ba1aae6eed0 100644
--- a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Buildkite
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
index f846e126f3e..a24f817c648 100644
--- a/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Buildkite
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
index 816f153d252..585cd495667 100644
--- a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Campfire
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
index e87e0748062..74d0023e7be 100644
--- a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Campfire
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
index 00f32987f4e..561e1ed76cd 100644
--- a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Campfire
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
index a2c18935954..662a8c3aace 100644
--- a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Campfire
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
index a09a7f7cb4e..756a7c7da1b 100644
--- a/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Campfire
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
index 55780ebfef1..b38fb1669e0 100644
--- a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Campfire
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
index ec23eae4aad..241be154181 100644
--- a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Confluence
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
index ae6caba5551..aecf743467b 100644
--- a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Confluence
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
index 720325f1ee9..a0be5b61109 100644
--- a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Confluence
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
index 521f29949c1..d26c1ed6c89 100644
--- a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Confluence
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
index 1fc45db4903..e8e6d44811e 100644
--- a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Confluence
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
index e9c0d456ab0..0c3f0d38dbe 100644
--- a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Confluence
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
index f3ee6b40bce..9de86ec786a 100644
--- a/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for a Custom Issue Track
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
index c9b11d6c5e9..03ba2cc240c 100644
--- a/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for a Custom Issue Tracker
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
index 110f6cc9606..2216d415bf2 100644
--- a/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for a Custom Issue Tracker
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
index ae72b015264..8a15205ef73 100644
--- a/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for a Custom Issue Trac
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
index 22b6fbfe846..35c79a5036f 100644
--- a/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for a Custom Issue
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
index a047b76b5cb..88131008b06 100644
--- a/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for a Custom Issue T
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175753_projects_discord_active.yml b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
index a228c98c52f..137608e391c 100644
--- a/config/metrics/counts_all/20210216175753_projects_discord_active.yml
+++ b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Discord
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175755_groups_discord_active.yml b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
index 86ffb00edc4..57f02a085f4 100644
--- a/config/metrics/counts_all/20210216175755_groups_discord_active.yml
+++ b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Discord
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175756_templates_discord_active.yml b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
index 47d111dc895..156185b3ae7 100644
--- a/config/metrics/counts_all/20210216175756_templates_discord_active.yml
+++ b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Discord
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175758_instances_discord_active.yml b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
index d508e171a7a..7e325fbabc7 100644
--- a/config/metrics/counts_all/20210216175758_instances_discord_active.yml
+++ b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Discord
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
index 478151f1889..bcf909b7908 100644
--- a/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Discord
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
index 1016a71b1c8..03f7cee6039 100644
--- a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Discord
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
index e8511564bdd..4a9f00fcb65 100644
--- a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Drone CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
index 3a5ce0f3882..aa1f533f8cc 100644
--- a/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Drone CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
index 80e017c5a2c..8d400caff33 100644
--- a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Drone CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
index b071268f48c..4aee85aa6a8 100644
--- a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Drone CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
index b9fafd7d3c8..ebe7a2d45ce 100644
--- a/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Drone CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
index 60b5c5bf7c8..d21efb0213f 100644
--- a/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Drone CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml b/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
index 47f094738d0..231c025a224 100644
--- a/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Emails on Push
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml b/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
index 7c67463eba3..aa03838911d 100644
--- a/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Emails on Push
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
index 387874eb108..b99cff392ad 100644
--- a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Emails on Push
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml b/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
index a1588510b2b..23ca85503d1 100644
--- a/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Emails on Push
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml b/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
index 892249b795d..4a44bbb7e1e 100644
--- a/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Emails on Push
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
index a02c183202d..f718316d2b1 100644
--- a/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Emails on Push
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
index f2d71a1a775..0c11f2b2a30 100644
--- a/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for External Wiki
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
index e7cb654e8e5..2a1f9c976ea 100644
--- a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for External Wiki
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
index b80bb0e6902..a531b187420 100644
--- a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for External Wiki
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
index fbc863ee474..53701a86784 100644
--- a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for External Wiki
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml b/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
index f27b94f9b54..ad37b6ade29 100644
--- a/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for External Wiki
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml b/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
index 7f6ca0a013b..a9d28ca6d88 100644
--- a/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for External Wiki
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
index b88351eb4dc..edcbc344d87 100644
--- a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Flowdock
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
diff --git a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
index f77fe5ec728..6a7da541138 100644
--- a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Flowdock
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
diff --git a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
index d3ed9f36425..68d3ed10346 100644
--- a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Flowdock
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
index f22e6e6bc77..d94b07a151d 100644
--- a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Flowdock
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
diff --git a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
index a291191eaeb..4d8b1f0f8a0 100644
--- a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Flowdock
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
diff --git a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
index c3c4a01a809..b55b9132a4c 100644
--- a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Flowdock
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
diff --git a/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
index 14865b2dffc..774a592810d 100644
--- a/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Hangouts Chat
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
index 0dcb3881909..cb11d7ff1a0 100644
--- a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Hangouts Chat
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
index 0d60c70c6e2..5d92d0b81b6 100644
--- a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Hangouts Chat
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
index 4208f647cf3..d0e42de5086 100644
--- a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Hangouts Chat
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
index 7168c788670..0c67c33eeb2 100644
--- a/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Hangouts Chat
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
index 45465412b80..8fa597c7dd5 100644
--- a/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Hangouts Chat
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
index 915c634cdb3..737e9696f14 100644
--- a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for HipChat
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.11'
diff --git a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
index 5391dda3b7c..ac3d2ebe91a 100644
--- a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for HipChat
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.11'
diff --git a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
index 7bcb8206beb..2be621c6d35 100644
--- a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for HipChat
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.11'
diff --git a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
index f30e667b316..591fd17e33e 100644
--- a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for HipChat
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.11'
diff --git a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
index aef3e97590f..ca710cb7edc 100644
--- a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for HipChat
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.11'
diff --git a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
index ff4e3d9d0b3..e0da8100b3a 100644
--- a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for HipChat
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.11'
diff --git a/config/metrics/counts_all/20210216175921_projects_irker_active.yml b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
index 0a01091482f..5d100486ecd 100644
--- a/config/metrics/counts_all/20210216175921_projects_irker_active.yml
+++ b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Irker
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175923_groups_irker_active.yml b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
index 12faf9b8871..ca6cf2cb395 100644
--- a/config/metrics/counts_all/20210216175923_groups_irker_active.yml
+++ b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Irker
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175924_templates_irker_active.yml b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
index 1717439aad6..d88a90223eb 100644
--- a/config/metrics/counts_all/20210216175924_templates_irker_active.yml
+++ b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Irker
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175926_instances_irker_active.yml b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
index edb31b01c5e..468b55d632d 100644
--- a/config/metrics/counts_all/20210216175926_instances_irker_active.yml
+++ b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Irker
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
index 5aab65d8491..b8dd0ee7aea 100644
--- a/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Irker
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
index d724dccbd82..03a1af03ce8 100644
--- a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Irker
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
index 85eb568a586..90f7f20bb83 100644
--- a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Jenkins
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
index 336eea6884a..df8ac5fa50b 100644
--- a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Jenkins
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
index 3475c1d4046..bf8d582550c 100644
--- a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Jenkins
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
index a587373aa24..c79f694bac9 100644
--- a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Jenkins
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
index 8670bf8ccc2..69d892c7b3e 100644
--- a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Jenkins
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
index 1cb7931cf48..2766a6e1e3c 100644
--- a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Jenkins
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175943_projects_jira_active.yml b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
index adfaacfae0a..2c09473aca2 100644
--- a/config/metrics/counts_all/20210216175943_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Jira
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175945_groups_jira_active.yml b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
index 3464df2ef60..fd0b74c9d8a 100644
--- a/config/metrics/counts_all/20210216175945_groups_jira_active.yml
+++ b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Jira
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175946_templates_jira_active.yml b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
index a77057f5a53..3f5a28774a0 100644
--- a/config/metrics/counts_all/20210216175946_templates_jira_active.yml
+++ b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Jira
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175948_instances_jira_active.yml b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
index 444f1c79ca9..7c1561e72d7 100644
--- a/config/metrics/counts_all/20210216175948_instances_jira_active.yml
+++ b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Jira
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
index 4a0097e21ba..415b8665dc3 100644
--- a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Jira
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
index 6ff87cde23f..c765657cb0f 100644
--- a/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Jira
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
index 4d351b42abb..70ee1313d4c 100644
--- a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Mattermost
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
index 8036eff1e67..a034a351516 100644
--- a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Mattermost
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
index c4cc0f0d9c7..2c568ebcbac 100644
--- a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Mattermost
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
index cdde4ac4027..8680abe82cd 100644
--- a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Mattermost
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
index 240a59a8b1e..e417fd72a8a 100644
--- a/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Mattermost
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
index f7bb7cb1a3e..598fb293026 100644
--- a/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Mattermost
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
index d2a787ffa32..e884e462765 100644
--- a/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Mattermost (slash co
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
index 6b8c43319c6..13221f47c57 100644
--- a/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Mattermost (slash comm
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
index a9703666f63..3691f524c22 100644
--- a/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Mattermost (slash commands)
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
index 0e498eaf251..c17fe82c500 100644
--- a/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Mattermost (slash c
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
index 5f498994eb6..02f684972b7 100644
--- a/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
@@ -6,7 +6,6 @@ description: Count of active projects inheriting integrations for Mattermost (sl
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
index 804100472b8..21d4aae8a0a 100644
--- a/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
@@ -6,7 +6,6 @@ description: Count of active groups inheriting integrations for Mattermost (slas
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
index 6b517b8ea65..1ab66a9b9f4 100644
--- a/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Microsoft Teams
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
index 75bc1c38b85..2a3fd51cd1d 100644
--- a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Microsoft Teams
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
index 0bd44801ce0..78ee7a08864 100644
--- a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Microsoft Teams
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
index e5fbd0dd3b6..7cf2319dcb4 100644
--- a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Microsoft Teams
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
index de36020f9e5..13d60a55b81 100644
--- a/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Microsoft Team
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
index 0f17bfc7fb4..faf3657cb62 100644
--- a/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Microsoft Teams
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
index f598ea26661..4e6b37f4b6e 100644
--- a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Packagist
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
index 25feaa36b23..f5c014370cc 100644
--- a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Packagist
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
index 61d0d5e1341..a498548b841 100644
--- a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Packagist
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
index 7cf1c495a94..20e0e354d43 100644
--- a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Packagist
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
index cc61aeab951..9eaf4d09eb9 100644
--- a/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Packagist
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
index 87e89a24f0b..9d94c971dc7 100644
--- a/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Packagist
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
index e23ac62c864..a15df37f468 100644
--- a/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Pipeline Emails
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
index 8e969cd2254..5be9cf45186 100644
--- a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Pipeline Emails
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
index 9fccfbfb67e..14335a4a6c6 100644
--- a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Pipeline Emails
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
index 253d76935dd..83aa8997e86 100644
--- a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Pipeline Emails
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
index c43f3484f35..705c4b77497 100644
--- a/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Pipeline Email
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
index 4e03c0cf990..5b3d48d2a58 100644
--- a/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Pipeline Emails
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
index 39be8cbf49c..1bc23715ecf 100644
--- a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Pivotal Tracker
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
index ef3d5627379..3eaa25f2ff3 100644
--- a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Pivotal Tracker
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
index b54e62f535c..0f33662ab50 100644
--- a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Pivotal Tracker
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
index 931c9b981f6..1cc495a5413 100644
--- a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Pivotal Tracker
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
index beaf20266af..731fefb4110 100644
--- a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Pivotal Tracke
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
index 55f9346ac0f..4a8b3083608 100644
--- a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Pivotal Tracker
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
index 7f6a57168d9..602a111de7b 100644
--- a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Pushover
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
index 897c531a6f7..aa7ae2238b8 100644
--- a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Pushover
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
index 1f0cca6305d..10fd599f612 100644
--- a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Pushover
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
index bfaf2726283..8977c57d6a7 100644
--- a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Pushover
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
index a71e5f50fb1..fd1a2041563 100644
--- a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Pushover
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
index c08a8f4cc90..aed415e83a7 100644
--- a/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Pushover
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
index c058489c438..8fd63c93316 100644
--- a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Redmine
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
index 95c566730bb..6c5d5b3f0ea 100644
--- a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Redmine
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
index c3806d83cf9..380c4a29475 100644
--- a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Redmine
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
index c6990f3a55d..446bab8c9f1 100644
--- a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Redmine
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
index 968b5a2c71d..572568dce81 100644
--- a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Redmine
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
index 521ddf7e182..522dee6436c 100644
--- a/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Redmine
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180122_projects_slack_active.yml b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
index a885f965100..0ccfcf4a265 100644
--- a/config/metrics/counts_all/20210216180122_projects_slack_active.yml
+++ b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Slack
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180124_groups_slack_active.yml b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
index f7c35542615..e75fcb1d155 100644
--- a/config/metrics/counts_all/20210216180124_groups_slack_active.yml
+++ b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Slack
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180126_templates_slack_active.yml b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
index 5253bed85ca..5b6ae8cd466 100644
--- a/config/metrics/counts_all/20210216180126_templates_slack_active.yml
+++ b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Slack
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180127_instances_slack_active.yml b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
index 707d61aed19..e1e7a8357ca 100644
--- a/config/metrics/counts_all/20210216180127_instances_slack_active.yml
+++ b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Slack
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
index f402f2b39d3..95dd89a1b6d 100644
--- a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Slack
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
index d83501b3273..e4200e8c9ad 100644
--- a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Slack
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
index e0a75a66df5..c597e92eda4 100644
--- a/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Slack (slash command
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
index d53b0333205..e0a2ad4160e 100644
--- a/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Slack (slash commands)
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
index ce6a1ae807d..d79ab237338 100644
--- a/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Slack (slash commands)
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
index de0bd69b1d9..becd19567c7 100644
--- a/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Slack (slash comman
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
index cb3ae4b9b14..945d68d6017 100644
--- a/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Slack (slash c
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
index d075715daae..dcc4de87d47 100644
--- a/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Slack (slash com
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
index 10c1f56070a..6d4935fafed 100644
--- a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Teamcity CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
index 5171ab2c2d1..bef5b278420 100644
--- a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Teamcity CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
index b6845efeb28..d6f5fde5cb2 100644
--- a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Teamcity CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
index 00f423a9169..92ef88178d2 100644
--- a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Teamcity CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
index 917579478b5..56ca14fecc2 100644
--- a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Teamcity CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
index 5a82830dea5..a192e6edb8d 100644
--- a/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Teamcity CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
index 6aa78eaabfd..82f3d56b1a5 100644
--- a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Unifiy Circuit
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
index 623c2389073..fada3445343 100644
--- a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Unifiy Circuit
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
index 47731d1b5b9..abea902b74a 100644
--- a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Unifiy Circuit
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
index 20deb22c0cb..daa8f332c46 100644
--- a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Unifiy Circuit
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
index d75f316c69c..c6fa0cf0fea 100644
--- a/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Unifiy Circuit
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml b/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
index a4e9de64cc7..979f61dab4f 100644
--- a/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Unifiy Circuit
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
index 92d93cecdb5..57e2b4f201d 100644
--- a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Webex Teams
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
index 4a40e435994..383272d170e 100644
--- a/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Webex Teams
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
index 3360b45093e..fb08834235e 100644
--- a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Webex Teams
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
index a5e4dc2cfa6..17d0906668b 100644
--- a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Webex Teams
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
index 2fe2a61187e..38e29e7f5f9 100644
--- a/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Webex Teams
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
index 8a87a1cdc02..7627e2986a6 100644
--- a/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Webex Teams
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
index a8625a464cb..b3f285d7cc9 100644
--- a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for YouTrack
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
index 0ee62f379e8..d45589eeb18 100644
--- a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for YouTrack
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
index 9334ef68345..d3dc6ecc2c5 100644
--- a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for YouTrack
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
index 24d6440afb6..e7ec0b8ab85 100644
--- a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for YouTrack
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
index cacc694f002..17d262de18b 100644
--- a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for YouTrack
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
index 1286a306aef..afe4792f22b 100644
--- a/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for YouTrack
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
index cc000031e83..c196d017874 100644
--- a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
+++ b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
@@ -5,9 +5,8 @@ description: Count of active integrations with Jira Software (server)
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
-status: active
+status: removed
time_frame: all
data_source: database
distribution:
@@ -19,3 +18,5 @@ tier:
- ultimate
performance_indicator_type: []
milestone: "<13.9"
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112571
+milestone_removed: "15.10"
diff --git a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
index d607f3d6aea..c82411850d5 100644
--- a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
@@ -5,9 +5,8 @@ description: Count of active integrations with Jira Cloud (Saas)
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
-status: active
+status: removed
time_frame: all
data_source: database
distribution:
@@ -19,3 +18,5 @@ tier:
- ultimate
performance_indicator_type: []
milestone: "<13.9"
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112571
+milestone_removed: "15.10"
diff --git a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
index 158e18a738e..29edaa6ab3b 100644
--- a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
@@ -5,7 +5,6 @@ description: Count of active integrations with Jira Cloud (DVCS Connector)
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
index a436d0dddae..9673956c7e1 100644
--- a/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
@@ -5,7 +5,6 @@ description: Count of active integrations with Jira Software (DVCS connector)
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180239_personal_snippets.yml b/config/metrics/counts_all/20210216180239_personal_snippets.yml
index 146b3217514..7477fd3cdf3 100644
--- a/config/metrics/counts_all/20210216180239_personal_snippets.yml
+++ b/config/metrics/counts_all/20210216180239_personal_snippets.yml
@@ -5,7 +5,6 @@ description: Count of personal Snippets
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180241_project_snippets.yml b/config/metrics/counts_all/20210216180241_project_snippets.yml
index c60a82e9ef0..74e3ac6e97b 100644
--- a/config/metrics/counts_all/20210216180241_project_snippets.yml
+++ b/config/metrics/counts_all/20210216180241_project_snippets.yml
@@ -5,7 +5,6 @@ description: Count of project Snippets
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180242_web_ide_commits.yml b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
index f86b5bd5f84..a67a62716c7 100644
--- a/config/metrics/counts_all/20210216180242_web_ide_commits.yml
+++ b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
@@ -1,11 +1,10 @@
---
-data_category: optional
+data_category: operational
key_path: counts.web_ide_commits
description: Count of commits made from the Web IDE
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180244_web_ide_views.yml b/config/metrics/counts_all/20210216180244_web_ide_views.yml
index 63149b86e0f..c18feaacf6d 100644
--- a/config/metrics/counts_all/20210216180244_web_ide_views.yml
+++ b/config/metrics/counts_all/20210216180244_web_ide_views.yml
@@ -5,7 +5,6 @@ description: Count of views of the Web IDE
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
index f620447e615..29252f16e73 100644
--- a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
@@ -5,7 +5,6 @@ description: Count of merge requests created from the Web IDE
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180248_web_ide_previews.yml b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
index c785e95e105..5a59b88ac79 100644
--- a/config/metrics/counts_all/20210216180248_web_ide_previews.yml
+++ b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
@@ -5,7 +5,6 @@ description: Count of Live Preview tab views in the Web IDE
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
index cd64a877341..04d14f57470 100644
--- a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
+++ b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
@@ -5,7 +5,6 @@ description: Count of Web Terminal tab views in the Web IDE
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
index bfd0b69401e..fc7dd96d4ae 100644
--- a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
+++ b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
@@ -5,7 +5,6 @@ description: Count of Pipeline tab views in the Web IDE
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180253_snippet_comment.yml b/config/metrics/counts_all/20210216180253_snippet_comment.yml
index 03e45717517..9dae9e8aaad 100644
--- a/config/metrics/counts_all/20210216180253_snippet_comment.yml
+++ b/config/metrics/counts_all/20210216180253_snippet_comment.yml
@@ -5,7 +5,6 @@ description: Count of comments on Snippets
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180255_snippet_create.yml b/config/metrics/counts_all/20210216180255_snippet_create.yml
index 9c69c99d694..719ae81b0d3 100644
--- a/config/metrics/counts_all/20210216180255_snippet_create.yml
+++ b/config/metrics/counts_all/20210216180255_snippet_create.yml
@@ -5,7 +5,6 @@ description: Count of newly created Snippets
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180257_snippet_update.yml b/config/metrics/counts_all/20210216180257_snippet_update.yml
index d8fee7daa90..d0802cb275a 100644
--- a/config/metrics/counts_all/20210216180257_snippet_update.yml
+++ b/config/metrics/counts_all/20210216180257_snippet_update.yml
@@ -5,7 +5,6 @@ description: Count of updates to existing Snippets
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
index f80d80ff42e..58264a8f56b 100644
--- a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
+++ b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
@@ -5,7 +5,6 @@ description: Count of Static Site Editor views
product_section: dev
product_stage: create
product_group: editor
-product_category: static_site_editor
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
index f2fd1b12e1f..ea2505c0d4c 100644
--- a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
+++ b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
@@ -5,7 +5,6 @@ description: Count of commits created from the Static Site Editor
product_section: dev
product_stage: create
product_group: editor
-product_category: static_site_editor
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
index 149ff63703d..c1b243d32a0 100644
--- a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
@@ -5,7 +5,6 @@ description: Count of merge requests created via Static Site Editor
product_section: dev
product_stage: create
product_group: editor
-product_category: static_site_editor
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
index 7fa03fd335e..07347d421d3 100644
--- a/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
+++ b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
@@ -5,7 +5,6 @@ description: Count of users with the GitPod integration enabled
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180306_snippets.yml b/config/metrics/counts_all/20210216180306_snippets.yml
index 08344a43f39..b7fa05e1a16 100644
--- a/config/metrics/counts_all/20210216180306_snippets.yml
+++ b/config/metrics/counts_all/20210216180306_snippets.yml
@@ -5,7 +5,6 @@ description: Count of all Snippets
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180316_snippets.yml b/config/metrics/counts_all/20210216180316_snippets.yml
index 6196e159588..cfafaf5d379 100644
--- a/config/metrics/counts_all/20210216180316_snippets.yml
+++ b/config/metrics/counts_all/20210216180316_snippets.yml
@@ -6,7 +6,6 @@ description: Count of distinct author_id from snippets
product_section: dev
product_stage: create
product_group: editor
-product_category: snippets
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180410_pool_repositories.yml b/config/metrics/counts_all/20210216180410_pool_repositories.yml
index 1e5938b6eef..a03db1eddef 100644
--- a/config/metrics/counts_all/20210216180410_pool_repositories.yml
+++ b/config/metrics/counts_all/20210216180410_pool_repositories.yml
@@ -5,7 +5,6 @@ description: Count of unique object pool repositories for fork deduplication
product_section: dev
product_stage: create
product_group: gitaly
-product_category: gitaly
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180413_all_searches.yml b/config/metrics/counts_all/20210216180413_all_searches.yml
index abd2e31b8d8..09d3873cb93 100644
--- a/config/metrics/counts_all/20210216180413_all_searches.yml
+++ b/config/metrics/counts_all/20210216180413_all_searches.yml
@@ -6,7 +6,6 @@ description: Total Searches for All Basic Search and Advanced Search in self-man
product_section: enablement
product_stage: enablement
product_group: global_search
-product_category: global_search
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180414_navbar_searches.yml b/config/metrics/counts_all/20210216180414_navbar_searches.yml
index 9ba086ed271..08c3afc5817 100644
--- a/config/metrics/counts_all/20210216180414_navbar_searches.yml
+++ b/config/metrics/counts_all/20210216180414_navbar_searches.yml
@@ -6,7 +6,6 @@ description: Total Searches using the navbar for All Basic Search and Advanced S
product_section: enablement
product_stage: enablement
product_group: global_search
-product_category: global_search
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml b/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
index 640f5798d87..63dbbc67870 100644
--- a/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
+++ b/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
@@ -5,7 +5,6 @@ description: Count of issues manually created from the GitLab UI on Sentry error
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: error_tracking
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml b/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
index 7bdb4b65b29..f0d5c931d00 100644
--- a/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
+++ b/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
@@ -5,7 +5,6 @@ description: Count of issues where a user has linked a Zoom meeting
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml b/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
index 6a0d68c289d..b4fd354b86a 100644
--- a/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
+++ b/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
@@ -6,7 +6,6 @@ description: Count of issues where a user have added AND removed a zoom meeting
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml b/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
index 48782412f7b..8ba4e5d6987 100644
--- a/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
+++ b/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
@@ -5,7 +5,6 @@ description: Count of issues where a user has embedded a Grafana chart
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
index 7b46d786a7a..fa3e8a5b7ab 100644
--- a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
@@ -5,7 +5,6 @@ description: Count of issues created automatically on alerts from GitLab-Managed
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml b/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
index 6d53e08645e..da68ae832d9 100644
--- a/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
+++ b/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
@@ -5,7 +5,6 @@ description: Count of all issues created from GitLab alerts (bot and non-bot)
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml b/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
index 4517a187ae1..c9dccae903a 100644
--- a/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
@@ -5,7 +5,6 @@ description: Count of issues created manually by non-bot users from GitLab alert
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180447_incident_issues.yml b/config/metrics/counts_all/20210216180447_incident_issues.yml
index 33726405845..0767efa0a07 100644
--- a/config/metrics/counts_all/20210216180447_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180447_incident_issues.yml
@@ -5,7 +5,6 @@ description: Count of incidents (issues where issue_type=incident)
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml b/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
index 83c77355282..9f7767619cb 100644
--- a/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
@@ -5,7 +5,6 @@ description: Count of issues created by the alert bot automatically
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
index e734fbc6735..14e7c87c780 100644
--- a/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
+++ b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
@@ -5,7 +5,6 @@ description: Count of all issues with the label=incident
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
index ee200720ad1..b179c2808f8 100644
--- a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
+++ b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
@@ -5,7 +5,6 @@ description: Counts of Projects that have incident issues, regardless of status.
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml b/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
index 965b16e77f5..489856768ac 100644
--- a/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
@@ -5,7 +5,6 @@ description: Count of projects that have enabled Error tracking via Sentry
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: error_tracking
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
index 741a523e113..bfa644092b7 100644
--- a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
+++ b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
@@ -5,7 +5,6 @@ description: Count of projects that have enabled the Alerts service
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: removed
milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
index 863f2bc63c3..eef336feb68 100644
--- a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
+++ b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
@@ -5,7 +5,6 @@ description: Count of projects with alerts created in given time period
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: alert_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml b/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
index 4a9ffeb2c2a..3f632bf906a 100644
--- a/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
+++ b/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
@@ -5,7 +5,6 @@ description: Count of projects with at least 1 enabled integration
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml b/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
index d684c6dc71c..9309929f1a0 100644
--- a/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
@@ -5,7 +5,6 @@ description: Projects where error tracking is enabled
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: error_tracking
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
index 7b6ca1dce80..a11bf9453d7 100644
--- a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
+++ b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
@@ -5,7 +5,6 @@ description: Count of unique projects with an incident
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
index 50b2b6307d9..0ea0d53cf0f 100644
--- a/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
@@ -5,7 +5,6 @@ description: Count of unique projects with an incident from an alert
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
index a55600b2b7d..32f91f6faf6 100644
--- a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from GitHub
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
index d5226578de5..52b59889383 100644
--- a/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from GitHub
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
index 5bfc7ea3069..ed5a2d297fb 100644
--- a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
+++ b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that triggered any kind of import
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180634_gitlab.yml b/config/metrics/counts_all/20210216180634_gitlab.yml
index f908af91de7..f7f99d39208 100644
--- a/config/metrics/counts_all/20210216180634_gitlab.yml
+++ b/config/metrics/counts_all/20210216180634_gitlab.yml
@@ -6,7 +6,6 @@ description: Distinct count of users that triggered an import using the Group Mi
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180636_gitlab_v1.yml b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
index b1b6e20e092..8e2fe7b6b54 100644
--- a/config/metrics/counts_all/20210216180636_gitlab_v1.yml
+++ b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
@@ -5,7 +5,6 @@ description: Count of imports using GitLab Migration
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180638_gitlab_project.yml b/config/metrics/counts_all/20210216180638_gitlab_project.yml
index 5635d3918f4..ec7cebe3eb2 100644
--- a/config/metrics/counts_all/20210216180638_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180638_gitlab_project.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using Project Import/Export
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180639_gitlab.yml b/config/metrics/counts_all/20210216180639_gitlab.yml
index ffee62ebbf7..d8622818173 100644
--- a/config/metrics/counts_all/20210216180639_gitlab.yml
+++ b/config/metrics/counts_all/20210216180639_gitlab.yml
@@ -5,9 +5,10 @@ description: Count of projects imported from GitLab.com
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
-status: active
+status: removed
+removed_by: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118891"
+milestone_removed: "16.0"
time_frame: all
data_source: database
instrumentation_class: CountImportedProjectsMetric
diff --git a/config/metrics/counts_all/20210216180641_github.yml b/config/metrics/counts_all/20210216180641_github.yml
index 72f7a33beb6..3a2f95e8357 100644
--- a/config/metrics/counts_all/20210216180641_github.yml
+++ b/config/metrics/counts_all/20210216180641_github.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from GitHub
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180643_bitbucket.yml b/config/metrics/counts_all/20210216180643_bitbucket.yml
index 86f7d15eea5..32843d9760a 100644
--- a/config/metrics/counts_all/20210216180643_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180643_bitbucket.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Bitbucket
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180645_bitbucket_server.yml b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
index c37009c4ed5..3e1876c517e 100644
--- a/config/metrics/counts_all/20210216180645_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Bitbucket Server
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180647_gitea.yml b/config/metrics/counts_all/20210216180647_gitea.yml
index a7d80f15686..97a88d928bb 100644
--- a/config/metrics/counts_all/20210216180647_gitea.yml
+++ b/config/metrics/counts_all/20210216180647_gitea.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Gitea
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180649_git.yml b/config/metrics/counts_all/20210216180649_git.yml
index 9851e1b97eb..0881edf754a 100644
--- a/config/metrics/counts_all/20210216180649_git.yml
+++ b/config/metrics/counts_all/20210216180649_git.yml
@@ -5,7 +5,6 @@ description: Count of projects imported by URL
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180650_manifest.yml b/config/metrics/counts_all/20210216180650_manifest.yml
index a76dc28c9c5..4a6c561eb2b 100644
--- a/config/metrics/counts_all/20210216180650_manifest.yml
+++ b/config/metrics/counts_all/20210216180650_manifest.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using manifst file
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180652_gitlab_migration.yml b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
index a563b3d53d1..195f3499088 100644
--- a/config/metrics/counts_all/20210216180652_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
@@ -5,7 +5,6 @@ description: Count of projects imported using GitLab Migration
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180654_jira.yml b/config/metrics/counts_all/20210216180654_jira.yml
index cf33c7f8128..46178bf1ff6 100644
--- a/config/metrics/counts_all/20210216180654_jira.yml
+++ b/config/metrics/counts_all/20210216180654_jira.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from Jira
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180656_fogbugz.yml b/config/metrics/counts_all/20210216180656_fogbugz.yml
index d51591d0297..fc49f7e4b9c 100644
--- a/config/metrics/counts_all/20210216180656_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180656_fogbugz.yml
@@ -5,7 +5,6 @@ description: Count of projects imported from fogbugz
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180658_phabricator.yml b/config/metrics/counts_all/20210216180658_phabricator.yml
index 834322726fa..fc7245e913b 100644
--- a/config/metrics/counts_all/20210216180658_phabricator.yml
+++ b/config/metrics/counts_all/20210216180658_phabricator.yml
@@ -5,9 +5,10 @@ description: Count of projects imported from phabricator
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
-status: active
+status: removed
+removed_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117649"
+milestone_removed: "16.0"
time_frame: all
data_source: database
instrumentation_class: CountImportedProjectsMetric
diff --git a/config/metrics/counts_all/20210216180700_csv.yml b/config/metrics/counts_all/20210216180700_csv.yml
index e5ca3cbc7e2..cf1d3c2327f 100644
--- a/config/metrics/counts_all/20210216180700_csv.yml
+++ b/config/metrics/counts_all/20210216180700_csv.yml
@@ -5,7 +5,6 @@ description: Count of (attempted) imports from csv files
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180702_group_import.yml b/config/metrics/counts_all/20210216180702_group_import.yml
index ed0b3b9d032..b07e42b2c3a 100644
--- a/config/metrics/counts_all/20210216180702_group_import.yml
+++ b/config/metrics/counts_all/20210216180702_group_import.yml
@@ -5,7 +5,6 @@ description: Count of groups imported using Group Import/Export
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180703_gitlab_migration.yml b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
index b5b6f0a73b5..fff765ec389 100644
--- a/config/metrics/counts_all/20210216180703_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
@@ -5,7 +5,6 @@ description: Count of groups imported using GitLab Migration
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180705_total.yml b/config/metrics/counts_all/20210216180705_total.yml
index 22f46b6bf04..beac0d6acc5 100644
--- a/config/metrics/counts_all/20210216180705_total.yml
+++ b/config/metrics/counts_all/20210216180705_total.yml
@@ -5,7 +5,6 @@ description: Total count of all projects imported with import_source NOT NULL
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180707_gitlab_project.yml b/config/metrics/counts_all/20210216180707_gitlab_project.yml
index 76c17b6c81d..b6f189f2908 100644
--- a/config/metrics/counts_all/20210216180707_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180707_gitlab_project.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects using Project Import
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180709_gitlab.yml b/config/metrics/counts_all/20210216180709_gitlab.yml
index 28495cc221a..defb43f9de3 100644
--- a/config/metrics/counts_all/20210216180709_gitlab.yml
+++ b/config/metrics/counts_all/20210216180709_gitlab.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects from GitLab.com
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180711_github.yml b/config/metrics/counts_all/20210216180711_github.yml
index db8655eba39..fb434d09013 100644
--- a/config/metrics/counts_all/20210216180711_github.yml
+++ b/config/metrics/counts_all/20210216180711_github.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects from GitHub
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180713_bitbucket.yml b/config/metrics/counts_all/20210216180713_bitbucket.yml
index d2dd844a237..c6132dd7bc3 100644
--- a/config/metrics/counts_all/20210216180713_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180713_bitbucket.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects from Bitbucket Cloud
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180715_bitbucket_server.yml b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
index 8110fc3e008..3fff679d5c6 100644
--- a/config/metrics/counts_all/20210216180715_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects from Bitbucket Serve
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180716_gitea.yml b/config/metrics/counts_all/20210216180716_gitea.yml
index 4a32e8e5ca1..7d727ceab3e 100644
--- a/config/metrics/counts_all/20210216180716_gitea.yml
+++ b/config/metrics/counts_all/20210216180716_gitea.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects from Gitea
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180718_git.yml b/config/metrics/counts_all/20210216180718_git.yml
index f1ea4ca9441..fccc694ba81 100644
--- a/config/metrics/counts_all/20210216180718_git.yml
+++ b/config/metrics/counts_all/20210216180718_git.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects using Import by URL
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180720_manifest.yml b/config/metrics/counts_all/20210216180720_manifest.yml
index 938ba0b48f4..2347510d8d1 100644
--- a/config/metrics/counts_all/20210216180720_manifest.yml
+++ b/config/metrics/counts_all/20210216180720_manifest.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported projects using Manifest file
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180722_jira.yml b/config/metrics/counts_all/20210216180722_jira.yml
index 63b8b83f219..a8b10bea3ca 100644
--- a/config/metrics/counts_all/20210216180722_jira.yml
+++ b/config/metrics/counts_all/20210216180722_jira.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported issues into projects using Ji
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180724_fogbugz.yml b/config/metrics/counts_all/20210216180724_fogbugz.yml
index 618b647a931..9914a143603 100644
--- a/config/metrics/counts_all/20210216180724_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180724_fogbugz.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported issues into projects using Fo
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180726_phabricator.yml b/config/metrics/counts_all/20210216180726_phabricator.yml
index 0fa06ea3ab7..76ac173e021 100644
--- a/config/metrics/counts_all/20210216180726_phabricator.yml
+++ b/config/metrics/counts_all/20210216180726_phabricator.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported issues into projects using Ph
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180727_csv.yml b/config/metrics/counts_all/20210216180727_csv.yml
index e700a0dbf8d..9341f5cbb0d 100644
--- a/config/metrics/counts_all/20210216180727_csv.yml
+++ b/config/metrics/counts_all/20210216180727_csv.yml
@@ -6,7 +6,6 @@ description: Distinct count of users that imported issues into projects using CS
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180729_groups_imported.yml b/config/metrics/counts_all/20210216180729_groups_imported.yml
index c7f0f128d83..6d52117d7f0 100644
--- a/config/metrics/counts_all/20210216180729_groups_imported.yml
+++ b/config/metrics/counts_all/20210216180729_groups_imported.yml
@@ -5,7 +5,6 @@ description: Distinct count of users that imported groups using Group Import
product_section: dev
product_stage: manage
product_group: import
-product_category: importers
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
index 08121468e38..ff3dc3c54d4 100644
--- a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
+++ b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
@@ -5,7 +5,6 @@ description: Count of all Wiki pages created
product_section: dev
product_stage: create
product_group: editor
-product_category: wiki
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
index ffb2ed4227c..05722e59fcd 100644
--- a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
+++ b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
@@ -5,7 +5,6 @@ description: Count of all Wiki page updates
product_section: dev
product_stage: create
product_group: editor
-product_category: wiki
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
index 75c2d13d744..4e441376286 100644
--- a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
+++ b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
@@ -5,7 +5,6 @@ description: Count of all Wiki pages deleted
product_section: dev
product_stage: create
product_group: editor
-product_category: wiki
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
index a6f04c56d56..6b015860613 100644
--- a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
+++ b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
@@ -5,7 +5,6 @@ description: Number of designs that were created
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: design_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
index aedfed669a6..320921048fd 100644
--- a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
+++ b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
@@ -5,7 +5,6 @@ description: Number of updates to designs
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: design_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
index 0fee24ec9e2..156c1a481e6 100644
--- a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
+++ b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
@@ -5,7 +5,6 @@ description: Number of designs that were deleted
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: design_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180750_groups.yml b/config/metrics/counts_all/20210216180750_groups.yml
index e8298cb7fbc..72d5c97ccb1 100644
--- a/config/metrics/counts_all/20210216180750_groups.yml
+++ b/config/metrics/counts_all/20210216180750_groups.yml
@@ -5,7 +5,6 @@ description: Total count of groups as of usage ping snapshot
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category: subgroups
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180752_keys.yml b/config/metrics/counts_all/20210216180752_keys.yml
index dad2a777d26..1471e2ab302 100644
--- a/config/metrics/counts_all/20210216180752_keys.yml
+++ b/config/metrics/counts_all/20210216180752_keys.yml
@@ -5,7 +5,6 @@ description: Number of keys.
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category: authentication_and_authorization
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180754_events.yml b/config/metrics/counts_all/20210216180754_events.yml
index 068ff246f97..7fa5b29d805 100644
--- a/config/metrics/counts_all/20210216180754_events.yml
+++ b/config/metrics/counts_all/20210216180754_events.yml
@@ -5,7 +5,6 @@ description: Number of distinct users who have generated a manage event
product_section: dev
product_stage: manage
product_group: manage
-product_category:
value_type: number
status: broken
repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344100
diff --git a/config/metrics/counts_all/20210216180756_groups.yml b/config/metrics/counts_all/20210216180756_groups.yml
index cacd3061278..1764e203258 100644
--- a/config/metrics/counts_all/20210216180756_groups.yml
+++ b/config/metrics/counts_all/20210216180756_groups.yml
@@ -5,7 +5,6 @@ description: Number of users who are group members.
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category: subgroups
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180758_users_created.yml b/config/metrics/counts_all/20210216180758_users_created.yml
index c34c1cfe264..cc885359d58 100644
--- a/config/metrics/counts_all/20210216180758_users_created.yml
+++ b/config/metrics/counts_all/20210216180758_users_created.yml
@@ -5,7 +5,6 @@ description: Number of users
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category:
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
index 35117f6217d..901e609875c 100644
--- a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
+++ b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
@@ -5,7 +5,6 @@ description: Total Grafana integrations attached to projects
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
index 106ecfa4483..e2b4b35afcd 100644
--- a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
@@ -5,7 +5,6 @@ description: Projects with tracing enabled
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: tracing
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
index 112e7a493c0..c0b572ba851 100644
--- a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Prometheus
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
index 92b913621e3..787c2d35d47 100644
--- a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Prometheus
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
index e71461d1a5a..b8836be2107 100644
--- a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Prometheus
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
index 17cf56a6fc4..ff8b929ee49 100644
--- a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Prometheus
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
index 9dbd83529d6..4da9dcb236f 100644
--- a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Prometheus
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
index 10a149c3ae8..e204dc6941e 100644
--- a/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Prometheus
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
index ae3909f78a4..a352352fb0d 100644
--- a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
@@ -5,7 +5,6 @@ description: Active users with enabled operations dashboard
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
index 843f75ef12a..af7fb206fe1 100644
--- a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
@@ -5,7 +5,6 @@ description: Active users with projects on operations dashboard
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180945_clusters.yml b/config/metrics/counts_all/20210216180945_clusters.yml
index 93fffedd2e6..d6bc0b5cd96 100644
--- a/config/metrics/counts_all/20210216180945_clusters.yml
+++ b/config/metrics/counts_all/20210216180945_clusters.yml
@@ -5,7 +5,6 @@ description: Users creating clusters.
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
index 0148788f635..76497d1a020 100644
--- a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
@@ -5,7 +5,6 @@ description: Users creating clusters with Prometheus enabled.
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
index c3c840c6228..47ee0e3a144 100644
--- a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
@@ -5,7 +5,6 @@ description: Active users with enabled operations dashboard
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
index 62f472da341..7da2a9d12f2 100644
--- a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
@@ -5,7 +5,6 @@ description: Projects with tracing enabled
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: tracing
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
index b22402d2a1b..0744fa2e829 100644
--- a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
@@ -5,7 +5,6 @@ description: Active users with projects on operations dashboard
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181009_lfs_objects.yml b/config/metrics/counts_all/20210216181009_lfs_objects.yml
index 851281b799d..ce210cc0e35 100644
--- a/config/metrics/counts_all/20210216181009_lfs_objects.yml
+++ b/config/metrics/counts_all/20210216181009_lfs_objects.yml
@@ -5,7 +5,6 @@ description: Count of lfs objects
product_section: ops
product_stage: create
product_group: create
-product_category:
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181011_projects_with_packages.yml b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
index f2f7870cfc9..434d9989ed4 100644
--- a/config/metrics/counts_all/20210216181011_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
@@ -5,7 +5,6 @@ description: Projects with package registry enabled
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181012_packages.yml b/config/metrics/counts_all/20210216181012_packages.yml
index 647e4dd3183..468b0d9782c 100644
--- a/config/metrics/counts_all/20210216181012_packages.yml
+++ b/config/metrics/counts_all/20210216181012_packages.yml
@@ -5,7 +5,6 @@ description: The total number of packages published to the registry
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
index 6b6f0e978ae..41ed478156e 100644
--- a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
+++ b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
@@ -5,7 +5,6 @@ description: The number of projects with cleanup policy for tags turned off
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
index 3c49f82fa6b..f0a1328674a 100644
--- a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
+++ b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy for tags turned on
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
index e9eaec20453..ace1a48247c 100644
--- a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
+++ b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to keep 1 tag
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
index b6bc610b97a..4f29e00776d 100644
--- a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
+++ b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to keep 5 tags
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
index 906382f2e52..0aeeefe6fcf 100644
--- a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
+++ b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to keep 10 tags
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
index 2ba5e503c81..23f08c6c538 100644
--- a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
+++ b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to keep 25 tags
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
index faa4bb4ba8f..59cd82e005b 100644
--- a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
+++ b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to keep 50 tags
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml b/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
index bc2963db71f..9d0f6ff26d0 100644
--- a/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
+++ b/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to keep 100 tags
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
index 2c6e2745560..cadb36f57d6 100644
--- a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
+++ b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to run every day
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
index 15be6b54bfd..be914ed1132 100644
--- a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to run every 7 days
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
index 68d54c4ebe0..fc9b10e1f73 100644
--- a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to run every 14 day
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
index fe620f1997c..f30f835aea3 100644
--- a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
+++ b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to run monthly
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
index 8b06790d4ac..8ee1f401797 100644
--- a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
+++ b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
@@ -5,7 +5,6 @@ description: A count of projects with the cleanup policy set to run every 3 mont
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
index 22c6c6b7833..d126e605ff4 100644
--- a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
@@ -6,7 +6,6 @@ description: A count of projects with the cleanup policy set delete tags older t
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
index e4094c25594..8b7f03d5b68 100644
--- a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
@@ -6,7 +6,6 @@ description: A count of projects with the cleanup policy set delete tags older t
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
index 11e7b1ebef5..a94f094c6a1 100644
--- a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
+++ b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
@@ -6,7 +6,6 @@ description: A count of projects with the cleanup policy set delete tags older t
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
index 987bffdcef8..f039a69fbd6 100644
--- a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
+++ b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
@@ -6,7 +6,6 @@ description: A count of projects with the cleanup policy set delete tags older t
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
index 912e349a206..80f4ecfd6ac 100644
--- a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
+++ b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
@@ -6,7 +6,6 @@ description: A count of projects with the cleanup policy with the number of tags
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
index a4cfecc228b..55a42c96bc7 100644
--- a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
+++ b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
@@ -6,7 +6,6 @@ description: A count of projects with the cleanup policy with the number of tags
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181051_vendor.yml b/config/metrics/counts_all/20210216181051_vendor.yml
index ecc9cf97b4d..0f17a55ade8 100644
--- a/config/metrics/counts_all/20210216181051_vendor.yml
+++ b/config/metrics/counts_all/20210216181051_vendor.yml
@@ -6,7 +6,6 @@ description: Identifies if a user is using an external container registry and wh
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181055_projects_with_packages.yml b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
index 5862f6b4ca5..d405ed43fe4 100644
--- a/config/metrics/counts_all/20210216181055_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
@@ -5,7 +5,6 @@ description: Projects with package registry enabled
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181102_issues.yml b/config/metrics/counts_all/20210216181102_issues.yml
index 894691e7880..ec679b1089f 100644
--- a/config/metrics/counts_all/20210216181102_issues.yml
+++ b/config/metrics/counts_all/20210216181102_issues.yml
@@ -5,7 +5,6 @@ description: Count of Issues created
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181104_label_lists.yml b/config/metrics/counts_all/20210216181104_label_lists.yml
index 80a18c67252..c564f9ea369 100644
--- a/config/metrics/counts_all/20210216181104_label_lists.yml
+++ b/config/metrics/counts_all/20210216181104_label_lists.yml
@@ -5,7 +5,6 @@ description: Count of label lists created on Boards
product_section: dev
product_stage: plan
product_group: project_management
-product_category: boards
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181108_milestones.yml b/config/metrics/counts_all/20210216181108_milestones.yml
index abeec87524c..ec220fc4da8 100644
--- a/config/metrics/counts_all/20210216181108_milestones.yml
+++ b/config/metrics/counts_all/20210216181108_milestones.yml
@@ -5,7 +5,6 @@ description: Count of milestones created
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181109_uploads.yml b/config/metrics/counts_all/20210216181109_uploads.yml
index bd2dc41838f..30b6ae5bc43 100644
--- a/config/metrics/counts_all/20210216181109_uploads.yml
+++ b/config/metrics/counts_all/20210216181109_uploads.yml
@@ -5,7 +5,6 @@ description: Count of Uploads via Notes and Descriptions
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181111_labels.yml b/config/metrics/counts_all/20210216181111_labels.yml
index b91356054bb..26364489b5a 100644
--- a/config/metrics/counts_all/20210216181111_labels.yml
+++ b/config/metrics/counts_all/20210216181111_labels.yml
@@ -5,7 +5,6 @@ description: Count of Labels
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181113_notes.yml b/config/metrics/counts_all/20210216181113_notes.yml
index 8a73c5f93b0..6112421c149 100644
--- a/config/metrics/counts_all/20210216181113_notes.yml
+++ b/config/metrics/counts_all/20210216181113_notes.yml
@@ -5,7 +5,6 @@ description: Count of Notes across all objects that use them
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181115_issues.yml b/config/metrics/counts_all/20210216181115_issues.yml
index e7383e40f9d..ed1b0c2532c 100644
--- a/config/metrics/counts_all/20210216181115_issues.yml
+++ b/config/metrics/counts_all/20210216181115_issues.yml
@@ -5,7 +5,6 @@ description: Count of users creating Issues
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181117_notes.yml b/config/metrics/counts_all/20210216181117_notes.yml
index 5f8a7097ec0..c5f1595f9e3 100644
--- a/config/metrics/counts_all/20210216181117_notes.yml
+++ b/config/metrics/counts_all/20210216181117_notes.yml
@@ -5,7 +5,6 @@ description: Count of users creating Notes on Issues
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181119_projects.yml b/config/metrics/counts_all/20210216181119_projects.yml
index 31b315b6e12..0b69061425e 100644
--- a/config/metrics/counts_all/20210216181119_projects.yml
+++ b/config/metrics/counts_all/20210216181119_projects.yml
@@ -5,7 +5,6 @@ description: Count of users creating projects
product_section: dev
product_stage: plan
product_group: project_management
-product_category: projects
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181121_todos.yml b/config/metrics/counts_all/20210216181121_todos.yml
index c89cd1208c4..be7578a0c6d 100644
--- a/config/metrics/counts_all/20210216181121_todos.yml
+++ b/config/metrics/counts_all/20210216181121_todos.yml
@@ -5,7 +5,6 @@ description: Count of users todos created
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
index e25512bf85f..30318cd2d3c 100644
--- a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
@@ -2,10 +2,9 @@
data_category: optional
key_path: usage_activity_by_stage.plan.service_desk_enabled_projects
description: Count creator ids from projects with service desk enabled
-product_section: dev
-product_stage: plan
-product_group: product_planning
-product_category: service_desk
+product_section: ops
+product_stage: monitor
+product_group: respond
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181124_service_desk_issues.yml b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
index 4d2c933ea59..c2b27567ff1 100644
--- a/config/metrics/counts_all/20210216181124_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
@@ -2,10 +2,9 @@
data_category: optional
key_path: usage_activity_by_stage.plan.service_desk_issues
description: Count of service desk issues
-product_section: dev
-product_stage: plan
-product_group: product_planning
-product_category: service_desk
+product_section: ops
+product_stage: monitor
+product_group: respond
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181126_projects_jira_active.yml b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
index 54426bd92bf..245719d8e4c 100644
--- a/config/metrics/counts_all/20210216181126_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
@@ -5,7 +5,6 @@ description: Distinct count of creator_id from projects with an active Jira inte
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
index 7ed8f79a5a7..015a7c2bbbe 100644
--- a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
@@ -6,7 +6,6 @@ description: Distinct count of creator_id from projects with an active Jira Clou
product_section: dev
product_stage: manage
product_group: integration
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
index 4d34d7917d5..b3f8b6ac307 100644
--- a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
@@ -6,7 +6,6 @@ description: Distinct count of creator_id from projects with an active Jira Serv
product_section: dev
product_stage: manage
product_group: integration
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181134_epics.yml b/config/metrics/counts_all/20210216181134_epics.yml
index 9f491a10552..87a8278c9aa 100644
--- a/config/metrics/counts_all/20210216181134_epics.yml
+++ b/config/metrics/counts_all/20210216181134_epics.yml
@@ -5,7 +5,6 @@ description: Count distinct author ids from epics
product_section: dev
product_stage: plan
product_group: product_planning
-product_category: epics
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181135_label_lists.yml b/config/metrics/counts_all/20210216181135_label_lists.yml
index 4a8714c16c6..838ba151546 100644
--- a/config/metrics/counts_all/20210216181135_label_lists.yml
+++ b/config/metrics/counts_all/20210216181135_label_lists.yml
@@ -5,7 +5,6 @@ description: Count of users creating label lists on Boards
product_section: dev
product_stage: plan
product_group: project_management
-product_category: boards
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181249_feature_flags.yml b/config/metrics/counts_all/20210216181249_feature_flags.yml
index 2b25ce6a32b..c812959bcce 100644
--- a/config/metrics/counts_all/20210216181249_feature_flags.yml
+++ b/config/metrics/counts_all/20210216181249_feature_flags.yml
@@ -5,7 +5,6 @@ description: Number of feature flag toggles
product_section: ops
product_stage: release
product_group: release
-product_category: feature_flags
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181252_boards.yml b/config/metrics/counts_all/20210216181252_boards.yml
index 6d4c41cd95e..24fbbebc4cc 100644
--- a/config/metrics/counts_all/20210216181252_boards.yml
+++ b/config/metrics/counts_all/20210216181252_boards.yml
@@ -5,7 +5,6 @@ description: Count of Boards created
product_section: dev
product_stage: plan
product_group: project_management
-product_category: boards
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181254_projects.yml b/config/metrics/counts_all/20210216181254_projects.yml
index 1327d016b9d..0bd0e783c0a 100644
--- a/config/metrics/counts_all/20210216181254_projects.yml
+++ b/config/metrics/counts_all/20210216181254_projects.yml
@@ -5,7 +5,6 @@ description: Count of Projects created
product_section: dev
product_stage: plan
product_group: project_management
-product_category: projects
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181256_todos.yml b/config/metrics/counts_all/20210216181256_todos.yml
index 27edfc7527a..98fb0df53a5 100644
--- a/config/metrics/counts_all/20210216181256_todos.yml
+++ b/config/metrics/counts_all/20210216181256_todos.yml
@@ -5,7 +5,6 @@ description: Count of todos created
product_section: dev
product_stage: plan
product_group: project_management
-product_category: issue_tracking
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
index 4facf658e6a..5812515da44 100644
--- a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
+++ b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
@@ -5,7 +5,6 @@ description: Count of Jira imports completed
product_section: dev
product_stage: manage
product_group: integrations
-product_category: jira_importer
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
index fb5a674aff9..9f22ee3ebcc 100644
--- a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
+++ b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
@@ -5,7 +5,6 @@ description: Count of Projects that imported Issues from Jira
product_section: dev
product_stage: manage
product_group: integrations
-product_category: jira_importer
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
index 6d4265d9ac7..82dacb57b67 100644
--- a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
+++ b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
@@ -6,7 +6,6 @@ description: Count of total issues imported via the Jira Importer
product_section: dev
product_stage: manage
product_group: integrations
-product_category: jira_importer
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181908_deploy_keys.yml b/config/metrics/counts_all/20210216181908_deploy_keys.yml
index b160392c5ac..1f3a8722606 100644
--- a/config/metrics/counts_all/20210216181908_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216181908_deploy_keys.yml
@@ -5,7 +5,6 @@ description: Count of deploy keys
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181911_successful_deployments.yml b/config/metrics/counts_all/20210216181911_successful_deployments.yml
index b684cf0aa93..1b03273b287 100644
--- a/config/metrics/counts_all/20210216181911_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181911_successful_deployments.yml
@@ -5,7 +5,6 @@ description: Total successful deployments
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181912_failed_deployments.yml b/config/metrics/counts_all/20210216181912_failed_deployments.yml
index 605282e0ae0..a250f9c52aa 100644
--- a/config/metrics/counts_all/20210216181912_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181912_failed_deployments.yml
@@ -5,7 +5,6 @@ description: Total failed deployments
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181914_environments.yml b/config/metrics/counts_all/20210216181914_environments.yml
index 8985639f927..cf1b6723b36 100644
--- a/config/metrics/counts_all/20210216181914_environments.yml
+++ b/config/metrics/counts_all/20210216181914_environments.yml
@@ -5,7 +5,6 @@ description: Total available and stopped environments
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181916_in_review_folder.yml b/config/metrics/counts_all/20210216181916_in_review_folder.yml
index eaebd12475c..a8bfcf8d001 100644
--- a/config/metrics/counts_all/20210216181916_in_review_folder.yml
+++ b/config/metrics/counts_all/20210216181916_in_review_folder.yml
@@ -5,7 +5,6 @@ description: A number of environments with name review/*
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181918_releases.yml b/config/metrics/counts_all/20210216181918_releases.yml
index aff67e4e6e5..4b8c047ea9c 100644
--- a/config/metrics/counts_all/20210216181918_releases.yml
+++ b/config/metrics/counts_all/20210216181918_releases.yml
@@ -5,7 +5,6 @@ description: Count of releases
product_section: ops
product_stage: release
product_group: release
-product_category: release_orchestration
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181926_deployments.yml b/config/metrics/counts_all/20210216181926_deployments.yml
index 51650d645e8..ec186c3910f 100644
--- a/config/metrics/counts_all/20210216181926_deployments.yml
+++ b/config/metrics/counts_all/20210216181926_deployments.yml
@@ -5,7 +5,6 @@ description: Unique users triggering deployments
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181928_failed_deployments.yml b/config/metrics/counts_all/20210216181928_failed_deployments.yml
index 670c7fb65cc..6e69a80cb7e 100644
--- a/config/metrics/counts_all/20210216181928_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181928_failed_deployments.yml
@@ -5,7 +5,6 @@ description: Total failed deployments
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181930_releases.yml b/config/metrics/counts_all/20210216181930_releases.yml
index b86e467b2d3..49a75057fe2 100644
--- a/config/metrics/counts_all/20210216181930_releases.yml
+++ b/config/metrics/counts_all/20210216181930_releases.yml
@@ -5,7 +5,6 @@ description: Unique users creating release tags
product_section: ops
product_stage: release
product_group: release
-product_category: release_orchestration
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181932_successful_deployments.yml b/config/metrics/counts_all/20210216181932_successful_deployments.yml
index 003d5e8ef6f..31ab9308ac1 100644
--- a/config/metrics/counts_all/20210216181932_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181932_successful_deployments.yml
@@ -5,7 +5,6 @@ description: Total successful deployments
product_section: ops
product_stage: release
product_group: release
-product_category: continuous_delivery
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181946_pages_domains.yml b/config/metrics/counts_all/20210216181946_pages_domains.yml
index b6c7ef41b34..679e0029bee 100644
--- a/config/metrics/counts_all/20210216181946_pages_domains.yml
+++ b/config/metrics/counts_all/20210216181946_pages_domains.yml
@@ -5,7 +5,6 @@ description: Total GitLab Pages domains
product_section: ops
product_stage: create
product_group: editor
-product_category: pages
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
index 37128c7aa0a..8e5acdf5ce3 100644
--- a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
@@ -5,7 +5,7 @@ description: Count of users creating managed clusters with Runner enabled
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216182002_remote_mirrors.yml b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
index 3f9b8ded5ce..0c8103284a3 100644
--- a/config/metrics/counts_all/20210216182002_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
@@ -5,7 +5,6 @@ description: Count of total remote mirrors. Includes both push and pull mirrors
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index 6de9b8476d4..009097245ef 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -5,7 +5,6 @@ description: Count of total unique commit comments. Does not include MR diff com
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182006_source_code_pushes.yml b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
index 3e4ef3ec76c..900ea7feaef 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -5,7 +5,6 @@ description: Count of total Git push operations
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182010_deploy_keys.yml b/config/metrics/counts_all/20210216182010_deploy_keys.yml
index 347b487c999..a701bf5b71d 100644
--- a/config/metrics/counts_all/20210216182010_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216182010_deploy_keys.yml
@@ -5,7 +5,6 @@ description: Count of users creating deploy keys.
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182012_keys.yml b/config/metrics/counts_all/20210216182012_keys.yml
index 66d0c070b1c..09121d5586a 100644
--- a/config/metrics/counts_all/20210216182012_keys.yml
+++ b/config/metrics/counts_all/20210216182012_keys.yml
@@ -5,7 +5,6 @@ description: Count of users creating regular keys.
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
index ca48d4f4251..b895c2af2ba 100644
--- a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -6,7 +6,6 @@ description: Total count of projects that do not allow overriding approvers on d
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
index dbbb491e3f0..d2a883e63ae 100644
--- a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -6,7 +6,6 @@ description: Count of total projects that do not disable overriding approvers pe
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182017_remote_mirrors.yml b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
index df9dd1e03f9..a28794c3ea8 100644
--- a/config/metrics/counts_all/20210216182017_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
@@ -5,7 +5,6 @@ description: Count of users creating projects with remote mirrors.
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
index 1bc3b8ba43a..3f64043fc5d 100644
--- a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
+++ b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
@@ -5,7 +5,6 @@ description: Count of branches that have been protected and are not the default
product_section: dev
product_stage: create
product_group: source_code
-product_category: source_code_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
index 3d057ff95bc..46e6776597c 100644
--- a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Datadog
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
index be03cd7e5e2..c61b8e698e8 100644
--- a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Datadog
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
index 4fba91477b6..965a797a426 100644
--- a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Datadog
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
index f5d70fb8260..1b9f5ac9943 100644
--- a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Datadog
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
index 0bd995daf6f..863a80f8c29 100644
--- a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Datadog
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
index 09bcd9912f6..6b38dfb129b 100644
--- a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Datadog
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
index 772ef421072..0cbfb6f0976 100644
--- a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for EWM
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
index 07366301514..180ab4b61b4 100644
--- a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for EWM
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
index 0e11cba9c6e..0b4bd1d8bbd 100644
--- a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for EWM
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
index 5e07ff74113..3c85cba0764 100644
--- a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for EWM
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
index 4704daf9813..da399896087 100644
--- a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for EWM
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
index e5c80d2c1d1..4d6be9b294a 100644
--- a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for EWM
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
index cd958106cbc..b2ca56dae60 100644
--- a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Mock CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
index 0db2c32ba7a..d9cd14d9603 100644
--- a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Mock CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
index 279fd3cc10d..3a9afd94991 100644
--- a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Mock CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
index 15347e16178..1067c8b781a 100644
--- a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Mock CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
index 6b1a9ed0089..c1498b0afd4 100644
--- a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Mock CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
index 314e0e23397..f8fb07787c3 100644
--- a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Mock CI
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
index df1a5def60d..375afffabb6 100644
--- a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Mock Monitoring
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
index 1e891cd7307..e363a531363 100644
--- a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Mock Monitoring
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
index 4254f5ffd44..fdd9cedf0bf 100644
--- a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
@@ -5,7 +5,6 @@ description: Count of active service templates for Mock Monitoring
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
index e2504a98c71..2bd63d7909e 100644
--- a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Mock Monitoring
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
index 6a39fcb9fa1..f3e55e49f18 100644
--- a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Mock Monitorin
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
index 7a3fe6993d8..c4798be2f30 100644
--- a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Mock Monitoring
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: removed
milestone_removed: '13.12'
diff --git a/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml b/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
index 2db1ff225d8..5b23018a7a6 100644
--- a/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
+++ b/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of Composer packages that have been deleted
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml b/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
index 81b381e7337..56a0dd08f4d 100644
--- a/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
+++ b/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of Composer packages that have been downloaded
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml b/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
index 27e2b6ce535..6ebab3064f6 100644
--- a/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
+++ b/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
@@ -5,7 +5,6 @@ description: A count of Composer packages that have been published
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml b/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
index 90f0a59f58b..f725f16a442 100644
--- a/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
+++ b/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of Conan packages that have been deleted
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml b/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
index be07d3a67c8..68eff4f7a62 100644
--- a/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
+++ b/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of Conan packages that have been downloaded
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml b/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
index deb3e1b4d0f..632c1874cb4 100644
--- a/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
+++ b/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
@@ -5,7 +5,6 @@ description: A count of Conan packages that have been published
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml b/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
index 1a208c53f81..682ec3917ff 100644
--- a/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
+++ b/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of container images that have been deleted
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: removed
milestone_removed: "14.4"
diff --git a/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml b/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
index db4e4f63fff..71b6eb6df2d 100644
--- a/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
+++ b/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of container images that have been downloaded
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: removed
milestone_removed: "14.4"
diff --git a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
index 29b93b42dfb..a1a4a856bce 100644
--- a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
+++ b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
@@ -5,7 +5,6 @@ description: A count of container images that have been published
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: removed
milestone_removed: "14.4"
diff --git a/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml b/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
index e95a140aec9..8007bab48ed 100644
--- a/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
+++ b/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of Debian packages that have been deleted
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml b/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
index f416d00ab4b..66b1f186498 100644
--- a/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
+++ b/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of Debian packages that have been downloaded
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
index c71e5d608cf..fde9ada1a4c 100644
--- a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
+++ b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
@@ -5,7 +5,6 @@ description: A count of Debian packages that have been published
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
milestone_removed: "14.4"
diff --git a/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml b/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
index c5e999ae8f6..7530a75d0ea 100644
--- a/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
+++ b/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of packages that have been deleted
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml b/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
index 7c160f02fee..468163b3d44 100644
--- a/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
@@ -5,7 +5,6 @@ description: A count of packages that have been deleted using a Deploy Token
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml b/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
index b631d667ff0..f2fc817afb9 100644
--- a/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
@@ -5,7 +5,6 @@ description: A count of packages that have been deleted using a Guest
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml b/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
index 3f62b79e9f1..a54de5b8c90 100644
--- a/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
+++ b/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
@@ -5,7 +5,6 @@ description: A count of packages that have been deleted using a logged in user
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml b/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
index 82584ecd920..a6bd49eeb1c 100644
--- a/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
+++ b/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of generic packages that have been deleted
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml b/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
index 0eca0f41708..dec802df936 100644
--- a/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
+++ b/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of generic packages that have been downloaded
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml b/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
index 1e3577820a4..1fb1ff006da 100644
--- a/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
+++ b/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
@@ -5,7 +5,6 @@ description: A count of generic packages that have been published
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml b/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
index 8c0cfd62490..a483f6a2e29 100644
--- a/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
+++ b/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of Go modules that have been deleted
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml b/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
index bd8b5ec54b7..fb05f47bf7f 100644
--- a/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
+++ b/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of Go modules that have been downloaded
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml b/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
index 0610ac36fab..3b4d4b5c975 100644
--- a/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
+++ b/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
@@ -5,7 +5,6 @@ description: A count of Go modules that have been published
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml b/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
index 1dfbdebfdc8..8619c77ede8 100644
--- a/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
+++ b/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of Maven packages that have been deleted
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml b/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
index 7e8891faa7a..a0b49c09ea5 100644
--- a/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
+++ b/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of Maven packages that have been downloaded
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml b/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
index 7685a116b9f..d7228659269 100644
--- a/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
+++ b/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
@@ -5,7 +5,6 @@ description: A count of Maven packages that have been published
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml b/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
index 104576a8f32..460931b3919 100644
--- a/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
+++ b/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of npm packages that have been deleted
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml b/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
index fe04fafc3c8..36fb5aeebff 100644
--- a/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
+++ b/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of npm packages that have been downloaded
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml b/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
index 5f8ccc277f8..d660058cf73 100644
--- a/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
+++ b/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
@@ -5,7 +5,6 @@ description: A count of npm packages that have been published
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml b/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
index 3570e509ce9..e97b213129c 100644
--- a/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
+++ b/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of NuGet packages that have been deleted
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml b/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
index 2eddb4af420..db42b30b36e 100644
--- a/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
+++ b/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of NuGet packages that have been downloaded
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml b/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
index 02f45dad580..825ce7038d7 100644
--- a/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
+++ b/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
@@ -5,7 +5,6 @@ description: A count of NuGet packages that have been published
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml b/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
index aa459c6db2c..89639cefbcd 100644
--- a/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
+++ b/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of packages that have been downloaded from the package regi
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml b/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
index a527379fe00..5ad492ef26f 100644
--- a/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
@@ -6,7 +6,6 @@ description: A count of packages that have been downloaded from the package regi
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
index 1ad33d0d479..f60f74f132b 100644
--- a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
@@ -6,7 +6,6 @@ description: A count of packages that have been downloaded from the package regi
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml b/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
index 69983e77d5f..37c5cd9204b 100644
--- a/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
+++ b/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
@@ -6,7 +6,6 @@ description: A count of packages that have been downloaded from the package regi
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml b/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
index 22c4969ad7d..030a763cc6e 100644
--- a/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
+++ b/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
@@ -5,7 +5,6 @@ description: A count of packages that have been published to the package registr
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
index 051e99a67e4..012254ffc6b 100644
--- a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
@@ -6,7 +6,6 @@ description: A count of packages that have been published to the package registr
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml b/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
index 8fa5f2b877c..1858f806817 100644
--- a/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
@@ -6,7 +6,6 @@ description: A count of packages that have been published to the package registr
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml b/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
index 42b0b0130ad..395db445777 100644
--- a/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
+++ b/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
@@ -6,7 +6,6 @@ description: A count of packages that have been published to the package registr
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml b/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
index d1c7f71e593..1ad2bb81933 100644
--- a/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
+++ b/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of Python packages that have been deleted from the package
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml b/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
index e47231a30bd..9417bccdc62 100644
--- a/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
+++ b/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
@@ -6,7 +6,6 @@ description: A count of Python packages that have been downloaded from the packa
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml b/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
index 4edd359cc1e..666714af31a 100644
--- a/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
+++ b/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
@@ -5,7 +5,6 @@ description: A count of Python packages that have been published to the package
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
index eef109e87c1..6ff3af56c3d 100644
--- a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
+++ b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
@@ -5,7 +5,6 @@ description: A count of package tags that have been deleted from the package reg
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
index 76923282a40..f071e1763c0 100644
--- a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
+++ b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of package tags that have been downloaded from the package
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
index 823c81d37c4..2c21127d1e8 100644
--- a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
+++ b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
@@ -5,7 +5,6 @@ description: A count of package tags that have been published to the package reg
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
index 278524f6d79..5e54f9d806d 100644
--- a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
+++ b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
@@ -3,9 +3,8 @@ data_category: optional
key_path: counts.wiki_pages_view
description: Total number of wiki page views
product_section: dev
-product_stage: create
-product_group: editor
-product_category: wiki
+product_stage: plan
+product_group: knowledge
value_type: number
status: active
milestone: "13.3"
diff --git a/config/metrics/counts_all/20210216183400_omniauth_providers.yml b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
index f4d6e2bc57b..22ff6084082 100644
--- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml
+++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
@@ -5,7 +5,6 @@ description: List of unique OmniAuth providers
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category: authentication_and_authorization
value_type: object
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml b/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
index 2265eff7393..ffafdb83bae 100644
--- a/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
+++ b/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
@@ -5,7 +5,6 @@ description: Total count of RubyGems packages delete events
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: '13.10'
diff --git a/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml b/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
index 20af7e2a564..5af1d22be86 100644
--- a/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
+++ b/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
@@ -5,7 +5,6 @@ description: Total count of pull RubyGems packages events
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: '13.10'
diff --git a/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml b/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
index 6c7150b3f44..e189dee8522 100644
--- a/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
+++ b/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
@@ -5,7 +5,6 @@ description: Total count of push RubyGems packages events
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml b/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
index df47faec027..eead64bd627 100644
--- a/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
+++ b/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
@@ -5,7 +5,6 @@ description: Histogram (buckets 1 to 100) of projects with at least 1 enabled in
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: incident_management
value_type: object
status: active
milestone: "13.10"
diff --git a/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml b/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
index 2dd4576a0fc..d8c3aa3cac4 100644
--- a/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
+++ b/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
@@ -3,9 +3,8 @@ data_category: optional
key_path: counts.package_events_i_package_terraform_module_delete_package
description: Total count of Terraform Module packages delete events
product_section: ops
-product_stage: configure
-product_group: configure
-product_category: infrastructure_as_code
+product_stage: package
+product_group: package
value_type: number
status: active
milestone: '13.11'
diff --git a/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml b/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
index 21b36947f1a..40a901ceeaa 100644
--- a/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
+++ b/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
@@ -3,9 +3,8 @@ data_category: optional
key_path: counts.package_events_i_package_terraform_module_pull_package
description: Total count of pull Terraform Module packages events
product_section: ops
-product_stage: configure
-product_group: configure
-product_category: infrastructure_as_code
+product_stage: package
+product_group: package
value_type: number
status: active
milestone: '13.11'
diff --git a/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml b/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
index bd7a26f022b..85c3898d825 100644
--- a/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
+++ b/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
@@ -3,9 +3,8 @@ data_category: optional
key_path: counts.package_events_i_package_terraform_module_push_package
description: Total count of push Terraform Module packages events
product_section: ops
-product_stage: configure
-product_group: configure
-product_category: infrastructure_as_code
+product_stage: package
+product_group: package
value_type: number
status: active
milestone: '13.11'
diff --git a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
index e07dc348c67..ef969f31496 100644
--- a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
+++ b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
@@ -6,13 +6,13 @@ description: Total active Shared (Instance) Runners
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
milestone: "13.12"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
time_frame: all
data_source: database
+instrumentation_class: CountCiRunnersInstanceTypeActiveMetric
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
index 4b578cecb9d..bc5f69f80b7 100644
--- a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
+++ b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
@@ -6,13 +6,13 @@ description: Total active Group Runners
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
milestone: "13.12"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
time_frame: all
data_source: database
+instrumentation_class: CountCiRunnersGroupTypeActiveMetric
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
index 2e21fdc511e..054e3f9e524 100644
--- a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
+++ b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
@@ -6,13 +6,13 @@ description: Total active Specific (Project) Runners
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
milestone: "13.12"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
time_frame: all
data_source: database
+instrumentation_class: CountCiRunnersProjectTypeActiveMetric
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210502050942_ci_runners_online.yml b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
index 455c3e39d4d..4896ddd4699 100644
--- a/config/metrics/counts_all/20210502050942_ci_runners_online.yml
+++ b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
@@ -6,7 +6,6 @@ description: Total online Runners of all types
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
index 6a7f1f7c776..653a4a3917a 100644
--- a/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
+++ b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
@@ -6,13 +6,13 @@ description: Total active and online Shared (Instance) Runners
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
milestone: "13.12"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
time_frame: all
data_source: database
+instrumentation_class: CountCiRunnersInstanceTypeActiveOnlineMetric
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
index 2c604235f36..53c2c2a8650 100644
--- a/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
+++ b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
@@ -6,13 +6,13 @@ description: Total active and online Group Runners
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
milestone: "13.12"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
time_frame: all
data_source: database
+instrumentation_class: CountCiRunnersGroupTypeActiveOnlineMetric
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
index aaedfeaf477..556492214f1 100644
--- a/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
+++ b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
@@ -6,13 +6,13 @@ description: Total active and online Specific (Project) Runners
product_section: ops
product_stage: verify
product_group: pipeline_execution
-product_category: continuous_integration
value_type: number
status: active
milestone: "13.12"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58197
time_frame: all
data_source: database
+instrumentation_class: CountCiRunnersProjectTypeActiveOnlineMetric
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
index fcb2be99fab..b1d5688c9a5 100644
--- a/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
+++ b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
@@ -5,7 +5,7 @@ description: Count of Kubernetes API proxy requests
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
milestone: '13.12'
diff --git a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
index b8362fb9d71..022b7b83528 100644
--- a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
+++ b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the create track's first email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
index b93fe4f735e..14a2b4915c0 100644
--- a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the create track's first email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
index b6b3fbb3c49..69c0890cb11 100644
--- a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
+++ b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the create track's second email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
index 4c457b33db3..c084777ed3d 100644
--- a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the create track's second email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
index b0611253f8f..064e9ccf999 100644
--- a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
+++ b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the create track's third email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
index 150e8ba7f3a..a408cf82092 100644
--- a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the create track's third email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
index d52c4b0066c..df84273fe83 100644
--- a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the verify track's first email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
index 6deabd1edda..e3930f3120b 100644
--- a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the verify track's first email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
index 6d0d53c94d4..c7a85350425 100644
--- a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
+++ b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the verify track's second email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
index dd412d2cb96..7574fc98775 100644
--- a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the verify track's second email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
index f076b40f403..c1e5b418d90 100644
--- a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
+++ b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the verify track's third email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
index 1eea75bb65f..a292d93b12b 100644
--- a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the verify track's third email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
index 216997d9710..8b9324d0631 100644
--- a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
+++ b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the trial track's first email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
index 4a8cbd28827..2753e697b56 100644
--- a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the verify trial's first email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
index faaf52e4edd..bfb2b178139 100644
--- a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
+++ b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the trial track's second email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
index 87b8a1322d5..82cf36fa2cf 100644
--- a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the trial track's second email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
index 0a1c9d7018e..ab0b4acbfab 100644
--- a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
+++ b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the trial track's third email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
index 10d03b730d0..a01f04cd37f 100644
--- a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the trial track's third email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
index 572547424c7..def1d3c062d 100644
--- a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
+++ b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the team track's first email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
index aeaced8c4f2..9821d80ab93 100644
--- a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the team track's first email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
index 3e8fead4c32..9211bd3ebb1 100644
--- a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
+++ b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the team track's second email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
index 8445229f781..a0571fbb3f7 100644
--- a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the team track's second email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
index d8f4beb30c1..ff2430a5f49 100644
--- a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
+++ b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the team track's third email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
index b6ff4c4ad85..71d7e51c31a 100644
--- a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
@@ -6,7 +6,6 @@ description: Total clicks on the team track's third email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210514141520_project_imports_total.yml b/config/metrics/counts_all/20210514141520_project_imports_total.yml
index cfd3581c337..d3462f48afb 100644
--- a/config/metrics/counts_all/20210514141520_project_imports_total.yml
+++ b/config/metrics/counts_all/20210514141520_project_imports_total.yml
@@ -5,7 +5,6 @@ description: Number of projects imported
product_section: dev
product_stage: manage
product_group: import
-product_category:
value_type: number
status: active
milestone: "14.0"
diff --git a/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml b/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
index f2bbac01b47..c03bd01e218 100644
--- a/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
+++ b/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
@@ -5,7 +5,6 @@ description: Total count of pull Helm packages events
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: "14.0"
diff --git a/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
index 720b0dde650..13c9d9ea3ff 100644
--- a/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
+++ b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
@@ -6,7 +6,6 @@ description: Total sent emails of the experience track's first email
product_section: 'TBD'
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: removed
milestone: "13.12"
diff --git a/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml b/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml
index 5be5a703ad4..49d3401ab69 100644
--- a/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml
+++ b/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml
@@ -4,7 +4,6 @@ description: The total count of Helm packages that have been published.
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml b/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
index 9924df439b0..fcb565db67b 100644
--- a/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
+++ b/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
@@ -5,7 +5,6 @@ description: A count of NuGet symbol packages that have been downloaded from the
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml b/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml
index ecff5ad53e0..e3321108c3d 100644
--- a/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml
+++ b/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml
@@ -5,7 +5,6 @@ description: A count of NuGet symbol packages that have been uploaded to the pac
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml b/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
index e7f3491aa09..dc40f24ac72 100644
--- a/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
+++ b/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pulled from the package r
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml b/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
index 6aaf9bc2978..7d0f196e242 100644
--- a/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pulled with a deploy toke
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml b/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
index 936e245c240..487aae4b3c0 100644
--- a/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
+++ b/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pulled with by a guest fr
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml b/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
index 373c23a4016..cf0bf021c05 100644
--- a/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
+++ b/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pulled with by an authent
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml b/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
index e1c08134dec..e993de870f8 100644
--- a/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
+++ b/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pushed to the package reg
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml b/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
index 2cdfc6f86d0..af44b3218d6 100644
--- a/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pushed with a deploy toke
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml b/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
index 69db39047c7..674d7817daf 100644
--- a/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
+++ b/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pushed by a guest to the
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
milestone: "14.1"
diff --git a/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml b/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
index d7fd850a24f..cc3887eeeff 100644
--- a/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
+++ b/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
@@ -5,7 +5,6 @@ description: A count of symbol packages that have been pushed by an authenticate
product_section: ops
product_stage: package
product_group: package
-product_category: package registry
value_type: number
status: active
milestone: "14.1"
diff --git a/config/metrics/counts_all/20210715094459_releases_with_milestones.yml b/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
index a935f1e5829..48461dab515 100644
--- a/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
+++ b/config/metrics/counts_all/20210715094459_releases_with_milestones.yml
@@ -5,7 +5,6 @@ performance_indicator_type: []
product_section: ops
product_stage: release
product_group: 'release'
-product_category: Release Orchestration
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_all/20210723075525_diff_searches.yml b/config/metrics/counts_all/20210723075525_diff_searches.yml
index 54deaba0406..abf5e62fdc9 100644
--- a/config/metrics/counts_all/20210723075525_diff_searches.yml
+++ b/config/metrics/counts_all/20210723075525_diff_searches.yml
@@ -5,7 +5,6 @@ description: Total count of merge request diff searches
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: '14.2'
diff --git a/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
index 4c8659e9f95..7216ad9dc11 100644
--- a/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
@@ -5,7 +5,6 @@ description: Total clicks on the team_short track's first email
product_section: growth
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "14.2"
diff --git a/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
index 9f18e78c443..bc7948d5702 100644
--- a/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
+++ b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
@@ -5,7 +5,6 @@ description: Total sent emails of the team_short track's first email
product_section: growth
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "14.2"
diff --git a/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
index 57f1fcc6694..a189aa0fce9 100644
--- a/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
@@ -5,7 +5,6 @@ description: Total clicks on the trial_short track's first email
product_section: growth
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "14.2"
diff --git a/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
index dc18b08081f..0d69622c3d5 100644
--- a/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
+++ b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
@@ -5,7 +5,6 @@ description: Total sent emails of the trial_short track's first email
product_section: growth
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "14.2"
diff --git a/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
index a991d9362d1..d4768092e6f 100644
--- a/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
@@ -5,7 +5,6 @@ description: Total clicks on the admin_verify track's first email
product_section: growth
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "14.2"
diff --git a/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
index 0ecf55cc5fc..af423588b9a 100644
--- a/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
@@ -5,7 +5,6 @@ description: Total sent emails of the admin_verify track's first email
product_section: growth
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
milestone: "14.2"
diff --git a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
index 2071f97b37e..cc17e370b4c 100644
--- a/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011801_projects_zentao_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active Zentao integrations
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_all/20210730011802_groups_zentao_active.yml b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
index 5708b9f678e..02752c70d85 100644
--- a/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011802_groups_zentao_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active Zentao integrations
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_all/20210730011804_instances_zentao_active.yml b/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
index 1fed38ede89..d5bdd07ea46 100644
--- a/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011804_instances_zentao_active.yml
@@ -5,7 +5,6 @@ description: Count of instances with active Zentao integrations
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
index 81408dc5e1c..d84151a8ded 100644
--- a/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011805_projects_inheriting_zentao_active.yml
@@ -5,7 +5,6 @@ description: Count of projects that inherit active Zentao integrations
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
index 55fcd877e8c..46f11dbec22 100644
--- a/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
+++ b/config/metrics/counts_all/20210730011806_groups_inheriting_zentao_active.yml
@@ -5,7 +5,6 @@ description: Count of groups that inherit active Zentao integrations
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "14.4"
diff --git a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
index 98ac9ace52f..e61552038a2 100644
--- a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
+++ b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
@@ -5,7 +5,6 @@ description: Number of unique user logins using two factor authentication for av
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category: authentication_and_authorization
value_type: object
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml b/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml
index bd00db71abb..9d7fea181a0 100644
--- a/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml
+++ b/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml
@@ -6,7 +6,6 @@ description: A count of projects with the cleanup policy set delete tags older t
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
index b8b238e28fe..e374f970901 100644
--- a/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml
@@ -5,7 +5,6 @@ description: Count groups with active slack application
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml
index 7e696485c9b..f8ad5d4c793 100644
--- a/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml
@@ -5,7 +5,6 @@ description: Count projects with active slack application
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml
index 3730c21bd59..16043ec6137 100644
--- a/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml
@@ -5,7 +5,6 @@ description: Count instances with active slack application
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
index fd4a833b2b3..296e218d7b6 100644
--- a/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
+++ b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml
@@ -5,7 +5,7 @@ description: Total clusters with Clusters::Integrations::Prometheus enabled
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
index 72183cdf8ac..0e8b04ad660 100644
--- a/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
+++ b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml
@@ -5,7 +5,7 @@ description: Total clusters with Clusters::Integrations::ElasticStack enabled
product_section: ops
product_stage: configure
product_group: configure
-product_category: kubernetes_management
+product_category: deployment_management
value_type: number
status: removed
time_frame: all
diff --git a/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml b/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml
index 47928eee9cb..11623fa361a 100644
--- a/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml
+++ b/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml
@@ -5,7 +5,6 @@ description: Users creating clusters with Prometheus integration enabled in last
product_section: ops
product_stage: monitor
product_group: monitor
-product_category: metrics
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml
index 904cf384072..48aa9b15864 100644
--- a/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml
@@ -5,7 +5,6 @@ description: Count groups inheriting active slack application
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
index 5b4843c2fd0..8b95c0df21a 100644
--- a/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml
@@ -5,7 +5,6 @@ description: Count projects inheriting active slack application
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_all/20211028210001_projects_shimo_active.yml b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
index 9256e3114e7..b641f342f1e 100644
--- a/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active Shimo integrations
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "14.5"
diff --git a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
index 215c300a418..6f97ff718f6 100644
--- a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active Shimo integrations
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "14.5"
diff --git a/config/metrics/counts_all/20211028210003_instances_shimo_active.yml b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
index f2d18212671..6a976b62517 100644
--- a/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
@@ -5,7 +5,6 @@ description: Count of instances with active Shimo integrations
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "14.5"
diff --git a/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
index cb433b10c0e..039afc60009 100644
--- a/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
@@ -5,7 +5,6 @@ description: Count of projects that inherit active Shimo integrations
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "14.5"
diff --git a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
index 0dc13607603..093d22825a9 100644
--- a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
@@ -5,7 +5,6 @@ description: Count of groups that inherit active Shimo integrations
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "14.5"
diff --git a/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml b/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml
index e2d617dba16..0320f29ca14 100644
--- a/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml
+++ b/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml
@@ -5,7 +5,6 @@ description: Count of Live Preview tab successful initializations in the Web IDE
product_section: dev
product_stage: create
product_group: editor
-product_category: web_ide
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml b/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
index 5a330eea78b..fbc44bd2a04 100644
--- a/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
+++ b/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
@@ -6,7 +6,6 @@ name: service_usage_data_download_payload_click
product_section: analytics
product_stage: analytics
product_group: product_intelligence
-product_category: collection
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20220315180122_projects_harbor_active.yml b/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
index 7e84ebefc86..9130545796f 100644
--- a/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Harbor
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20220315180124_groups_harbor_active.yml b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
index 344a07e006d..888b3bbd8a0 100644
--- a/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Harbor
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20220315180127_instances_harbor_active.yml b/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
index d6f76a1c31a..9db7ccd965d 100644
--- a/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Harbor
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml b/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
index d3c6e214eb8..49d9d55869f 100644
--- a/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Harbor
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml b/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
index c61c58da4c9..89fa880f6ad 100644
--- a/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
+++ b/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Harbor
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml b/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
index e84cad9b9a9..d1842bc9705 100644
--- a/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
+++ b/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
@@ -4,7 +4,6 @@ description: Total number of times the Test Summary widget extension was viewed
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml b/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
index 92c5605f5fa..f9c11f9efee 100644
--- a/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
@@ -4,7 +4,6 @@ description: Total number of times the Test Summary widget extension Full Report
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml b/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
index 6501152e564..f141e13bf3e 100644
--- a/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
+++ b/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
@@ -4,7 +4,6 @@ description: Total number of times the Test Summary widget extension was expande
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml b/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
index 4be50d63e30..92c20a55418 100644
--- a/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
+++ b/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
@@ -4,7 +4,6 @@ description: Total number of times the Test Summary widget extension was expande
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml b/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
index d5e36376b4a..e520852923b 100644
--- a/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
@@ -4,7 +4,6 @@ description: Total number of times the Test Summary widget extension was expande
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml b/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
index fbb2684fa11..cb95d09eeb7 100644
--- a/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
@@ -4,7 +4,6 @@ description: Total number of times the Test Summary widget extension was expande
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.2"
diff --git a/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml b/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
index 235b5ed838a..d9ce82794eb 100644
--- a/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
+++ b/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
@@ -4,7 +4,6 @@ description: Total number of times the Accessibility widget extension was viewed
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml b/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
index 25f62dd0184..a3c60c34b90 100644
--- a/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
@@ -4,7 +4,6 @@ description: Total number of times the Accessibility widget extension Full Repor
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml b/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
index a747a6252e9..9e126525b11 100644
--- a/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
+++ b/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
@@ -4,7 +4,6 @@ description: Total number of times the Accessibility widget extension was expand
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml b/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
index 9d1b51a2bce..c6412c94640 100644
--- a/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
+++ b/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
@@ -4,7 +4,6 @@ description: Total number of times the Accessibility widget extension was expand
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml b/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
index 3d98561d8eb..7c557f33ca4 100644
--- a/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
@@ -4,7 +4,6 @@ description: Total number of times the Accessibility widget extension was expand
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml b/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
index b3312480433..b83c7ddfc6f 100644
--- a/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
@@ -4,7 +4,6 @@ description: Total number of times the Accessibility widget extension was expand
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml b/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
index 918ff9b362c..e540343a175 100644
--- a/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
+++ b/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
@@ -4,7 +4,6 @@ description: Total number of times the Code Quality widget extension was viewed
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml b/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
index 1fb7bbc070b..8e4bd3e3d05 100644
--- a/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
@@ -4,7 +4,6 @@ description: Total number of times the Code Quality widget extension Full Report
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml b/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
index 65315c78f2b..2f1e2d13256 100644
--- a/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
+++ b/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
@@ -4,7 +4,6 @@ description: Total number of times the Code Quality widget extension was expande
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml b/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
index a32d388e58d..be88831a42e 100644
--- a/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
+++ b/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
@@ -4,7 +4,6 @@ description: Total number of times the Code Quality widget extension was expande
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml b/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
index 7287000128e..03a85a76b0f 100644
--- a/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
@@ -4,7 +4,6 @@ description: Total number of times the Code Quality widget extension was expande
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml b/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
index 1e4d668ba98..57e70d7e77e 100644
--- a/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
@@ -4,7 +4,6 @@ description: Total number of times the Code Quality widget extension was expande
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml b/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
index 4f3c66162c3..33ff93179dc 100644
--- a/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
+++ b/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
@@ -4,7 +4,6 @@ description: Total number of times the Terraform widget extension was viewed (re
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml b/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
index f98b80e3741..a025b62a020 100644
--- a/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
@@ -4,7 +4,6 @@ description: Total number of times the Terraform widget extension Full Report bu
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml b/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
index 9d4d25d5514..f76c3ddccf5 100644
--- a/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
+++ b/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
@@ -4,7 +4,6 @@ description: Total number of times the Terraform widget extension was expanded (
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml b/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
index 92f9e149377..32a07704948 100644
--- a/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
+++ b/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
@@ -4,7 +4,6 @@ description: Total number of times the Terraform widget extension was expanded (
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml b/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
index aaece878b05..7c72de195d8 100644
--- a/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
@@ -4,7 +4,6 @@ description: Total number of times the Terraform widget extension was expanded (
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml b/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
index 1a382cc30ac..152516ff8c7 100644
--- a/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
@@ -4,7 +4,6 @@ description: Total number of times the Terraform widget extension was expanded (
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.3"
diff --git a/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml b/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml
index 07a630424df..df546f533b7 100644
--- a/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_groups_inheriting_pumble_active.yml
@@ -5,7 +5,6 @@ description: Count of active groups inheriting integrations for Pumble
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20220802141715_groups_pumble_active.yml b/config/metrics/counts_all/20220802141715_groups_pumble_active.yml
index 2d79df7b275..b4df1200234 100644
--- a/config/metrics/counts_all/20220802141715_groups_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_groups_pumble_active.yml
@@ -5,7 +5,6 @@ description: Count of groups with active integrations for Pumble
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20220802141715_instances_pumble_active.yml b/config/metrics/counts_all/20220802141715_instances_pumble_active.yml
index 457e6d7e861..e237ea87ea4 100644
--- a/config/metrics/counts_all/20220802141715_instances_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_instances_pumble_active.yml
@@ -5,7 +5,6 @@ description: Count of active instance-level integrations for Pumble
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml b/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml
index 560593744d1..f90acd3755f 100644
--- a/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_projects_inheriting_pumble_active.yml
@@ -5,7 +5,6 @@ description: Count of active projects inheriting integrations for Pumble
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20220802141715_projects_pumble_active.yml b/config/metrics/counts_all/20220802141715_projects_pumble_active.yml
index 182a76e98f8..998f821823d 100644
--- a/config/metrics/counts_all/20220802141715_projects_pumble_active.yml
+++ b/config/metrics/counts_all/20220802141715_projects_pumble_active.yml
@@ -5,7 +5,6 @@ description: Count of projects with active integrations for Pumble
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml b/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
index 39d1bea3536..96c97d75c3b 100644
--- a/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
+++ b/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
@@ -4,7 +4,6 @@ description: Total number of times the License Compliance widget extension was v
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml b/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
index 1258a40add0..15de79082dd 100644
--- a/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
@@ -4,7 +4,6 @@ description: Total number of times the License Compliance widget extension Full
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml b/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
index 07a8ac69ae1..511470a624c 100644
--- a/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
+++ b/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
@@ -4,7 +4,6 @@ description: Total number of times the License Compliance widget extension was e
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml b/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
index 2785964ed25..e111fe6652f 100644
--- a/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
+++ b/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
@@ -4,7 +4,6 @@ description: Total number of times the License Compliance widget extension was e
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml b/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
index eabef1927c6..86446bb4364 100644
--- a/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
@@ -4,7 +4,6 @@ description: Total number of times the License Compliance widget extension was e
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml b/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
index 39d252fa1b3..5afb1f5135d 100644
--- a/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
@@ -4,7 +4,6 @@ description: Total number of times the License Compliance widget extension was e
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_all/20220825232556_count_user_auth.yml b/config/metrics/counts_all/20220825232556_count_user_auth.yml
index 623e0dbb7a4..32cccc5ddcf 100644
--- a/config/metrics/counts_all/20220825232556_count_user_auth.yml
+++ b/config/metrics/counts_all/20220825232556_count_user_auth.yml
@@ -4,7 +4,6 @@ description: Number of unique user logins
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category: system_access
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml b/config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml
index e45b9092147..abe95c49c1b 100644
--- a/config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml
+++ b/config/metrics/counts_all/20220906074055_package_events_i_package_rpm_pull_package.yml
@@ -5,7 +5,6 @@ description: A count of RPM packages that have been downloaded
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: '15.6'
diff --git a/config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml b/config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml
index f41f98d5052..fa4d9435345 100644
--- a/config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml
+++ b/config/metrics/counts_all/20220906074525_package_events_i_package_rpm_push_package.yml
@@ -5,7 +5,6 @@ description: A count of RPM packages that have been published
product_section: ops
product_stage: package
product_group: package
-product_category: package_registry
value_type: number
status: active
milestone: '15.6'
diff --git a/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml b/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
index a89ceecbe0e..627d16438ea 100644
--- a/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
+++ b/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
@@ -4,7 +4,6 @@ description: Count active Jira Cloud direct installations
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml b/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
index 6b05ad8c250..e22a0d34044 100644
--- a/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
+++ b/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
@@ -4,7 +4,6 @@ description: Count active Jira Cloud installations that are using GitLab as a pr
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml b/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml
index 4c17bd746b3..707ea3420fe 100644
--- a/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml
+++ b/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml
@@ -4,7 +4,6 @@ description: Total number of times the Security Reports widget extension was vie
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml
index 60b6b75d064..7379f0e233c 100644
--- a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml
+++ b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml
@@ -4,7 +4,6 @@ description: Total number of times the Security Reports widget extension was exp
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml
index f5fef7e7cbe..442d7f04f2d 100644
--- a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml
@@ -4,7 +4,6 @@ description: Total number of times the Security Reports widget extension Full Re
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml b/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml
index fa0b573be84..2c065118d8e 100644
--- a/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml
+++ b/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml
@@ -4,7 +4,6 @@ description: Total number of times the Security Reports widget extension was exp
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml
index 20e21862a9a..f9de1ef3fa1 100644
--- a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml
+++ b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml
@@ -4,7 +4,6 @@ description: Total number of times the Security Reports widget extension was exp
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml
index 7a917d85b9c..b4d5a765a08 100644
--- a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml
+++ b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml
@@ -4,7 +4,6 @@ description: Total number of times the Security Reports widget extension was exp
product_section: dev
product_stage: create
product_group: code_review
-product_category: code_review
value_type: number
status: active
milestone: "15.7"
diff --git a/config/metrics/counts_all/20221209212603_projects_inheriting_apple_app_store_active.yml b/config/metrics/counts_all/20221209212603_projects_inheriting_apple_app_store_active.yml
index 5e00246a15c..b63357507ed 100644
--- a/config/metrics/counts_all/20221209212603_projects_inheriting_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209212603_projects_inheriting_apple_app_store_active.yml
@@ -4,7 +4,6 @@ description: Count of active projects inheriting integrations for Apple App Stor
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "15.8"
diff --git a/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml b/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml
index 9099752c62c..055e7748e0d 100644
--- a/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209213642_groups_apple_app_store_active.yml
@@ -4,7 +4,6 @@ description: Count of active groups inheriting integrations for Apple App Store
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "15.8"
diff --git a/config/metrics/counts_all/20221209214020_projects_apple_app_store_active.yml b/config/metrics/counts_all/20221209214020_projects_apple_app_store_active.yml
index 92e9acbcca0..52fb49f5b99 100644
--- a/config/metrics/counts_all/20221209214020_projects_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209214020_projects_apple_app_store_active.yml
@@ -4,7 +4,6 @@ description: Count of projects with active integrations for Apple App Store
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "15.8"
diff --git a/config/metrics/counts_all/20221209233053_groups_inheriting_apple_app_store_active.yml b/config/metrics/counts_all/20221209233053_groups_inheriting_apple_app_store_active.yml
index f7835a4e072..9e7effebb60 100644
--- a/config/metrics/counts_all/20221209233053_groups_inheriting_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209233053_groups_inheriting_apple_app_store_active.yml
@@ -4,7 +4,6 @@ description: Count of active groups inheriting integrations for Apple App Store
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "15.8"
diff --git a/config/metrics/counts_all/20221209233201_instances_apple_app_store_active.yml b/config/metrics/counts_all/20221209233201_instances_apple_app_store_active.yml
index 436f869cf0d..afbcd40d291 100644
--- a/config/metrics/counts_all/20221209233201_instances_apple_app_store_active.yml
+++ b/config/metrics/counts_all/20221209233201_instances_apple_app_store_active.yml
@@ -4,7 +4,6 @@ description: Count of instances with active integrations for Apple App Store
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "15.8"
diff --git a/config/metrics/counts_all/20230119154124_projects_with_monitor_enabled.yml b/config/metrics/counts_all/20230119154124_projects_with_monitor_enabled.yml
index 3bfa27fa8ed..e80fe7cf169 100644
--- a/config/metrics/counts_all/20230119154124_projects_with_monitor_enabled.yml
+++ b/config/metrics/counts_all/20230119154124_projects_with_monitor_enabled.yml
@@ -4,7 +4,6 @@ description: The number of projects with Monitor turned on.
product_section: ops
product_stage: monitor
product_group: respond
-product_category: incident_management
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_all/20230201120001_count_ml_candidates.yml b/config/metrics/counts_all/20230201120001_count_ml_candidates.yml
index aec9e18006e..dd76ea9c36a 100644
--- a/config/metrics/counts_all/20230201120001_count_ml_candidates.yml
+++ b/config/metrics/counts_all/20230201120001_count_ml_candidates.yml
@@ -4,7 +4,6 @@ description: Count of created Ml Candidates
product_section: dev
product_stage: create
product_group: mlops
-product_category: MLOps
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_all/20230201120002_count_ml_experiments.yml b/config/metrics/counts_all/20230201120002_count_ml_experiments.yml
index 52c076cf072..8786c7fc031 100644
--- a/config/metrics/counts_all/20230201120002_count_ml_experiments.yml
+++ b/config/metrics/counts_all/20230201120002_count_ml_experiments.yml
@@ -4,7 +4,6 @@ description: Count of created Ml Experiments
product_section: dev
product_stage: create
product_group: mlops
-product_category: MLOps
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml b/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml
index 77b0fef30c4..6a4fd0b7c53 100644
--- a/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml
+++ b/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml
@@ -4,7 +4,6 @@ description: Count of unique projects that contain at least one Ml Candidate
product_section: dev
product_stage: create
product_group: mlops
-product_category: MLOps
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml b/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml
index 7cb86824e35..a12b3be4a29 100644
--- a/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml
+++ b/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml
@@ -4,7 +4,6 @@ description: Count of unique users that have created at least one Ml Candidate
product_section: dev
product_stage: create
product_group: mlops
-product_category: MLOps
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml b/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml
index fed72a30697..f1f6f6c594e 100644
--- a/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml
+++ b/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml
@@ -4,7 +4,6 @@ description: Count of unique projects that contain at least one Ml Experiment
product_section: dev
product_stage: create
product_group: mlops
-product_category: MLOps
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_all/20230209153034_projects_jira_server_deployment_type_active.yml b/config/metrics/counts_all/20230209153034_projects_jira_server_deployment_type_active.yml
index 53b8c280db4..26873a8001c 100644
--- a/config/metrics/counts_all/20230209153034_projects_jira_server_deployment_type_active.yml
+++ b/config/metrics/counts_all/20230209153034_projects_jira_server_deployment_type_active.yml
@@ -4,7 +4,6 @@ description: Count of active integrations with Jira Software with server deploym
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_all/20230209153255_projects_jira_cloud_deployment_type_active.yml b/config/metrics/counts_all/20230209153255_projects_jira_cloud_deployment_type_active.yml
index 093afb71275..7d49a7223ba 100644
--- a/config/metrics/counts_all/20230209153255_projects_jira_cloud_deployment_type_active.yml
+++ b/config/metrics/counts_all/20230209153255_projects_jira_cloud_deployment_type_active.yml
@@ -4,7 +4,6 @@ description: Count of active integrations with Jira Software with cloud deployme
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: number
status: active
milestone: "15.9"
diff --git a/config/metrics/counts_all/20230210184724_projects_inheriting_google_play_active.yml b/config/metrics/counts_all/20230210184724_projects_inheriting_google_play_active.yml
new file mode 100644
index 00000000000..23058f2f6f7
--- /dev/null
+++ b/config/metrics/counts_all/20230210184724_projects_inheriting_google_play_active.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.projects_inheriting_google_play_active
+description: Count of active projects inheriting integrations for Google Play
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111621
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230222192643_projects_google_play_active.yml b/config/metrics/counts_all/20230222192643_projects_google_play_active.yml
new file mode 100644
index 00000000000..dff05e0132c
--- /dev/null
+++ b/config/metrics/counts_all/20230222192643_projects_google_play_active.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.projects_google_play_active
+description: Count of projects with active integrations for Google Play
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111621
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230222193011_instances_google_play_active.yml b/config/metrics/counts_all/20230222193011_instances_google_play_active.yml
new file mode 100644
index 00000000000..ae5a38597c1
--- /dev/null
+++ b/config/metrics/counts_all/20230222193011_instances_google_play_active.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.instances_google_play_active
+description: Count of instances with active integrations for Google Play
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111621
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml b/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml
new file mode 100644
index 00000000000..015e0941ffe
--- /dev/null
+++ b/config/metrics/counts_all/20230222193151_groups_inheriting_google_play_active.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.groups_inheriting_google_play_active
+description: Count of active groups inheriting integrations for Google Play
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111621
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230222193255_groups_google_play_active.yml b/config/metrics/counts_all/20230222193255_groups_google_play_active.yml
new file mode 100644
index 00000000000..cafd77f9416
--- /dev/null
+++ b/config/metrics/counts_all/20230222193255_groups_google_play_active.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.groups_google_play_active
+description: Count of active groups inheriting integrations for Google Play
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111621
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230303131933_groups_inheriting_squash_tm_active.yml b/config/metrics/counts_all/20230303131933_groups_inheriting_squash_tm_active.yml
new file mode 100644
index 00000000000..f21ca8ade83
--- /dev/null
+++ b/config/metrics/counts_all/20230303131933_groups_inheriting_squash_tm_active.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.groups_inheriting_squash_tm_active
+description: Count of active groups inheriting integrations for Squash TM
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110909
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230303131936_groups_squash_tm_active.yml b/config/metrics/counts_all/20230303131936_groups_squash_tm_active.yml
new file mode 100644
index 00000000000..859b381493a
--- /dev/null
+++ b/config/metrics/counts_all/20230303131936_groups_squash_tm_active.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.groups_squash_tm_active
+description: Count of groups with active integrations for Squash TM
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110909
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml b/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml
new file mode 100644
index 00000000000..ec88fbb94c0
--- /dev/null
+++ b/config/metrics/counts_all/20230303132041_instances_squash_tm_active.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.instances_squash_tm_active
+description: Count of instance-level integrations for Squash TM
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110909
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230303132048_projects_inheriting_squash_tm_active.yml b/config/metrics/counts_all/20230303132048_projects_inheriting_squash_tm_active.yml
new file mode 100644
index 00000000000..079d73e70fe
--- /dev/null
+++ b/config/metrics/counts_all/20230303132048_projects_inheriting_squash_tm_active.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.projects_inheriting_squash_tm_active
+description: Count of active projects inheriting integrations for Squash TM
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110909
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml b/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml
new file mode 100644
index 00000000000..c349bf05dae
--- /dev/null
+++ b/config/metrics/counts_all/20230303132352_projects_squash_tm_active.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.projects_squash_tm_active
+description: Count of projects with active integrations for Squash TM
+product_section: dev
+product_stage: manage
+product_group: integrations
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110909
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20230306191328_i_container_registry_delete_manifest.yml b/config/metrics/counts_all/20230306191328_i_container_registry_delete_manifest.yml
new file mode 100644
index 00000000000..0cb1ceb8595
--- /dev/null
+++ b/config/metrics/counts_all/20230306191328_i_container_registry_delete_manifest.yml
@@ -0,0 +1,25 @@
+---
+key_path: counts.container_registry_events_i_container_registry_delete_manifest
+name: manifest_delete_events
+description: A count of manifests that have been deleted
+product_section: ops
+product_stage: package
+product_group: package
+value_type: number
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113440
+time_frame: all
+data_source: redis
+instrumentation_class: RedisMetric
+options:
+ prefix: container_registry_events
+ event: i_container_registry_delete_manifest
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/license/20210201124932_recorded_at.yml b/config/metrics/license/20210201124932_recorded_at.yml
index c9d98a96727..d37d8b0e3ea 100644
--- a/config/metrics/license/20210201124932_recorded_at.yml
+++ b/config/metrics/license/20210201124932_recorded_at.yml
@@ -5,7 +5,6 @@ description: When the Usage Ping computation was started
product_section: analytics
product_stage: analytics
product_group: product_intelligence
-product_category: collection
value_type: string
status: active
milestone: "8.10"
diff --git a/config/metrics/license/20210201124933_uuid.yml b/config/metrics/license/20210201124933_uuid.yml
index f864c2be37a..2b08e8667c9 100644
--- a/config/metrics/license/20210201124933_uuid.yml
+++ b/config/metrics/license/20210201124933_uuid.yml
@@ -4,7 +4,6 @@ description: GitLab instance unique identifier
product_section: analytics
product_stage: analytics
product_group: product_intelligence
-product_category: collection
value_type: string
status: active
milestone: "9.1"
diff --git a/config/metrics/license/20210204124827_hostname.yml b/config/metrics/license/20210204124827_hostname.yml
index f545ae0c061..891ce0c20ff 100644
--- a/config/metrics/license/20210204124827_hostname.yml
+++ b/config/metrics/license/20210204124827_hostname.yml
@@ -4,7 +4,6 @@ description: Host name of GitLab instance
product_section: analytics
product_stage: analytics
product_group: product_intelligence
-product_category: collection
value_type: string
status: active
milestone: "<13.9"
diff --git a/config/metrics/license/20210204124829_active_user_count.yml b/config/metrics/license/20210204124829_active_user_count.yml
index 037ac7b5a03..c0cbdfa8df3 100644
--- a/config/metrics/license/20210204124829_active_user_count.yml
+++ b/config/metrics/license/20210204124829_active_user_count.yml
@@ -4,7 +4,6 @@ description: The number of active users existing in the instance. This is named
product_section: analytics
product_stage: analytics
product_group: product_intelligence
-product_category: collection
value_type: number
status: active
milestone: "<13.9"
diff --git a/config/metrics/license/20210204124928_version.yml b/config/metrics/license/20210204124928_version.yml
index 77cfcc38204..8c7bfeb5903 100644
--- a/config/metrics/license/20210204124928_version.yml
+++ b/config/metrics/license/20210204124928_version.yml
@@ -5,7 +5,6 @@ description: Version of Gitaly
product_section: dev
product_stage: create
product_group: gitaly
-product_category: gitaly
value_type: string
status: active
milestone: "<13.9"
diff --git a/config/metrics/license/20210204124936_pages_version.yml b/config/metrics/license/20210204124936_pages_version.yml
index 35fdc4676fe..e98e258e37d 100644
--- a/config/metrics/license/20210204124936_pages_version.yml
+++ b/config/metrics/license/20210204124936_pages_version.yml
@@ -5,7 +5,6 @@ description: The version number of GitLab Pages
product_section: ops
product_stage: create
product_group: editor
-product_category: pages
value_type: string
status: active
milestone: "<13.9"
diff --git a/config/metrics/license/20210204124938_recording_ce_finished_at.yml b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
index 54728ff8206..28a9adf9071 100644
--- a/config/metrics/license/20210204124938_recording_ce_finished_at.yml
+++ b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
@@ -5,7 +5,6 @@ description: When the core features were computed
product_section: analytics
product_stage: analytics
product_group: product_intelligence
-product_category: collection
value_type: string
status: active
milestone: "13.0"
diff --git a/config/metrics/license/20210216175601_version.yml b/config/metrics/license/20210216175601_version.yml
index 3eb94445513..ddaf0a18f4f 100644
--- a/config/metrics/license/20210216175601_version.yml
+++ b/config/metrics/license/20210216175601_version.yml
@@ -5,12 +5,12 @@ description: Version of GitLab instance
product_section: enablement
product_stage: enablement
product_group: distribution
-product_category: collection
value_type: string
status: active
milestone: "<13.9"
time_frame: none
data_source: system
+instrumentation_class: VersionMetric
distribution:
- ce
- ee
diff --git a/config/metrics/license/20210216175602_installation_type.yml b/config/metrics/license/20210216175602_installation_type.yml
index 9c3abd0131f..7ec3d54ec4e 100644
--- a/config/metrics/license/20210216175602_installation_type.yml
+++ b/config/metrics/license/20210216175602_installation_type.yml
@@ -5,13 +5,13 @@ description: The installation method used to install GitLab (Omnibus, Helm, etc)
product_section: enablement
product_stage: enablement
product_group: distribution
-product_category: collection
value_type: string
status: active
milestone: "11.0"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/5952/
time_frame: none
data_source: system
+instrumentation_class: InstallationTypeMetric
distribution:
- ce
- ee
diff --git a/config/metrics/license/20210216181053_version.yml b/config/metrics/license/20210216181053_version.yml
index 36920d7c895..d4f3bedaa6e 100644
--- a/config/metrics/license/20210216181053_version.yml
+++ b/config/metrics/license/20210216181053_version.yml
@@ -5,7 +5,6 @@ description: Identifies the version of the external registry being used
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: number
status: active
milestone: "<13.9"
diff --git a/config/metrics/license/20210216183237_version.yml b/config/metrics/license/20210216183237_version.yml
index 3303d8fbdef..e896ce12687 100644
--- a/config/metrics/license/20210216183237_version.yml
+++ b/config/metrics/license/20210216183237_version.yml
@@ -5,7 +5,6 @@ description: Information about Git version
product_section: enablement
product_stage: enablement
product_group: distribution
-product_category: ''
value_type: object
value_json_schema: 'config/metrics/objects_schemas/git_version_schema.json'
status: active
diff --git a/config/metrics/license/20230228110448_installation_creation_date.yml b/config/metrics/license/20230228110448_installation_creation_date.yml
new file mode 100644
index 00000000000..53f9438ba0f
--- /dev/null
+++ b/config/metrics/license/20230228110448_installation_creation_date.yml
@@ -0,0 +1,22 @@
+---
+key_path: installation_creation_date
+description: "The date and time the instance was installed"
+product_section: analytics
+product_stage: analytics
+product_group: product_intelligence
+value_type: string
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113090
+time_frame: none
+data_source: database
+data_category: operational
+instrumentation_class: InstallationCreationDateMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/license/20230314161014_gitlab_dedicated.yml b/config/metrics/license/20230314161014_gitlab_dedicated.yml
new file mode 100644
index 00000000000..1aff67f2561
--- /dev/null
+++ b/config/metrics/license/20230314161014_gitlab_dedicated.yml
@@ -0,0 +1,19 @@
+---
+key_path: gitlab_dedicated
+description: Is the instance a Gitlab Dedicated instance
+product_section: analytics
+product_stage: analytics
+product_group: product_intelligence
+value_type: boolean
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114717
+time_frame: none
+data_source: database
+data_category: optional
+instrumentation_class: GitlabDedicatedMetric
+performance_indicator_type: []
+distribution:
+- ee
+tier:
+- ultimate
diff --git a/config/metrics/license/20230505112412_installation_creation_date_approximation.yml b/config/metrics/license/20230505112412_installation_creation_date_approximation.yml
new file mode 100644
index 00000000000..5cc7957eca1
--- /dev/null
+++ b/config/metrics/license/20230505112412_installation_creation_date_approximation.yml
@@ -0,0 +1,22 @@
+---
+key_path: installation_creation_date_approximation
+description: "The approximate date and time the instance was installed. Based on the first created user or application setting"
+product_section: analytics
+product_stage: analytics
+product_group: product_intelligence
+value_type: string
+status: active
+milestone: "16.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119588
+time_frame: none
+data_source: database
+data_category: operational
+instrumentation_class: InstallationCreationDateApproximationMetric
+performance_indicator_type: []
+distribution:
+ - ce
+ - ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/objects_schemas/index_inconsistencies_metric.json b/config/metrics/objects_schemas/index_inconsistencies_metric.json
new file mode 100644
index 00000000000..635cfa64d95
--- /dev/null
+++ b/config/metrics/objects_schemas/index_inconsistencies_metric.json
@@ -0,0 +1,19 @@
+{
+ "type": "array",
+ "items": {
+ "type": [
+ {
+ "type": "object",
+ "properties": {
+ "object_name": {
+ "type": "string"
+ },
+ "type": {
+ "type": "string",
+ "description": "Type of index inconsistency"
+ }
+ }
+ }
+ ]
+ }
+}
diff --git a/config/metrics/schema.json b/config/metrics/schema.json
index f4594dcc2d2..d3afc779e14 100644
--- a/config/metrics/schema.json
+++ b/config/metrics/schema.json
@@ -43,12 +43,6 @@
"type": "string",
"pattern": "^$|^([a-z]+_)*[a-z]+$"
},
- "product_category": {
- "type": [
- "string",
- "null"
- ]
- },
"value_type": {
"type": "string",
"enum": [
@@ -199,4 +193,4 @@
}
}
]
-} \ No newline at end of file
+}
diff --git a/config/metrics/settings/20210201124935_database_adapter.yml b/config/metrics/settings/20210201124935_database_adapter.yml
index 335f8eb15ac..2cfc5567cd9 100644
--- a/config/metrics/settings/20210201124935_database_adapter.yml
+++ b/config/metrics/settings/20210201124935_database_adapter.yml
@@ -7,7 +7,6 @@ description: This metric only returns a value of PostgreSQL in supported version
product_section: enablement
product_stage: enablement
product_group: enablement_distribution
-product_category: collection
value_type: string
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
index a5406c43c4b..df53d2784d2 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -5,7 +5,6 @@ description: Whether auto DevOps is enabled
product_section: ops
product_stage: configure
product_group: configure
-product_category: auto_devops
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index de5f181216b..f7ef96f196d 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -5,7 +5,6 @@ description: A count of projects where the container registry is enabled
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
index 3ed4fa06c05..0d3382cfe5a 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -5,7 +5,6 @@ description: A count of projects where the dependency proxy is enabled
product_section: ops
product_stage: package
product_group: package
-product_category: container registry
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
index 8c92609ca26..fa645922f92 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -5,7 +5,6 @@ description: Whether shared runners is enabled
product_section: ops
product_stage: verify
product_group: runner
-product_category: runner
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index ec7495cfbe5..932151ca37a 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -5,7 +5,6 @@ description: Whether gravatar is enabled
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category: users
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index 2c506cb40fc..3a5d6335693 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -5,7 +5,6 @@ description: Whether LDAP is enabled
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category: authentication_and_authorization
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index fb4608c12c5..6c8b0635471 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Mattermost is enabled
product_section: dev
product_stage: manage
product_group: integrations
-product_category: integrations
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index 83ea666a331..810ded396ca 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -5,7 +5,6 @@ description: Whether OmniAuth is enabled
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category: authentication_and_authorization
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
index b003b2d8c19..a68569d728e 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -5,7 +5,6 @@ description: Whether incoming email is setup
product_section: dev
product_stage: plan
product_group: certify
-product_category: collection
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index df7f03a7d2e..0fc1e768de1 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -5,7 +5,6 @@ description: Whether public signup is enabled
product_section: dev
product_stage: manage
product_group: authentication_and_authorization
-product_category: authentication_and_authorization
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
index ba19088442f..da6055ae7cc 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Web IDE clientside preview is enabled
product_section: dev
product_stage: create
product_group: editor
-product_category: collection
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124922_grafana_link_enabled.yml b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
index 104f991e96f..c80a6c88073 100644
--- a/config/metrics/settings/20210204124922_grafana_link_enabled.yml
+++ b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Grafana is enabled
product_section: ops
product_stage: monitor
product_group: respond
-product_category: collection
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124934_pages_enabled.yml b/config/metrics/settings/20210204124934_pages_enabled.yml
index 76a1401ae2e..a3b341b2f14 100644
--- a/config/metrics/settings/20210204124934_pages_enabled.yml
+++ b/config/metrics/settings/20210204124934_pages_enabled.yml
@@ -5,7 +5,6 @@ description: Whether GitLab Pages is enabled
product_section: ops
product_stage: create
product_group: editor
-product_category: collection
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216174829_smtp_server.yml b/config/metrics/settings/20210216174829_smtp_server.yml
index 8d126e75ac0..a21165f6490 100644
--- a/config/metrics/settings/20210216174829_smtp_server.yml
+++ b/config/metrics/settings/20210216174829_smtp_server.yml
@@ -5,7 +5,6 @@ description: The value of the SMTP server that is used
product_section: growth
product_stage: growth
product_group: activation
-product_category: onboarding
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
index 7653505a19f..9f136ba3cc1 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -5,7 +5,6 @@ description: Whether or not ModSecurity is enabled within Ingress
product_section: sec
product_stage: protect_stage_was_removed
product_group: container_security_group_was_removed
-product_category: web_firewall_category_was_removed
value_type: boolean
status: removed
milestone_removed: 14.0
diff --git a/config/metrics/settings/20210216175604_edition.yml b/config/metrics/settings/20210216175604_edition.yml
index a8d363796ed..765210fb598 100644
--- a/config/metrics/settings/20210216175604_edition.yml
+++ b/config/metrics/settings/20210216175604_edition.yml
@@ -5,11 +5,11 @@ description: Edition of GitLab such as EE or CE
product_section: enablement
product_stage: enablement
product_group: distribution
-product_category: collection
value_type: string
status: active
time_frame: none
data_source: system
+instrumentation_class: EditionMetric
distribution:
- ce
- ee
diff --git a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
index b1eee864e24..b5880566d5e 100644
--- a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
@@ -5,7 +5,6 @@ description: Is encrypted LDAP secrets configured?
product_section: enablement
product_stage: enablement
product_group: distribution
-product_category: global_search
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216175609_version.yml b/config/metrics/settings/20210216175609_version.yml
index 493c93d3d1a..5e77d547a80 100644
--- a/config/metrics/settings/20210216175609_version.yml
+++ b/config/metrics/settings/20210216175609_version.yml
@@ -5,7 +5,6 @@ description: The version of the PostgreSQL database.
product_section: enablement
product_stage: enablement
product_group: distribution
-product_category: collection
value_type: string
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml
index fc12cc8803f..0510f56cf0a 100644
--- a/config/metrics/settings/20210216180314_gitpod_enabled.yml
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Gitpod is enabled in the instance
product_section: dev
product_stage: create
product_group: editor
-product_category: integrations
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180836_enabled.yml b/config/metrics/settings/20210216180836_enabled.yml
index a52473734eb..c648ea6d3e7 100644
--- a/config/metrics/settings/20210216180836_enabled.yml
+++ b/config/metrics/settings/20210216180836_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for Artifacts
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180838_enabled.yml b/config/metrics/settings/20210216180838_enabled.yml
index 68a466ebf0a..7ac3b166340 100644
--- a/config/metrics/settings/20210216180838_enabled.yml
+++ b/config/metrics/settings/20210216180838_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for Artifacts
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180840_direct_upload.yml b/config/metrics/settings/20210216180840_direct_upload.yml
index 242add8c15b..b73e74478ea 100644
--- a/config/metrics/settings/20210216180840_direct_upload.yml
+++ b/config/metrics/settings/20210216180840_direct_upload.yml
@@ -5,7 +5,6 @@ description: Whether Direct Upload for Object Storage is enabled for Artifacts
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180841_background_upload.yml b/config/metrics/settings/20210216180841_background_upload.yml
index 22f7e5e078d..f29588703fc 100644
--- a/config/metrics/settings/20210216180841_background_upload.yml
+++ b/config/metrics/settings/20210216180841_background_upload.yml
@@ -5,7 +5,6 @@ description: Whether Background Upload for Object Storage is enabled for Artifac
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: broken
repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900
diff --git a/config/metrics/settings/20210216180843_provider.yml b/config/metrics/settings/20210216180843_provider.yml
index bdb58fff347..ae449f4ce41 100644
--- a/config/metrics/settings/20210216180843_provider.yml
+++ b/config/metrics/settings/20210216180843_provider.yml
@@ -5,7 +5,6 @@ description: What Object Storage provider has been configured for Artifacts
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: string
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180845_enabled.yml b/config/metrics/settings/20210216180845_enabled.yml
index f712d4fd306..61df7c0a793 100644
--- a/config/metrics/settings/20210216180845_enabled.yml
+++ b/config/metrics/settings/20210216180845_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for External Diffs
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180847_enabled.yml b/config/metrics/settings/20210216180847_enabled.yml
index 128418f4bd3..d506f8bd727 100644
--- a/config/metrics/settings/20210216180847_enabled.yml
+++ b/config/metrics/settings/20210216180847_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for External Diffs
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180849_direct_upload.yml b/config/metrics/settings/20210216180849_direct_upload.yml
index e1865f244e9..d246768a52a 100644
--- a/config/metrics/settings/20210216180849_direct_upload.yml
+++ b/config/metrics/settings/20210216180849_direct_upload.yml
@@ -5,7 +5,6 @@ description: Whether Direct Upload for Object Storage is enabled for External Di
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180851_background_upload.yml b/config/metrics/settings/20210216180851_background_upload.yml
index 21536e35303..fddcce4691b 100644
--- a/config/metrics/settings/20210216180851_background_upload.yml
+++ b/config/metrics/settings/20210216180851_background_upload.yml
@@ -6,7 +6,6 @@ description: Whether Background Upload for Object Storage is enabled for Externa
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: broken
repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900
diff --git a/config/metrics/settings/20210216180852_provider.yml b/config/metrics/settings/20210216180852_provider.yml
index c6d09c82480..615badfd761 100644
--- a/config/metrics/settings/20210216180852_provider.yml
+++ b/config/metrics/settings/20210216180852_provider.yml
@@ -5,7 +5,6 @@ description: What Object Storage provider has been configured for External Diffs
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: string
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180854_enabled.yml b/config/metrics/settings/20210216180854_enabled.yml
index a4fca5e347b..0da06a20e36 100644
--- a/config/metrics/settings/20210216180854_enabled.yml
+++ b/config/metrics/settings/20210216180854_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for LFS
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180856_enabled.yml b/config/metrics/settings/20210216180856_enabled.yml
index 05c390c0040..b76c51857cf 100644
--- a/config/metrics/settings/20210216180856_enabled.yml
+++ b/config/metrics/settings/20210216180856_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for LFS
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180858_direct_upload.yml b/config/metrics/settings/20210216180858_direct_upload.yml
index 8cdfd1844b8..2aec5df1117 100644
--- a/config/metrics/settings/20210216180858_direct_upload.yml
+++ b/config/metrics/settings/20210216180858_direct_upload.yml
@@ -5,7 +5,6 @@ description: Whether Direct Upload for Object Storage is enabled for LFS
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180900_background_upload.yml b/config/metrics/settings/20210216180900_background_upload.yml
index df93b11c656..fb92b12d608 100644
--- a/config/metrics/settings/20210216180900_background_upload.yml
+++ b/config/metrics/settings/20210216180900_background_upload.yml
@@ -5,7 +5,6 @@ description: Whether Background Upload for Object Storage is enabled for LFS
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: broken
repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900
diff --git a/config/metrics/settings/20210216180902_provider.yml b/config/metrics/settings/20210216180902_provider.yml
index 40a39acc8fd..c9fe9bf9e2a 100644
--- a/config/metrics/settings/20210216180902_provider.yml
+++ b/config/metrics/settings/20210216180902_provider.yml
@@ -5,7 +5,6 @@ description: What Object Storage provider has been configured for LFS
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: string
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180903_enabled.yml b/config/metrics/settings/20210216180903_enabled.yml
index 3e3f1ec17dc..f4296a1d4eb 100644
--- a/config/metrics/settings/20210216180903_enabled.yml
+++ b/config/metrics/settings/20210216180903_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for Uploads
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: string
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180905_enabled.yml b/config/metrics/settings/20210216180905_enabled.yml
index 7e35d718dd3..41b35c32ab8 100644
--- a/config/metrics/settings/20210216180905_enabled.yml
+++ b/config/metrics/settings/20210216180905_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for Uploads
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180907_direct_upload.yml b/config/metrics/settings/20210216180907_direct_upload.yml
index 53f3e2a7022..f891271bdbe 100644
--- a/config/metrics/settings/20210216180907_direct_upload.yml
+++ b/config/metrics/settings/20210216180907_direct_upload.yml
@@ -5,7 +5,6 @@ description: Whether Direct Upload for Object Storage is enabled for Uploads
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180909_background_upload.yml b/config/metrics/settings/20210216180909_background_upload.yml
index 32871d5d30e..2ed457f4262 100644
--- a/config/metrics/settings/20210216180909_background_upload.yml
+++ b/config/metrics/settings/20210216180909_background_upload.yml
@@ -5,7 +5,6 @@ description: Whether Background Upload for Object Storage is enabled for Uploads
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: broken
repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900
diff --git a/config/metrics/settings/20210216180911_provider.yml b/config/metrics/settings/20210216180911_provider.yml
index ba3f68dab4d..4572ab0330d 100644
--- a/config/metrics/settings/20210216180911_provider.yml
+++ b/config/metrics/settings/20210216180911_provider.yml
@@ -5,7 +5,6 @@ description: What Object Storage provider has been configured for Uploads
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: string
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index 7c91a7cbe5b..f7ed9d04862 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for Uploads
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180915_enabled.yml b/config/metrics/settings/20210216180915_enabled.yml
index ae465ef80b3..aaeb66f10c2 100644
--- a/config/metrics/settings/20210216180915_enabled.yml
+++ b/config/metrics/settings/20210216180915_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Object Storage is enabled for Packages
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180916_direct_upload.yml b/config/metrics/settings/20210216180916_direct_upload.yml
index 8628e5aeda9..0463c0726c7 100644
--- a/config/metrics/settings/20210216180916_direct_upload.yml
+++ b/config/metrics/settings/20210216180916_direct_upload.yml
@@ -5,7 +5,6 @@ description: Whether Direct Upload for Object Storage is enabled for Packages
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216180918_background_upload.yml b/config/metrics/settings/20210216180918_background_upload.yml
index 186e7c8b2b9..5c9afd5a281 100644
--- a/config/metrics/settings/20210216180918_background_upload.yml
+++ b/config/metrics/settings/20210216180918_background_upload.yml
@@ -5,7 +5,6 @@ description: Whether Background Upload for Object Storage is enabled for Package
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: boolean
status: broken
repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382900
diff --git a/config/metrics/settings/20210216180920_provider.yml b/config/metrics/settings/20210216180920_provider.yml
index 88fd70061db..38143e1f4b9 100644
--- a/config/metrics/settings/20210216180920_provider.yml
+++ b/config/metrics/settings/20210216180920_provider.yml
@@ -5,7 +5,6 @@ description: What Object Storage provider has been configured for Packages
product_section: enablement
product_stage: enablement
product_group: memory
-product_category: memory
value_type: string
status: active
time_frame: none
diff --git a/config/metrics/settings/20210216183241_filesystems.yml b/config/metrics/settings/20210216183241_filesystems.yml
index b0df7200270..6536d06779d 100644
--- a/config/metrics/settings/20210216183241_filesystems.yml
+++ b/config/metrics/settings/20210216183241_filesystems.yml
@@ -5,7 +5,6 @@ description: Filesystem data for Gitaly installations
product_section: dev
product_stage: create
product_group: gitaly
-product_category: gitaly
value_type: string
status: active
time_frame: all
diff --git a/config/metrics/settings/20210216183248_pg_system_id.yml b/config/metrics/settings/20210216183248_pg_system_id.yml
index a466872922e..fdda68c977e 100644
--- a/config/metrics/settings/20210216183248_pg_system_id.yml
+++ b/config/metrics/settings/20210216183248_pg_system_id.yml
@@ -5,7 +5,6 @@ description: TBD
product_section: enablement
product_stage: enablement
product_group: distribution
-product_category:
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/settings/20210225045628_operating_system.yml b/config/metrics/settings/20210225045628_operating_system.yml
index 5eeb45ea062..e1249aee2a7 100644
--- a/config/metrics/settings/20210225045628_operating_system.yml
+++ b/config/metrics/settings/20210225045628_operating_system.yml
@@ -5,7 +5,6 @@ description: Information about the operating system running GitLab
product_section: enablement
product_stage: enablement
product_group: distribution
-product_category: collection
value_type: string
status: active
milestone: "13.10"
diff --git a/config/metrics/settings/20210321224827_gitaly_apdex.yml b/config/metrics/settings/20210321224827_gitaly_apdex.yml
index 101c94157eb..3dcb8340628 100644
--- a/config/metrics/settings/20210321224827_gitaly_apdex.yml
+++ b/config/metrics/settings/20210321224827_gitaly_apdex.yml
@@ -5,7 +5,6 @@ description: Gitaly application performance
product_section: dev
product_stage: create
product_group: gitaly
-product_category: gitaly
value_type: number
status: active
milestone: "13.11"
diff --git a/config/metrics/settings/20210323120839_topology.yml b/config/metrics/settings/20210323120839_topology.yml
index 6cd6e91d2c4..1d25dfed3a9 100644
--- a/config/metrics/settings/20210323120839_topology.yml
+++ b/config/metrics/settings/20210323120839_topology.yml
@@ -5,7 +5,6 @@ description: Topology data
product_section: enablement
product_stage: enablement
product_group: memory
-product_category:
value_type: object
status: active
milestone: "13.11"
diff --git a/config/metrics/settings/20210702140138_collected_data_categories.yml b/config/metrics/settings/20210702140138_collected_data_categories.yml
index 006a77f8b29..e5732e3410b 100644
--- a/config/metrics/settings/20210702140138_collected_data_categories.yml
+++ b/config/metrics/settings/20210702140138_collected_data_categories.yml
@@ -5,7 +5,6 @@ description: List of collected data categories corresponding to instance setting
product_section: analytics
product_stage: analytics
product_group: product_intelligence
-product_category: collection
value_type: object
status: active
milestone: "14.1"
diff --git a/config/metrics/settings/20210915152326_service_ping_features_enabled.yml b/config/metrics/settings/20210915152326_service_ping_features_enabled.yml
index d7e1a7f68bf..ec7a2480990 100644
--- a/config/metrics/settings/20210915152326_service_ping_features_enabled.yml
+++ b/config/metrics/settings/20210915152326_service_ping_features_enabled.yml
@@ -5,7 +5,6 @@ description: Whether Service Ping features are enabled
product_section: analytics
product_stage: analytics
product_group: product_intelligence
-product_category: collection
value_type: boolean
status: active
milestone: "14.3"
diff --git a/config/metrics/settings/20211124061450_snowplow_enabled.yml b/config/metrics/settings/20211124061450_snowplow_enabled.yml
index 14662665cf7..7c4ae3a4f29 100644
--- a/config/metrics/settings/20211124061450_snowplow_enabled.yml
+++ b/config/metrics/settings/20211124061450_snowplow_enabled.yml
@@ -5,7 +5,6 @@ description: Whether snowplow is enabled for the GitLab instance
product_section: analytics
product_stage: analytics
product_group: product_intelligence
-product_category: product intelligence
value_type: boolean
status: active
milestone: "14.6"
diff --git a/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml b/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml
index c634facdd92..f1d2b64c531 100644
--- a/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml
+++ b/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml
@@ -5,7 +5,6 @@ description: Metric informs if currently configured Snowplow collector hostname
product_section: analytics
product_stage: analytics
product_group: product_intelligence
-product_category: product intelligence
value_type: boolean
status: active
milestone: "14.6"
diff --git a/config/metrics/settings/20211201012652_flavor.yml b/config/metrics/settings/20211201012652_flavor.yml
index 01c73de57c0..625afabb029 100644
--- a/config/metrics/settings/20211201012652_flavor.yml
+++ b/config/metrics/settings/20211201012652_flavor.yml
@@ -7,7 +7,6 @@ description: What PostgreSQL flavor is being used. Possible values are
product_section: enablement
product_stage: enablement
product_group: database
-product_category: database
value_type: string
status: active
milestone: "14.6"
diff --git a/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml b/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
index f331aab7882..8ec9482b8c7 100644
--- a/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
+++ b/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
@@ -5,7 +5,6 @@ description: "Certificate-based clusters feature flag"
product_section: ops
product_stage: configure
product_group: configure
-product_category:
value_type: boolean
status: active
milestone: "14.9"
diff --git a/config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml b/config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml
index 0f77cde4014..4a1cacfcfb2 100644
--- a/config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml
+++ b/config/metrics/settings/20221015152126_deactivate_dormant_users_enabled.yml
@@ -4,7 +4,6 @@ description: Whether Dormant User Deactivation is enabled
product_section: fulfillment
product_stage: fulfillment
product_group: utilization
-product_category: subscription_cost_management
value_type: boolean
status: active
milestone: "15.6"
diff --git a/config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml b/config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml
index 6cd7e0f0da7..015cffd4032 100644
--- a/config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml
+++ b/config/metrics/settings/20221015161233_deactivate_dormant_users_period.yml
@@ -4,7 +4,6 @@ description: The value of the dormant users period being used
product_section: fulfillment
product_stage: fulfillment
product_group: utilization
-product_category: subscription_cost_management
value_type: boolean
status: active
milestone: "15.6"
diff --git a/config/metrics/settings/20230125220526_incoming_email_encrypted_secrets_enabled.yml b/config/metrics/settings/20230125220526_incoming_email_encrypted_secrets_enabled.yml
index ae73bcbafea..9c633a701c1 100644
--- a/config/metrics/settings/20230125220526_incoming_email_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20230125220526_incoming_email_encrypted_secrets_enabled.yml
@@ -4,7 +4,6 @@ description: Are encrypted incoming email secrets configured?
product_section: enablement
product_stage: enablement
product_group: distribution
-product_category: build
value_type: boolean
status: active
milestone: "15.9"
diff --git a/config/metrics/settings/20230125221700_service_desk_email_encrypted_secrets_enabled.yml b/config/metrics/settings/20230125221700_service_desk_email_encrypted_secrets_enabled.yml
index 227bc86adfa..8b22c398861 100644
--- a/config/metrics/settings/20230125221700_service_desk_email_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20230125221700_service_desk_email_encrypted_secrets_enabled.yml
@@ -4,7 +4,6 @@ description: Are service desk email secrets configured?
product_section: enablement
product_stage: enablement
product_group: distribution
-product_category: build
value_type: boolean
status: active
milestone: "15.9"
diff --git a/config/metrics/settings/20230203164341_index_inconsistencies_metric.yml b/config/metrics/settings/20230203164341_index_inconsistencies_metric.yml
new file mode 100644
index 00000000000..08016b5143e
--- /dev/null
+++ b/config/metrics/settings/20230203164341_index_inconsistencies_metric.yml
@@ -0,0 +1,24 @@
+---
+key_path: index_inconsistencies
+name: "index_inconsistencies"
+description: "List the index inconsistencies in the database"
+product_section: enablement
+product_stage: enablement
+product_group: database
+value_type: object
+status: active
+milestone: "15.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111015
+time_frame: none
+data_source: system
+data_category: optional
+instrumentation_class: IndexInconsistenciesMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+value_json_schema: "config/metrics/objects_schemas/index_inconsistencies_metric.json"
diff --git a/config/metrics/settings/20230328165533_mode.yml b/config/metrics/settings/20230328165533_mode.yml
new file mode 100644
index 00000000000..bc8019d86aa
--- /dev/null
+++ b/config/metrics/settings/20230328165533_mode.yml
@@ -0,0 +1,23 @@
+---
+key_path: database.mode
+description: What PostgreSQL database mode is used. Possible values are
+ "single-database", "single-database-ci-connection", or "multiple-databases"
+product_section: enablement
+product_stage: enablement
+product_group: database
+product_category: database
+value_type: string
+status: active
+milestone: "15.11"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115900
+time_frame: none
+instrumentation_class: DatabaseMode
+data_source: system
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/object_store_settings.rb b/config/object_store_settings.rb
index 58d7ea22231..615b13d59ca 100644
--- a/config/object_store_settings.rb
+++ b/config/object_store_settings.rb
@@ -20,7 +20,7 @@ class ObjectStoreSettings
# Legacy parser
def self.legacy_parse(object_store, object_store_type)
- object_store ||= Settingslogic.new({})
+ object_store ||= GitlabSettings::Options.build({})
object_store['enabled'] = false if object_store['enabled'].nil?
object_store['remote_directory'], object_store['bucket_prefix'] = split_bucket_prefix(
object_store['remote_directory']
@@ -162,7 +162,7 @@ class ObjectStoreSettings
)
target_config['consolidated_settings'] = true
section['object_store'] = target_config
- # Settingslogic internally stores data as a Hash, but it also
+ # GitlabSettings::Options internally stores data as a Hash, but it also
# creates a Settings object for every key. To avoid confusion, we should
# update both so that Settings.artifacts and Settings['artifacts'] return
# the same result.
@@ -178,23 +178,11 @@ class ObjectStoreSettings
# 1. The common settings are defined
# 2. The legacy settings are not defined
def use_consolidated_settings?
- # to_h is needed because we define `default` as a Gitaly storage name
- # in stub_storage_settings. This causes Settingslogic to redefine Hash#default,
- # which causes Hash#dig to fail when the key doesn't exist: https://gitlab.com/gitlab-org/gitlab/-/issues/286873
- settings_h = settings.to_h
- return false unless settings_h.dig('object_store', 'enabled')
- return false unless settings_h.dig('object_store', 'connection').present?
+ return false unless settings.dig('object_store', 'enabled')
+ return false unless settings.dig('object_store', 'connection').present?
WORKHORSE_ACCELERATED_TYPES.each do |store|
- # to_h is needed because we define `default` as a Gitaly storage name
- # in stub_storage_settings. This causes Settingslogic to redefine Hash#default,
- # which causes Hash#dig to fail when the key doesn't exist: https://gitlab.com/gitlab-org/gitlab/-/issues/286873
- #
- # (byebug) section.dig
- # *** ArgumentError Exception: wrong number of arguments (given 0, expected 1+)
- # (byebug) section.dig('object_store')
- # *** ArgumentError Exception: wrong number of arguments (given 1, expected 0)
- section = settings.try(store)&.to_h
+ section = settings.try(store)
next unless section
diff --git a/config/plugins/graphql_known_operations_plugin.js b/config/plugins/graphql_known_operations_plugin.js
index c340849e084..783887cf6e6 100644
--- a/config/plugins/graphql_known_operations_plugin.js
+++ b/config/plugins/graphql_known_operations_plugin.js
@@ -4,7 +4,9 @@ const yaml = require('js-yaml');
const { evaluateModuleFromSource } = require('../helpers/evaluate_module_from_source');
const PLUGIN_NAME = 'GraphqlKnownOperationsPlugin';
-const GRAPHQL_PATH_REGEX = /(query|mutation)\.graphql$/;
+const SUPPORTED_OPS = ['query', 'mutation', 'subscription'];
+/* eslint-disable no-useless-escape */
+const GRAPHQL_PATH_REGEX = new RegExp(`(${SUPPORTED_OPS.join('|')})\.graphql$`);
/**
* Returns whether a given webpack module is a "graphql" module
@@ -34,7 +36,7 @@ const getOperationNames = (module) => {
});
const names = moduleExports.definitions
- .filter((x) => ['query', 'mutation'].includes(x.operation))
+ .filter((x) => SUPPORTED_OPS.includes(x.operation))
.map((x) => x.name?.value)
// why: It's possible for operations to not have a name. That violates our eslint rule, but either way, let's ignore those here.
.filter(Boolean);
diff --git a/config/prometheus/self_monitoring_default.yml b/config/prometheus/self_monitoring_default.yml
deleted file mode 100644
index 024733bf2f0..00000000000
--- a/config/prometheus/self_monitoring_default.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-dashboard: 'Overview'
-priority: 1
-
-templating:
- variables:
- instance:
- type: 'text'
- label: 'Instance label regex'
- options:
- default_value: '.+'
-
-panel_groups:
-
-- group: 'Resource usage'
- panels:
- - title: "Memory usage"
- type: "line-chart"
- y_label: "% memory used"
- metrics:
- - id: node_memory_usage_percentage
- query_range: '(1 - (node_memory_MemAvailable_bytes{instance=~"{{instance}}"} or (node_memory_MemFree_bytes{instance=~"{{instance}}"} + node_memory_Buffers_bytes{instance=~"{{instance}}"} + node_memory_Cached_bytes{instance=~"{{instance}}"} + node_memory_Slab_bytes{instance=~"{{instance}}"})) / node_memory_MemTotal_bytes{instance=~"{{instance}}"}) * 100'
- unit: "%"
- label: instance
-
- - title: "CPU usage"
- type: "line-chart"
- y_label: "% CPU used"
- metrics:
- - id: node_cpu_usage_percentage
- query_range: '(avg without (mode,cpu) (1 - irate(node_cpu_seconds_total{mode="idle",instance=~"{{instance}}"}[5m]))) * 100'
- unit: "%"
- label: instance
-
-- group: Web Service
- panels:
- - title: Web Service - Error Ratio
- type: line-chart
- y_label: "Unhandled Exceptions (%)"
- metrics:
- - id: wser_web_service
- query_range: 'max(max_over_time(gitlab_service_errors:ratio{environment="{{ci_environment_slug}}", type="web", stage="main"}[1m])) by (type) * 100'
- unit: "%"
- label: "Error Ratio"
- - id: wser_degradation_slo
- query_range: 'avg(slo:max:gitlab_service_errors:ratio{environment="{{ci_environment_slug}}", type="web", stage="main"}) or avg(slo:max:gitlab_service_errors:ratio{type="web"}) * 100'
- unit: "%"
- label: "Degradation SLO"
- - id: wser_outage_slo
- query_range: '2 * (avg(slo:max:gitlab_service_errors:ratio{environment="{{ci_environment_slug}}", type="web", stage="main"}) or avg(slo:max:gitlab_service_errors:ratio{type="web"})) * 100'
- unit: "%"
- label: "Outage SLO"
-- group: API Service
- panels:
- - title: API Service - Error Ratio
- type: line-chart
- y_label: "Unhandled Exceptions (%)"
- metrics:
- - id: aser_web_service
- query_range: 'max(max_over_time(gitlab_service_errors:ratio{environment="{{ci_environment_slug}}", type="api", stage="main"}[1m])) by (type) * 100'
- unit: "%"
- label: "Error Ratio"
- - id: aser_degradation_slo
- query_range: 'avg(slo:max:gitlab_service_errors:ratio{environment="{{ci_environment_slug}}", type="api", stage="main"}) or avg(slo:max:gitlab_service_errors:ratio{type="web"}) * 100'
- unit: "%"
- label: "Degradation SLO"
- - id: aser_outage_slo
- query_range: '2 * (avg(slo:max:gitlab_service_errors:ratio{environment="{{ci_environment_slug}}", type="api", stage="main"}) or avg(slo:max:gitlab_service_errors:ratio{type="web"})) * 100'
- unit: "%"
- label: "Outage SLO"
diff --git a/config/puma.example.development.rb b/config/puma.example.development.rb
index 71a4e9b36f1..1b75238112f 100644
--- a/config/puma.example.development.rb
+++ b/config/puma.example.development.rb
@@ -88,8 +88,12 @@ worker_timeout 60
# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput
wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
+# nakayoshi_fork was removed in Puma 6.0: https://github.com/puma/puma/issues/2258
# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork
-nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true'
+if Gem::Version.new(Puma::Const::PUMA_VERSION).canonical_segments.first == 5 &&
+ ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] != 'true'
+ nakayoshi_fork
+end
# Use json formatter
require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
diff --git a/config/puma.rb.example b/config/puma.rb.example
index 59844b4aecf..d474fc70500 100644
--- a/config/puma.rb.example
+++ b/config/puma.rb.example
@@ -77,8 +77,12 @@ worker_timeout 60
# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput
wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
+# nakayoshi_fork was removed in Puma 6.0: https://github.com/puma/puma/issues/2258
# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork
-nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true'
+if Gem::Version.new(Puma::Const::PUMA_VERSION).canonical_segments.first == 5 &&
+ ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] != 'true'
+ nakayoshi_fork
+end
# Use json formatter
require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
diff --git a/config/routes.rb b/config/routes.rb
index 8530923aa1a..9c8ad8fe047 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -24,11 +24,12 @@ InitializerConnections.raise_if_new_database_connection do
use_doorkeeper do
controllers applications: 'oauth/applications',
- authorized_applications: 'oauth/authorized_applications',
- authorizations: 'oauth/authorizations',
- token_info: 'oauth/token_info',
- tokens: 'oauth/tokens'
+ authorized_applications: 'oauth/authorized_applications',
+ authorizations: 'oauth/authorizations',
+ token_info: 'oauth/token_info',
+ tokens: 'oauth/tokens'
end
+ put '/oauth/applications/:id/renew(.:format)' => 'oauth/applications#renew', as: :renew_oauth_application
# This prefixless path is required because Jira gets confused if we set it up with a path
# More information: https://gitlab.com/gitlab-org/gitlab/issues/6752
@@ -66,10 +67,7 @@ InitializerConnections.raise_if_new_database_connection do
Gitlab.ee do
resource :company, only: [:new, :create], controller: 'company'
resources :groups_projects, only: [:new, :create] do
- collection do
- post :import
- put :exit
- end
+ post :import, on: :collection
end
draw :verification
end
@@ -87,6 +85,7 @@ InitializerConnections.raise_if_new_database_connection do
# JSON Web Token
get 'jwt/auth' => 'jwt#auth'
+ post 'jwt/auth', to: proc { [404, {}, ['']] }
# Health check
get 'health_check(/:checks)' => 'health_check#index', as: :health_check
@@ -152,15 +151,16 @@ InitializerConnections.raise_if_new_database_connection do
# Remote host can contain "." characters so it needs a constraint
post 'remote/:remote_host(/*remote_path)',
- as: :remote,
- to: 'web_ide/remote_ide#index',
- constraints: { remote_host: %r{[^/?]+} }
+ as: :remote,
+ to: 'web_ide/remote_ide#index',
+ constraints: { remote_host: %r{[^/?]+} }
end
draw :operations
draw :jira_connect
Gitlab.ee do
+ draw :remote_development
draw :security
draw :smartcard
draw :trial
@@ -222,6 +222,8 @@ InitializerConnections.raise_if_new_database_connection do
# Deprecated route for permanent failures
# https://gitlab.com/gitlab-org/gitlab/-/issues/362606
post '/members/mailgun/permanent_failures' => 'mailgun/webhooks#process_webhook'
+
+ get '/timelogs' => 'time_tracking/timelogs#index'
end
# End of the /-/ scope.
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 9181c1c94cf..d9cd60f8086 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -35,7 +35,7 @@ namespace :admin do
resource :impersonation, only: :destroy
- resources :abuse_reports, only: [:index, :destroy]
+ resources :abuse_reports, only: [:index, :show, :update, :destroy]
resources :gitaly_servers, only: [:index]
resources :spam_logs, only: [:index, :destroy] do
@@ -44,13 +44,17 @@ namespace :admin do
end
end
- resources :applications
+ resources :applications do
+ put 'renew', on: :member
+ end
resources :groups, only: [:index, :new, :create]
- scope(path: 'groups/*id',
- controller: :groups,
- constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom)/ }) do
+ scope(
+ path: 'groups/*id',
+ controller: :groups,
+ constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom)/ }
+ ) do
scope(as: :group) do
put :members_update
get :edit, action: :edit
@@ -111,16 +115,24 @@ namespace :admin do
get 'dev_ops_report', to: redirect('admin/dev_ops_reports')
resources :cohorts, only: :index
- scope(path: 'projects/*namespace_id',
- as: :namespace,
- constraints: { namespace_id: Gitlab::PathRegex.full_namespace_route_regex }) do
- resources(:projects,
- path: '/',
- constraints: { id: Gitlab::PathRegex.project_route_regex },
- only: [:show, :destroy]) do
+ scope(
+ path: 'projects/*namespace_id',
+ as: :namespace,
+ constraints: { namespace_id: Gitlab::PathRegex.full_namespace_route_regex }
+ ) do
+ resources(
+ :projects,
+ path: '/',
+ constraints: { id: Gitlab::PathRegex.project_route_regex },
+ only: [:show, :destroy]
+ ) do
member do
put :transfer
post :repository_check
+ get :edit, action: :edit
+ get '/', action: :show
+ patch '/', action: :update
+ put '/', action: :update
end
resources :runner_projects, only: [:create, :destroy]
@@ -144,11 +156,6 @@ namespace :admin do
match :general, :integrations, :repository, :ci_cd, :reporting, :metrics_and_profiling, :network, :preferences, via: [:get, :patch]
get :lets_encrypt_terms_of_service
- post :create_self_monitoring_project
- get :status_create_self_monitoring_project
- delete :delete_self_monitoring_project
- get :status_delete_self_monitoring_project
-
get :service_usage_data
resource :appearances, only: [:show, :create, :update], path: 'appearance', module: 'application_settings' do
@@ -168,6 +175,7 @@ namespace :admin do
resources :runners, only: [:index, :new, :show, :edit, :update, :destroy] do
member do
+ get :register
post :resume
post :pause
end
diff --git a/config/routes/directs.rb b/config/routes/directs.rb
index f28750b5c2e..407e2a9d8a5 100644
--- a/config/routes/directs.rb
+++ b/config/routes/directs.rb
@@ -3,3 +3,4 @@
# Custom URL definitions for the Community Edition.
draw 'directs/milestone'
+draw 'directs/subscription_portal'
diff --git a/config/routes/directs/subscription_portal.rb b/config/routes/directs/subscription_portal.rb
new file mode 100644
index 00000000000..188725d16c1
--- /dev/null
+++ b/config/routes/directs/subscription_portal.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+direct :subscription_portal_staging do
+ ENV.fetch('STAGING_CUSTOMER_PORTAL_URL', 'https://customers.staging.gitlab.com')
+end
+
+direct :subscription_portal do
+ default_subscriptions_url = if ::Gitlab.dev_or_test_env?
+ subscription_portal_staging_url
+ else
+ 'https://customers.gitlab.com'
+ end
+
+ ENV.fetch('CUSTOMER_PORTAL_URL', default_subscriptions_url)
+end
+
+direct :subscription_portal_instance_review do
+ Addressable::URI.join(subscription_portal_url, '/instance_review').to_s
+end
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 582f8bf9471..9b346867f78 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -1,9 +1,11 @@
# frozen_string_literal: true
constraints(::Constraints::GroupUrlConstrainer.new) do
- scope(path: 'groups/*id',
- controller: :groups,
- constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom|ics)/ }) do
+ scope(
+ path: 'groups/*id',
+ controller: :groups,
+ constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom|ics)/ }
+ ) do
scope(path: '-') do
# These routes are legit and the cop rule will be improved in
# https://gitlab.com/gitlab-org/gitlab/-/issues/230703
@@ -27,10 +29,12 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
get '/', action: :show, as: :group_canonical
end
- scope(path: 'groups/*group_id/-',
- module: :groups,
- as: :group,
- constraints: { group_id: Gitlab::PathRegex.full_namespace_route_regex }) do
+ scope(
+ path: 'groups/*group_id/-',
+ module: :groups,
+ as: :group,
+ constraints: { group_id: Gitlab::PathRegex.full_namespace_route_regex }
+ ) do
namespace :settings do
resource :ci_cd, only: [:show, :update], controller: 'ci_cd' do
put :reset_registration_token
@@ -56,7 +60,9 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
end
end
- resources :applications
+ resources :applications do
+ put 'renew', on: :member
+ end
resource :packages_and_registries, only: [:show]
end
@@ -112,8 +118,9 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
resources :boards, only: [:index, :show], constraints: { id: /\d+/ }
- resources :runners, only: [:index, :edit, :update, :destroy, :show] do
+ resources :runners, only: [:index, :new, :edit, :update, :destroy, :show] do
member do
+ get :register
post :resume
post :pause
end
@@ -151,12 +158,16 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
resources :contacts, only: [:index, :new, :edit]
resources :organizations, only: [:index, :new, :edit]
end
+
+ resources :achievements, only: [:index, :new, :edit]
end
- scope(path: '*id',
- as: :group,
- constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom)/ },
- controller: :groups) do
+ scope(
+ path: '*id',
+ as: :group,
+ constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom)/ },
+ controller: :groups
+ ) do
get '/', action: :show
patch '/', action: :update
put '/', action: :update
diff --git a/config/routes/import.rb b/config/routes/import.rb
index 2513cd04cfb..26843b4bc8d 100644
--- a/config/routes/import.rb
+++ b/config/routes/import.rb
@@ -19,10 +19,13 @@ namespace :import do
resource :github, only: [:create, :new], controller: :github do
post :personal_access_token
get :status
+ get :details
get :callback
get :realtime_changes
+ get :failures
post :cancel
post :cancel_all
+ get :counts
end
resource :gitea, only: [:create, :new], controller: :gitea do
@@ -31,12 +34,6 @@ namespace :import do
get :realtime_changes
end
- resource :gitlab, only: [:create], controller: :gitlab do
- get :status
- get :callback
- get :realtime_changes
- end
-
resource :bitbucket, only: [:create], controller: :bitbucket do
get :status
get :callback
@@ -84,6 +81,4 @@ namespace :import do
get :realtime_changes
post :upload
end
-
- resource :phabricator, only: [:create, :new], controller: :phabricator
end
diff --git a/config/routes/issues.rb b/config/routes/issues.rb
index 25e59022272..13fdde5841b 100644
--- a/config/routes/issues.rb
+++ b/config/routes/issues.rb
@@ -14,6 +14,10 @@ resources :issues, concerns: :awardable, constraints: { id: /\d+/ } do
post :create_merge_request
get :discussions, format: :json
get '/designs(/*vueroute)', to: 'issues#designs', as: :designs, format: false
+ get '/:incident_tab',
+ action: :show,
+ as: :incident_issue,
+ constraints: { incident_tab: /timeline|metrics|alerts/ }
end
collection do
@@ -23,9 +27,10 @@ resources :issues, concerns: :awardable, constraints: { id: /\d+/ } do
post :export_csv
scope :incident do
- get '/:id',
+ get '/:id(/:incident_tab)',
to: 'incidents#show',
- as: :incident
+ as: :incident,
+ constraints: { incident_tab: /timeline|metrics|alerts/ }
end
end
diff --git a/config/routes/jira_connect.rb b/config/routes/jira_connect.rb
index f45f524935a..91f2a313c4e 100644
--- a/config/routes/jira_connect.rb
+++ b/config/routes/jira_connect.rb
@@ -5,7 +5,6 @@ namespace :jira_connect do
root to: proc { [404, {}, ['']] }, as: 'base'
get 'app_descriptor' => 'app_descriptor#show'
- get :users, to: 'users#show'
namespace :events do
post 'installed'
diff --git a/config/routes/pipelines.rb b/config/routes/pipelines.rb
index ef390d7988b..10e0e948c62 100644
--- a/config/routes/pipelines.rb
+++ b/config/routes/pipelines.rb
@@ -7,7 +7,6 @@ resources :pipelines, only: [:index, :new, :create, :show, :destroy] do
scope '(*ref)', constraints: { ref: Gitlab::PathRegex.git_reference_regex } do
get :latest, action: :show, defaults: { latest: true }
end
- get :config_variables
end
member do
diff --git a/config/routes/profile.rb b/config/routes/profile.rb
index bee1a0f108e..f42f6a9037d 100644
--- a/config/routes/profile.rb
+++ b/config/routes/profile.rb
@@ -22,11 +22,13 @@ resource :profile, only: [:show, :update] do
end
resource :notifications, only: [:show, :update] do
- scope(path: 'groups/*id',
- id: Gitlab::PathRegex.full_namespace_route_regex,
- as: :group,
- controller: :groups,
- constraints: { format: /(html|json)/ }) do
+ scope(
+ path: 'groups/*id',
+ id: Gitlab::PathRegex.full_namespace_route_regex,
+ as: :group,
+ controller: :groups,
+ constraints: { format: /(html|json)/ }
+ ) do
patch '/', action: :update
put '/', action: :update
end
@@ -39,7 +41,7 @@ resource :profile, only: [:show, :update] do
end
resource :preferences, only: [:show, :update]
- resources :saved_replies, only: [:index], action: :index
+ resources :comment_templates, only: [:index, :show], action: :index
resources :keys, only: [:index, :show, :create, :destroy] do
member do
@@ -75,14 +77,12 @@ resource :profile, only: [:show, :update] do
resource :two_factor_auth, only: [:show, :create, :destroy] do
member do
- post :create_u2f
post :codes
patch :skip
post :create_webauthn
end
end
- resources :u2f_registrations, only: [:destroy]
resources :webauthn_registrations, only: [:destroy]
end
end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index cf19111b2e2..995c9879aa3 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -14,22 +14,25 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
# `:project_id`, or `*id`.
#
# See https://github.com/rails/rails/blob/v4.2.8/actionpack/lib/action_dispatch/routing/mapper.rb#L155
- scope(path: '*namespace_id',
- as: :namespace,
- namespace_id: Gitlab::PathRegex.full_namespace_route_regex) do
- scope(path: ':project_id',
- constraints: { project_id: Gitlab::PathRegex.project_route_regex },
- module: :projects,
- as: :project) do
+ scope(
+ path: '*namespace_id',
+ as: :namespace,
+ namespace_id: Gitlab::PathRegex.full_namespace_route_regex
+ ) do
+ scope(
+ path: ':project_id',
+ constraints: { project_id: Gitlab::PathRegex.project_route_regex },
+ module: :projects,
+ as: :project
+ ) do
# Begin of the /-/ scope.
# Use this scope for all new project routes.
scope '-' do
- get 'archive/*id', constraints: { format: Gitlab::PathRegex.archive_formats_regex, id: /.+?/ }, to: 'repositories#archive', as: 'archive'
- # Since the page parameter can contain slashes (panel/new), use Rails'
- # "Route Globbing" syntax (/*page) so that the route helpers do not encode
- # the slash character.
- get 'metrics(/:dashboard_path)(/*page)', constraints: { dashboard_path: /.+\.yml/, page: 'panel/new' },
- to: 'metrics_dashboard#show', as: :metrics_dashboard, format: false
+ get 'archive/*id', format: true, constraints: { format: Gitlab::PathRegex.archive_formats_regex, id: /.+?/ }, to: 'repositories#archive', as: 'archive'
+ get 'metrics(/:dashboard_path)', constraints: { dashboard_path: /.+\.yml/ },
+ to: 'metrics_dashboard#show', as: :metrics_dashboard, format: false
+ get 'metrics(/:dashboard_path)/panel/new', constraints: { dashboard_path: /.+\.yml/ },
+ to: 'metrics_dashboard#show', as: :new_metrics_dashboard, format: false
namespace :metrics, module: :metrics do
namespace :dashboards do
@@ -101,8 +104,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
end
end
- resources :runners, only: [:index, :edit, :update, :destroy, :show] do
+ resources :runners, only: [:index, :new, :edit, :update, :destroy, :show] do
member do
+ get :register
post :resume
post :pause
end
@@ -311,6 +315,12 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
resources :databases, only: [:index, :create, :new], path_names: { new: 'new/:product' }
end
+ namespace :aws do
+ get '/', to: redirect('%{namespace_id}/%{project_id}/-/aws/configuration')
+
+ get '/configuration', to: 'configuration#index'
+ end
+
resources :environments, except: [:destroy] do
member do
post :stop
@@ -361,6 +371,13 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
get 'work_items/*work_items_path' => 'work_items#index', as: :work_items
get 'work_items/*work_items_path' => 'work_items#index', as: :work_item
+ resources :work_items, only: [] do
+ collection do
+ post :import_csv
+ post 'import_csv/authorize', to: 'work_items#authorize'
+ end
+ end
+
post 'incidents/integrations/pagerduty', to: 'incident_management/pager_duty_incidents#create'
resources :incidents, only: [:index]
@@ -470,12 +487,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
end
namespace :ml do
- resources :experiments, only: [:index, :show], controller: 'experiments'
- resources :candidates, only: [:show], controller: 'candidates', param: :iid
- end
-
- namespace :airflow do
- resources :dags, only: [:index, :show], controller: 'dags'
+ resources :experiments, only: [:index, :show, :destroy], controller: 'experiments', param: :iid
+ resources :candidates, only: [:show, :destroy], controller: 'candidates', param: :iid
end
end
# End of the /-/ scope.
@@ -493,20 +506,20 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
# Templates
#
get '/templates/:template_type' => 'templates#index', # rubocop:todo Cop/PutProjectRoutesUnderScope
- as: :templates,
- defaults: { format: 'json' },
- constraints: { template_type: %r{issue|merge_request}, format: 'json' }
+ as: :templates,
+ defaults: { format: 'json' },
+ constraints: { template_type: %r{issue|merge_request}, format: 'json' }
get '/templates/:template_type/:key' => 'templates#show', # rubocop:todo Cop/PutProjectRoutesUnderScope
- as: :template,
- defaults: { format: 'json' },
- constraints: { key: %r{[^/]+}, template_type: %r{issue|merge_request}, format: 'json' }
+ as: :template,
+ defaults: { format: 'json' },
+ constraints: { key: %r{[^/]+}, template_type: %r{issue|merge_request}, format: 'json' }
get '/description_templates/names/:template_type', # rubocop:todo Cop/PutProjectRoutesUnderScope
- to: 'templates#names',
- as: :template_names,
- defaults: { format: 'json' },
- constraints: { template_type: %r{issue|merge_request}, format: 'json' }
+ to: 'templates#names',
+ as: :template_names,
+ defaults: { format: 'json' },
+ constraints: { template_type: %r{issue|merge_request}, format: 'json' }
resource :pages, only: [:new, :show, :update, :destroy] do # rubocop: disable Cop/PutProjectRoutesUnderScope
resources :domains, except: :index, controller: 'pages_domains', constraints: { id: %r{[^/]+} } do # rubocop: disable Cop/PutProjectRoutesUnderScope
@@ -534,14 +547,14 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
post 'alerts/notify', to: 'alerting/notifications#create' # rubocop:todo Cop/PutProjectRoutesUnderScope
post 'alerts/notify/:name/:endpoint_identifier', # rubocop:todo Cop/PutProjectRoutesUnderScope
- to: 'alerting/notifications#create',
- as: :alert_http_integration,
- constraints: { endpoint_identifier: /[A-Za-z0-9]+/ }
+ to: 'alerting/notifications#create',
+ as: :alert_http_integration,
+ constraints: { endpoint_identifier: /[A-Za-z0-9]+/ }
draw :legacy_builds
resources :container_registry, only: [:index, :destroy, :show], # rubocop: disable Cop/PutProjectRoutesUnderScope
- controller: 'registry/repositories'
+ controller: 'registry/repositories'
namespace :registry do
resources :repository, only: [] do # rubocop: disable Cop/PutProjectRoutesUnderScope
@@ -550,7 +563,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
# in JSON format, or a request for tag named `latest.json`.
scope format: false do
resources :tags, only: [:index, :destroy], # rubocop: disable Cop/PutProjectRoutesUnderScope
- constraints: { id: Gitlab::Regex.container_registry_tag_regex } do
+ constraints: { id: Gitlab::Regex.container_registry_tag_regex } do
collection do
delete :bulk_destroy # rubocop:todo Cop/PutProjectRoutesUnderScope
end
@@ -619,26 +632,15 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
constraints: { id: /\d+/ }
# rubocop: enable Cop/PutProjectRoutesUnderScope
end
-
- # All new routes should go under /-/ scope.
- # Look for scope '-' at the top of the file.
-
- # Legacy routes.
- # Introduced in 12.0.
- # Should be removed with https://gitlab.com/gitlab-org/gitlab/issues/28848.
- Gitlab::Routing.redirect_legacy_paths(self, :mirror, :tags, :hooks,
- :commits, :commit, :find_file, :files, :compare,
- :cycle_analytics, :mattermost, :variables, :triggers,
- :environments, :protected_environments, :error_tracking, :alert_management,
- :serverless, :clusters, :audit_events, :wikis, :merge_requests,
- :vulnerability_feedback, :security, :dependencies, :issues,
- :pipelines, :pipeline_schedules, :runners, :snippets)
end
+
# rubocop: disable Cop/PutProjectRoutesUnderScope
- resources(:projects,
- path: '/',
- constraints: { id: Gitlab::PathRegex.project_route_regex },
- only: [:edit, :show, :update, :destroy]) do
+ resources(
+ :projects,
+ path: '/',
+ constraints: { id: Gitlab::PathRegex.project_route_regex },
+ only: [:edit, :show, :update, :destroy]
+ ) do
member do
put :transfer
delete :remove_fork
@@ -665,8 +667,8 @@ end
# rubocop: disable Cop/PutProjectRoutesUnderScope
scope path: '(/-/jira)', constraints: ::Constraints::JiraEncodedUrlConstrainer.new, as: :jira do
scope path: '*namespace_id/:project_id',
- namespace_id: Gitlab::Jira::Dvcs::ENCODED_ROUTE_REGEX,
- project_id: Gitlab::Jira::Dvcs::ENCODED_ROUTE_REGEX do
+ namespace_id: Gitlab::Jira::Dvcs::ENCODED_ROUTE_REGEX,
+ project_id: Gitlab::Jira::Dvcs::ENCODED_ROUTE_REGEX do
get '/', to: redirect { |params, req|
::Gitlab::Jira::Dvcs.restore_full_path(
namespace: params[:namespace_id],
diff --git a/config/routes/repository.rb b/config/routes/repository.rb
index 0202eb80b23..08aa113685a 100644
--- a/config/routes/repository.rb
+++ b/config/routes/repository.rb
@@ -75,6 +75,8 @@ scope format: false do
get '/tree/*id', to: 'tree#show', as: :tree
get '/raw/*id', to: 'raw#show', as: :raw
+ get '/blame_page/*id', to: 'blame#page', as: :blame_page
+ get '/blame/*id/streaming', to: 'blame#streaming', as: :blame_streaming, defaults: { streaming: true }
get '/blame/*id', to: 'blame#show', as: :blame
get '/commits', to: 'commits#commits_root', as: :commits_root
diff --git a/config/routes/repository_deprecated.rb b/config/routes/repository_deprecated.rb
index 32682000941..00206592fc8 100644
--- a/config/routes/repository_deprecated.rb
+++ b/config/routes/repository_deprecated.rb
@@ -10,21 +10,6 @@ resource :repository, only: [:create]
# Don't use format parameter as file extension (old 3.0.x behavior)
# See http://guides.rubyonrails.org/routing.html#route-globbing-and-wildcard-segments
scope format: false do
- get '/refs/switch',
- to: redirect('%{namespace_id}/%{project_id}/-/refs/switch')
-
- get '/refs/:id/logs_tree',
- to: redirect('%{namespace_id}/%{project_id}/-/refs/%{id}/logs_tree'),
- constraints: { id: Gitlab::PathRegex.git_reference_regex }
-
- get '/refs/:id/logs_tree/*path',
- constraints: { id: /.*/, path: /[^\0]*/ },
- to: redirect { |params, _request|
- path = params[:path]
- path.gsub!('@', '-/')
- Addressable::URI.escape("#{params[:namespace_id]}/#{params[:project_id]}/-/refs/#{params[:id]}/logs_tree/#{path}")
- }
-
scope constraints: { id: /[^\0]+/ } do
# Deprecated. Keep for compatibility.
# Issue https://gitlab.com/gitlab-org/gitlab/-/issues/118849
@@ -32,9 +17,5 @@ scope format: false do
get '/blob/*id', to: 'blob#show', as: :deprecated_blob
get '/raw/*id', to: 'raw#show', as: :deprecated_raw
get '/blame/*id', to: 'blame#show', as: :deprecated_blame
-
- # Redirect those explicitly since `redirect_legacy_paths` conflicts with project new/edit actions
- get '/new/*id', to: redirect('%{namespace_id}/%{project_id}/-/new/%{id}')
- get '/edit/*id', to: redirect('%{namespace_id}/%{project_id}/-/edit/%{id}')
end
end
diff --git a/config/routes/snippets.rb b/config/routes/snippets.rb
index 5c162d0c37f..4b76ebd5ea5 100644
--- a/config/routes/snippets.rb
+++ b/config/routes/snippets.rb
@@ -26,4 +26,4 @@ get '/snippets/:snippet_id/raw/:ref/*path',
constraints: { snippet_id: /\d+/ }
get '/s/:username', to: redirect('users/%{username}/snippets'),
- constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }
+ constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }
diff --git a/config/routes/unmatched_project.rb b/config/routes/unmatched_project.rb
index 3f94af33e18..c310ae91777 100644
--- a/config/routes/unmatched_project.rb
+++ b/config/routes/unmatched_project.rb
@@ -1,11 +1,15 @@
# frozen_string_literal: true
-scope(path: '*namespace_id',
- as: :namespace,
- namespace_id: Gitlab::PathRegex.full_namespace_route_regex) do
- scope(path: ':project_id',
- constraints: { project_id: Gitlab::PathRegex.project_route_regex },
- as: :project) do
+scope(
+ path: '*namespace_id',
+ as: :namespace,
+ namespace_id: Gitlab::PathRegex.full_namespace_route_regex
+) do
+ scope(
+ path: ':project_id',
+ constraints: { project_id: Gitlab::PathRegex.project_route_regex },
+ as: :project
+ ) do
post '*all', to: 'application#route_not_found'
put '*all', to: 'application#route_not_found'
patch '*all', to: 'application#route_not_found'
diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb
index 52c67a705dc..4108d4675a5 100644
--- a/config/routes/uploads.rb
+++ b/config/routes/uploads.rb
@@ -3,8 +3,8 @@
scope path: :uploads do
# Note attachments and User/Group/Project/Topic avatars
get "-/system/:model/:mounted_as/:id/:filename",
- to: "uploads#show",
- constraints: { model: %r{note|user|group|project|projects\/topic|achievements\/achievement}, mounted_as: /avatar|attachment/, filename: %r{[^/]+} }
+ to: "uploads#show",
+ constraints: { model: %r{note|user|group|project|projects\/topic|achievements\/achievement}, mounted_as: /avatar|attachment/, filename: %r{[^/]+} }
# show uploads for models, snippets (notes) available for now
get '-/system/:model/:id/:secret/:filename',
@@ -18,9 +18,9 @@ scope path: :uploads do
# Appearance
get "-/system/:model/:mounted_as/:id/:filename",
- to: "uploads#show",
- constraints: { model: /appearance/, mounted_as: /logo|header_logo|pwa_icon|favicon/, filename: /.+/ },
- as: 'appearance_upload'
+ to: "uploads#show",
+ constraints: { model: /appearance/, mounted_as: /logo|header_logo|pwa_icon|favicon/, filename: /.+/ },
+ as: 'appearance_upload'
# create uploads for models, snippets (notes) available for now
post ':model',
@@ -34,9 +34,15 @@ scope path: :uploads do
# Alert Metric Images
get "-/system/:model/:mounted_as/:id/:filename",
- to: "uploads#show",
- constraints: { model: /alert_management_metric_image/, mounted_as: /file/, filename: %r{[^/]+} },
- as: 'alert_metric_image_upload'
+ to: "uploads#show",
+ constraints: { model: /alert_management_metric_image/, mounted_as: /file/, filename: %r{[^/]+} },
+ as: 'alert_metric_image_upload'
+
+ # Abuse Reports Images
+ get "-/system/:model/:mounted_as/:id/:filename",
+ to: "uploads#show",
+ constraints: { model: /abuse_report/, mounted_as: /screenshot/, filename: %r{[^/]+} },
+ as: 'abuse_report_upload'
end
# Redirect old note attachments path to new uploads path.
diff --git a/config/routes/user.rb b/config/routes/user.rb
index 1c122ea0c94..5723421cad2 100644
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
@@ -82,12 +82,12 @@ scope '-/users', module: :users do
resources :callouts, only: [:create]
resources :group_callouts, only: [:create]
resources :project_callouts, only: [:create]
+
+ resource :pins, only: [:update]
end
scope(constraints: { username: Gitlab::PathRegex.root_namespace_route_regex }) do
- scope(path: 'users/:username',
- as: :user,
- controller: :users) do
+ scope(path: 'users/:username', as: :user, controller: :users) do
get :calendar
get :calendar_activities
get :groups
@@ -112,10 +112,12 @@ constraints(::Constraints::UserUrlConstrainer.new) do
# Get all GPG keys of user
get ':username.gpg' => 'users#gpg_keys', as: 'user_gpg_keys', constraints: { username: Gitlab::PathRegex.root_namespace_route_regex }
- scope(path: ':username',
- as: :user,
- constraints: { username: Gitlab::PathRegex.root_namespace_route_regex },
- controller: :users) do
+ scope(
+ path: ':username',
+ as: :user,
+ constraints: { username: Gitlab::PathRegex.root_namespace_route_regex },
+ controller: :users
+ ) do
get '/', action: :show
end
end
diff --git a/config/settings.rb b/config/settings.rb
index ae95af802c4..c25531a3311 100644
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -1,217 +1,223 @@
# frozen_string_literal: true
-require 'settingslogic'
+require_relative '../lib/gitlab_settings'
-class Settings < Settingslogic
- source ENV.fetch('GITLAB_CONFIG') { Pathname.new(File.expand_path('..', __dir__)).join('config/gitlab.yml') }
- namespace ENV.fetch('GITLAB_ENV') { Rails.env }
+file = ENV.fetch('GITLAB_CONFIG') { Rails.root.join('config/gitlab.yml') }
+section = ENV.fetch('GITLAB_ENV') { Rails.env }
- class << self
- def gitlab_on_standard_port?
- on_standard_port?(gitlab)
- end
+Settings = GitlabSettings.load(file, section) do
+ def gitlab_on_standard_port?
+ on_standard_port?(gitlab)
+ end
- def build_ci_component_fqdn
- custom_port = ":#{gitlab.port}" unless on_standard_port?(gitlab)
+ def build_ci_component_fqdn
+ custom_port = ":#{gitlab.port}" unless on_standard_port?(gitlab)
- [
- gitlab.host,
- custom_port,
- gitlab.relative_url_root,
- '/'
- ].join('')
- end
+ [
+ gitlab.host,
+ custom_port,
+ gitlab.relative_url_root,
+ '/'
+ ].join('')
+ end
- def host_without_www(url)
- host(url).sub('www.', '')
- end
+ def host_without_www(url)
+ host(url).sub('www.', '')
+ end
- def build_gitlab_ci_url
- custom_port =
- if on_standard_port?(gitlab)
- nil
- else
- ":#{gitlab.port}"
- end
-
- [
- gitlab.protocol,
- "://",
- gitlab.host,
- custom_port,
- gitlab.relative_url_root
- ].join('')
- end
+ def build_gitlab_ci_url
+ custom_port =
+ if on_standard_port?(gitlab)
+ nil
+ else
+ ":#{gitlab.port}"
+ end
- def build_pages_url
- base_url(pages).join('')
- end
+ [
+ gitlab.protocol,
+ "://",
+ gitlab.host,
+ custom_port,
+ gitlab.relative_url_root
+ ].join('')
+ end
- def build_gitlab_shell_ssh_path_prefix
- user = "#{gitlab_shell.ssh_user}@" unless gitlab_shell.ssh_user.empty?
- user_host = "#{user}#{gitlab_shell.ssh_host}"
+ def build_pages_url
+ base_url(pages).join('')
+ end
- if gitlab_shell.ssh_port != 22
- "ssh://#{user_host}:#{gitlab_shell.ssh_port}/"
- elsif gitlab_shell.ssh_host.include? ':'
- "[#{user_host}]:"
- else
- "#{user_host}:"
- end
- end
+ def build_gitlab_shell_ssh_path_prefix
+ user = "#{gitlab_shell.ssh_user}@" unless gitlab_shell.ssh_user.empty?
+ user_host = "#{user}#{gitlab_shell.ssh_host}"
- def build_base_gitlab_url
- base_url(gitlab).join('')
+ if gitlab_shell.ssh_port != 22
+ "ssh://#{user_host}:#{gitlab_shell.ssh_port}/"
+ elsif gitlab_shell.ssh_host.include? ':'
+ "[#{user_host}]:"
+ else
+ "#{user_host}:"
end
+ end
- def build_gitlab_url
- (base_url(gitlab) + [gitlab.relative_url_root]).join('')
- end
+ def build_base_gitlab_url
+ base_url(gitlab).join('')
+ end
- def build_gitlab_go_url
- # "Go package paths are not URLs, and do not include port numbers"
- # https://github.com/golang/go/issues/38213#issuecomment-607851460
- "#{gitlab.host}#{gitlab.relative_url_root}"
- end
+ def build_gitlab_url
+ (base_url(gitlab) + [gitlab.relative_url_root]).join('')
+ end
- def kerberos_protocol
- kerberos.https ? "https" : "http"
- end
+ def build_gitlab_go_url
+ # "Go package paths are not URLs, and do not include port numbers"
+ # https://github.com/golang/go/issues/38213#issuecomment-607851460
+ "#{gitlab.host}#{gitlab.relative_url_root}"
+ end
- def kerberos_port
- kerberos.use_dedicated_port ? kerberos.port : gitlab.port
- end
+ def kerberos_protocol
+ kerberos.https ? "https" : "http"
+ end
- # Curl expects username/password for authentication. However when using GSS-Negotiate not credentials should be needed.
- # By inserting in the Kerberos dedicated URL ":@", we give to curl an empty username and password and GSS auth goes ahead
- # Known bug reported in http://sourceforge.net/p/curl/bugs/440/ and http://curl.haxx.se/docs/knownbugs.html
- def build_gitlab_kerberos_url
- [
- kerberos_protocol,
- "://:@",
- gitlab.host,
- ":#{kerberos_port}",
- gitlab.relative_url_root
- ].join('')
- end
+ def kerberos_port
+ kerberos.use_dedicated_port ? kerberos.port : gitlab.port
+ end
- def alternative_gitlab_kerberos_url?
- kerberos.enabled && (build_gitlab_kerberos_url != build_gitlab_url)
- end
+ # Curl expects username/password for authentication. However when using GSS-Negotiate not credentials should be needed.
+ # By inserting in the Kerberos dedicated URL ":@", we give to curl an empty username and password and GSS auth goes ahead
+ # Known bug reported in http://sourceforge.net/p/curl/bugs/440/ and http://curl.haxx.se/docs/knownbugs.html
+ def build_gitlab_kerberos_url
+ [
+ kerberos_protocol,
+ "://:@",
+ gitlab.host,
+ ":#{kerberos_port}",
+ gitlab.relative_url_root
+ ].join('')
+ end
- # check that values in `current` (string or integer) is a contant in `modul`.
- def verify_constant_array(modul, current, default)
- values = default || []
- unless current.nil?
- values = []
- current.each do |constant|
- values.push(verify_constant(modul, constant, nil))
- end
- values.delete_if { |value| value.nil? }
- end
+ def alternative_gitlab_kerberos_url?
+ kerberos.enabled && (build_gitlab_kerberos_url != build_gitlab_url)
+ end
- values
+ # check that values in `current` (string or integer) is a contant in `modul`.
+ def verify_constant_array(modul, current, default)
+ values = default || []
+ unless current.nil?
+ values = []
+ current.each do |constant|
+ values.push(verify_constant(modul, constant, nil))
+ end
+ values.delete_if { |value| value.nil? }
end
- # check that `current` (string or integer) is a contant in `modul`.
- def verify_constant(modul, current, default)
- constant = modul.constants.find { |name| modul.const_get(name, false) == current }
- value = constant.nil? ? default : modul.const_get(constant, false)
- if current.is_a? String
- value = begin
- modul.const_get(current.upcase, false)
- rescue StandardError
- default
- end
- end
+ values
+ end
- value
+ # check that `current` (string or integer) is a contant in `modul`.
+ def verify_constant(modul, current, default)
+ constant = modul.constants.find { |name| modul.const_get(name, false) == current }
+ value = constant.nil? ? default : modul.const_get(constant, false)
+ if current.is_a? String
+ value = begin
+ modul.const_get(current.upcase, false)
+ rescue StandardError
+ default
+ end
end
- def absolute(path)
- File.expand_path(path, Rails.root)
- end
+ value
+ end
- # Don't use this in new code, use attr_encrypted_db_key_base_32 instead!
- def attr_encrypted_db_key_base_truncated
- Gitlab::Application.secrets.db_key_base[0..31]
- end
+ def absolute(path)
+ File.expand_path(path, Rails.root)
+ end
- # Ruby 2.4+ requires passing in the exact required length for OpenSSL keys
- # (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1).
- # Previous versions quietly truncated the input.
- #
- # Makes sure the key is exactly 32 bytes long, either by
- # truncating or right-padding it with ASCII 0s. Use this when
- # using :per_attribute_iv mode for attr_encrypted.
- def attr_encrypted_db_key_base_32
- Gitlab::Utils.ensure_utf8_size(attr_encrypted_db_key_base, bytes: 32.bytes)
- end
+ # Don't use this in new code, use attr_encrypted_db_key_base_32 instead!
+ def attr_encrypted_db_key_base_truncated
+ Gitlab::Application.secrets.db_key_base[0..31]
+ end
- def attr_encrypted_db_key_base_12
- Gitlab::Utils.ensure_utf8_size(attr_encrypted_db_key_base, bytes: 12.bytes)
- end
+ # Ruby 2.4+ requires passing in the exact required length for OpenSSL keys
+ # (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1).
+ # Previous versions quietly truncated the input.
+ #
+ # Makes sure the key is exactly 32 bytes long, either by
+ # truncating or right-padding it with ASCII 0s. Use this when
+ # using :per_attribute_iv mode for attr_encrypted.
+ def attr_encrypted_db_key_base_32
+ Gitlab::Utils.ensure_utf8_size(attr_encrypted_db_key_base, bytes: 32.bytes)
+ end
- # This should be used for :per_attribute_salt_and_iv mode. There is no
- # need to truncate the key because the encryptor will use the salt to
- # generate a hash of the password:
- # https://github.com/attr-encrypted/encryptor/blob/c3a62c4a9e74686dd95e0548f9dc2a361fdc95d1/lib/encryptor.rb#L77
- def attr_encrypted_db_key_base
- Gitlab::Application.secrets.db_key_base
- end
+ def attr_encrypted_db_key_base_12
+ Gitlab::Utils.ensure_utf8_size(attr_encrypted_db_key_base, bytes: 12.bytes)
+ end
- def encrypted(path)
- Gitlab::EncryptedConfiguration.new(
- content_path: path,
- base_key: Gitlab::Application.secrets.encrypted_settings_key_base,
- previous_keys: Gitlab::Application.secrets.rotated_encrypted_settings_key_base || []
- )
- end
+ # This should be used for :per_attribute_salt_and_iv mode. There is no
+ # need to truncate the key because the encryptor will use the salt to
+ # generate a hash of the password:
+ # https://github.com/attr-encrypted/encryptor/blob/c3a62c4a9e74686dd95e0548f9dc2a361fdc95d1/lib/encryptor.rb#L77
+ def attr_encrypted_db_key_base
+ Gitlab::Application.secrets.db_key_base
+ end
- def load_dynamic_cron_schedules!
- cron_jobs['gitlab_service_ping_worker']['cron'] ||= cron_for_service_ping
- end
+ def encrypted(path)
+ Gitlab::EncryptedConfiguration.new(
+ content_path: path,
+ base_key: Gitlab::Application.secrets.encrypted_settings_key_base,
+ previous_keys: Gitlab::Application.secrets.rotated_encrypted_settings_key_base || []
+ )
+ end
- private
+ def load_dynamic_cron_schedules!
+ cron_jobs['gitlab_service_ping_worker']['cron'] ||= cron_for_service_ping
+ end
- def base_url(config)
- custom_port = on_standard_port?(config) ? nil : ":#{config.port}"
+ # Route all jobs to 'default' queue. This setting is meant for self-managed instances use to keep things simple.
+ # See https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1491
+ def build_sidekiq_routing_rules(rules)
+ return rules unless rules.nil? || rules&.empty?
- [
- config.protocol,
- "://",
- config.host,
- custom_port
- ]
- end
+ [[Gitlab::SidekiqConfig::WorkerMatcher::WILDCARD_MATCH, 'default']]
+ end
- def on_standard_port?(config)
- config.port.to_i == (config.https ? 443 : 80)
- end
+ private
- # Extract the host part of the given +url+.
- def host(url)
- url = url.downcase
- url = "http://#{url}" unless url.start_with?('http')
+ def base_url(config)
+ custom_port = on_standard_port?(config) ? nil : ":#{config.port}"
- # Get rid of the path so that we don't even have to encode it
- url_without_path = url.sub(%r{(https?://[^/]+)/?.*}, '\1')
+ [
+ config.protocol,
+ "://",
+ config.host,
+ custom_port
+ ]
+ end
- URI.parse(url_without_path).host
- end
+ def on_standard_port?(config)
+ config.port.to_i == (config.https ? 443 : 80)
+ end
- # Runs at a consistent random time of day on a day of the week based on
- # the instance UUID. This is to balance the load on the service receiving
- # these pings. The sidekiq job handles temporary http failures.
- def cron_for_service_ping
- # Set a default UUID for the case when the UUID hasn't been initialized.
- uuid = Gitlab::CurrentSettings.uuid || 'uuid-not-set'
+ # Extract the host part of the given +url+.
+ def host(url)
+ url = url.downcase
+ url = "http://#{url}" unless url.start_with?('http')
- minute = Digest::SHA256.hexdigest(uuid + 'minute').to_i(16) % 60
- hour = Digest::SHA256.hexdigest(uuid + 'hour').to_i(16) % 24
- day_of_week = Digest::SHA256.hexdigest(uuid).to_i(16) % 7
+ # Get rid of the path so that we don't even have to encode it
+ url_without_path = url.sub(%r{(https?://[^/]+)/?.*}, '\1')
- "#{minute} #{hour} * * #{day_of_week}"
- end
+ URI.parse(url_without_path).host
+ end
+
+ # Runs at a consistent random time of day on a day of the week based on
+ # the instance UUID. This is to balance the load on the service receiving
+ # these pings. The sidekiq job handles temporary http failures.
+ def cron_for_service_ping
+ # Set a default UUID for the case when the UUID hasn't been initialized.
+ uuid = Gitlab::CurrentSettings.uuid || 'uuid-not-set'
+
+ minute = Digest::SHA256.hexdigest(uuid + 'minute').to_i(16) % 60
+ hour = Digest::SHA256.hexdigest(uuid + 'hour').to_i(16) % 24
+ day_of_week = Digest::SHA256.hexdigest(uuid).to_i(16) % 7
+
+ "#{minute} #{hour} * * #{day_of_week}"
end
end
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 17440acddc3..370fe87ff96 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -23,6 +23,8 @@
# chance = (queue weight / total weight of all queues) * 100
---
:queues:
+- - abuse_new_abuse_report
+ - 1
- - adjourned_project_deletion
- 1
- - admin_emails
@@ -81,8 +83,12 @@
- 1
- - bulk_imports_export_request
- 1
+- - bulk_imports_finish_batched_relation_export
+ - 1
- - bulk_imports_pipeline
- 1
+- - bulk_imports_relation_batch_export
+ - 1
- - bulk_imports_relation_export
- 1
- - chaos
@@ -99,6 +105,8 @@
- 1
- - ci_job_artifacts_expire_project_build_artifacts
- 1
+- - ci_llm_generate_config
+ - 1
- - ci_parse_secure_file_metadata
- 1
- - ci_runners_process_runner_version_update
@@ -109,6 +117,8 @@
- 1
- - compliance_management_chain_of_custody_report
- 1
+- - compliance_management_framework_export_mailer
+ - 1
- - compliance_management_merge_requests_compliance_violations
- 1
- - compliance_management_update_default_framework
@@ -177,8 +187,12 @@
- 1
- - elastic_namespace_rollout
- 1
+- - elastic_namespace_update
+ - 1
- - elastic_project_transfer
- 1
+- - elastic_wiki_indexer
+ - 1
- - email_receiver
- 2
- - emails_on_push
@@ -295,6 +309,8 @@
- 1
- - ldap_group_sync
- 2
+- - llm_completion
+ - 1
- - mail_scheduler
- 2
- - mailers
@@ -323,10 +339,14 @@
- 1
- - merge_requests_handle_assignees_change
- 1
+- - merge_requests_llm_summarize_merge_request
+ - 1
- - merge_requests_resolve_todos
- 1
- - merge_requests_resolve_todos_after_approval
- 1
+- - merge_requests_set_reviewer_reviewed
+ - 1
- - merge_requests_stream_approval_audit_event
- 1
- - merge_requests_sync_code_owner_approval_rules
@@ -339,6 +359,10 @@
- 1
- - migrate_external_diffs
- 1
+- - ml_experiment_tracking_associate_ml_candidate_to_package
+ - 1
+- - namespaces_free_user_cap_notification_clearing
+ - 1
- - namespaces_free_user_cap_over_limit_notification
- 1
- - namespaces_process_sync_events
@@ -385,8 +409,6 @@
- 1
- - personal_access_tokens
- 1
-- - phabricator_import_import_tasks
- - 1
- - pipeline_background
- 1
- - pipeline_creation
@@ -403,6 +425,10 @@
- 3
- - product_analytics_initialize_analytics
- 1
+- - product_analytics_initialize_snowplow_product_analytics
+ - 1
+- - product_analytics_post_push
+ - 1
- - project_cache
- 1
- - project_destroy
@@ -417,14 +443,22 @@
- 1
- - projects_delete_branch
- 1
+- - projects_deregister_suggested_reviewers_project
+ - 1
- - projects_finalize_project_statistics_refresh
- 1
+- - projects_forks_sync
+ - 1
- - projects_git_garbage_collect
- 1
+- - projects_import_export_create_relation_exports
+ - 1
- - projects_import_export_parallel_project_export
- 1
- - projects_import_export_relation_export
- 1
+- - projects_import_export_wait_relation_exports
+ - 1
- - projects_inactive_projects_deletion_notification
- 1
- - projects_post_creation
@@ -481,8 +515,16 @@
- 1
- - sbom_reports
- 1
+- - search_namespace_index_integrity
+ - 1
+- - search_project_index_integrity
+ - 1
+- - search_zoekt_namespace_indexer
+ - 1
- - security_auto_fix
- 1
+- - security_orchestration_configuration_create_bot
+ - 1
- - security_orchestration_policy_rule_schedule_namespace
- 1
- - security_process_scan_result_policy
@@ -493,10 +535,6 @@
- 1
- - security_sync_scan_policies
- 1
-- - self_monitoring_project_create
- - 2
-- - self_monitoring_project_delete
- - 2
- - service_desk_email_receiver
- 2
- - set_user_status_based_on_user_cap_setting
@@ -505,6 +543,8 @@
- 1
- - snippets_update_repository_storage
- 1
+- - ssh_keys_update_last_used_at
+ - 1
- - status_page_publish
- 1
- - sync_seat_link_request
@@ -547,6 +587,10 @@
- 1
- - wikis_git_garbage_collect
- 1
+- - work_items_import_work_items_csv
+ - 1
+- - work_items_update_parent_objectives_progress
+ - 1
- - x509_certificate_revoke
- 1
- - zoekt_indexer
diff --git a/config/smime_signature_settings.rb b/config/smime_signature_settings.rb
index 4b50e01dba0..e964684ea80 100644
--- a/config/smime_signature_settings.rb
+++ b/config/smime_signature_settings.rb
@@ -3,7 +3,7 @@
# Set default values for email_smime settings
class SmimeSignatureSettings
def self.parse(email_smime)
- email_smime ||= Settingslogic.new({})
+ email_smime ||= GitlabSettings::Options.build({})
email_smime['enabled'] = false unless email_smime['enabled']
email_smime['key_file'] ||= Rails.root.join('.gitlab_smime_key')
email_smime['cert_file'] ||= Rails.root.join('.gitlab_smime_cert')
diff --git a/config/vue3migration/compiler.js b/config/vue3migration/compiler.js
new file mode 100644
index 00000000000..d6b6e1e7533
--- /dev/null
+++ b/config/vue3migration/compiler.js
@@ -0,0 +1,126 @@
+const { parse, compile: compilerDomCompile } = require('@vue/compiler-dom');
+
+const COMMENT_NODE_TYPE = 3;
+
+const hasProp = (node, prop) => node.props?.some((p) => p.name === prop);
+
+function modifyKeysInsideTemplateTag(templateNode) {
+ if (!templateNode.tag === 'template' || !hasProp(templateNode, 'for')) {
+ return;
+ }
+
+ let keyCandidate = null;
+ for (const node of templateNode.children) {
+ const keyBindingIndex = node.props
+ ? node.props.findIndex((prop) => prop.arg && prop.arg.content === 'key')
+ : -1;
+
+ if (keyBindingIndex !== -1 && !hasProp(node, 'for')) {
+ if (!keyCandidate) {
+ keyCandidate = node.props[keyBindingIndex];
+ }
+ node.props.splice(keyBindingIndex, 1);
+ }
+ }
+
+ if (keyCandidate) {
+ templateNode.props.push(keyCandidate);
+ }
+}
+
+function getSlotName(node) {
+ return node?.props?.find((prop) => prop.name === 'slot')?.arg?.content;
+}
+
+function filterCommentNodeAndTrailingSpace(node, idx, list) {
+ if (node.type === COMMENT_NODE_TYPE) {
+ return false;
+ }
+
+ if (node.content !== ' ') {
+ return true;
+ }
+
+ if (list[idx - 1]?.type === COMMENT_NODE_TYPE) {
+ return false;
+ }
+
+ return true;
+}
+
+function filterCommentNodes(node) {
+ const { length: originalLength } = node.children;
+ // eslint-disable-next-line no-param-reassign
+ node.children = node.children.filter(filterCommentNodeAndTrailingSpace);
+ if (node.children.length !== originalLength) {
+ // trim remaining spaces
+ while (node.children.at(-1)?.content === ' ') {
+ node.children.pop();
+ }
+ }
+}
+
+function dropVOnceForChildrenInsideVIfBecauseOfIssue7725(node) {
+ // See https://github.com/vuejs/core/issues/7725 for details
+ if (!hasProp(node, 'if')) {
+ return;
+ }
+
+ node.children?.forEach((child) => {
+ if (Array.isArray(child.props)) {
+ // eslint-disable-next-line no-param-reassign
+ child.props = child.props.filter((prop) => prop.name !== 'once');
+ }
+ });
+}
+
+function fixSameSlotsInsideTemplateFailingWhenUsingWhitespacePreserveDueToIssue6063(node) {
+ // See https://github.com/vuejs/core/issues/6063 for details
+ // eslint-disable-next-line no-param-reassign
+ node.children = node.children.filter((child, idx) => {
+ if (child.content !== ' ') {
+ // We need to drop only comment nodes
+ return true;
+ }
+
+ const previousNodeSlotName = getSlotName(node.children[idx - 1]);
+ const nextNodeSlotName = getSlotName(node.children[idx + 1]);
+
+ if (previousNodeSlotName && previousNodeSlotName === nextNodeSlotName) {
+ // We have a space beween two slot entries with same slot name, we need to drop it
+ return false;
+ }
+
+ return true;
+ });
+}
+
+module.exports = {
+ parse,
+ compile(template, options) {
+ const rootNode = parse(template, options);
+
+ const pendingNodes = [rootNode];
+ while (pendingNodes.length) {
+ const currentNode = pendingNodes.pop();
+ if (Array.isArray(currentNode.children)) {
+ // This one will be dropped all together with compiler when we drop Vue.js 2 support
+ modifyKeysInsideTemplateTag(currentNode);
+
+ dropVOnceForChildrenInsideVIfBecauseOfIssue7725(currentNode);
+
+ // See https://github.com/vuejs/core/issues/7909 for details
+ // However, this issue applies not only to root-level nodes
+ // But on any level comments could change slot emptiness detection
+ // so we simply drop them
+ filterCommentNodes(currentNode);
+
+ fixSameSlotsInsideTemplateFailingWhenUsingWhitespacePreserveDueToIssue6063(currentNode);
+
+ currentNode.children.forEach((child) => pendingNodes.push(child));
+ }
+ }
+
+ return compilerDomCompile(rootNode, options);
+ },
+};
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 8ae803ca738..e3505ae47b8 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -1,6 +1,19 @@
// eslint-disable-next-line import/order
const crypto = require('./helpers/patched_crypto');
+const { VUE_VERSION: EXPLICIT_VUE_VERSION } = process.env;
+if (![undefined, '2', '3'].includes(EXPLICIT_VUE_VERSION)) {
+ throw new Error(
+ `Invalid VUE_VERSION value: ${EXPLICIT_VUE_VERSION}. Only '2' and '3' are supported`,
+ );
+}
+const USE_VUE3 = EXPLICIT_VUE_VERSION === '3';
+
+if (USE_VUE3) {
+ console.log('[V] Using Vue.js 3');
+}
+const VUE_LOADER_MODULE = USE_VUE3 ? 'vue-loader-vue3' : 'vue-loader';
+
const fs = require('fs');
const path = require('path');
@@ -12,18 +25,17 @@ const BABEL_LOADER_VERSION = require('babel-loader/package.json').version;
const CompressionPlugin = require('compression-webpack-plugin');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const glob = require('glob');
-const VueLoaderPlugin = require('vue-loader/lib/plugin');
-const VUE_LOADER_VERSION = require('vue-loader/package.json').version;
+// eslint-disable-next-line import/no-dynamic-require
+const { VueLoaderPlugin } = require(VUE_LOADER_MODULE);
+// eslint-disable-next-line import/no-dynamic-require
+const VUE_LOADER_VERSION = require(`${VUE_LOADER_MODULE}/package.json`).version;
const VUE_VERSION = require('vue/package.json').version;
-const { ESBuildMinifyPlugin } = require('esbuild-loader');
-
const webpack = require('webpack');
const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
const { StatsWriterPlugin } = require('webpack-stats-plugin');
const WEBPACK_VERSION = require('webpack/package.json').version;
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
-const esbuildConfiguration = require('./esbuild.config');
const createIncrementalWebpackCompiler = require('./helpers/incremental_webpack_compiler');
const IS_EE = require('./helpers/is_ee_env');
@@ -43,8 +55,6 @@ const VENDOR_DLL = process.env.WEBPACK_VENDOR_DLL && process.env.WEBPACK_VENDOR_
const CACHE_PATH = process.env.WEBPACK_CACHE_PATH || path.join(ROOT_PATH, 'tmp/cache');
const IS_PRODUCTION = process.env.NODE_ENV === 'production';
const IS_DEV_SERVER = process.env.WEBPACK_SERVE === 'true';
-const WEBPACK_USE_ESBUILD_LOADER =
- process.env.WEBPACK_USE_ESBUILD_LOADER && process.env.WEBPACK_USE_ESBUILD_LOADER !== 'false';
const { DEV_SERVER_HOST, DEV_SERVER_PUBLIC_ADDR } = process.env;
const DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10);
@@ -54,11 +64,9 @@ const DEV_SERVER_LIVERELOAD = IS_DEV_SERVER && process.env.DEV_SERVER_LIVERELOAD
const INCREMENTAL_COMPILER_ENABLED =
IS_DEV_SERVER &&
process.env.DEV_SERVER_INCREMENTAL &&
- process.env.DEV_SERVER_INCREMENTAL !== 'false' &&
- !WEBPACK_USE_ESBUILD_LOADER;
+ process.env.DEV_SERVER_INCREMENTAL !== 'false';
const INCREMENTAL_COMPILER_TTL = Number(process.env.DEV_SERVER_INCREMENTAL_TTL) || Infinity;
-const INCREMENTAL_COMPILER_RECORD_HISTORY =
- IS_DEV_SERVER && !process.env.CI && !WEBPACK_USE_ESBUILD_LOADER;
+const INCREMENTAL_COMPILER_RECORD_HISTORY = IS_DEV_SERVER && !process.env.CI;
const WEBPACK_REPORT = process.env.WEBPACK_REPORT && process.env.WEBPACK_REPORT !== 'false';
const WEBPACK_MEMORY_TEST =
process.env.WEBPACK_MEMORY_TEST && process.env.WEBPACK_MEMORY_TEST !== 'false';
@@ -158,6 +166,7 @@ function generateEntries() {
Note 2: If you are using web-workers, you might need to reset the public path, see:
https://gitlab.com/gitlab-org/gitlab/-/issues/321656
*/
+
const manualEntries = {
default: defaultEntries,
legacy_sentry: './sentry/legacy_index.js',
@@ -167,6 +176,8 @@ function generateEntries() {
sandboxed_mermaid: './lib/mermaid.js',
redirect_listbox: './entrypoints/behaviors/redirect_listbox.js',
sandboxed_swagger: './lib/swagger.js',
+ super_sidebar: './entrypoints/super_sidebar.js',
+ tracker: './entrypoints/tracker.js',
};
return Object.assign(manualEntries, incrementalCompiler.filterEntryPoints(autoEntries));
@@ -278,8 +289,49 @@ const defaultJsOptions = {
cacheCompression: false,
};
-if (WEBPACK_USE_ESBUILD_LOADER) {
- console.log('esbuild-loader is active');
+const vueLoaderOptions = {
+ ident: 'vue-loader-options',
+
+ cacheDirectory: path.join(CACHE_PATH, 'vue-loader'),
+ cacheIdentifier: [
+ process.env.NODE_ENV || 'development',
+ webpack.version,
+ VUE_VERSION,
+ VUE_LOADER_VERSION,
+ EXPLICIT_VUE_VERSION,
+ ].join('|'),
+};
+
+let shouldExcludeFromCompliling = (modulePath) =>
+ /node_modules|vendor[\\/]assets/.test(modulePath) && !/\.vue\.js/.test(modulePath);
+// We explicitly set VUE_VERSION
+// Use @gitlab-ui from source to allow us to dig differences
+// between Vue.js 2 and Vue.js 3 while using built gitlab-ui by default
+if (EXPLICIT_VUE_VERSION) {
+ Object.assign(alias, {
+ '@gitlab/ui/scss_to_js': path.join(ROOT_PATH, 'node_modules/@gitlab/ui/scss_to_js'),
+ '@gitlab/ui/dist': '@gitlab/ui/src',
+ '@gitlab/ui': '@gitlab/ui/src',
+ });
+
+ const originalShouldExcludeFromCompliling = shouldExcludeFromCompliling;
+
+ shouldExcludeFromCompliling = (modulePath) =>
+ originalShouldExcludeFromCompliling(modulePath) &&
+ !/node_modules[\\/]@gitlab[\\/]ui/.test(modulePath) &&
+ !/node_modules[\\/]bootstrap-vue[\\/]src[\\/]vue\.js/.test(modulePath);
+}
+
+if (USE_VUE3) {
+ Object.assign(alias, {
+ // ensure we always use the same type of module for Vue
+ vue: '@vue/compat/dist/vue.runtime.esm-bundler.js',
+ vuex: path.join(ROOT_PATH, 'app/assets/javascripts/lib/utils/vue3compat/vuex.js'),
+ 'vue-apollo': path.join(ROOT_PATH, 'app/assets/javascripts/lib/utils/vue3compat/vue_apollo.js'),
+ 'vue-router': path.join(ROOT_PATH, 'app/assets/javascripts/lib/utils/vue3compat/vue_router.js'),
+ });
+
+ vueLoaderOptions.compiler = require.resolve('./vue3migration/compiler');
}
module.exports = {
@@ -317,30 +369,31 @@ module.exports = {
include: /node_modules/,
loader: 'babel-loader',
},
- WEBPACK_USE_ESBUILD_LOADER && {
- test: /\.(js|cjs)$/,
- exclude: (modulePath) =>
- /node_modules|vendor[\\/]assets/.test(modulePath) && !/\.vue\.js/.test(modulePath),
- loader: 'esbuild-loader',
- options: esbuildConfiguration,
- },
- !WEBPACK_USE_ESBUILD_LOADER && {
- test: /\.(js|cjs)$/,
- exclude: (modulePath) =>
- /node_modules|vendor[\\/]assets/.test(modulePath) && !/\.vue\.js/.test(modulePath),
+ {
+ test: /mermaid\/.*\.js?$/,
+ include: /node_modules/,
loader: 'babel-loader',
- options: defaultJsOptions,
},
- WEBPACK_USE_ESBUILD_LOADER && {
+ {
test: /\.(js|cjs)$/,
- include: (modulePath) =>
- /node_modules\/(monaco-worker-manager|monaco-marker-data-provider)\/index\.js/.test(
- modulePath,
- ) || /node_modules\/yaml/.test(modulePath),
- loader: 'esbuild-loader',
- options: esbuildConfiguration,
+ exclude: shouldExcludeFromCompliling,
+ use: [
+ {
+ loader: 'thread-loader',
+ options: {
+ workerParallelJobs: 20,
+ poolRespawn: false,
+ poolParallelJobs: 200,
+ poolTimeout: DEV_SERVER_LIVERELOAD ? Infinity : 5000,
+ },
+ },
+ {
+ loader: 'babel-loader',
+ options: defaultJsOptions,
+ },
+ ],
},
- !WEBPACK_USE_ESBUILD_LOADER && {
+ {
test: /\.(js|cjs)$/,
include: (modulePath) =>
/node_modules\/(monaco-worker-manager|monaco-marker-data-provider)\/index\.js/.test(
@@ -354,16 +407,8 @@ module.exports = {
},
{
test: /\.vue$/,
- loader: 'vue-loader',
- options: {
- cacheDirectory: path.join(CACHE_PATH, 'vue-loader'),
- cacheIdentifier: [
- process.env.NODE_ENV || 'development',
- webpack.version,
- VUE_VERSION,
- VUE_LOADER_VERSION,
- ].join('|'),
- },
+ loader: VUE_LOADER_MODULE,
+ options: vueLoaderOptions,
},
{
test: /\.(graphql|gql)$/,
@@ -424,7 +469,7 @@ module.exports = {
{
test: /.css$/,
use: [
- 'vue-style-loader',
+ 'style-loader',
{
loader: 'css-loader',
options: {
@@ -452,7 +497,6 @@ module.exports = {
},
},
{
- test: /\.(yml|yaml)$/,
resourceQuery: /raw/,
loader: 'raw-loader',
},
@@ -527,9 +571,6 @@ module.exports = {
},
},
},
- ...(WEBPACK_USE_ESBUILD_LOADER
- ? { minimizer: [new ESBuildMinifyPlugin(esbuildConfiguration)] }
- : {}),
},
plugins: [
@@ -850,6 +891,15 @@ module.exports = {
...(DEV_SERVER_ALLOWED_HOSTS ? { allowedHosts: DEV_SERVER_ALLOWED_HOSTS } : {}),
client: {
...(DEV_SERVER_PUBLIC_ADDR ? { webSocketURL: DEV_SERVER_PUBLIC_ADDR } : {}),
+ overlay: {
+ runtimeErrors: (error) => {
+ if (error instanceof DOMException && error.message === 'The user aborted a request.') {
+ return false;
+ }
+
+ return true;
+ },
+ },
},
},
diff --git a/config/webpack.vendor.config.js b/config/webpack.vendor.config.js
index a43febe5e25..c79ed9fe85c 100644
--- a/config/webpack.vendor.config.js
+++ b/config/webpack.vendor.config.js
@@ -25,26 +25,24 @@ module.exports = {
entry: {
vendor: [
- 'jquery/dist/jquery.slim.js',
+ '@apollo/client/core',
+ '@gitlab/at.js',
'core-js',
+ 'dexie',
+ 'dompurify',
'echarts',
- 'lodash',
- 'vuex',
- 'vue',
- 'pikaday',
- '@gitlab/at.js',
'jed',
- 'mermaid',
+ 'jquery/dist/jquery.slim.js',
'katex',
- 'three',
- 'moment-mini',
- 'dompurify',
- 'bootstrap/dist/js/bootstrap.js',
- 'sortablejs/modular/sortable.esm.js',
+ 'lodash',
+ 'mousetrap',
+ 'pikaday',
'popper.js',
- '@apollo/client/core',
+ 'sortablejs/modular/sortable.esm.js',
'source-map',
- 'mousetrap',
+ 'three',
+ 'vue',
+ 'vuex',
],
},
@@ -76,8 +74,6 @@ module.exports = {
https://gitlab.com/gitlab-org/gitlab/-/issues/219353
*/
'chokidar',
- // We are ignoring esbuild as we want to force a newer version than what esbuild-loader provides
- 'esbuild',
// We are ignoring ts-jest, because we force a newer version, compatible with our current jest version
'ts-jest',
].join('|'),