diff options
Diffstat (limited to 'config')
172 files changed, 963 insertions, 470 deletions
diff --git a/config/application.rb b/config/application.rb index 8a40aaa8bd6..ad76a6d8e7e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -99,7 +99,6 @@ module Gitlab #{config.root}/app/models/badges #{config.root}/app/models/hooks #{config.root}/app/models/members - #{config.root}/app/models/project_services #{config.root}/app/graphql/resolvers/concerns #{config.root}/app/graphql/mutations/concerns #{config.root}/app/graphql/types/concerns]) @@ -324,6 +323,8 @@ module Gitlab # Import gitlab-svgs directly from vendored directory config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist" + config.assets.paths << "#{config.root}/node_modules/@jihulab/svgs/dist" if Gitlab.jh? + config.assets.precompile << "illustrations/jh/*.svg" if Gitlab.jh? config.assets.precompile << "icons.svg" config.assets.precompile << "icons.json" config.assets.precompile << "illustrations/*.svg" @@ -399,7 +400,7 @@ module Gitlab resource oauth_path, headers: %w(Authorization), credentials: false, - methods: %i(post) + methods: %i(post options) end end @@ -410,7 +411,7 @@ module Gitlab resource '/oauth/userinfo', headers: %w(Authorization), credentials: false, - methods: %i(get head post) + methods: %i(get head post options) end %w(/oauth/discovery/keys /.well-known/openid-configuration /.well-known/webfinger).each do |openid_path| diff --git a/config/database.yml.decomposed-postgresql b/config/database.yml.decomposed-postgresql index 23c7f052f5a..04add959ad4 100644 --- a/config/database.yml.decomposed-postgresql +++ b/config/database.yml.decomposed-postgresql @@ -16,6 +16,14 @@ production: username: git password: "secure password" host: localhost + geo: + adapter: postgresql + encoding: unicode + database: gitlabhq_geo_production + username: git + password: "secure password" + host: localhost + # # Development specific # @@ -38,6 +46,13 @@ development: host: localhost variables: statement_timeout: 15s + geo: + adapter: postgresql + encoding: unicode + database: gitlabhq_geo_development + username: postgres + password: "secure password" + host: localhost # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". @@ -63,3 +78,10 @@ test: &test prepared_statements: false variables: statement_timeout: 15s + geo: + adapter: postgresql + encoding: unicode + database: gitlabhq_geo_test + username: postgres + password: + host: localhost diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql index a4daab1fd0c..5329a8e9fd7 100644 --- a/config/database.yml.postgresql +++ b/config/database.yml.postgresql @@ -18,6 +18,13 @@ production: # port: 8600 # record: secondary.postgresql.service.consul # interval: 300 + geo: + adapter: postgresql + encoding: unicode + database: gitlabhq_geo_production + username: git + password: "secure password" + host: localhost # # Development specific @@ -32,6 +39,13 @@ development: host: localhost variables: statement_timeout: 15s + geo: + adapter: postgresql + encoding: unicode + database: gitlabhq_geo_development + username: postgres + password: "secure password" + host: localhost # # Staging specific @@ -44,6 +58,13 @@ staging: username: git password: "secure password" host: localhost + geo: + adapter: postgresql + encoding: unicode + database: gitlabhq_geo_staging + username: git + password: "secure password" + host: localhost # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". @@ -59,3 +80,10 @@ test: &test prepared_statements: false variables: statement_timeout: 15s + geo: + adapter: postgresql + encoding: unicode + database: gitlabhq_geo_test + username: postgres + password: + host: localhost diff --git a/config/database_geo.yml.postgresql b/config/database_geo.yml.postgresql deleted file mode 100644 index 25b9c6d5eb1..00000000000 --- a/config/database_geo.yml.postgresql +++ /dev/null @@ -1,43 +0,0 @@ -# -# PRODUCTION -# -production: - adapter: postgresql - encoding: unicode - database: gitlabhq_geo_production - username: git - password: "secure password" - host: localhost - -# -# Development specific -# -development: - adapter: postgresql - encoding: unicode - database: gitlabhq_geo_development - username: postgres - password: "secure password" - host: localhost - -# -# Staging specific -# -staging: - adapter: postgresql - encoding: unicode - database: gitlabhq_geo_staging - username: git - password: "secure password" - host: localhost - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: &test - adapter: postgresql - encoding: unicode - database: gitlabhq_geo_test - username: postgres - password: - host: localhost diff --git a/config/events/1654698269_merge_request_action_create.yml b/config/events/1654698269_merge_request_action_create.yml new file mode 100644 index 00000000000..999d9744c92 --- /dev/null +++ b/config/events/1654698269_merge_request_action_create.yml @@ -0,0 +1,26 @@ +--- +description: Triggered from backend layer when merge request is created +category: merge_request_action +action: create +label_description: Constant string that match with ServicePing metric name of merge_requests_users +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +product_section: dev +product_stage: create +product_group: group::code review +product_category: code_review +milestone: "15.1" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89544 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1654698359_merge_request_action_close.yml b/config/events/1654698359_merge_request_action_close.yml new file mode 100644 index 00000000000..79807fa378d --- /dev/null +++ b/config/events/1654698359_merge_request_action_close.yml @@ -0,0 +1,26 @@ +--- +description: Triggered from backend layer when merge request is closed +category: merge_request_action +action: close +label_description: Constant string that match with ServicePing metric name of merge_requests_users +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +product_section: dev +product_stage: create +product_group: group::code review +product_category: code_review +milestone: "15.1" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89544 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1654698407_merge_request_action_merge.yml b/config/events/1654698407_merge_request_action_merge.yml new file mode 100644 index 00000000000..3a0a1282e93 --- /dev/null +++ b/config/events/1654698407_merge_request_action_merge.yml @@ -0,0 +1,26 @@ +--- +description: Triggered from backend layer when merge request is merged +category: merge_request_action +action: merge +label_description: Constant string that match with ServicePing metric name of merge_requests_users +property_description: +value_description: +extra_properties: +identifiers: +- project +- user +- namespace +product_section: dev +product_stage: create +product_group: group::code review +product_category: code_review +milestone: "15.1" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89544 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/events/1654843786_merge_request_action_comment.yml b/config/events/1654843786_merge_request_action_comment.yml new file mode 100644 index 00000000000..5cd384cd78e --- /dev/null +++ b/config/events/1654843786_merge_request_action_comment.yml @@ -0,0 +1,27 @@ +--- +description: Triggered from backend layer when merge request is commented +category: merge_request_action +action: comment +label_description: Constant string that match with ServicePing metric name of merge_requests_users +property_description: +value_description: +extra_properties: +identifiers: + - project + - user + - namespace +product_section: dev +product_stage: create +product_group: group::code review +product_category: code_review +milestone: "15.1" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89544 +distributions: + - ce + - ee +tiers: + - free + - premium + - ultimate + + diff --git a/config/feature_categories.yml b/config/feature_categories.yml index 473cf240864..d52f621e436 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -90,6 +90,7 @@ - permissions - pipeline_authoring - planning_analytics +- pods - portfolio_management - privacy_control_center - product_analytics @@ -114,7 +115,6 @@ - security_orchestration - service_desk - service_ping -- sharding - snippets - source_code_management - static_application_security_testing diff --git a/config/feature_flags/development/ci_owned_runners_unnest_index.yml b/config/feature_flags/development/active_support_hash_digest_sha256.yml index 225ec3d5df4..147b84bf112 100644 --- a/config/feature_flags/development/ci_owned_runners_unnest_index.yml +++ b/config/feature_flags/development/active_support_hash_digest_sha256.yml @@ -1,8 +1,8 @@ --- -name: ci_owned_runners_unnest_index -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83843 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357869 -milestone: '14.10' +name: active_support_hash_digest_sha256 +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90098 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365314 +milestone: '15.1' type: development group: group::sharding default_enabled: false diff --git a/config/feature_flags/development/batch_load_environment_last_deployment_group.yml b/config/feature_flags/development/batch_load_environment_last_deployment_group.yml new file mode 100644 index 00000000000..d6de45eacdf --- /dev/null +++ b/config/feature_flags/development/batch_load_environment_last_deployment_group.yml @@ -0,0 +1,8 @@ +--- +name: batch_load_environment_last_deployment_group +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86584/ +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363023 +milestone: '15.1' +type: development +group: group::release +default_enabled: false diff --git a/config/feature_flags/development/branch_rules.yml b/config/feature_flags/development/branch_rules.yml new file mode 100644 index 00000000000..822496b48b0 --- /dev/null +++ b/config/feature_flags/development/branch_rules.yml @@ -0,0 +1,8 @@ +--- +name: branch_rules +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88279 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363170 +milestone: '15.1' +type: development +group: group::source code +default_enabled: false diff --git a/config/feature_flags/development/paginated_notes.yml b/config/feature_flags/development/change_response_code_merge_status.yml index 733e23083d2..89092fe4164 100644 --- a/config/feature_flags/development/paginated_notes.yml +++ b/config/feature_flags/development/change_response_code_merge_status.yml @@ -1,8 +1,8 @@ --- -name: paginated_notes -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34628 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/254987 -milestone: '13.2' +name: change_response_code_merge_status +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82465/ +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356930 +milestone: '15.1' type: development group: group::code review default_enabled: false diff --git a/config/feature_flags/development/changelog_commits_limitation.yml b/config/feature_flags/development/changelog_commits_limitation.yml new file mode 100644 index 00000000000..3339fc7f946 --- /dev/null +++ b/config/feature_flags/development/changelog_commits_limitation.yml @@ -0,0 +1,8 @@ +--- +name: changelog_commits_limitation +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89032 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364101 +milestone: '15.1' +type: development +group: group::source code +default_enabled: false diff --git a/config/feature_flags/development/ci_test_report_artifacts_expired.yml b/config/feature_flags/development/ci_child_pipeline_coverage_reports.yml index 843aa42efdc..c77bd223eff 100644 --- a/config/feature_flags/development/ci_test_report_artifacts_expired.yml +++ b/config/feature_flags/development/ci_child_pipeline_coverage_reports.yml @@ -1,8 +1,8 @@ --- -name: ci_test_report_artifacts_expired -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83113 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356773 -milestone: '14.10' +name: ci_child_pipeline_coverage_reports +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88626 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363557 +milestone: '15.1' type: development group: group::pipeline insights default_enabled: false diff --git a/config/feature_flags/development/pipeline_editor_file_tree.yml b/config/feature_flags/development/ci_docker_image_pull_policy.yml index db31133a530..09e01fb5232 100644 --- a/config/feature_flags/development/pipeline_editor_file_tree.yml +++ b/config/feature_flags/development/ci_docker_image_pull_policy.yml @@ -1,8 +1,8 @@ --- -name: pipeline_editor_file_tree -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83910 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357219 -milestone: '15.0' +name: ci_docker_image_pull_policy +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85588 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363186 +milestone: '15.1' type: development group: group::pipeline authoring default_enabled: false diff --git a/config/feature_flags/development/ci_owned_runners_cross_joins_fix.yml b/config/feature_flags/development/ci_enforce_throttle_pipelines_creation.yml index aacb188ba35..828fde06bab 100644 --- a/config/feature_flags/development/ci_owned_runners_cross_joins_fix.yml +++ b/config/feature_flags/development/ci_enforce_throttle_pipelines_creation.yml @@ -1,8 +1,8 @@ --- -name: ci_owned_runners_cross_joins_fix -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78216 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350322 -milestone: '14.8' +name: ci_enforce_throttle_pipelines_creation +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87223 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362513 +milestone: '15.1' type: development group: group::pipeline execution default_enabled: false diff --git a/config/feature_flags/development/ci_throttle_pipelines_creation.yml b/config/feature_flags/development/ci_enforce_throttle_pipelines_creation_override.yml index 162a69ade5d..e6458729cc9 100644 --- a/config/feature_flags/development/ci_throttle_pipelines_creation.yml +++ b/config/feature_flags/development/ci_enforce_throttle_pipelines_creation_override.yml @@ -1,8 +1,8 @@ --- -name: ci_throttle_pipelines_creation -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83969 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357520 -milestone: '14.10' +name: ci_enforce_throttle_pipelines_creation_override +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89518 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362513 +milestone: '15.1' type: development group: group::pipeline execution default_enabled: false diff --git a/config/feature_flags/development/ci_fix_rules_if_comparison_with_regexp_variable.yml b/config/feature_flags/development/ci_fix_rules_if_comparison_with_regexp_variable.yml index be21707d376..d4393f64059 100644 --- a/config/feature_flags/development/ci_fix_rules_if_comparison_with_regexp_variable.yml +++ b/config/feature_flags/development/ci_fix_rules_if_comparison_with_regexp_variable.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/359740 milestone: '15.0' type: development group: group::pipeline authoring -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/ci_jwt_signing_key.yml b/config/feature_flags/development/ci_jwt_signing_key.yml deleted file mode 100644 index 7d96264e25f..00000000000 --- a/config/feature_flags/development/ci_jwt_signing_key.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ci_jwt_signing_key -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34249 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258546 -milestone: '13.6' -type: development -group: group::configure -default_enabled: true diff --git a/config/feature_flags/development/ci_throttle_pipelines_creation_dry_run.yml b/config/feature_flags/development/ci_throttle_pipelines_creation_dry_run.yml deleted file mode 100644 index 5092767e089..00000000000 --- a/config/feature_flags/development/ci_throttle_pipelines_creation_dry_run.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ci_throttle_pipelines_creation_dry_run -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83969 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357524 -milestone: '14.10' -type: development -group: group::pipeline execution -default_enabled: true diff --git a/config/feature_flags/development/ci_trigger_forward_variables.yml b/config/feature_flags/development/ci_variable_for_group_gitlab_deploy_token.yml index 4767ca0cb75..155a6c385fc 100644 --- a/config/feature_flags/development/ci_trigger_forward_variables.yml +++ b/config/feature_flags/development/ci_variable_for_group_gitlab_deploy_token.yml @@ -1,8 +1,8 @@ --- -name: ci_trigger_forward_variables -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82676 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355572 -milestone: '14.9' +name: ci_variable_for_group_gitlab_deploy_token +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88696 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363621 +milestone: '15.1' type: development group: group::pipeline authoring default_enabled: true diff --git a/config/feature_flags/development/ci_variable_settings_graphql.yml b/config/feature_flags/development/ci_variable_settings_graphql.yml new file mode 100644 index 00000000000..0af109968ab --- /dev/null +++ b/config/feature_flags/development/ci_variable_settings_graphql.yml @@ -0,0 +1,8 @@ +--- +name: ci_variable_settings_graphql +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89332 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364423 +milestone: '15.1' +type: development +group: group::pipeline authoring +default_enabled: false diff --git a/config/feature_flags/development/bootstrap_confirmation_modals.yml b/config/feature_flags/development/closed_as_duplicate_of_issues_api.yml index e67fd03fea6..6628feb3879 100644 --- a/config/feature_flags/development/bootstrap_confirmation_modals.yml +++ b/config/feature_flags/development/closed_as_duplicate_of_issues_api.yml @@ -1,8 +1,8 @@ --- -name: bootstrap_confirmation_modals -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73167 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344658 -milestone: '14.5' +name: closed_as_duplicate_of_issues_api +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89375 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364749 +milestone: '15.1' type: development -group: group::foundations +group: group::respond default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_phase2_enqueuer_loop.yml b/config/feature_flags/development/container_registry_migration_phase2_capacity_40.yml index abd14090007..f26ddd99607 100644 --- a/config/feature_flags/development/container_registry_migration_phase2_enqueuer_loop.yml +++ b/config/feature_flags/development/container_registry_migration_phase2_capacity_40.yml @@ -1,8 +1,8 @@ --- -name: container_registry_migration_phase2_enqueuer_loop -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87168 +name: container_registry_migration_phase2_capacity_40 +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86543 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 -milestone: '15.0' +milestone: '15.1' type: development group: group::package default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_phase2_delete_container_repository_worker_support.yml b/config/feature_flags/development/container_registry_migration_phase2_delete_container_repository_worker_support.yml new file mode 100644 index 00000000000..f6a5ae36c07 --- /dev/null +++ b/config/feature_flags/development/container_registry_migration_phase2_delete_container_repository_worker_support.yml @@ -0,0 +1,8 @@ +--- +name: container_registry_migration_phase2_delete_container_repository_worker_support +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88997 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 +milestone: '15.1' +type: development +group: group::package +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 new file mode 100644 index 00000000000..acf5902716e --- /dev/null +++ b/config/feature_flags/development/delayed_repository_update_mirror_worker.yml @@ -0,0 +1,8 @@ +--- +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/slack_app_use_v2_flow.yml b/config/feature_flags/development/deployment_hooks_skip_worker.yml index 2f696629cee..d7d35912e2d 100644 --- a/config/feature_flags/development/slack_app_use_v2_flow.yml +++ b/config/feature_flags/development/deployment_hooks_skip_worker.yml @@ -1,8 +1,8 @@ --- -name: slack_app_use_v2_flow -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85726 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360680 -milestone: '15.0' +name: deployment_hooks_skip_worker +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83351 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356468 +milestone: '14.10' type: development group: group::integrations default_enabled: false diff --git a/config/feature_flags/development/enable_vulnerability_remediations_from_records.yml b/config/feature_flags/development/enable_vulnerability_remediations_from_records.yml new file mode 100644 index 00000000000..c557ad751f2 --- /dev/null +++ b/config/feature_flags/development/enable_vulnerability_remediations_from_records.yml @@ -0,0 +1,8 @@ +--- +name: enable_vulnerability_remediations_from_records +introduced_by_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362283 +milestone: '15.1' +type: development +group: group::threat insights +default_enabled: false diff --git a/config/feature_flags/development/omit_epic_subscribed.yml b/config/feature_flags/development/fe_epic_board_total_weight.yml index 885636d6626..5550d7fa01d 100644 --- a/config/feature_flags/development/omit_epic_subscribed.yml +++ b/config/feature_flags/development/fe_epic_board_total_weight.yml @@ -1,8 +1,8 @@ --- -name: omit_epic_subscribed -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86016 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360663 -milestone: '15.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: true +default_enabled: false diff --git a/config/feature_flags/development/force_no_sharing_primary_model.yml b/config/feature_flags/development/fix_sliding_list_partitioning.yml index 5732f39fdee..90b4bf87740 100644 --- a/config/feature_flags/development/force_no_sharing_primary_model.yml +++ b/config/feature_flags/development/fix_sliding_list_partitioning.yml @@ -1,8 +1,8 @@ --- -name: force_no_sharing_primary_model -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76188 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347286 -milestone: '14.8' +name: fix_sliding_list_partitioning +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85222 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362246 +milestone: '15.1' type: development group: group::sharding default_enabled: false diff --git a/config/feature_flags/development/group_ip_restrictions_allow_global.yml b/config/feature_flags/development/group_ip_restrictions_allow_global.yml new file mode 100644 index 00000000000..87cfa5e8b1b --- /dev/null +++ b/config/feature_flags/development/group_ip_restrictions_allow_global.yml @@ -0,0 +1,8 @@ +--- +name: group_ip_restrictions_allow_global +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87579 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362603 +milestone: '15.1' +type: development +group: group::source code +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 new file mode 100644 index 00000000000..ad9ba309d69 --- /dev/null +++ b/config/feature_flags/development/group_level_git_protocol_control.yml @@ -0,0 +1,8 @@ +--- +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/group_member_inherited_group.yml b/config/feature_flags/development/group_name_path_vue.yml index 6b10f8fa715..6ecb0eaf20e 100644 --- a/config/feature_flags/development/group_member_inherited_group.yml +++ b/config/feature_flags/development/group_name_path_vue.yml @@ -1,8 +1,8 @@ --- -name: group_member_inherited_group -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71465 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357244 -milestone: '14.10' +name: group_name_path_vue +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88085 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363623 +milestone: '15.1' type: development group: group::workspace default_enabled: false diff --git a/config/feature_flags/development/group_runner_view_ui.yml b/config/feature_flags/development/group_runner_view_ui.yml new file mode 100644 index 00000000000..f3a9eb15f0f --- /dev/null +++ b/config/feature_flags/development/group_runner_view_ui.yml @@ -0,0 +1,8 @@ +--- +name: group_runner_view_ui +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89638/ +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364811 +milestone: '15.1' +type: development +group: group::runner +default_enabled: false diff --git a/config/feature_flags/development/import_release_authors_from_github.yml b/config/feature_flags/development/import_release_authors_from_github.yml new file mode 100644 index 00000000000..b0ddca12d87 --- /dev/null +++ b/config/feature_flags/development/import_release_authors_from_github.yml @@ -0,0 +1,8 @@ +--- +name: import_release_authors_from_github +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89692 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343448 +milestone: '15.1' +type: development +group: group::release +default_enabled: false diff --git a/config/feature_flags/development/replace_order_by_created_at_with_id.yml b/config/feature_flags/development/linear_scopes_superset.yml index c370b172cd3..555b36262ec 100644 --- a/config/feature_flags/development/replace_order_by_created_at_with_id.yml +++ b/config/feature_flags/development/linear_scopes_superset.yml @@ -1,8 +1,8 @@ --- -name: replace_order_by_created_at_with_id -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86104 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360757 -milestone: '15.0' +name: linear_scopes_superset +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87643 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362687 +milestone: '15.1' type: development group: group::workspace default_enabled: false diff --git a/config/feature_flags/development/markup_rendering_timeout.yml b/config/feature_flags/development/markup_rendering_timeout.yml new file mode 100644 index 00000000000..6c579ebe28a --- /dev/null +++ b/config/feature_flags/development/markup_rendering_timeout.yml @@ -0,0 +1,8 @@ +--- +name: markup_rendering_timeout +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89509 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365358 +milestone: '15.1' +type: development +group: group::source code +default_enabled: false diff --git a/config/feature_flags/development/updated_mr_header.yml b/config/feature_flags/development/mr_review_submit_comment.yml index 7268076b587..d06901d992c 100644 --- a/config/feature_flags/development/updated_mr_header.yml +++ b/config/feature_flags/development/mr_review_submit_comment.yml @@ -1,8 +1,8 @@ --- -name: updated_mr_header +name: mr_review_submit_comment introduced_by_url: rollout_issue_url: -milestone: '14.10' +milestone: '15.1' type: development group: group::code review -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/namespaces_cache_first_auto_devops_config.yml b/config/feature_flags/development/namespaces_cache_first_auto_devops_config.yml deleted file mode 100644 index 6d15df2bb91..00000000000 --- a/config/feature_flags/development/namespaces_cache_first_auto_devops_config.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: namespaces_cache_first_auto_devops_config -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80937 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353503 -milestone: '14.9' -type: development -group: group::authentication and authorization -default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_phase2_enqueue_twice.yml b/config/feature_flags/development/package_registry_access_level.yml index 83ae4e8c761..093315f77bd 100644 --- a/config/feature_flags/development/container_registry_migration_phase2_enqueue_twice.yml +++ b/config/feature_flags/development/package_registry_access_level.yml @@ -1,7 +1,7 @@ --- -name: container_registry_migration_phase2_enqueue_twice -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86596 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 +name: package_registry_access_level +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82808 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363018 milestone: '15.0' type: development group: group::package diff --git a/config/feature_flags/undefined/gitaly_replace_wiki_create_page.yml b/config/feature_flags/development/pages_lets_encrypt_ecdsa.yml index 9b7a36cb2c0..866c2438e9f 100644 --- a/config/feature_flags/undefined/gitaly_replace_wiki_create_page.yml +++ b/config/feature_flags/development/pages_lets_encrypt_ecdsa.yml @@ -1,8 +1,8 @@ --- -name: gitaly_replace_wiki_create_page -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83734 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356983 -milestone: '15.0' -type: undefined +name: pages_lets_encrypt_ecdsa +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88125 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363026 +milestone: '15.1' +type: development group: group::editor default_enabled: false diff --git a/config/feature_flags/development/async_mr_close_issue.yml b/config/feature_flags/development/paginated_mr_discussions.yml index 84db0a57fd6..ec2fb41f310 100644 --- a/config/feature_flags/development/async_mr_close_issue.yml +++ b/config/feature_flags/development/paginated_mr_discussions.yml @@ -1,8 +1,8 @@ --- -name: async_mr_close_issue -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86328 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/361320 -milestone: '15.0' +name: paginated_mr_discussions +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88905 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364497 +milestone: '15.1' type: development group: group::code review default_enabled: false diff --git a/config/feature_flags/development/filter_quarantined_commits.yml b/config/feature_flags/development/prerecord_service_ping_data.yml index 2c18e83d947..ad284dbcce8 100644 --- a/config/feature_flags/development/filter_quarantined_commits.yml +++ b/config/feature_flags/development/prerecord_service_ping_data.yml @@ -1,8 +1,8 @@ --- -name: filter_quarantined_commits -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86440 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/361174 +name: prerecord_service_ping_data +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85503 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360675 milestone: '15.0' type: development -group: group::gitaly +group: group::product intelligence default_enabled: true diff --git a/config/feature_flags/development/failed_jobs_tab_vue.yml b/config/feature_flags/development/refactor_code_quality_extension.yml index 1c70bd5b418..c6eb7c19a6e 100644 --- a/config/feature_flags/development/failed_jobs_tab_vue.yml +++ b/config/feature_flags/development/refactor_code_quality_extension.yml @@ -1,8 +1,8 @@ --- -name: failed_jobs_tab_vue -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86151 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360849 -milestone: '15.0' +name: refactor_code_quality_extension +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88865 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363845 +milestone: '15.1' type: development -group: group::pipeline execution +group: group::secure default_enabled: false diff --git a/config/feature_flags/development/refactor_security_extension.yml b/config/feature_flags/development/refactor_security_extension.yml new file mode 100644 index 00000000000..7651f7d387d --- /dev/null +++ b/config/feature_flags/development/refactor_security_extension.yml @@ -0,0 +1,8 @@ +--- +name: refactor_security_extension +introduced_by_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365320 +milestone: '14.10' +type: development +group: group::threat insights +default_enabled: false diff --git a/config/feature_flags/development/container_registry_project_statistics.yml b/config/feature_flags/development/refresh_authorizations_via_affected_projects_on_group_membership.yml index e17fb8406b3..77b6b5a8a40 100644 --- a/config/feature_flags/development/container_registry_project_statistics.yml +++ b/config/feature_flags/development/refresh_authorizations_via_affected_projects_on_group_membership.yml @@ -1,8 +1,8 @@ --- -name: container_registry_project_statistics -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84923 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/359852 +name: refresh_authorizations_via_affected_projects_on_group_membership +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87071 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362204 milestone: '15.0' type: development -group: group::utilization +group: group::workspace default_enabled: false diff --git a/config/feature_flags/development/registry_migration_guard_dynamic_pre_import_timeout.yml b/config/feature_flags/development/registry_migration_guard_dynamic_pre_import_timeout.yml new file mode 100644 index 00000000000..503eb95dd62 --- /dev/null +++ b/config/feature_flags/development/registry_migration_guard_dynamic_pre_import_timeout.yml @@ -0,0 +1,8 @@ +--- +name: registry_migration_guard_dynamic_pre_import_timeout +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88292 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 +milestone: '15.1' +type: development +group: group::package +default_enabled: false diff --git a/config/feature_flags/development/registry_migration_guard_thresholds.yml b/config/feature_flags/development/registry_migration_guard_thresholds.yml deleted file mode 100644 index 664897c9e87..00000000000 --- a/config/feature_flags/development/registry_migration_guard_thresholds.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: registry_migration_guard_thresholds -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360790 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 -milestone: '15.0' -type: development -group: group::package -default_enabled: false diff --git a/config/feature_flags/development/remove_diff_header_icons.yml b/config/feature_flags/development/remove_diff_header_icons.yml deleted file mode 100644 index 213e911c414..00000000000 --- a/config/feature_flags/development/remove_diff_header_icons.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: remove_diff_header_icons -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87289 -rollout_issue_url: -milestone: '15.0' -type: development -group: group::code review -default_enabled: true diff --git a/config/feature_flags/development/incident_escalations.yml b/config/feature_flags/development/rename_integrations_workers.yml index 61ae0092dc9..307b21c0545 100644 --- a/config/feature_flags/development/incident_escalations.yml +++ b/config/feature_flags/development/rename_integrations_workers.yml @@ -1,8 +1,8 @@ --- -name: incident_escalations -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74337 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345769 -milestone: '14.6' +name: rename_integrations_workers +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88558 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364112 +milestone: '15.1' type: development -group: group::respond +group: group::integrations default_enabled: true diff --git a/config/feature_flags/development/rendered_diffs_viewer.yml b/config/feature_flags/development/rendered_diffs_viewer.yml deleted file mode 100644 index bca0d638eaf..00000000000 --- a/config/feature_flags/development/rendered_diffs_viewer.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: rendered_diffs_viewer -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75500 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352831 -milestone: '15.0' -type: development -group: group::incubation -default_enabled: true diff --git a/config/feature_flags/development/restructured_mr_widget.yml b/config/feature_flags/development/restructured_mr_widget.yml index 75914da990f..cf20130509a 100644 --- a/config/feature_flags/development/restructured_mr_widget.yml +++ b/config/feature_flags/development/restructured_mr_widget.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339181 milestone: '14.3' type: development group: group::code review -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/ci_namespace_mirrors_consistency_check.yml b/config/feature_flags/development/route_hll_to_snowplow_phase2.yml index 6d4e50c2753..2a3a820afd2 100644 --- a/config/feature_flags/development/ci_namespace_mirrors_consistency_check.yml +++ b/config/feature_flags/development/route_hll_to_snowplow_phase2.yml @@ -1,8 +1,8 @@ --- -name: ci_namespace_mirrors_consistency_check -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81836 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356577 -milestone: '14.10' +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::sharding +group: group::product intelligence default_enabled: true diff --git a/config/feature_flags/development/omniauth_initializer_fullhost_proc.yml b/config/feature_flags/development/s3_omit_multipart_urls.yml index 52743818b5a..92d30601739 100644 --- a/config/feature_flags/development/omniauth_initializer_fullhost_proc.yml +++ b/config/feature_flags/development/s3_omit_multipart_urls.yml @@ -1,8 +1,8 @@ --- -name: omniauth_initializer_fullhost_proc -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82703 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355579 +name: s3_omit_multipart_urls +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85306 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/359718 milestone: '14.10' type: development -group: group::geo +group: group::package default_enabled: true diff --git a/config/feature_flags/development/group_projects_api_preload_groups.yml b/config/feature_flags/development/saml_group_sync_retain_default_membership.yml index dea472548ae..dbaaf681fb9 100644 --- a/config/feature_flags/development/group_projects_api_preload_groups.yml +++ b/config/feature_flags/development/saml_group_sync_retain_default_membership.yml @@ -1,8 +1,8 @@ --- -name: group_projects_api_preload_groups -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81838 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354372 -milestone: '14.9' +name: saml_group_sync_retain_default_membership +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88064 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364144 +milestone: '15.1' type: development group: group::authentication and authorization default_enabled: false diff --git a/config/feature_flags/development/sandboxed_mermaid.yml b/config/feature_flags/development/sandboxed_mermaid.yml deleted file mode 100644 index 434cd4055d8..00000000000 --- a/config/feature_flags/development/sandboxed_mermaid.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: sandboxed_mermaid -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74414 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349755 -milestone: '14.7' -type: development -group: group::analyzer frontend -default_enabled: true diff --git a/config/feature_flags/development/container_security_policy_selection.yml b/config/feature_flags/development/scan_execution_rule_mode.yml index e2407195ffc..44c985d6814 100644 --- a/config/feature_flags/development/container_security_policy_selection.yml +++ b/config/feature_flags/development/scan_execution_rule_mode.yml @@ -1,8 +1,8 @@ --- -name: container_security_policy_selection -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80272 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353071 -milestone: '14.10' +name: scan_execution_rule_mode +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90099 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/359883 +milestone: '15.2' type: development group: group::container security -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/seat_count_alerts.yml b/config/feature_flags/development/seat_count_alerts.yml new file mode 100644 index 00000000000..9b2f3a2ef55 --- /dev/null +++ b/config/feature_flags/development/seat_count_alerts.yml @@ -0,0 +1,8 @@ +--- +name: seat_count_alerts +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89204 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362041 +milestone: '15.1' +type: development +group: group::purchase +default_enabled: false diff --git a/config/feature_flags/development/downstream_retry_action.yml b/config/feature_flags/development/simulate_pipeline.yml index 7031c7565ce..3bc12d5b741 100644 --- a/config/feature_flags/development/downstream_retry_action.yml +++ b/config/feature_flags/development/simulate_pipeline.yml @@ -1,8 +1,8 @@ --- -name: downstream_retry_action -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83751 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357406 -milestone: '15.0' +name: simulate_pipeline +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88630 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364257 +milestone: '15.1' type: development group: group::pipeline authoring default_enabled: false diff --git a/config/feature_flags/development/ci_project_mirrors_consistency_check.yml b/config/feature_flags/development/ssh_banned_key.yml index 5fc88ef9bfb..e628e440176 100644 --- a/config/feature_flags/development/ci_project_mirrors_consistency_check.yml +++ b/config/feature_flags/development/ssh_banned_key.yml @@ -1,8 +1,8 @@ --- -name: ci_project_mirrors_consistency_check -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81836 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356583 -milestone: '14.10' +name: ssh_banned_key +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87541 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363410 +milestone: '15.1' type: development -group: group::sharding +group: 'group::authentication and authorization' default_enabled: true diff --git a/config/feature_flags/development/standard_context_type_check.yml b/config/feature_flags/development/standard_context_type_check.yml new file mode 100644 index 00000000000..1c6094abbf4 --- /dev/null +++ b/config/feature_flags/development/standard_context_type_check.yml @@ -0,0 +1,8 @@ +--- +name: standard_context_type_check +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88540 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364265 +milestone: '15.1' +type: development +group: group::product intelligence +default_enabled: false diff --git a/config/feature_flags/development/sticky_ci_archive_trace_worker.yml b/config/feature_flags/development/sticky_ci_archive_trace_worker.yml new file mode 100644 index 00000000000..9494f6070f4 --- /dev/null +++ b/config/feature_flags/development/sticky_ci_archive_trace_worker.yml @@ -0,0 +1,8 @@ +--- +name: sticky_ci_archive_trace_worker +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87577 +rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1681 +milestone: '15.1' +type: development +group: group::scalability +default_enabled: false diff --git a/config/feature_flags/development/sync_traversal_ids.yml b/config/feature_flags/development/sync_traversal_ids.yml deleted file mode 100644 index 188bb3e0975..00000000000 --- a/config/feature_flags/development/sync_traversal_ids.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: sync_traversal_ids -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52854 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321947 -group: group::access -type: development -default_enabled: true -milestone: '13.11' diff --git a/config/feature_flags/development/update_oauth_registration_flow.yml b/config/feature_flags/development/update_oauth_registration_flow.yml new file mode 100644 index 00000000000..5dd565e2143 --- /dev/null +++ b/config/feature_flags/development/update_oauth_registration_flow.yml @@ -0,0 +1,8 @@ +--- +name: update_oauth_registration_flow +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85871 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363030 +milestone: '15.1' +type: development +group: group::adoption +default_enabled: false diff --git a/config/feature_flags/development/update_vuln_identifiers_flag.yml b/config/feature_flags/development/update_vuln_identifiers_flag.yml new file mode 100644 index 00000000000..62fdc08ce34 --- /dev/null +++ b/config/feature_flags/development/update_vuln_identifiers_flag.yml @@ -0,0 +1,8 @@ +--- +name: update_vuln_identifiers_flag +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82538 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362179 +milestone: '15.1' +type: development +group: group::static analysis +default_enabled: false diff --git a/config/feature_flags/development/updated_diff_expansion_buttons.yml b/config/feature_flags/development/updated_diff_expansion_buttons.yml deleted file mode 100644 index a566eab6047..00000000000 --- a/config/feature_flags/development/updated_diff_expansion_buttons.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: updated_diff_expansion_buttons -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80890 -rollout_issue_url: -milestone: '14.10' -type: development -group: group::code review -default_enabled: true diff --git a/config/feature_flags/development/usage_data_i_incident_management_oncall_notification_sent.yml b/config/feature_flags/development/usage_data_i_incident_management_oncall_notification_sent.yml deleted file mode 100644 index 558232ca1bd..00000000000 --- a/config/feature_flags/development/usage_data_i_incident_management_oncall_notification_sent.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: usage_data_i_incident_management_oncall_notification_sent -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58606 -rollout_issue_url: -milestone: '13.11' -type: development -group: group::respond -default_enabled: true diff --git a/config/feature_flags/development/use_primary_and_secondary_stores_for_duplicate_jobs.yml b/config/feature_flags/development/use_primary_and_secondary_stores_for_duplicate_jobs.yml new file mode 100644 index 00000000000..323ad754627 --- /dev/null +++ b/config/feature_flags/development/use_primary_and_secondary_stores_for_duplicate_jobs.yml @@ -0,0 +1,8 @@ +--- +name: use_primary_and_secondary_stores_for_duplicate_jobs +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85740 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364381 +milestone: +type: development +group: group::scalability +default_enabled: false diff --git a/config/feature_flags/development/use_primary_and_secondary_stores_for_sidekiq_status.yml b/config/feature_flags/development/use_primary_and_secondary_stores_for_sidekiq_status.yml new file mode 100644 index 00000000000..4d99f02cda4 --- /dev/null +++ b/config/feature_flags/development/use_primary_and_secondary_stores_for_sidekiq_status.yml @@ -0,0 +1,8 @@ +--- +name: use_primary_and_secondary_stores_for_sidekiq_status +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89561 +rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/924 +milestone: +type: development +group: group::scalability +default_enabled: false diff --git a/config/feature_flags/development/use_primary_store_as_default_for_duplicate_jobs.yml b/config/feature_flags/development/use_primary_store_as_default_for_duplicate_jobs.yml new file mode 100644 index 00000000000..3cd25d7b735 --- /dev/null +++ b/config/feature_flags/development/use_primary_store_as_default_for_duplicate_jobs.yml @@ -0,0 +1,8 @@ +--- +name: use_primary_store_as_default_for_duplicate_jobs +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85740 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364381 +milestone: +type: development +group: group::scalability +default_enabled: false diff --git a/config/feature_flags/development/use_primary_store_as_default_for_sidekiq_status.yml b/config/feature_flags/development/use_primary_store_as_default_for_sidekiq_status.yml new file mode 100644 index 00000000000..d7d51c6ab41 --- /dev/null +++ b/config/feature_flags/development/use_primary_store_as_default_for_sidekiq_status.yml @@ -0,0 +1,8 @@ +--- +name: use_primary_store_as_default_for_sidekiq_status +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89561 +rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/924 +milestone: +type: development +group: group::scalability +default_enabled: false diff --git a/config/feature_flags/development/use_received_header_for_incoming_emails.yml b/config/feature_flags/development/use_received_header_for_incoming_emails.yml deleted file mode 100644 index e466a266367..00000000000 --- a/config/feature_flags/development/use_received_header_for_incoming_emails.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: use_received_header_for_incoming_emails -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81489 -rollout_issue_url: -milestone: '14.9' -type: development -group: group::certify -default_enabled: true diff --git a/config/feature_flags/development/use_status_for_repository_update_mirror.yml b/config/feature_flags/development/use_status_for_repository_update_mirror.yml new file mode 100644 index 00000000000..37c26f14791 --- /dev/null +++ b/config/feature_flags/development/use_status_for_repository_update_mirror.yml @@ -0,0 +1,8 @@ +--- +name: use_status_for_repository_update_mirror +introduced_by_url: +rollout_issue_url: +milestone: '15.1' +type: development +group: group::source code +default_enabled: false diff --git a/config/feature_flags/development/use_traversal_ids_for_ancestor_scopes_with_inner_join.yml b/config/feature_flags/development/use_traversal_ids_for_ancestor_scopes_with_inner_join.yml new file mode 100644 index 00000000000..a9f7b18acd9 --- /dev/null +++ b/config/feature_flags/development/use_traversal_ids_for_ancestor_scopes_with_inner_join.yml @@ -0,0 +1,8 @@ +--- +name: use_traversal_ids_for_ancestor_scopes_with_inner_join +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83371 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356628 +milestone: '15.1' +type: development +group: group::workspace +default_enabled: false diff --git a/config/feature_flags/development/user_other_role_details.yml b/config/feature_flags/development/user_other_role_details.yml deleted file mode 100644 index 7c0b417d398..00000000000 --- a/config/feature_flags/development/user_other_role_details.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: user_other_role_details -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45635 -rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/282 -milestone: '13.7' -type: development -group: group::conversion -default_enabled: false diff --git a/config/feature_flags/development/remove_sha_from_releases_json.yml b/config/feature_flags/development/validate_release_with_author.yml index 27b62c62978..45102103183 100644 --- a/config/feature_flags/development/remove_sha_from_releases_json.yml +++ b/config/feature_flags/development/validate_release_with_author.yml @@ -1,8 +1,8 @@ --- -name: remove_sha_from_releases_json -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86233 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360903 -milestone: '15.0' +name: validate_release_with_author +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89694 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365350 +milestone: '15.1' type: development group: group::release default_enabled: false diff --git a/config/feature_flags/development/vsa_consistency_worker.yml b/config/feature_flags/development/vsa_consistency_worker.yml deleted file mode 100644 index c038efeb9cd..00000000000 --- a/config/feature_flags/development/vsa_consistency_worker.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: vsa_consistency_worker -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82591 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355709 -milestone: '14.9' -type: development -group: group::optimize -default_enabled: true diff --git a/config/feature_flags/development/vsa_incremental_worker.yml b/config/feature_flags/development/vsa_incremental_worker.yml deleted file mode 100644 index 9caad7818e7..00000000000 --- a/config/feature_flags/development/vsa_incremental_worker.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: vsa_incremental_worker -introduced_by_url: -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353453 -milestone: '14.9' -type: development -group: group::optimize -default_enabled: true diff --git a/config/feature_flags/development/customer_relations.yml b/config/feature_flags/development/work_items_hierarchy.yml index d68e299758a..439fb941eb9 100644 --- a/config/feature_flags/development/customer_relations.yml +++ b/config/feature_flags/development/work_items_hierarchy.yml @@ -1,8 +1,8 @@ --- -name: customer_relations -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69472 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346082 -milestone: '14.3' +name: work_items_hierarchy +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88504 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363447 +milestone: '15.1' type: development group: group::product planning -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/vue_issues_list.yml b/config/feature_flags/development/work_items_mvc_2.yml index b85c75105f7..871c3d3a82c 100644 --- a/config/feature_flags/development/vue_issues_list.yml +++ b/config/feature_flags/development/work_items_mvc_2.yml @@ -1,8 +1,8 @@ --- -name: vue_issues_list -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55699 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323743 -milestone: '13.10' +name: work_items_mvc_2 +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89028 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363030 +milestone: '15.1' type: development group: group::project management -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/ops/execute_batched_migrations_on_schedule_ci_database.yml b/config/feature_flags/ops/execute_background_migrations.yml index 9efbbd014a1..3f27039c32e 100644 --- a/config/feature_flags/ops/execute_batched_migrations_on_schedule_ci_database.yml +++ b/config/feature_flags/ops/execute_background_migrations.yml @@ -1,8 +1,8 @@ --- -name: execute_batched_migrations_on_schedule_ci_database -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83109 +name: execute_background_migrations +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88981 rollout_issue_url: -milestone: '14.9' +milestone: '15.1' type: ops group: group::database -default_enabled: false +default_enabled: true diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 54a92f5b8b4..841e7670e45 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -1172,7 +1172,7 @@ production: &base # keep_time: 604800 # default: 0 (forever) (in seconds) # pg_schema: public # default: nil, it means that all schemas will be backed up # upload: - # # Fog storage connection settings, see http://fog.io/storage/ . + # # Fog storage connection settings, see https://fog.io/storage/ . # connection: # provider: AWS # region: eu-west-1 diff --git a/config/gitlab_loose_foreign_keys.yml b/config/gitlab_loose_foreign_keys.yml index ae6c2bde081..309afe413cc 100644 --- a/config/gitlab_loose_foreign_keys.yml +++ b/config/gitlab_loose_foreign_keys.yml @@ -179,6 +179,14 @@ dast_site_profiles_pipelines: - table: ci_pipelines column: ci_pipeline_id on_delete: async_delete +deployment_clusters: + - table: clusters + column: cluster_id + on_delete: async_delete +deployments: + - table: clusters + column: cluster_id + on_delete: async_nullify external_pull_requests: - table: projects column: project_id diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 7cc5b0130cf..8de514e9455 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -627,7 +627,7 @@ Settings.cron_jobs['projects_schedule_refresh_build_artifacts_size_statistics_wo 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']['cron'] ||= '0 1 * * *' +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']['cron'] ||= '*/1 * * * *' @@ -714,7 +714,7 @@ Gitlab.ee do Settings.cron_jobs['ldap_sync_worker']['job_class'] = 'LdapSyncWorker' Settings.cron_jobs['free_user_cap_data_remediation'] ||= Settingslogic.new({}) Settings.cron_jobs['free_user_cap_data_remediation']['cron'] ||= '17 6,10,14,18 * * *' - Settings.cron_jobs['free_user_cap_data_remediation']['job_class'] = 'Namespaces::FreeUserCapWorker' + Settings.cron_jobs['free_user_cap_data_remediation']['job_class'] = 'Namespaces::FreeUserCap::RemediationWorker' 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' @@ -775,6 +775,9 @@ Gitlab.ee do Settings.cron_jobs['ci_runners_stale_group_runners_prune_worker_cron'] ||= Settingslogic.new({}) 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']['cron'] ||= "0 0 * * *" + Settings.cron_jobs['licenses_reset_submit_license_usage_data_banner']['job_class'] = 'Licenses::ResetSubmitLicenseUsageDataBannerWorker' end # diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index a8e8bdf2c9f..92c45c59f7b 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -62,6 +62,11 @@ Gitlab::Cluster::LifecycleEvents.on_master_start do Gitlab::Metrics.gauge(:deployments, 'GitLab Version', {}, :max).set({ version: Gitlab::VERSION, revision: Gitlab.revision }, 1) if Gitlab::Runtime.puma? + [ + Gitlab::Metrics::Samplers::RubySampler, + Gitlab::Metrics::Samplers::ThreadsSampler + ].each { |sampler| sampler.instance(logger: Gitlab::AppLogger).start } + Gitlab::Metrics::Samplers::PumaSampler.instance.start MetricsServer.start_for_puma if puma_dedicated_metrics_server? @@ -76,9 +81,14 @@ end Gitlab::Cluster::LifecycleEvents.on_worker_start do defined?(::Prometheus::Client.reinitialize_on_pid_change) && ::Prometheus::Client.reinitialize_on_pid_change logger = Gitlab::AppLogger - Gitlab::Metrics::Samplers::RubySampler.initialize_instance(logger: logger).start + # Since we also run these samplers in the Puma primary, we need to re-create them each time we fork. + # For Sidekiq, this does not make any difference, since there is no primary. + [ + Gitlab::Metrics::Samplers::RubySampler, + Gitlab::Metrics::Samplers::ThreadsSampler + ].each { |sampler| sampler.initialize_instance(logger: logger, recreate: true).start } + Gitlab::Metrics::Samplers::DatabaseSampler.initialize_instance(logger: logger).start - Gitlab::Metrics::Samplers::ThreadsSampler.initialize_instance(logger: logger).start if Gitlab::Runtime.puma? # Since we are observing a metrics server from the Puma primary, we would inherit diff --git a/config/initializers/7_redis.rb b/config/initializers/7_redis.rb index 50f0fb92317..415574e1ce1 100644 --- a/config/initializers/7_redis.rb +++ b/config/initializers/7_redis.rb @@ -19,3 +19,5 @@ Gitlab::Redis::SharedState.with { nil } Gitlab::Redis::TraceChunks.with { nil } Gitlab::Redis::RateLimiting.with { nil } Gitlab::Redis::Sessions.with { nil } +Gitlab::Redis::DuplicateJobs.with { nil } +Gitlab::Redis::SidekiqStatus.with { nil } diff --git a/config/initializers/active_record_database_tasks.rb b/config/initializers/active_record_database_tasks.rb index f06174262a9..8b231f4af14 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 - ActiveRecord::Tasks::DatabaseTasks.singleton_class.prepend(Gitlab::Patch::GeoDatabaseTasks) + Gitlab::Patch::GeoDatabaseTasks.patch! end diff --git a/config/initializers/database_config.rb b/config/initializers/database_config.rb index 050ab1d9b3e..84ef0bc9f16 100644 --- a/config/initializers/database_config.rb +++ b/config/initializers/database_config.rb @@ -1,14 +1,6 @@ # frozen_string_literal: true Gitlab.ee do - # We need to initialize the Geo database before - # setting the Geo DB connection pool size. - if File.exist?(Rails.root.join('config/database_geo.yml')) - Rails.application.configure do - config.geo_database = config_for(:database_geo) - end - end - if Gitlab::Runtime.sidekiq? && Gitlab::Geo.geo_database_configured? # The Geo::TrackingBase model does not yet use connects_to. So, # this will not properly support geo: from config/databse.yml diff --git a/config/initializers/fips.rb b/config/initializers/fips.rb new file mode 100644 index 00000000000..a5b2f324e7f --- /dev/null +++ b/config/initializers/fips.rb @@ -0,0 +1,3 @@ +# frozen_string_literal: true + +Labkit::FIPS.enable_fips_mode! if Gitlab::FIPS.enabled? diff --git a/config/initializers/forbid_sidekiq_in_transactions.rb b/config/initializers/forbid_sidekiq_in_transactions.rb index 2ea6c9a7343..c96524b824d 100644 --- a/config/initializers/forbid_sidekiq_in_transactions.rb +++ b/config/initializers/forbid_sidekiq_in_transactions.rb @@ -16,19 +16,31 @@ module Sidekiq Thread.current[:sidekiq_worker_skip_transaction_check] end + def self.inside_transaction? + ::ApplicationRecord.inside_transaction? || ::Ci::ApplicationRecord.inside_transaction? + end + + def self.raise_exception_for_being_inside_a_transaction? + !skip_transaction_check && inside_transaction? + end + + def self.raise_inside_transaction_exception(cause:) + raise Sidekiq::Worker::EnqueueFromTransactionError, <<~MSG + #{cause} cannot be enqueued inside a transaction as this can lead to + race conditions when the worker runs before the transaction is committed and + tries to access a model that has not been saved yet. + + Use an `after_commit` hook, or include `AfterCommitQueue` and use a `run_after_commit` block instead. + MSG + end + module ClassMethods module NoEnqueueingFromTransactions %i(perform_async perform_at perform_in).each do |name| define_method(name) do |*args| - if !Sidekiq::Worker.skip_transaction_check && inside_transaction? + if Sidekiq::Worker.raise_exception_for_being_inside_a_transaction? begin - raise Sidekiq::Worker::EnqueueFromTransactionError, <<~MSG - `#{self}.#{name}` cannot be called inside a transaction as this can lead to - race conditions when the worker runs before the transaction is committed and - tries to access a model that has not been saved yet. - - Use an `after_commit` hook, or include `AfterCommitQueue` and use a `run_after_commit` block instead. - MSG + Sidekiq::Worker.raise_inside_transaction_exception(cause: "#{self}.#{name}") rescue Sidekiq::Worker::EnqueueFromTransactionError => e Gitlab::AppLogger.error(e.message) if ::Rails.env.production? Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e) @@ -38,14 +50,50 @@ module Sidekiq super(*args) end end + end + + prepend NoEnqueueingFromTransactions + end + end +end - private +# We deliver emails using the `deliver_later` method and it uses ActiveJob +# under the hood, which later processes the email via the defined ActiveJob adapter's `enqueue` method. +# For GitLab, the ActiveJob adapter is Sidekiq (in development and production environments). +# We need to set the following up to override the ActiveJob adapater +# so as to ensure that no mailer jobs are enqueued from within a transaction. +module ActiveJob + module QueueAdapters + module NoEnqueueingFromTransactions + %i(enqueue enqueue_at).each do |name| + define_method(name) do |*args| + if Sidekiq::Worker.raise_exception_for_being_inside_a_transaction? + begin + job = args.first + Sidekiq::Worker.raise_inside_transaction_exception( + cause: "The #{job.class} job, enqueued into the queue: #{job.queue_name}" + ) + rescue Sidekiq::Worker::EnqueueFromTransactionError => e + Gitlab::AppLogger.error(e.message) if ::Rails.env.production? + Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e) + end + end - def inside_transaction? - ::ApplicationRecord.inside_transaction? || ::Ci::ApplicationRecord.inside_transaction? + super(*args) end end + end + + # This adapter is used in development & production environments. + class SidekiqAdapter + prepend NoEnqueueingFromTransactions + end + # This adapter is used in test environment. + # If we don't override the test environment adapter, + # we won't be seeing any failing jobs during the CI run, + # even if we enqueue mailers from within a transaction. + class TestAdapter prepend NoEnqueueingFromTransactions end end diff --git a/config/initializers/mail_encoding_patch.rb b/config/initializers/mail_encoding_patch.rb index 11a96625e08..f72d4814856 100644 --- a/config/initializers/mail_encoding_patch.rb +++ b/config/initializers/mail_encoding_patch.rb @@ -54,6 +54,13 @@ module Mail decoded = dec.decode(raw_source) if defined?(Encoding) && charset && charset != "US-ASCII" + # Sometimes, the decoded string is frozen. Encoders in + # Mail::Encodings behave differently in this case. Unlike the + # original implementation which does not modify this string, we + # enforce the encoding below. That may lead to FrozenError. + # Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/364619 + decoded = decoded.dup if decoded.frozen? + # PATCH # We need to force the encoding: in the case of quoted-printable # this will throw an exception otherwise, because `decoded` will have diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 2c7034f758d..38bd1034b36 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -11,14 +11,7 @@ if Gitlab::Auth::Ldap::Config.enabled? end end -OmniAuth.config.full_host = - if Feature.feature_flags_available? && ::Feature.enabled?(:omniauth_initializer_fullhost_proc) - Gitlab::AppLogger.debug("Using OmniAuth proc initializer") - Gitlab::OmniauthInitializer.full_host - else - Gitlab::AppLogger.debug("Fallback to OmniAuth static full_host") - Settings.gitlab['base_url'] - end +OmniAuth.config.full_host = Gitlab::OmniauthInitializer.full_host OmniAuth.config.allowed_request_methods = [:post] # In case of auto sign-in, the GET method is used (users don't get to click on a button) diff --git a/config/initializers/rack_timeout.rb b/config/initializers/rack_timeout.rb index d5027cae08d..c2f2f3e093c 100644 --- a/config/initializers/rack_timeout.rb +++ b/config/initializers/rack_timeout.rb @@ -4,7 +4,7 @@ # requests, to make sure that server is not paralyzed by long-running # or stuck queries, we add a request timeout which terminates the # request after 60 seconds. This may be dangerous in some situations -# (https://github.com/heroku/rack-timeout/blob/master/doc/exceptions.md) +# (https://github.com/zombocom/rack-timeout/blob/master/doc/exceptions.md) # and it's used only as the last resort. In such case this termination is # logged and we should fix the potential timeout issue in the code itself. diff --git a/config/initializers/set_active_support_hash_digest_class.rb b/config/initializers/set_active_support_hash_digest_class.rb new file mode 100644 index 00000000000..743b45eed34 --- /dev/null +++ b/config/initializers/set_active_support_hash_digest_class.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +Rails.application.configure do + # We set ActiveSupport::Digest.hash_digest_class directly copying + # See https://github.com/rails/rails/blob/6-1-stable/activesupport/lib/active_support/railtie.rb#L96-L98 + # + # Note that is the only usage of config.active_support.hash_digest_class + config.after_initialize do + ActiveSupport::Digest.hash_digest_class = Gitlab::HashDigest::Facade + end +end diff --git a/config/initializers/truncato.rb b/config/initializers/truncato.rb new file mode 100644 index 00000000000..dd0a8a313c3 --- /dev/null +++ b/config/initializers/truncato.rb @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +# Source: https://github.com/jorgemanrubia/truncato/issues/20#issuecomment-1135105823 +silence_warnings do + Truncato::ARTIFICIAL_ROOT_NAME = 'truncato-artificial-root' +end diff --git a/config/initializers/zz_metrics.rb b/config/initializers/zz_metrics.rb index 88469d2cdef..5e6c1abdda6 100644 --- a/config/initializers/zz_metrics.rb +++ b/config/initializers/zz_metrics.rb @@ -32,7 +32,9 @@ if Gitlab::Metrics.enabled? && !Rails.env.test? && !(Rails.env.development? && d config.middleware.insert_before Gitlab::Database::LoadBalancing::RackMiddleware, Gitlab::Metrics::RackMiddleware - config.middleware.use(Gitlab::Middleware::RailsQueueDuration) + config.middleware.insert_before Gitlab::Database::LoadBalancing::RackMiddleware, + Gitlab::Middleware::RailsQueueDuration + config.middleware.use(Gitlab::Metrics::ElasticsearchRackMiddleware) end diff --git a/config/initializers_before_autoloader/004_zeitwerk.rb b/config/initializers_before_autoloader/004_zeitwerk.rb index db0688d1559..cae6650db41 100644 --- a/config/initializers_before_autoloader/004_zeitwerk.rb +++ b/config/initializers_before_autoloader/004_zeitwerk.rb @@ -54,7 +54,6 @@ Rails.autoloaders.each do |autoloader| 'sca' => 'SCA', 'spdx' => 'SPDX', 'sql' => 'SQL', - 'sse_helpers' => 'SSEHelpers', 'ssh_key' => 'SSHKey', 'ssh_key_with_user' => 'SSHKeyWithUser', 'ssh_public_key' => 'SSHPublicKey', diff --git a/config/mail_room.yml b/config/mail_room.yml index 49cb765ebe6..1e76f5e9875 100644 --- a/config/mail_room.yml +++ b/config/mail_room.yml @@ -46,6 +46,7 @@ :delivery_method: postback :delivery_options: :delivery_url: <%= config[:gitlab_url] %>/api/v4/internal/mail_room/<%= key %> + :content_type: text/plain :jwt_auth_header: <%= Gitlab::MailRoom::INTERNAL_API_REQUEST_HEADER %> :jwt_issuer: <%= Gitlab::MailRoom::INTERNAL_API_REQUEST_JWT_ISSUER %> :jwt_algorithm: "HS256" diff --git a/config/metrics/aggregates/code_review.yml b/config/metrics/aggregates/code_review.yml index a25222b8d6b..2a58540f348 100644 --- a/config/metrics/aggregates/code_review.yml +++ b/config/metrics/aggregates/code_review.yml @@ -1,3 +1,5 @@ +# NOTE: Please read the following to check if and which aggregate the metric should be added to. +# # code_review_extension_category_monthly_active_users # This is only metrics related to the VS Code Extension for now. # @@ -78,9 +80,6 @@ - 'i_code_review_user_create_note_in_ipynb_diff' - 'i_code_review_user_create_note_in_ipynb_diff_mr' - 'i_code_review_user_create_note_in_ipynb_diff_commit' - - 'i_code_review_create_note_in_ipynb_diff' - - 'i_code_review_create_note_in_ipynb_diff_mr' - - 'i_code_review_create_note_in_ipynb_diff_commit' - name: code_review_category_monthly_active_users operator: OR source: redis @@ -149,9 +148,6 @@ - 'i_code_review_user_create_note_in_ipynb_diff' - 'i_code_review_user_create_note_in_ipynb_diff_mr' - 'i_code_review_user_create_note_in_ipynb_diff_commit' - - 'i_code_review_create_note_in_ipynb_diff' - - 'i_code_review_create_note_in_ipynb_diff_mr' - - 'i_code_review_create_note_in_ipynb_diff_commit' - name: code_review_extension_category_monthly_active_users operator: OR source: redis 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 f1bff756c5f..791cad7b6e2 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 @@ -10,6 +10,29 @@ value_type: number status: active time_frame: 28d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - users_viewing_analytics_group_devops_adoption + - i_analytics_dev_ops_adoption + - i_analytics_dev_ops_score + - p_analytics_merge_request + - i_analytics_instance_statistics + - g_analytics_contribution + - g_analytics_insights + - g_analytics_issues + - g_analytics_productivity + - g_analytics_valuestream + - p_analytics_pipelines + - p_analytics_code_reviews + - p_analytics_valuestream + - p_analytics_insights + - p_analytics_issues + - p_analytics_repo + - i_analytics_cohorts + - p_analytics_ci_cd_pipelines + - p_analytics_ci_cd_deployment_frequency + - p_analytics_ci_cd_lead_time distribution: - ce - ee 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 eb22e82c62e..0c6421ad1fa 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 @@ -7,7 +7,7 @@ product_stage: create product_group: group::editor product_category: static_site_editor value_type: number -status: active +status: removed time_frame: 28d data_source: redis_hll distribution: @@ -19,3 +19,5 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "15.1" +removed_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88485" 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 ea357356742..35291d12239 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 @@ -16,7 +16,6 @@ options: - g_edit_by_web_ide - g_edit_by_sfe - g_edit_by_snippet_ide - - g_edit_by_sse distribution: - ce - ee 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 3c35bed2ceb..5189d4685d0 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 @@ -17,6 +17,5 @@ tier: - free - premium - ultimate -performance_indicator_type: -- paid_gmau +performance_indicator_type: [] milestone: "<13.9" diff --git a/config/metrics/counts_28d/20210216180816_groups.yml b/config/metrics/counts_28d/20210216180816_groups.yml index 600408f92ef..9ddb7547644 100644 --- a/config/metrics/counts_28d/20210216180816_groups.yml +++ b/config/metrics/counts_28d/20210216180816_groups.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.groups description: Number of users who are group members for last 28 days product_section: dev product_stage: manage -product_group: group::access +product_group: group::authentication and authorization product_category: subgroups value_type: number status: active diff --git a/config/metrics/counts_28d/20210216180818_users_created.yml b/config/metrics/counts_28d/20210216180818_users_created.yml index 1df17b13891..80fef7467e0 100644 --- a/config/metrics/counts_28d/20210216180818_users_created.yml +++ b/config/metrics/counts_28d/20210216180818_users_created.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage_monthly.manage.users_created description: Number of users created in the month product_section: dev product_stage: manage -product_group: group::access +product_group: group::authentication and authorization product_category: users value_type: number status: active diff --git a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml index 54335b419e1..4240abf9aa9 100644 --- a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml +++ b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml @@ -1,20 +1,21 @@ --- data_category: optional key_path: usage_activity_by_stage_monthly.manage.omniauth_providers -description: Number of unique user logins using an OmniAuth provider +description: List of unique OmniAuth providers product_section: dev product_stage: manage -product_group: group::access +product_group: group::authentication and authorization product_category: authentication_and_authorization -value_type: number +value_type: object status: active time_frame: 28d -data_source: database +data_source: system distribution: - ce tier: - free - premium - ultimate +value_json_schema: 'config/metrics/objects_schemas/omniauth_providers_schema.json' performance_indicator_type: [] milestone: "<13.9" 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 1a1fbec4f8c..e4c831091da 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 @@ -7,7 +7,7 @@ product_stage: create product_group: group::editor product_category: static_site_editor value_type: number -status: active +status: removed time_frame: 28d data_source: redis_hll instrumentation_class: RedisHLLMetric @@ -23,3 +23,5 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "15.1" +removed_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88485" 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 a0dd87cd7dc..67cae705601 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 @@ -3,7 +3,7 @@ data_category: operational key_path: counts_monthly.aggregated_metrics.code_review_category_monthly_active_users description: Unique users performing actions on code review events product_section: dev -product_stage: devops::create +product_stage: create product_group: group::code review product_category: value_type: number 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 faa452f73a6..b379aa78586 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 @@ -3,7 +3,7 @@ data_category: optional key_path: counts_monthly.aggregated_metrics.code_review_extension_category_monthly_active_users description: Number of users performing i_code_review_user_vs_code_api_request event product_section: dev -product_stage: devops::create +product_stage: create product_group: group::code review product_category: value_type: number 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 5cbdd9afa54..01c4724971d 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 @@ -3,7 +3,7 @@ data_category: optional key_path: counts_monthly.aggregated_metrics.code_review_group_monthly_active_users description: Number of users performing at least one of the code review events product_section: dev -product_stage: devops::create +product_stage: create product_group: group::code review product_category: value_type: number diff --git a/config/metrics/counts_28d/20210520111133_total.yml b/config/metrics/counts_28d/20210520111133_total.yml index 3da6de21632..cef2766c95a 100644 --- a/config/metrics/counts_28d/20210520111133_total.yml +++ b/config/metrics/counts_28d/20210520111133_total.yml @@ -12,6 +12,7 @@ milestone: "14.0" introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61775" time_frame: 28d data_source: database +instrumentation_class: CountImportedProjectsTotalMetric distribution: - ce - ee 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 9704fcc43dd..65a9a0b3cee 100644 --- a/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml +++ b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml @@ -4,7 +4,7 @@ name: count_distinct_users_using_two_factor_authentication description: Number of unique user logins using two factor authentication for available providers product_section: dev product_stage: manage -product_group: group::access +product_group: group::authentication and authorization product_category: authentication_and_authorization value_type: object status: active diff --git a/config/metrics/counts_28d/20210916080405_promoted_issues.yml b/config/metrics/counts_28d/20210916080405_promoted_issues.yml index ec73682b1f3..27c9f01edbe 100644 --- a/config/metrics/counts_28d/20210916080405_promoted_issues.yml +++ b/config/metrics/counts_28d/20210916080405_promoted_issues.yml @@ -7,8 +7,10 @@ product_stage: growth product_group: group::product intelligence product_category: collection value_type: number -status: deprecated +status: removed milestone: "14.3" +milestone_removed: "15.1" +removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88113 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70485 time_frame: 28d data_source: database 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 2812aa73cad..d79dede39f0 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 @@ -2,7 +2,7 @@ key_path: redis_hll_counters.importer.github_import_project_start_monthly description: The number of github projects that were enqueued to start monthy product_section: dev -product_stage: devops +product_stage: manage product_group: group::import product_category: value_type: number 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 ab599c67376..eb4ce81997f 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 @@ -2,7 +2,7 @@ key_path: redis_hll_counters.importer.github_import_project_success_monthly description: The number of github projects that were successful monthly product_section: dev -product_stage: devops +product_stage: manage product_group: group::import product_category: value_type: number 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 6651a770920..0f16cf65ca5 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 @@ -2,7 +2,7 @@ key_path: redis_hll_counters.importer.github_import_project_failure_monthly description: The number of github projects that failed monthly product_section: dev -product_stage: devops +product_stage: manage product_group: group::import product_category: value_type: number diff --git a/config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml b/config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml new file mode 100644 index 00000000000..658db1a27af --- /dev/null +++ b/config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml @@ -0,0 +1,23 @@ +--- +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: group::manage +value_type: number +status: active +milestone: "15.1" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88631 +time_frame: 28d +data_source: database +data_category: optional +instrumentation_class: UniqueActiveUsersMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate 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 new file mode 100644 index 00000000000..1c70507da36 --- /dev/null +++ b/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml @@ -0,0 +1,32 @@ +--- +key_path: redis_hll_counters.incident_management.timeline_event_total_unique_counts_monthly +name: count_unique_users_interacting_with_timeline_events_monthly +description: Counts unique users for timeline events create, edit and delete events per month +product_section: ops +product_stage: monitor +product_group: group::respond +product_category: incident_management +value_type: number +status: active +milestone: "15.1" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90205 +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +options: + events: + - incident_management_timeline_event_created + - incident_management_timeline_event_edited + - incident_management_timeline_event_deleted +performance_indicator_type: + - smau + - gmau + - paid_gmau +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml b/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml index c34f5644053..8c491bc24b1 100644 --- a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml +++ b/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml @@ -8,8 +8,12 @@ product_group: group::optimize product_category: value_type: number status: active -time_frame: all +time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - p_analytics_pipelines distribution: - ce - ee diff --git a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml b/config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml index 671cd9a10b3..0cb77ed4933 100644 --- a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml +++ b/config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml @@ -8,8 +8,12 @@ product_group: group::optimize product_category: value_type: number status: active -time_frame: all +time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - p_analytics_valuestream distribution: - ce - ee diff --git a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml b/config/metrics/counts_7d/20210216174856_p_analytics_repo.yml index 5e6e308d8d2..fc1fb3470db 100644 --- a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml +++ b/config/metrics/counts_7d/20210216174856_p_analytics_repo.yml @@ -8,8 +8,12 @@ product_group: group::optimize product_category: value_type: number status: active -time_frame: all +time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - p_analytics_repo distribution: - ce - ee diff --git a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml b/config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml index 9a06f4c44df..705cfefc5b5 100644 --- a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml +++ b/config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml @@ -8,8 +8,12 @@ product_group: group::optimize product_category: value_type: number status: active -time_frame: all +time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - i_analytics_cohorts distribution: - ce - ee diff --git a/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml b/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml index 9130eb837e7..72db511d1e7 100644 --- a/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml +++ b/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml @@ -8,8 +8,12 @@ product_group: group::optimize product_category: value_type: number status: active -time_frame: all +time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - i_analytics_dev_ops_score distribution: - ce - ee diff --git a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml b/config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml index af9338f028a..0e726cfceae 100644 --- a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml +++ b/config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml @@ -8,8 +8,12 @@ product_group: group::optimize product_category: value_type: number status: removed -time_frame: all +time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - g_analytics_merge_request distribution: - ce - ee diff --git a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml b/config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml index 5ee75f27529..06123553499 100644 --- a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml +++ b/config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml @@ -8,8 +8,12 @@ product_group: group::optimize product_category: value_type: number status: active -time_frame: all +time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - i_analytics_instance_statistics distribution: - ce - ee 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 new file mode 100644 index 00000000000..cdc7ee79752 --- /dev/null +++ b/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml @@ -0,0 +1,44 @@ +--- +data_category: optional +key_path: analytics_unique_visits.analytics_unique_visits_for_any_target +description: Unique visitors to any analytics feature by week +product_section: dev +product_stage: manage +product_group: group::optimize +product_category: +value_type: number +status: active +time_frame: 7d +data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - users_viewing_analytics_group_devops_adoption + - i_analytics_dev_ops_adoption + - i_analytics_dev_ops_score + - p_analytics_merge_request + - i_analytics_instance_statistics + - g_analytics_contribution + - g_analytics_insights + - g_analytics_issues + - g_analytics_productivity + - g_analytics_valuestream + - p_analytics_pipelines + - p_analytics_code_reviews + - p_analytics_valuestream + - p_analytics_insights + - p_analytics_issues + - p_analytics_repo + - i_analytics_cohorts + - p_analytics_ci_cd_pipelines + - p_analytics_ci_cd_deployment_frequency + - p_analytics_ci_cd_lead_time +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +performance_indicator_type: [] +milestone: "<13.9" 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 8e913a78a1f..00c19a06ab9 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 @@ -16,7 +16,6 @@ options: - g_edit_by_web_ide - g_edit_by_sfe - g_edit_by_snippet_ide - - g_edit_by_sse distribution: - ce - ee diff --git a/config/metrics/counts_all/20210216180416_i_search_total.yml b/config/metrics/counts_7d/20210216180416_i_search_total.yml index 6166ba87ab5..82e2c0eceb3 100644 --- a/config/metrics/counts_all/20210216180416_i_search_total.yml +++ b/config/metrics/counts_7d/20210216180416_i_search_total.yml @@ -8,8 +8,12 @@ product_group: group::global search product_category: global_search value_type: number status: active -time_frame: all +time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - i_search_total distribution: - ce - ee 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 a903ce2ceea..d0e3ac2ceb3 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 @@ -7,7 +7,7 @@ product_stage: create product_group: group::editor product_category: static_site_editor value_type: number -status: active +status: removed time_frame: 7d data_source: redis_hll instrumentation_class: RedisHLLMetric @@ -23,3 +23,5 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "15.1" +removed_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88485" diff --git a/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml index 7a524dee720..b79b021901c 100644 --- a/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml +++ b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml @@ -9,8 +9,12 @@ product_category: value_type: number status: active milestone: "13.11" -time_frame: all +time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - i_analytics_dev_ops_adoption distribution: - ce - ee 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 fa58494cc05..1143a233e85 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 @@ -3,7 +3,7 @@ data_category: optional key_path: counts_weekly.aggregated_metrics.code_review_group_monthly_active_users description: Number of users performing at least one of the code review events product_section: dev -product_stage: devops::create +product_stage: create product_group: group::code review product_category: value_type: number 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 e1c61db272b..96490623d95 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 @@ -3,7 +3,7 @@ data_category: optional key_path: counts_weekly.aggregated_metrics.code_review_category_monthly_active_users description: Unique users performing actions on code review events product_section: dev -product_stage: devops::create +product_stage: create product_group: group::code review product_category: value_type: number 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 29e52e07a14..d452a7d2c28 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 @@ -3,7 +3,7 @@ data_category: optional key_path: counts_weekly.aggregated_metrics.code_review_extension_category_monthly_active_users description: Number of users performing code review extension_category events product_section: dev -product_stage: devops::create +product_stage: create product_group: group::code review product_category: value_type: number diff --git a/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml b/config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml index b8ae877b0be..2f5415c7802 100644 --- a/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml +++ b/config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml @@ -10,8 +10,12 @@ product_category: value_type: number status: active milestone: "13.12" -time_frame: all +time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - users_viewing_analytics_group_devops_adoption distribution: - ce - ee 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 2c5b7d46e1a..fb065ffe3b1 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 @@ -2,7 +2,7 @@ key_path: redis_hll_counters.importer.github_import_project_start_weekly description: The number of github projects that were enqueued to start weekly product_section: dev -product_stage: devops +product_stage: manage product_group: group::import product_category: value_type: number 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 10147658ddc..887dc2565dc 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 @@ -2,7 +2,7 @@ key_path: redis_hll_counters.importer.github_import_project_success_weekly description: The number of github projects that were successful weekly product_section: dev -product_stage: devops +product_stage: manage product_group: group::import product_category: value_type: number 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 33a1902504f..c4ffb079c38 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 @@ -2,7 +2,7 @@ key_path: redis_hll_counters.importer.github_import_project_failure_weekly description: The number of github projects that failed weekly product_section: dev -product_stage: devops +product_stage: manage product_group: group::import product_category: value_type: number diff --git a/config/metrics/counts_all/20211126090001_p_analytics_ci_cd_pipelines.yml b/config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml index 7e6820b0d24..ec686425d7c 100644 --- a/config/metrics/counts_all/20211126090001_p_analytics_ci_cd_pipelines.yml +++ b/config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml @@ -10,8 +10,12 @@ value_type: number status: active milestone: '14.6' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187 -time_frame: all +time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - p_analytics_ci_cd_pipelines distribution: - ce - ee diff --git a/config/metrics/counts_all/20211126090002_p_analytics_ci_cd_deployment_frequency.yml b/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml index 134f43b1b27..bee4b88889e 100644 --- a/config/metrics/counts_all/20211126090002_p_analytics_ci_cd_deployment_frequency.yml +++ b/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml @@ -10,8 +10,12 @@ value_type: number status: active milestone: '14.6' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187 -time_frame: all +time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - p_analytics_ci_cd_deployment_frequency distribution: - ce - ee diff --git a/config/metrics/counts_all/20211126090003_p_analytics_ci_cd_lead_time.yml b/config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml index a167a380432..3c1f6082049 100644 --- a/config/metrics/counts_all/20211126090003_p_analytics_ci_cd_lead_time.yml +++ b/config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml @@ -10,8 +10,12 @@ value_type: number status: active milestone: '14.6' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187 -time_frame: all +time_frame: 7d data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - p_analytics_ci_cd_lead_time distribution: - ce - ee 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 new file mode 100644 index 00000000000..33e5c7f25f9 --- /dev/null +++ b/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml @@ -0,0 +1,32 @@ +--- +key_path: redis_hll_counters.incident_management.timeline_event_total_unique_counts_weekly +name: count_unique_users_interacting_with_timeline_events_weekly +description: Counts unique users for timeline events create, edit and delete events per month +product_section: ops +product_stage: monitor +product_group: group::respond +product_category: incident_management +value_type: number +status: active +milestone: "15.1" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90205 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +options: + events: + - incident_management_timeline_event_created + - incident_management_timeline_event_edited + - incident_management_timeline_event_deleted +performance_indicator_type: + - smau + - gmau + - paid_gmau +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml b/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml deleted file mode 100644 index 488bb48be0e..00000000000 --- a/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -data_category: optional -key_path: analytics_unique_visits.analytics_unique_visits_for_any_target -description: Unique visitors to any analytics feature by week -product_section: dev -product_stage: manage -product_group: group::optimize -product_category: -value_type: number -status: active -time_frame: all -data_source: redis_hll -distribution: -- ce -- ee -tier: -- free -- premium -- ultimate -performance_indicator_type: [] -milestone: "<13.9" 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 35698258e53..3dad2082894 100644 --- a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml +++ b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml @@ -7,7 +7,7 @@ product_stage: create product_group: group::editor product_category: static_site_editor value_type: number -status: active +status: removed time_frame: all data_source: redis distribution: @@ -17,7 +17,7 @@ tier: - free - premium - ultimate -performance_indicator_type: -- gmau -- paid_gmau +performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "15.1" +removed_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88485" 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 9f248e812f5..eef5102a070 100644 --- a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml +++ b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml @@ -7,7 +7,7 @@ product_stage: create product_group: group::editor product_category: static_site_editor value_type: number -status: active +status: removed time_frame: all data_source: redis distribution: @@ -18,3 +18,5 @@ tier: - premium - ultimate milestone: "<13.9" +milestone_removed: "15.1" +removed_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88485" 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 056c718c5eb..01f0fee9a58 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 @@ -7,7 +7,7 @@ product_stage: create product_group: group::editor product_category: static_site_editor value_type: number -status: active +status: removed time_frame: all data_source: redis distribution: @@ -18,3 +18,5 @@ tier: - premium - ultimate milestone: "<13.9" +milestone_removed: "15.1" +removed_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88485" 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 b1e1c4bc24b..2b3db17c271 100644 --- a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml +++ b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml @@ -10,6 +10,7 @@ value_type: number status: active time_frame: all data_source: database +instrumentation_class: IssuesCreatedFromAlertsMetric distribution: - ce - ee diff --git a/config/metrics/counts_all/20210216180750_groups.yml b/config/metrics/counts_all/20210216180750_groups.yml index 67419cf9b82..2ed6e0f7da2 100644 --- a/config/metrics/counts_all/20210216180750_groups.yml +++ b/config/metrics/counts_all/20210216180750_groups.yml @@ -4,7 +4,7 @@ key_path: counts.groups description: Total count of groups as of usage ping snapshot product_section: dev product_stage: manage -product_group: group::access +product_group: group::authentication and authorization product_category: subgroups value_type: number status: active diff --git a/config/metrics/counts_all/20210216180752_keys.yml b/config/metrics/counts_all/20210216180752_keys.yml index d5c50688915..546bc303314 100644 --- a/config/metrics/counts_all/20210216180752_keys.yml +++ b/config/metrics/counts_all/20210216180752_keys.yml @@ -4,7 +4,7 @@ key_path: counts.keys description: Number of keys. product_section: dev product_stage: managed -product_group: group::access +product_group: group::authentication and authorization product_category: authentication_and_authorization value_type: number status: active diff --git a/config/metrics/counts_all/20210216180756_groups.yml b/config/metrics/counts_all/20210216180756_groups.yml index 24d0268165e..0aaffbc9eae 100644 --- a/config/metrics/counts_all/20210216180756_groups.yml +++ b/config/metrics/counts_all/20210216180756_groups.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.groups description: Number of users who are group members. product_section: dev product_stage: manage -product_group: group::access +product_group: group::authentication and authorization product_category: subgroups value_type: number status: active diff --git a/config/metrics/counts_all/20210216180758_users_created.yml b/config/metrics/counts_all/20210216180758_users_created.yml index 3a815026d24..9567dbf5e23 100644 --- a/config/metrics/counts_all/20210216180758_users_created.yml +++ b/config/metrics/counts_all/20210216180758_users_created.yml @@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.users_created description: Number of users product_section: dev product_stage: manage -product_group: group::access +product_group: group::authentication and authorization product_category: value_type: number status: active 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 0b68f3d5698..312bbc1dff6 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 @@ -1,6 +1,7 @@ --- data_category: optional key_path: counts.jira_imports_total_imported_issues_count +instrumentation_class: JiraImportsTotalImportedIssuesCountMetric description: Count of total issues imported via the Jira Importer product_section: dev product_stage: ecosystem diff --git a/config/metrics/counts_all/20210216183400_omniauth_providers.yml b/config/metrics/counts_all/20210216183400_omniauth_providers.yml index 3598db2ea5a..a1cfca9019c 100644 --- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml +++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml @@ -1,19 +1,20 @@ --- data_category: optional key_path: usage_activity_by_stage.manage.omniauth_providers -description: Number of unique user logins using an OmniAuth provider +description: List of unique OmniAuth providers product_section: dev product_stage: manage -product_group: group::access +product_group: group::authentication and authorization product_category: authentication_and_authorization -value_type: number +value_type: object status: active time_frame: all -data_source: database +data_source: system distribution: - ce tier: - free - premium - ultimate +value_json_schema: 'config/metrics/objects_schemas/omniauth_providers_schema.json' milestone: "<13.9" diff --git a/config/metrics/counts_all/20210514141520_project_imports_total.yml b/config/metrics/counts_all/20210514141520_project_imports_total.yml index 2608714799a..14eac482774 100644 --- a/config/metrics/counts_all/20210514141520_project_imports_total.yml +++ b/config/metrics/counts_all/20210514141520_project_imports_total.yml @@ -12,6 +12,7 @@ milestone: "14.0" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61775 time_frame: all data_source: database +instrumentation_class: CountImportedProjectsTotalMetric distribution: - ce - ee 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 610c187407b..bb79aa07e86 100644 --- a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml +++ b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml @@ -4,7 +4,7 @@ name: count_distinct_users_using_two_factor_authentication description: Number of unique user logins using two factor authentication for available providers product_section: dev product_stage: manage -product_group: group::access +product_group: group::authentication and authorization product_category: authentication_and_authorization value_type: object status: active diff --git a/config/metrics/counts_7d/20210916100524_groups_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml index 9a23d73b136..43b71ec1c8a 100644 --- a/config/metrics/counts_7d/20210916100524_groups_gitlab_slack_application_active.yml +++ b/config/metrics/counts_all/20210916100524_groups_gitlab_slack_application_active.yml @@ -10,7 +10,7 @@ value_type: number status: active milestone: "14.3" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70496 -time_frame: 7d +time_frame: all data_source: database data_category: optional performance_indicator_type: [] diff --git a/config/metrics/counts_7d/20210916101641_projects_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml index 2d1124a5971..13954e6d01b 100644 --- a/config/metrics/counts_7d/20210916101641_projects_gitlab_slack_application_active.yml +++ b/config/metrics/counts_all/20210916101641_projects_gitlab_slack_application_active.yml @@ -10,7 +10,7 @@ value_type: number status: active milestone: "14.3" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70496 -time_frame: 7d +time_frame: all data_source: database data_category: optional performance_indicator_type: [] diff --git a/config/metrics/counts_7d/20210916101837_instances_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml index 8a04e024eba..43ea3d2d6e6 100644 --- a/config/metrics/counts_7d/20210916101837_instances_gitlab_slack_application_active.yml +++ b/config/metrics/counts_all/20210916101837_instances_gitlab_slack_application_active.yml @@ -10,7 +10,7 @@ value_type: number status: active milestone: "14.3" introduced_by_url: https://gilab.com/gitlab-org/gitlab/-/merge_requests/70496 -time_frame: 7d +time_frame: all data_source: database data_category: optional performance_indicator_type: [] diff --git a/config/metrics/counts_7d/20210917040700_groups_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml index 2a62c45c54a..70dc230ac85 100644 --- a/config/metrics/counts_7d/20210917040700_groups_inheriting_gitlab_slack_application_active.yml +++ b/config/metrics/counts_all/20210917040700_groups_inheriting_gitlab_slack_application_active.yml @@ -10,7 +10,7 @@ value_type: number status: active milestone: "14.3" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70496 -time_frame: 7d +time_frame: all data_source: database data_category: optional performance_indicator_type: [] diff --git a/config/metrics/counts_7d/20210917040956_projects_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml index 266670159b6..29781313d61 100644 --- a/config/metrics/counts_7d/20210917040956_projects_inheriting_gitlab_slack_application_active.yml +++ b/config/metrics/counts_all/20210917040956_projects_inheriting_gitlab_slack_application_active.yml @@ -10,7 +10,7 @@ value_type: number status: active milestone: "14.3" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70496 -time_frame: 7d +time_frame: all data_source: database data_category: optional performance_indicator_type: [] diff --git a/config/metrics/objects_schemas/omniauth_providers_schema.json b/config/metrics/objects_schemas/omniauth_providers_schema.json new file mode 100644 index 00000000000..b4b398c4048 --- /dev/null +++ b/config/metrics/objects_schemas/omniauth_providers_schema.json @@ -0,0 +1,6 @@ +{ + "type": "array", + "items": { + "type": ["string", "null"] + } +} diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml index dde0bc118e7..a6997b74c3c 100644 --- a/config/metrics/settings/20210204124904_gravatar_enabled.yml +++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml @@ -4,7 +4,7 @@ key_path: gravatar_enabled description: Whether gravatar is enabled product_section: dev product_stage: manage -product_group: group::access +product_group: group::authentication and authorization product_category: users value_type: boolean status: active diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml index 1f58fd0ffba..8f44f0c9de5 100644 --- a/config/metrics/settings/20210204124906_ldap_enabled.yml +++ b/config/metrics/settings/20210204124906_ldap_enabled.yml @@ -4,7 +4,7 @@ key_path: ldap_enabled description: Whether LDAP is enabled product_section: dev product_stage: manage -product_group: group::access +product_group: group::authentication and authorization product_category: authentication_and_authorization value_type: boolean status: active diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml index f4531b10055..8932b275f38 100644 --- a/config/metrics/settings/20210204124910_omniauth_enabled.yml +++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml @@ -4,7 +4,7 @@ key_path: omniauth_enabled description: Whether OmniAuth is enabled product_section: dev product_stage: manage -product_group: group::access +product_group: group::authentication and authorization product_category: authentication_and_authorization value_type: boolean status: active diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml index e8c3226ebf8..4fa464fa5c7 100644 --- a/config/metrics/settings/20210204124918_signup_enabled.yml +++ b/config/metrics/settings/20210204124918_signup_enabled.yml @@ -4,7 +4,7 @@ key_path: signup_enabled description: Whether public signup is enabled product_section: dev product_stage: manage -product_group: group::access +product_group: group::authentication and authorization product_category: authentication_and_authorization value_type: boolean status: active diff --git a/config/routes.rb b/config/routes.rb index b2b4bece68a..44e89f0d387 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -109,6 +109,7 @@ Rails.application.routes.draw do get '/autocomplete/project_groups' => 'autocomplete#project_groups' get '/autocomplete/project_routes' => 'autocomplete#project_routes' get '/autocomplete/namespace_routes' => 'autocomplete#namespace_routes' + get '/autocomplete/group_subgroups' => 'autocomplete#group_subgroups' end # sandbox @@ -117,6 +118,7 @@ Rails.application.routes.draw do get '/whats_new' => 'whats_new#index' get 'offline' => "pwa#offline" + get 'manifest' => "pwa#manifest", constraints: lambda { |req| req.format == :json } # '/-/health' implemented by BasicHealthCheck middleware get 'liveness' => 'health#liveness' @@ -228,7 +230,12 @@ Rails.application.routes.draw do draw :snippets draw :profile - draw :members + + post '/mailgun/webhooks' => 'mailgun/webhooks#process_webhook' + + # Deprecated route for permanent failures + # https://gitlab.com/gitlab-org/gitlab/-/issues/362606 + post '/members/mailgun/permanent_failures' => 'mailgun/webhooks#process_webhook' # Product analytics collector match '/collector/i', to: ProductAnalytics::CollectorApp.new, via: :all @@ -241,8 +248,6 @@ Rails.application.routes.draw do get :connect get :new_cluster_docs post :create_user - post :create_aws - post :authorize_aws_role end resource :integration, controller: 'clusters/integrations', only: [] do diff --git a/config/routes/jira_connect.rb b/config/routes/jira_connect.rb index 344f0114364..202d2574ad0 100644 --- a/config/routes/jira_connect.rb +++ b/config/routes/jira_connect.rb @@ -22,4 +22,5 @@ namespace :jira_connect do end resources :oauth_callbacks, only: [:index] + resource :oauth_application_id, only: [:show] end diff --git a/config/routes/members.rb b/config/routes/members.rb deleted file mode 100644 index e84f0987171..00000000000 --- a/config/routes/members.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -namespace :members do - namespace :mailgun do - resources :permanent_failures, only: [:create] - end -end diff --git a/config/routes/project.rb b/config/routes/project.rb index 6b2a9700686..afc06780471 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -130,13 +130,25 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end - resource :integrations, only: [:show] + resources :integrations, constraints: { id: %r{[^/]+} }, only: [:index, :edit, :update] do + member do + put :test + end + + resources :hook_logs, only: [:show], controller: :integration_hook_logs do + member do + post :retry + end + end + end resource :repository, only: [:show], controller: :repository do # TODO: Removed this "create_deploy_token" route after change was made in app/helpers/ci_variables_helper.rb:14 # See MR comment for more detail: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27059#note_311585356 post :create_deploy_token, path: 'deploy_token/create' post :cleanup + + resources :branch_rules, only: [:index] end resources :access_tokens, only: [:index, :create] do @@ -209,12 +221,14 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end - resources :integrations, controller: :services, constraints: { id: %r{[^/]+} }, only: [:edit, :update] do + # Legacy routes for `/-/integrations` which are now in `/-/settings/integrations`. + # Can be removed in 15.2, see https://gitlab.com/gitlab-org/gitlab/-/issues/334846 + resources :integrations, controller: 'settings/integrations', constraints: { id: %r{[^/]+} }, only: [:edit, :update] do member do put :test end - resources :hook_logs, only: [:show], controller: :service_hook_logs do + resources :hook_logs, only: [:show], controller: 'settings/integration_hook_logs' do member do post :retry end @@ -227,7 +241,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end - resources :releases, only: [:index, :new, :show, :edit], param: :tag, constraints: { tag: %r{[^/]+} } do + get 'releases/permalink/latest(/)(*suffix_path)', to: 'releases#latest_permalink', as: :latest_release_permalink, format: false + + resources :releases, only: [:index, :new, :show, :edit], param: :tag, constraints: { tag: %r{[^\\]+} } do member do get :downloads, path: 'downloads/*filepath', format: false scope module: :releases do @@ -236,8 +252,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end - get 'releases/permalink/latest(/)(*suffix_path)', to: 'releases#latest_permalink', as: :latest_release_permalink, format: false - resources :logs, only: [:index] do collection do get :k8s @@ -508,7 +522,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end namespace :prometheus do - resources :alerts, constraints: { id: /\d+/ }, only: [:index, :show] do # rubocop: disable Cop/PutProjectRoutesUnderScope + resources :alerts, constraints: { id: /\d+/ }, only: [] do # rubocop: disable Cop/PutProjectRoutesUnderScope post :notify, on: :collection # rubocop:todo Cop/PutProjectRoutesUnderScope member do get :metrics_dashboard # rubocop:todo Cop/PutProjectRoutesUnderScope diff --git a/config/routes/repository.rb b/config/routes/repository.rb index d2be18c62f9..74e72927699 100644 --- a/config/routes/repository.rb +++ b/config/routes/repository.rb @@ -57,13 +57,6 @@ scope format: false do resources :protected_branches, only: [:index, :show, :create, :update, :destroy, :patch], constraints: { id: Gitlab::PathRegex.git_reference_regex } resources :protected_tags, only: [:index, :show, :create, :update, :destroy] - - scope constraints: { id: /[^\0]+?/ } do - scope controller: :static_site_editor do - get '/sse/:id(/*vueroute)', action: :show, as: :show_sse - get '/sse', as: :root_sse, action: :index - end - end end scope constraints: { id: /[^\0]+/ } do diff --git a/config/settings.rb b/config/settings.rb index df67fdc8c53..35c8ad72bcf 100644 --- a/config/settings.rb +++ b/config/settings.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'settingslogic' -require 'digest/md5' class Settings < Settingslogic source ENV.fetch('GITLAB_CONFIG') { Pathname.new(File.expand_path('..', __dir__)).join('config/gitlab.yml') } diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 11c232df4e0..2838f0a8436 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -47,10 +47,20 @@ - 1 - - audit_events_user_impersonation_event_create - 1 +- - auth_saml_group_sync + - 1 - - authorized_keys - 2 -- - authorized_project_update +- - authorized_project_update:authorized_project_update_project_recalculate + - 1 +- - authorized_project_update:authorized_project_update_project_recalculate_per_user + - 1 +- - authorized_project_update:authorized_project_update_user_refresh_from_replica - 1 +- - authorized_project_update:authorized_project_update_user_refresh_over_user_range + - 1 +- - authorized_project_update:authorized_project_update_user_refresh_with_low_urgency + - 2 - - authorized_projects - 2 - - auto_devops @@ -97,8 +107,6 @@ - 1 - - cronjob - 1 -- - dast_site_validation - - 1 - - default - 1 - - delete_diff_files @@ -145,6 +153,8 @@ - 1 - - elastic_namespace_rollout - 1 +- - elastic_project_transfer + - 1 - - email_receiver - 2 - - emails_on_push @@ -223,6 +233,10 @@ - 1 - - integrations_create_external_cross_reference - 1 +- - integrations_execute + - 1 +- - integrations_irker + - 1 - - invalid_gpg_signature_update - 2 - - irker @@ -233,10 +247,6 @@ - 1 - - issuables_clear_groups_issue_counter - 1 -- - issue_placement - - 2 -- - issue_rebalancing - - 1 - - issues_placement - 2 - - issues_rebalancing @@ -279,8 +289,6 @@ - 1 - - migrate_external_diffs - 1 -- - namespaceless_project_destroy - - 1 - - namespaces_onboarding_issue_created - 1 - - namespaces_onboarding_pipeline_created @@ -327,8 +335,6 @@ - 1 - - pipeline_background - 1 -- - pipeline_cache - - 3 - - pipeline_creation - 4 - - pipeline_default @@ -343,8 +349,6 @@ - 3 - - project_cache - 1 -- - project_daily_statistics - - 1 - - project_destroy - 1 - - project_export @@ -373,8 +377,6 @@ - 1 - - projects_update_repository_storage - 1 -- - prometheus_create_default_alerts - - 1 - - propagate_integration - 1 - - propagate_integration_group @@ -403,10 +405,6 @@ - 1 - - repository_import - 1 -- - repository_push_audit_event - - 1 -- - repository_remove_remote - - 1 - - repository_update_mirror - 1 - - repository_update_remote_mirror @@ -419,8 +417,6 @@ - 1 - - security_findings_delete_by_job_id - 1 -- - security_generate_scan_finding_rules - - 1 - - security_orchestration_policy_rule_schedule_namespace - 1 - - security_scans @@ -432,7 +428,7 @@ - - self_monitoring_project_delete - 2 - - service_desk_email_receiver - - 1 + - 2 - - set_user_status_based_on_user_cap_setting - 1 - - snippets_schedule_bulk_repository_shard_moves @@ -447,6 +443,8 @@ - 1 - - tasks_to_be_done_create - 1 +- - terraform + - 1 - - todos_destroyer - 1 - - unassign_issuables @@ -473,6 +471,8 @@ - 1 - - web_hooks_destroy - 1 +- - web_hooks_log_destroy + - 1 - - web_hooks_log_execution - 1 - - wikis_git_garbage_collect |