diff options
Diffstat (limited to 'config')
202 files changed, 1213 insertions, 897 deletions
diff --git a/config/README.md b/config/README.md index be5bd442fd8..f04758fcaeb 100644 --- a/config/README.md +++ b/config/README.md @@ -1,13 +1,13 @@ # Configuration files Documentation Note that most configuration files (`config/*.*`) committed into -[gitlab-ce](https://gitlab.com/gitlab-org/gitlab-foss) **will not be used** for +[gitlab-foss](https://gitlab.com/gitlab-org/gitlab-foss) **will not be used** for [omnibus-gitlab](https://gitlab.com/gitlab-org/omnibus-gitlab). Configuration -files committed into gitlab-ce are only used for development. +files committed into gitlab-foss are only used for development. ## gitlab.yml -You can find most of GitLab configuration settings here. +You can find most of the GitLab configuration settings here. ## mail_room.yml @@ -21,7 +21,7 @@ This file is called `resque.yml` for historical reasons. We are **NOT** using Resque at the moment. It is used to specify Redis configuration values when a single database instance of Redis is desired. -# Advanced Redis configuration files +## Advanced Redis configuration files In more advanced configurations of Redis key-value storage, it is desirable to separate the keys by lifecycle and intended use to ease provisioning and @@ -40,7 +40,7 @@ If desired, the routing URL provided by these settings can be used with: 2. TCP port number for each Redis instance desired 3. `database number` for each Redis instance desired -## Example URL attribute formats for GitLab Redis `.yml` configuration files +### Example URL attribute formats for GitLab Redis `.yml` configuration files * Unix Socket, default Redis database (0) * `url: unix:/path/to/redis.sock` * `url: unix:/path/to/redis.sock?db=` @@ -52,129 +52,38 @@ If desired, the routing URL provided by these settings can be used with: * TCP Socket for Redis on remote host `myserver`, port 6379, database 33 * `url: redis://:mynewpassword@myserver:6379/33` -## redis.cache.yml - -If configured, `redis.cache.yml` overrides the -`resque.yml` settings to configure the Redis database instance -used for `Rails.cache` and other volatile non-persistent data which enhances -the performance of GitLab. -Settings here can be overridden by the environment variable -`GITLAB_REDIS_CACHE_CONFIG_FILE` which provides -an alternate location for configuration settings. - -The order of precedence for the URL used to connect to the Redis instance -used for `cache` is: -1. URL from a configuration file pointed to by the -`GITLAB_REDIS_CACHE_CONFIG_FILE` environment variable -2. URL from `redis.cache.yml` -3. URL from a configuration file pointed to by the -`GITLAB_REDIS_CONFIG_FILE` environment variable -4. URL from `resque.yml` -5. `redis://localhost:6380` - -The order of precedence for all other configuration settings for `cache` -are selected from only the first of the following files found (if a setting -is not provided in an earlier file, the remainder of the files are not -searched): -1. the configuration file pointed to by the -`GITLAB_REDIS_CACHE_CONFIG_FILE` environment variable -2. the configuration file `redis.cache.yml` -3. the configuration file pointed to by the -`GITLAB_REDIS_CONFIG_FILE` environment variable -4. the configuration file `resque.yml` - -## redis.queues.yml - -If configured, `redis.queues.yml` overrides the -`resque.yml` settings to configure the Redis database instance -used for clients of `::Gitlab::Redis::Queues`. -These queues are intended to be the foundation -of reliable inter-process communication between modules, whether on the same -host node, or within a cluster. The primary clients of the queues are -SideKiq, Mailroom, CI Runner, Workhorse, and push services. Settings here can -be overridden by the environment variable -`GITLAB_REDIS_QUEUES_CONFIG_FILE` which provides an alternate location for -configuration settings. - -The order of precedence for the URL used to connect to the Redis instance -used for `queues` is: -1. URL from a configuration file pointed to by the -`GITLAB_REDIS_QUEUES_CONFIG_FILE` environment variable -2. URL from `redis.queues.yml` -3. URL from a configuration file pointed to by the -`GITLAB_REDIS_CONFIG_FILE` environment variable -4. URL from `resque.yml` -5. `redis://localhost:6381` - -The order of precedence for all other configuration settings for `queues` -are selected from only the first of the following files found (if a setting -is not provided in an earlier file, the remainder of the files are not -searched): -1. the configuration file pointed to by the -`GITLAB_REDIS_QUEUES_CONFIG_FILE` environment variable -2. the configuration file `redis.queues.yml` -3. the configuration file pointed to by the -`GITLAB_REDIS_CONFIG_FILE` environment variable -4. the configuration file `resque.yml` - -## redis.shared_state.yml - -If configured, `redis.shared_state.yml` overrides the -`resque.yml` settings to configure the Redis database instance -used for clients of `::Gitlab::Redis::SharedState` such as session state, -and rate limiting. -Settings here can be overridden by the environment variable -`GITLAB_REDIS_SHARED_STATE_CONFIG_FILE` which provides -an alternate location for configuration settings. - -The order of precedence for the URL used to connect to the Redis instance -used for `shared_state` is: -1. URL from a configuration file pointed to by the -`GITLAB_REDIS_SHARED_STATE_CONFIG_FILE` environment variable -2. URL from `redis.shared_state.yml` -3. URL from a configuration file pointed to by the -`GITLAB_REDIS_CONFIG_FILE` environment variable -4. URL from `resque.yml` -5. `redis://localhost:6382` - -The order of precedence for all other configuration settings for `shared_state` -are selected from only the first of the following files found (if a setting -is not provided in an earlier file, the remainder of the files are not -searched): -1. the configuration file pointed to by the -`GITLAB_REDIS_SHARED_STATE_CONFIG_FILE` environment variable -2. the configuration file `redis.shared_state.yml` -3. the configuration file pointed to by the -`GITLAB_REDIS_CONFIG_FILE` environment variable -4. the configuration file `resque.yml` - -## redis.trace_chunks.yml - -If configured, `redis.trace_chunks.yml` overrides the -`resque.yml` settings to configure the Redis database instance -used for clients of `::Gitlab::Redis::TraceChunks` which stores CI trace chunks. - -Settings here can be overridden by the environment variable -`GITLAB_REDIS_TRACE_CHUNKS_CONFIG_FILE` which provides -an alternate location for configuration settings. - -The order of precedence for the URL used to connect to the Redis instance -used for `trace_chunks` is: -1. URL from a configuration file pointed to by the -`GITLAB_REDIS_TRACE_CHUNKS_CONFIG_FILE` environment variable -2. URL from `redis.trace_chunks.yml` -3. URL from a configuration file pointed to by the -`GITLAB_REDIS_CONFIG_FILE` environment variable -4. URL from `resque.yml` -5. `redis://localhost:6383` - -The order of precedence for all other configuration settings for `trace_chunks` -are selected from only the first of the following files found (if a setting -is not provided in an earlier file, the remainder of the files are not -searched): -1. the configuration file pointed to by the -`GITLAB_REDIS_TRACE_CHUNKS_CONFIG_FILE` environment variable -2. the configuration file `redis.trace_chunks.yml` -3. the configuration file pointed to by the -`GITLAB_REDIS_CONFIG_FILE` environment variable -4. the configuration file `resque.yml` +## Available configuration files + +The Redis instances that can be configured are described in the table below. The +order of precedence for configuration is described below, where `$NAME` and +`$FALLBACK_NAME` are the upper-cased instance names from the table, and `$name` +and `$fallback_name` are the lower-cased versions: + +1. The configuration file pointed to by the `GITLAB_REDIS_$NAME_CONFIG_FILE` + environment variable. +1. The configuration file `redis.$name.yml`. +1. **If a fallback instance is available**, the configuration file + `redis.$fallback_name.yml`. +1. The configuration file pointed to by the `GITLAB_REDIS_CONFIG_FILE` +environment variable. +1. The configuration file `resque.yml`. + +An example configuration file for Redis is in this directory under the name +`resque.yml.example`. + +| Name | Fallback instance | Purpose | +| --- | --- | --- | +| `cache` | | Volatile non-persistent data | +| `queues` | | Background job processing queues | +| `shared_state` | | Persistent application state | +| `trace_chunks` | `shared_state` | [CI trace chunks](https://docs.gitlab.com/ee/administration/job_logs.html#incremental-logging-architecture) | +| `rate_limiting` | `cache` | [Rate limiting](https://docs.gitlab.com/ee/user/admin_area/settings/user_and_ip_rate_limits.html) state | +| `sessions` | `shared_state` | [Sessions](https://docs.gitlab.com/ee/development/session.html#redis)| + +If no configuration is found, or no URL is found in the configuration +file, the default URL used is: + +1. `redis://localhost:6380` for `cache`. +1. `redis://localhost:6381` for `queues`. +1. `redis://localhost:6382` for `shared_state`. +1. The URL from the fallback instance for all other instances. diff --git a/config/application.rb b/config/application.rb index 2349de4892f..dba9550a3dc 100644 --- a/config/application.rb +++ b/config/application.rb @@ -23,6 +23,9 @@ module Gitlab require_dependency Rails.root.join('lib/gitlab/redis/cache') require_dependency Rails.root.join('lib/gitlab/redis/queues') require_dependency Rails.root.join('lib/gitlab/redis/shared_state') + require_dependency Rails.root.join('lib/gitlab/redis/trace_chunks') + require_dependency Rails.root.join('lib/gitlab/redis/rate_limiting') + require_dependency Rails.root.join('lib/gitlab/redis/sessions') require_dependency Rails.root.join('lib/gitlab/current_settings') require_dependency Rails.root.join('lib/gitlab/middleware/read_only') require_dependency Rails.root.join('lib/gitlab/middleware/basic_health_check') @@ -370,15 +373,7 @@ module Gitlab end # Use caching across all environments - # Full list of options: - # https://api.rubyonrails.org/classes/ActiveSupport/Cache/RedisCacheStore.html#method-c-new - caching_config_hash = {} - caching_config_hash[:redis] = Gitlab::Redis::Cache.pool - caching_config_hash[:compress] = Gitlab::Utils.to_boolean(ENV.fetch('ENABLE_REDIS_CACHE_COMPRESSION', '1')) - caching_config_hash[:namespace] = Gitlab::Redis::Cache::CACHE_NAMESPACE - caching_config_hash[:expires_in] = 2.weeks # Cache should not grow forever - - config.cache_store = :redis_cache_store, caching_config_hash + config.cache_store = :redis_cache_store, Gitlab::Redis::Cache.active_support_config config.active_job.queue_adapter = :sidekiq diff --git a/config/feature_categories.yml b/config/feature_categories.yml index 1ecf217dd92..e61048a6427 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -33,6 +33,7 @@ - continuous_integration_scaling - database - dataops +- delivery - delivery_management - dependency_firewall - dependency_proxy @@ -53,16 +54,15 @@ - five_minute_production_app - foundations - fuzz_testing -- gdk - geo_replication - git_lfs - gitaly - gitlab_docs - global_search - helm_chart_registry +- horse - importers - incident_management -- infrastructure - infrastructure_as_code - insider_threat - integrations @@ -103,12 +103,12 @@ - roadmaps - runbooks - runner +- scalability - secret_detection - secrets_management - security_benchmarking - security_orchestration - self_monitoring -- serverless - service_desk - service_ping - sharding diff --git a/config/feature_flags/development/add_actor_based_user_to_snowplow_tracking.yml b/config/feature_flags/development/add_actor_based_user_to_snowplow_tracking.yml new file mode 100644 index 00000000000..9dc20148d56 --- /dev/null +++ b/config/feature_flags/development/add_actor_based_user_to_snowplow_tracking.yml @@ -0,0 +1,8 @@ +--- +name: add_actor_based_user_to_snowplow_tracking +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71353 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338150 +milestone: '14.4' +type: development +group: group::product intelligence +default_enabled: false diff --git a/config/feature_flags/development/advanced_search_multi_project_select.yml b/config/feature_flags/development/advanced_search_multi_project_select.yml index 4f38955fa71..8f74c8990fa 100644 --- a/config/feature_flags/development/advanced_search_multi_project_select.yml +++ b/config/feature_flags/development/advanced_search_multi_project_select.yml @@ -2,7 +2,7 @@ name: advanced_search_multi_project_select introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62606 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333011 -milestone: '14.0' +milestone: '14.4' type: development group: group::global search default_enabled: false diff --git a/config/feature_flags/development/avoid_cross_joins_environments_in_self_and_descendants.yml b/config/feature_flags/development/avoid_cross_joins_environments_in_self_and_descendants.yml new file mode 100644 index 00000000000..25b714b2c65 --- /dev/null +++ b/config/feature_flags/development/avoid_cross_joins_environments_in_self_and_descendants.yml @@ -0,0 +1,8 @@ +--- +name: avoid_cross_joins_environments_in_self_and_descendants +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71894 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342991 +milestone: '14.4' +type: development +group: group::release +default_enabled: false diff --git a/config/feature_flags/development/ci_minutes_track_live_consumption.yml b/config/feature_flags/development/ci_archived_build_trace_checksum.yml index d94dfc4120b..95e641e0efa 100644 --- a/config/feature_flags/development/ci_minutes_track_live_consumption.yml +++ b/config/feature_flags/development/ci_archived_build_trace_checksum.yml @@ -1,8 +1,8 @@ --- -name: ci_minutes_track_live_consumption -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59263 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329197 -milestone: '13.12' +name: ci_archived_build_trace_checksum +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70072 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340737 +milestone: '14.4' type: development group: group::pipeline execution default_enabled: false diff --git a/config/feature_flags/development/ci_create_external_pr_pipeline_async.yml b/config/feature_flags/development/ci_create_external_pr_pipeline_async.yml index 3935a818b1f..48c7dbcf740 100644 --- a/config/feature_flags/development/ci_create_external_pr_pipeline_async.yml +++ b/config/feature_flags/development/ci_create_external_pr_pipeline_async.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338908 milestone: '14.3' type: development group: group::pipeline authoring -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/ci_idempotent_pipeline_process_worker.yml b/config/feature_flags/development/ci_idempotent_pipeline_process_worker.yml deleted file mode 100644 index 60104bd3109..00000000000 --- a/config/feature_flags/development/ci_idempotent_pipeline_process_worker.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ci_idempotent_pipeline_process_worker -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62410 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332963 -milestone: '14.0' -type: development -group: group::pipeline authoring -default_enabled: true diff --git a/config/feature_flags/development/ci_new_query_for_running_stuck_jobs.yml b/config/feature_flags/development/ci_new_query_for_running_stuck_jobs.yml new file mode 100644 index 00000000000..345e9b4c3ae --- /dev/null +++ b/config/feature_flags/development/ci_new_query_for_running_stuck_jobs.yml @@ -0,0 +1,8 @@ +--- +name: ci_new_query_for_running_stuck_jobs +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71013 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339264 +milestone: '14.4' +type: development +group: group::pipeline execution +default_enabled: false diff --git a/config/feature_flags/development/ci_optimize_project_records_destruction.yml b/config/feature_flags/development/ci_optimize_project_records_destruction.yml new file mode 100644 index 00000000000..73ad4ae995c --- /dev/null +++ b/config/feature_flags/development/ci_optimize_project_records_destruction.yml @@ -0,0 +1,8 @@ +--- +name: ci_optimize_project_records_destruction +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71342 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341936 +milestone: '14.4' +type: development +group: group::pipeline execution +default_enabled: false diff --git a/config/feature_flags/development/ci_pipeline_add_job_with_lock.yml b/config/feature_flags/development/ci_pipeline_add_job_with_lock.yml deleted file mode 100644 index 6a708013ca5..00000000000 --- a/config/feature_flags/development/ci_pipeline_add_job_with_lock.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ci_pipeline_add_job_with_lock -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65754 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337628 -milestone: '14.2' -type: development -group: group::pipeline authoring -default_enabled: true diff --git a/config/feature_flags/development/ci_remove_update_retried_from_process_pipeline.yml b/config/feature_flags/development/ci_remove_update_retried_from_process_pipeline.yml deleted file mode 100644 index 932ee766340..00000000000 --- a/config/feature_flags/development/ci_remove_update_retried_from_process_pipeline.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ci_remove_update_retried_from_process_pipeline -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54300 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321630 -milestone: '13.9' -type: development -group: group::pipeline authoring -default_enabled: true diff --git a/config/feature_flags/development/ci_scoped_job_token.yml b/config/feature_flags/development/ci_scoped_job_token.yml index a7fa0244839..a885a1e6391 100644 --- a/config/feature_flags/development/ci_scoped_job_token.yml +++ b/config/feature_flags/development/ci_scoped_job_token.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332272 milestone: '14.0' type: development group: group::pipeline execution -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/container_registry_expiration_policies_caching.yml b/config/feature_flags/development/container_registry_expiration_policies_caching.yml new file mode 100644 index 00000000000..6e8b0efe94d --- /dev/null +++ b/config/feature_flags/development/container_registry_expiration_policies_caching.yml @@ -0,0 +1,8 @@ +--- +name: container_registry_expiration_policies_caching +introduced_by_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340606 +milestone: '14.3' +type: development +group: group::package +default_enabled: false diff --git a/config/feature_flags/development/create_vulnerabilities_via_api.yml b/config/feature_flags/development/create_vulnerabilities_via_api.yml index 0a3f9fa73f8..3f8af065dc2 100644 --- a/config/feature_flags/development/create_vulnerabilities_via_api.yml +++ b/config/feature_flags/development/create_vulnerabilities_via_api.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338694 milestone: '14.3' type: development group: group::threat insights -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/decomposed_ci_query_in_pipelines_for_merge_request_finder.yml b/config/feature_flags/development/decomposed_ci_query_in_pipelines_for_merge_request_finder.yml new file mode 100644 index 00000000000..235b37dfb1d --- /dev/null +++ b/config/feature_flags/development/decomposed_ci_query_in_pipelines_for_merge_request_finder.yml @@ -0,0 +1,8 @@ +--- +name: decomposed_ci_query_in_pipelines_for_merge_request_finder +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68549 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341341 +milestone: '14.4' +type: development +group: group::pipeline execution +default_enabled: false diff --git a/config/feature_flags/development/dependency_proxy_workhorse.yml b/config/feature_flags/development/dependency_proxy_workhorse.yml new file mode 100644 index 00000000000..a3545d32cd5 --- /dev/null +++ b/config/feature_flags/development/dependency_proxy_workhorse.yml @@ -0,0 +1,8 @@ +--- +name: dependency_proxy_workhorse +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68157 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339639 +milestone: '14.3' +type: development +group: group::source code +default_enabled: false diff --git a/config/feature_flags/development/ensure_verified_primary_email_for_2fa.yml b/config/feature_flags/development/ensure_verified_primary_email_for_2fa.yml deleted file mode 100644 index 7a52486d356..00000000000 --- a/config/feature_flags/development/ensure_verified_primary_email_for_2fa.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ensure_verified_primary_email_for_2fa -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69593 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340151 -milestone: '14.3' -type: development -group: group::access -default_enabled: true diff --git a/config/feature_flags/development/environment_last_visible_pipeline_disable_joins.yml b/config/feature_flags/development/environment_last_visible_pipeline_disable_joins.yml deleted file mode 100644 index 7667542506a..00000000000 --- a/config/feature_flags/development/environment_last_visible_pipeline_disable_joins.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: environment_last_visible_pipeline_disable_joins -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68870 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340283 -milestone: '14.3' -type: development -group: group::release -default_enabled: true diff --git a/config/feature_flags/development/vulnerability_flags.yml b/config/feature_flags/development/finding_ci_pipeline_disable_joins.yml index 6ea7dd2e3f1..8987b729cac 100644 --- a/config/feature_flags/development/vulnerability_flags.yml +++ b/config/feature_flags/development/finding_ci_pipeline_disable_joins.yml @@ -1,8 +1,8 @@ --- -name: vulnerability_flags -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66775 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340203 +name: finding_ci_pipeline_disable_joins +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70216 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338665 milestone: '14.3' type: development -group: group::static analysis +group: group::threat insights default_enabled: true diff --git a/config/feature_flags/development/gitaly_user_merge_branch_access_error.yml b/config/feature_flags/development/gitaly_user_merge_branch_access_error.yml new file mode 100644 index 00000000000..6e52112b754 --- /dev/null +++ b/config/feature_flags/development/gitaly_user_merge_branch_access_error.yml @@ -0,0 +1,8 @@ +--- +name: gitaly_user_merge_branch_access_error +introduced_by_url: https://gitlab.com/gitlab-org/gitaly/-/merge_requests/3705 +rollout_issue_url: https://gitlab.com/gitlab-org/gitaly/-/issues/3757 +milestone: '14.3' +type: development +group: group::gitaly +default_enabled: false diff --git a/config/feature_flags/development/merge_request_discussion_cache.yml b/config/feature_flags/development/improved_mergeability_checks.yml index e90887fc2b3..83450ffa16f 100644 --- a/config/feature_flags/development/merge_request_discussion_cache.yml +++ b/config/feature_flags/development/improved_mergeability_checks.yml @@ -1,8 +1,8 @@ --- -name: merge_request_discussion_cache -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64688 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335799 -milestone: '14.1' +name: improved_mergeability_checks +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68312 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342386 +milestone: '14.4' type: development group: group::code review default_enabled: false diff --git a/config/feature_flags/development/incubation_5mp_google_cloud.yml b/config/feature_flags/development/incubation_5mp_google_cloud.yml new file mode 100644 index 00000000000..b687a656b40 --- /dev/null +++ b/config/feature_flags/development/incubation_5mp_google_cloud.yml @@ -0,0 +1,8 @@ +--- +name: incubation_5mp_google_cloud +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70715 +rollout_issue_url: +milestone: '14.3' +type: development +group: group::incubation +default_enabled: false diff --git a/config/feature_flags/development/infinitely_collapsible_sections.yml b/config/feature_flags/development/infinitely_collapsible_sections.yml index d0bf063c6f6..44f37c06d70 100644 --- a/config/feature_flags/development/infinitely_collapsible_sections.yml +++ b/config/feature_flags/development/infinitely_collapsible_sections.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335297 milestone: '14.1' type: development group: group::pipeline execution -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/jira_connect_asymmetric_jwt.yml b/config/feature_flags/development/jira_connect_asymmetric_jwt.yml new file mode 100644 index 00000000000..e204a7d6fac --- /dev/null +++ b/config/feature_flags/development/jira_connect_asymmetric_jwt.yml @@ -0,0 +1,8 @@ +--- +name: jira_connect_asymmetric_jwt +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71080 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342808 +milestone: '14.4' +type: development +group: group::integrations +default_enabled: false diff --git a/config/feature_flags/development/ci_runner_limits.yml b/config/feature_flags/development/lazy_load_commits.yml index e7d30dd086c..d4764907211 100644 --- a/config/feature_flags/development/ci_runner_limits.yml +++ b/config/feature_flags/development/lazy_load_commits.yml @@ -1,8 +1,8 @@ --- -name: ci_runner_limits -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60157 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329438 -milestone: '13.12' +name: lazy_load_commits +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71633 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342497 +milestone: '14.4' type: development -group: group::runner +group: group::source code default_enabled: false diff --git a/config/feature_flags/development/specialized_worker_for_project_transfer_auth_recalculation.yml b/config/feature_flags/development/linear_application_setting_ancestor_scopes.yml index b77ed607501..18c64df78d7 100644 --- a/config/feature_flags/development/specialized_worker_for_project_transfer_auth_recalculation.yml +++ b/config/feature_flags/development/linear_application_setting_ancestor_scopes.yml @@ -1,8 +1,8 @@ --- -name: specialized_worker_for_project_transfer_auth_recalculation -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61967 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334237 -milestone: '14.1' +name: linear_application_setting_ancestor_scopes +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70579 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341346 +milestone: '14.4' type: development group: group::access default_enabled: false diff --git a/config/feature_flags/development/specialized_worker_for_project_share_update_auth_recalculation.yml b/config/feature_flags/development/linear_ee_group_ancestor_scopes.yml index 5e7d3819a4a..46294b0aef0 100644 --- a/config/feature_flags/development/specialized_worker_for_project_share_update_auth_recalculation.yml +++ b/config/feature_flags/development/linear_ee_group_ancestor_scopes.yml @@ -1,8 +1,8 @@ --- -name: specialized_worker_for_project_share_update_auth_recalculation -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61964 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334234 -milestone: '14.1' +name: linear_ee_group_ancestor_scopes +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70708 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341350 +milestone: '14.4' type: development group: group::access default_enabled: false diff --git a/config/feature_flags/development/linear_group_ancestor_scopes.yml b/config/feature_flags/development/linear_group_ancestor_scopes.yml new file mode 100644 index 00000000000..f23399c1e6f --- /dev/null +++ b/config/feature_flags/development/linear_group_ancestor_scopes.yml @@ -0,0 +1,8 @@ +--- +name: linear_group_ancestor_scopes +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70495 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341115 +milestone: '14.4' +type: development +group: group::access +default_enabled: false diff --git a/config/feature_flags/development/linear_group_plans_preloaded_ancestor_scopes.yml b/config/feature_flags/development/linear_group_plans_preloaded_ancestor_scopes.yml new file mode 100644 index 00000000000..d45b8d71a20 --- /dev/null +++ b/config/feature_flags/development/linear_group_plans_preloaded_ancestor_scopes.yml @@ -0,0 +1,8 @@ +--- +name: linear_group_plans_preloaded_ancestor_scopes +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70685 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341349 +milestone: '14.4' +type: development +group: group::access +default_enabled: false diff --git a/config/feature_flags/development/linear_group_tree_ancestor_scopes.yml b/config/feature_flags/development/linear_group_tree_ancestor_scopes.yml new file mode 100644 index 00000000000..3a195242fa1 --- /dev/null +++ b/config/feature_flags/development/linear_group_tree_ancestor_scopes.yml @@ -0,0 +1,8 @@ +--- +name: linear_group_tree_ancestor_scopes +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70503 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341117 +milestone: '14.4' +type: development +group: group::access +default_enabled: false diff --git a/config/feature_flags/development/linear_members_finder_ancestor_scopes.yml b/config/feature_flags/development/linear_members_finder_ancestor_scopes.yml new file mode 100644 index 00000000000..6bd5e164324 --- /dev/null +++ b/config/feature_flags/development/linear_members_finder_ancestor_scopes.yml @@ -0,0 +1,8 @@ +--- +name: linear_members_finder_ancestor_scopes +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70583 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341347 +milestone: '14.4' +type: development +group: group::access +default_enabled: false diff --git a/config/feature_flags/development/linear_participants_service_ancestor_scopes.yml b/config/feature_flags/development/linear_participants_service_ancestor_scopes.yml new file mode 100644 index 00000000000..41b6f3b32d9 --- /dev/null +++ b/config/feature_flags/development/linear_participants_service_ancestor_scopes.yml @@ -0,0 +1,8 @@ +--- +name: linear_participants_service_ancestor_scopes +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70684 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341348 +milestone: '14.4' +type: development +group: group::access +default_enabled: false diff --git a/config/feature_flags/development/remove_composer_v1_cache_code.yml b/config/feature_flags/development/mergeability_caching.yml index 9654fc8dc54..b9063299926 100644 --- a/config/feature_flags/development/remove_composer_v1_cache_code.yml +++ b/config/feature_flags/development/mergeability_caching.yml @@ -1,8 +1,8 @@ --- -name: remove_composer_v1_cache_code -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67843 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338264 -milestone: '14.2' +name: mergeability_caching +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68312 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340810 +milestone: '14.4' type: development -group: group::package +group: group::code review default_enabled: false diff --git a/config/feature_flags/development/mr_changes_fluid_layout.yml b/config/feature_flags/development/mr_changes_fluid_layout.yml new file mode 100644 index 00000000000..87f0c0c6569 --- /dev/null +++ b/config/feature_flags/development/mr_changes_fluid_layout.yml @@ -0,0 +1,8 @@ +--- +name: mr_changes_fluid_layout +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70815 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341809 +milestone: '14.4' +type: development +group: group::code review +default_enabled: false diff --git a/config/feature_flags/development/new_customersdot_staging_url.yml b/config/feature_flags/development/new_customersdot_staging_url.yml new file mode 100644 index 00000000000..288d7f66f01 --- /dev/null +++ b/config/feature_flags/development/new_customersdot_staging_url.yml @@ -0,0 +1,8 @@ +--- +name: new_customersdot_staging_url +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71827 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342513 +milestone: '14.4' +type: development +group: group::fulfillment +default_enabled: false diff --git a/config/feature_flags/development/pipeline_editor_drawer.yml b/config/feature_flags/development/new_dir_modal.yml index df73c4be01e..12d007209b7 100644 --- a/config/feature_flags/development/pipeline_editor_drawer.yml +++ b/config/feature_flags/development/new_dir_modal.yml @@ -1,8 +1,8 @@ --- -name: pipeline_editor_drawer -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60856 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329806 -milestone: '13.12' +name: new_dir_modal +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71154 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341675 +milestone: '14.4' type: development -group: group::pipeline authoring +group: group::source code default_enabled: true diff --git a/config/feature_flags/development/operational_vulnerabilities.yml b/config/feature_flags/development/operational_vulnerabilities.yml new file mode 100644 index 00000000000..f1e19a626fb --- /dev/null +++ b/config/feature_flags/development/operational_vulnerabilities.yml @@ -0,0 +1,8 @@ +--- +name: operational_vulnerabilities +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70732 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341423 +milestone: '14.4' +type: development +group: group::container security +default_enabled: false diff --git a/config/feature_flags/development/package_list_apollo.yml b/config/feature_flags/development/package_list_apollo.yml new file mode 100644 index 00000000000..522b08594e2 --- /dev/null +++ b/config/feature_flags/development/package_list_apollo.yml @@ -0,0 +1,8 @@ +--- +name: package_list_apollo +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70598 +rollout_issue_url: +milestone: '14.3' +type: development +group: group::package +default_enabled: false diff --git a/config/feature_flags/development/paginated_tree_graphql_query.yml b/config/feature_flags/development/paginated_tree_graphql_query.yml index 13096412f25..d56d8fc336c 100644 --- a/config/feature_flags/development/paginated_tree_graphql_query.yml +++ b/config/feature_flags/development/paginated_tree_graphql_query.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337214 milestone: '14.2' type: development group: group::source code -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/pipeline_editor_empty_state_action.yml b/config/feature_flags/development/pipeline_editor_empty_state_action.yml deleted file mode 100644 index 870aeb14932..00000000000 --- a/config/feature_flags/development/pipeline_editor_empty_state_action.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: pipeline_editor_empty_state_action -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55414 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323229 -milestone: '13.10' -type: development -group: group::pipeline authoring -default_enabled: true diff --git a/config/feature_flags/development/ci_include_rules.yml b/config/feature_flags/development/pipeline_editor_mini_graph.yml index d8a3f0b245e..6f31cb18d82 100644 --- a/config/feature_flags/development/ci_include_rules.yml +++ b/config/feature_flags/development/pipeline_editor_mini_graph.yml @@ -1,8 +1,8 @@ --- -name: ci_include_rules -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67409 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337507 -milestone: '14.2' +name: pipeline_editor_mini_graph +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71622 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342217 +milestone: '14.4' type: development group: group::pipeline authoring -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/show_author_on_note.yml b/config/feature_flags/development/rate_limited_service_issues_create.yml index 7775bf5f27f..95ece10aa6c 100644 --- a/config/feature_flags/development/show_author_on_note.yml +++ b/config/feature_flags/development/rate_limited_service_issues_create.yml @@ -1,8 +1,8 @@ --- -name: show_author_on_note -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40198 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/250282 -milestone: '13.4' +name: rate_limited_service_issues_create +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68526 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342677 +milestone: '14.4' type: development group: group::project management default_enabled: false diff --git a/config/feature_flags/development/redirect_to_latest_template_jobs_browser_performance_testing.yml b/config/feature_flags/development/redirect_to_latest_template_jobs_browser_performance_testing.yml deleted file mode 100644 index 37c475067a3..00000000000 --- a/config/feature_flags/development/redirect_to_latest_template_jobs_browser_performance_testing.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: redirect_to_latest_template_jobs_browser_performance_testing -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63144 -rollout_issue_url: -milestone: '14.0' -type: development -group: group::pipeline authoring -default_enabled: false diff --git a/config/feature_flags/development/redirect_to_latest_template_security_api_fuzzing.yml b/config/feature_flags/development/redirect_to_latest_template_security_api_fuzzing.yml deleted file mode 100644 index 96606515bda..00000000000 --- a/config/feature_flags/development/redirect_to_latest_template_security_api_fuzzing.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: redirect_to_latest_template_security_api_fuzzing -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63144 -rollout_issue_url: -milestone: '14.0' -type: development -group: group::pipeline authoring -default_enabled: false diff --git a/config/feature_flags/development/redirect_to_latest_template_security_dast.yml b/config/feature_flags/development/redirect_to_latest_template_security_dast.yml deleted file mode 100644 index a95c1e1a045..00000000000 --- a/config/feature_flags/development/redirect_to_latest_template_security_dast.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: redirect_to_latest_template_security_dast -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63144 -rollout_issue_url: -milestone: '14.0' -type: development -group: group::pipeline authoring -default_enabled: false diff --git a/config/feature_flags/development/redirect_to_latest_template_terraform.yml b/config/feature_flags/development/redirect_to_latest_template_terraform.yml deleted file mode 100644 index cb5d833fa2d..00000000000 --- a/config/feature_flags/development/redirect_to_latest_template_terraform.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: redirect_to_latest_template_terraform -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63144 -rollout_issue_url: -milestone: '14.0' -type: development -group: group::pipeline authoring -default_enabled: false diff --git a/config/feature_flags/development/redirect_to_latest_template_verify_browser_performance.yml b/config/feature_flags/development/redirect_to_latest_template_verify_browser_performance.yml deleted file mode 100644 index 4df74a5b07a..00000000000 --- a/config/feature_flags/development/redirect_to_latest_template_verify_browser_performance.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: redirect_to_latest_template_verify_browser_performance -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63144 -rollout_issue_url: -milestone: '14.0' -type: development -group: group::pipeline authoring -default_enabled: false diff --git a/config/feature_flags/development/refactor_mr_widgets_extensions.yml b/config/feature_flags/development/refactor_mr_widgets_extensions.yml new file mode 100644 index 00000000000..5b6ea22aafe --- /dev/null +++ b/config/feature_flags/development/refactor_mr_widgets_extensions.yml @@ -0,0 +1,8 @@ +--- +name: refactor_mr_widgets_extensions +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70993 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341759 +milestone: '14.4' +type: development +group: group::code review +default_enabled: false diff --git a/config/feature_flags/development/refactor_mr_widgets_extensions_user.yml b/config/feature_flags/development/refactor_mr_widgets_extensions_user.yml new file mode 100644 index 00000000000..aa3c2799100 --- /dev/null +++ b/config/feature_flags/development/refactor_mr_widgets_extensions_user.yml @@ -0,0 +1,8 @@ +--- +name: refactor_mr_widgets_extensions_user +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70993 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341759 +milestone: '14.4' +type: development +group: group::code review +default_enabled: false diff --git a/config/feature_flags/development/refactor_text_viewer.yml b/config/feature_flags/development/refactor_text_viewer.yml new file mode 100644 index 00000000000..427137773c6 --- /dev/null +++ b/config/feature_flags/development/refactor_text_viewer.yml @@ -0,0 +1,8 @@ +--- +name: refactor_text_viewer +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70909 +rollout_issue_url: +milestone: '14.4' +type: development +group: 'group::source code' +default_enabled: false diff --git a/config/feature_flags/development/reference_cache_memoization.yml b/config/feature_flags/development/reference_cache_memoization.yml new file mode 100644 index 00000000000..74012208174 --- /dev/null +++ b/config/feature_flags/development/reference_cache_memoization.yml @@ -0,0 +1,8 @@ +--- +name: reference_cache_memoization +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71310 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341849 +milestone: '14.4' +type: development +group: group::source code +default_enabled: true diff --git a/config/feature_flags/development/request_apdex_counters.yml b/config/feature_flags/development/request_apdex_counters.yml new file mode 100644 index 00000000000..07d6cb7ac5e --- /dev/null +++ b/config/feature_flags/development/request_apdex_counters.yml @@ -0,0 +1,8 @@ +--- +name: request_apdex_counters +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69154 +rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1099 +milestone: '14.3' +type: development +group: team::Scalability +default_enabled: false diff --git a/config/feature_flags/development/search_blobs_language_aggregation.yml b/config/feature_flags/development/search_blobs_language_aggregation.yml new file mode 100644 index 00000000000..da1b81dc52c --- /dev/null +++ b/config/feature_flags/development/search_blobs_language_aggregation.yml @@ -0,0 +1,8 @@ +--- +name: search_blobs_language_aggregation +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71937 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342621 +milestone: '14.4' +type: development +group: group::global search +default_enabled: false diff --git a/config/feature_flags/development/serverless_domain.yml b/config/feature_flags/development/security_report_ingestion_framework.yml index 67b2c6b8e1a..490fd03c677 100644 --- a/config/feature_flags/development/serverless_domain.yml +++ b/config/feature_flags/development/security_report_ingestion_framework.yml @@ -1,8 +1,8 @@ --- -name: serverless_domain -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/21222 +name: security_report_ingestion_framework +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66735 rollout_issue_url: -milestone: '12.8' +milestone: '14.4' type: development -group: group::configure +group: group::threat insights default_enabled: false diff --git a/config/feature_flags/development/sort_by_project_users_by_project_authorizations_user_id.yml b/config/feature_flags/development/sort_by_project_users_by_project_authorizations_user_id.yml deleted file mode 100644 index 88a4e0b0472..00000000000 --- a/config/feature_flags/development/sort_by_project_users_by_project_authorizations_user_id.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: sort_by_project_users_by_project_authorizations_user_id -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64528 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334167 -milestone: '14.1' -type: development -group: group::optimize -default_enabled: true diff --git a/config/feature_flags/development/help_page_documentation_redirect.yml b/config/feature_flags/development/suppress_apollo_errors_during_navigation.yml index 8871160e42d..21548fa4dbb 100644 --- a/config/feature_flags/development/help_page_documentation_redirect.yml +++ b/config/feature_flags/development/suppress_apollo_errors_during_navigation.yml @@ -1,8 +1,8 @@ --- -name: help_page_documentation_redirect -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42702 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255328 -milestone: '13.5' +name: suppress_apollo_errors_during_navigation +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72031 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342745 +milestone: '14.4' type: development -group: group::static site editor +group: group::foundations default_enabled: false diff --git a/config/feature_flags/development/pages_smart_check_outdated_sha.yml b/config/feature_flags/development/surface_environment_creation_failure.yml index 528d357f65c..2c312d432ef 100644 --- a/config/feature_flags/development/pages_smart_check_outdated_sha.yml +++ b/config/feature_flags/development/surface_environment_creation_failure.yml @@ -1,8 +1,8 @@ --- -name: pages_smart_check_outdated_sha -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67303 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336574 -milestone: '14.2' +name: surface_environment_creation_failure +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69537 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340169 +milestone: '14.4' type: development group: group::release default_enabled: false diff --git a/config/feature_flags/development/surface_environment_creation_failure_override.yml b/config/feature_flags/development/surface_environment_creation_failure_override.yml new file mode 100644 index 00000000000..566281bcb89 --- /dev/null +++ b/config/feature_flags/development/surface_environment_creation_failure_override.yml @@ -0,0 +1,8 @@ +--- +name: surface_environment_creation_failure_override +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69537 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340169 +milestone: '14.4' +type: development +group: group::release +default_enabled: false diff --git a/config/feature_flags/development/gitaly_tags_finder.yml b/config/feature_flags/development/tags_finder_gitaly.yml index a0a1791e584..065a253a69f 100644 --- a/config/feature_flags/development/gitaly_tags_finder.yml +++ b/config/feature_flags/development/tags_finder_gitaly.yml @@ -1,8 +1,8 @@ --- -name: gitaly_tags_finder +name: tags_finder_gitaly introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69101 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339741 milestone: '14.3' type: development group: group::source code -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/track_epic_boards_activity.yml b/config/feature_flags/development/track_epic_boards_activity.yml deleted file mode 100644 index df48cc5a854..00000000000 --- a/config/feature_flags/development/track_epic_boards_activity.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: track_epic_boards_activity -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60357 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338038 -milestone: '13.12' -type: development -group: group::product planning -default_enabled: true diff --git a/config/feature_flags/development/track_importer_activity.yml b/config/feature_flags/development/track_importer_activity.yml new file mode 100644 index 00000000000..9f20a14790e --- /dev/null +++ b/config/feature_flags/development/track_importer_activity.yml @@ -0,0 +1,8 @@ +--- +name: track_importer_activity +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70012 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339392 +milestone: '14.4' +type: development +group: group::import +default_enabled: false diff --git a/config/feature_flags/development/update_deployment_after_transaction_commit.yml b/config/feature_flags/development/update_deployment_after_transaction_commit.yml new file mode 100644 index 00000000000..c07622fc9b4 --- /dev/null +++ b/config/feature_flags/development/update_deployment_after_transaction_commit.yml @@ -0,0 +1,8 @@ +--- +name: update_deployment_after_transaction_commit +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71450 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342021 +milestone: '14.4' +type: development +group: group::release +default_enabled: false diff --git a/config/feature_flags/development/usage_data_i_testing_group_code_coverage_visit_total.yml b/config/feature_flags/development/usage_data_i_testing_group_code_coverage_visit_total.yml deleted file mode 100644 index 720b94fcf6e..00000000000 --- a/config/feature_flags/development/usage_data_i_testing_group_code_coverage_visit_total.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: usage_data_i_testing_group_code_coverage_visit_total -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51382 -rollout_issue_url: -milestone: '13.8' -type: development -group: group::testing -default_enabled: true diff --git a/config/feature_flags/development/usage_data_i_testing_metrics_report_artifact_uploaders.yml b/config/feature_flags/development/usage_data_i_testing_metrics_report_artifact_uploaders.yml deleted file mode 100644 index 968ab3e63f1..00000000000 --- a/config/feature_flags/development/usage_data_i_testing_metrics_report_artifact_uploaders.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: usage_data_i_testing_metrics_report_artifact_uploaders -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51670 -rollout_issue_url: -milestone: '13.9' -type: development -group: group::testing -default_enabled: true diff --git a/config/feature_flags/development/usage_data_i_testing_summary_widget_total.yml b/config/feature_flags/development/usage_data_i_testing_summary_widget_total.yml deleted file mode 100644 index fb06ea9f58d..00000000000 --- a/config/feature_flags/development/usage_data_i_testing_summary_widget_total.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: usage_data_i_testing_summary_widget_total -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57543 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326058 -milestone: '13.11' -type: development -group: group::testing -default_enabled: true diff --git a/config/feature_flags/development/usage_data_i_testing_test_case_parsed.yml b/config/feature_flags/development/usage_data_i_testing_test_case_parsed.yml deleted file mode 100644 index e6e3cd09c28..00000000000 --- a/config/feature_flags/development/usage_data_i_testing_test_case_parsed.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: usage_data_i_testing_test_case_parsed -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41918 -rollout_issue_url: -milestone: '13.5' -type: development -group: group::testing -default_enabled: true diff --git a/config/feature_flags/development/use_upsert_query_for_mr_metrics.yml b/config/feature_flags/development/use_upsert_query_for_mr_metrics.yml index 14cc5d1a98c..605bc54b78a 100644 --- a/config/feature_flags/development/use_upsert_query_for_mr_metrics.yml +++ b/config/feature_flags/development/use_upsert_query_for_mr_metrics.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339677 milestone: '14.3' type: development group: group::optimize -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/validate_namespace_parent_type.yml b/config/feature_flags/development/validate_namespace_parent_type.yml index dc89c462f17..5c2e0add243 100644 --- a/config/feature_flags/development/validate_namespace_parent_type.yml +++ b/config/feature_flags/development/validate_namespace_parent_type.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/322101 milestone: '13.10' type: development group: group::access -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/variable_inside_variable.yml b/config/feature_flags/development/variable_inside_variable.yml index 2060958590f..fee4897b3f0 100644 --- a/config/feature_flags/development/variable_inside_variable.yml +++ b/config/feature_flags/development/variable_inside_variable.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/297382 milestone: '13.11' type: development group: group::runner -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/security_orchestration_policies_configuration.yml b/config/feature_flags/development/vulnerability_location_image_filter.yml index 2570743c101..4b373b76ff6 100644 --- a/config/feature_flags/development/security_orchestration_policies_configuration.yml +++ b/config/feature_flags/development/vulnerability_location_image_filter.yml @@ -1,8 +1,8 @@ --- -name: security_orchestration_policies_configuration -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54220 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321258 -milestone: '13.9' +name: vulnerability_location_image_filter +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69867 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340915 +milestone: '14.4' type: development group: group::container security -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/workhorse_use_sidechannel.yml b/config/feature_flags/development/workhorse_use_sidechannel.yml new file mode 100644 index 00000000000..f39d313bf1a --- /dev/null +++ b/config/feature_flags/development/workhorse_use_sidechannel.yml @@ -0,0 +1,8 @@ +--- +name: workhorse_use_sidechannel +introduced_by_url: +rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1193 +milestone: '14.4' +type: development +group: 'group::scalability' +default_enabled: false diff --git a/config/feature_flags/experiment/jobs_to_be_done.yml b/config/feature_flags/experiment/new_project_sast_enabled.yml index 5589d33a3c3..f47c01d26aa 100644 --- a/config/feature_flags/experiment/jobs_to_be_done.yml +++ b/config/feature_flags/experiment/new_project_sast_enabled.yml @@ -1,8 +1,8 @@ --- -name: jobs_to_be_done -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60038 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285564 -milestone: '13.12' +name: new_project_sast_enabled +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70548 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340929 +milestone: '14.4' type: experiment group: group::adoption default_enabled: false diff --git a/config/feature_flags/ops/ecomm_instrumentation.yml b/config/feature_flags/ops/ecomm_instrumentation.yml new file mode 100644 index 00000000000..e35937fa344 --- /dev/null +++ b/config/feature_flags/ops/ecomm_instrumentation.yml @@ -0,0 +1,8 @@ +--- +name: ecomm_instrumentation +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71243 +rollout_issue_url: +milestone: '14.4' +type: ops +group: group::product intelligence +default_enabled: false diff --git a/config/feature_flags/ops/show_terraform_banner.yml b/config/feature_flags/ops/show_terraform_banner.yml new file mode 100644 index 00000000000..a4ec831f4e4 --- /dev/null +++ b/config/feature_flags/ops/show_terraform_banner.yml @@ -0,0 +1,8 @@ +--- +name: show_terraform_banner +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71462 +rollout_issue_url: +milestone: '14.4' +type: ops +group: group::configure +default_enabled: true diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index a8881fd8a2e..3d2acce9a69 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -1218,6 +1218,9 @@ production: &base # The URL to the internal KAS API (used by the GitLab backend) # internal_url: grpc://localhost:8153 + # The URL to the Kubernetes API proxy (used by GitLab users) + # external_k8s_proxy_url: https://localhost:8154 # default: nil + ## GitLab Elasticsearch settings elasticsearch: indexer_path: /home/git/gitlab-elasticsearch-indexer/ @@ -1292,6 +1295,9 @@ production: &base ## Google tag manager # google_tag_manager_id: '_your_tracking_id' + ## OneTrust + # one_trust_id: '_your_one_trust_id' + ## Matomo analytics. # matomo_url: '_your_matomo_url' # matomo_site_id: '_your_matomo_site_id' diff --git a/config/initializers/00_active_record_disable_joins.rb b/config/initializers/00_active_record_disable_joins.rb new file mode 100644 index 00000000000..6348fd7c53b --- /dev/null +++ b/config/initializers/00_active_record_disable_joins.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module ActiveRecordRelationAllowCrossJoins + def allow_cross_joins_across_databases(url:) + # this method is implemented in: + # spec/support/database/prevent_cross_joins.rb + self + end +end + +ActiveRecord::Relation.prepend(ActiveRecordRelationAllowCrossJoins) diff --git a/config/initializers/0_acts_as_taggable.rb b/config/initializers/0_acts_as_taggable.rb index 04619590e3c..8dee3c52a53 100644 --- a/config/initializers/0_acts_as_taggable.rb +++ b/config/initializers/0_acts_as_taggable.rb @@ -11,8 +11,8 @@ raise "Counter cache is not disabled" if ActsAsTaggableOn::Tagging.reflections["tag"].options[:counter_cache] ActsAsTaggableOn::Tagging.include IgnorableColumns -ActsAsTaggableOn::Tagging.ignore_column :id_convert_to_bigint, remove_with: '14.2', remove_after: '2021-08-22' -ActsAsTaggableOn::Tagging.ignore_column :taggable_id_convert_to_bigint, remove_with: '14.2', remove_after: '2021-08-22' +ActsAsTaggableOn::Tagging.ignore_column :id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22' +ActsAsTaggableOn::Tagging.ignore_column :taggable_id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22' # The tags and taggings are supposed to be part of `gitlab_ci` ActsAsTaggableOn::Tag.gitlab_schema = :gitlab_ci diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 1c22216d442..0e4e6f5cc84 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -466,9 +466,6 @@ Settings.cron_jobs['personal_access_tokens_expired_notification_worker']['job_cl Settings.cron_jobs['repository_archive_cache_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['repository_archive_cache_worker']['cron'] ||= '0 * * * *' Settings.cron_jobs['repository_archive_cache_worker']['job_class'] = 'RepositoryArchiveCacheWorker' -Settings.cron_jobs['packages_composer_cache_cleanup_worker'] ||= Settingslogic.new({}) -Settings.cron_jobs['packages_composer_cache_cleanup_worker']['cron'] ||= '30 * * * *' -Settings.cron_jobs['packages_composer_cache_cleanup_worker']['job_class'] = 'Packages::Composer::CacheCleanupWorker' Settings.cron_jobs['import_export_project_cleanup_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['import_export_project_cleanup_worker']['cron'] ||= '0 * * * *' Settings.cron_jobs['import_export_project_cleanup_worker']['job_class'] = 'ImportExportProjectCleanupWorker' @@ -535,6 +532,9 @@ Settings.cron_jobs['namespaces_prune_aggregation_schedules_worker']['job_class'] Settings.cron_jobs['container_expiration_policy_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['container_expiration_policy_worker']['cron'] ||= '50 * * * *' Settings.cron_jobs['container_expiration_policy_worker']['job_class'] = 'ContainerExpirationPolicyWorker' +Settings.cron_jobs['image_ttl_group_policy_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['image_ttl_group_policy_worker']['cron'] ||= '40 0 * * *' +Settings.cron_jobs['image_ttl_group_policy_worker']['job_class'] = 'DependencyProxy::ImageTtlGroupPolicyWorker' Settings.cron_jobs['x509_issuer_crl_check_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['x509_issuer_crl_check_worker']['cron'] ||= '30 1 * * *' Settings.cron_jobs['x509_issuer_crl_check_worker']['job_class'] = 'X509IssuerCrlCheckWorker' @@ -757,6 +757,7 @@ Settings.gitlab_kas['enabled'] ||= false Settings.gitlab_kas['secret_file'] ||= Rails.root.join('.gitlab_kas_secret') Settings.gitlab_kas['external_url'] ||= 'wss://kas.example.com' Settings.gitlab_kas['internal_url'] ||= 'grpc://localhost:8153' +# Settings.gitlab_kas['external_k8s_proxy_url'] ||= 'grpc://localhost:8154' # NOTE: Do not set a default until all distributions have been updated with a correct value # # Repositories diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index d2d546a5438..587d393fd77 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -48,7 +48,7 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled? Gitlab::Metrics.gauge(:deployments, 'GitLab Version', {}, :max).set({ version: Gitlab::VERSION, revision: Gitlab.revision }, 1) - unless Gitlab::Runtime.sidekiq? + if Gitlab::Runtime.web_server? Gitlab::Metrics::RequestsRackMiddleware.initialize_metrics end diff --git a/config/initializers/7_redis.rb b/config/initializers/7_redis.rb index 84aa231089b..50f0fb92317 100644 --- a/config/initializers/7_redis.rb +++ b/config/initializers/7_redis.rb @@ -1,5 +1,11 @@ # frozen_string_literal: true +# We set the instance variable directly to suppress warnings. +# We cannot switch to the new behavior until we change all existing `redis.exists` calls to `redis.exists?`. +# Some gems also need to be updated +# https://gitlab.com/gitlab-org/gitlab/-/issues/340602 +Redis.instance_variable_set(:@exists_returns_integer, false) + Redis::Client.prepend(Gitlab::Instrumentation::RedisInterceptor) # Make sure we initialize a Redis connection pool before multi-threaded @@ -11,3 +17,5 @@ Gitlab::Redis::Cache.with { nil } Gitlab::Redis::Queues.with { nil } Gitlab::Redis::SharedState.with { nil } Gitlab::Redis::TraceChunks.with { nil } +Gitlab::Redis::RateLimiting.with { nil } +Gitlab::Redis::Sessions.with { nil } diff --git a/config/initializers/action_cable.rb b/config/initializers/action_cable.rb index 16d29f5910f..a7ef5cc332c 100644 --- a/config/initializers/action_cable.rb +++ b/config/initializers/action_cable.rb @@ -19,4 +19,4 @@ ActionCable::SubscriptionAdapter::Redis.redis_connector = lambda do |config| end Gitlab::ActionCable::RequestStoreCallbacks.install -Gitlab::Database::LoadBalancing::ActionCableCallbacks.install if Gitlab::Database::LoadBalancing.enable? +Gitlab::Database::LoadBalancing::ActionCableCallbacks.install diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb index f3e01d23448..4fd41bd4c75 100644 --- a/config/initializers/backtrace_silencers.rb +++ b/config/initializers/backtrace_silencers.rb @@ -4,7 +4,7 @@ Rails.backtrace_cleaner.remove_silencers! # This allows us to see the proper caller of SQL calls in {development,test}.log if (Rails.env.development? || Rails.env.test?) && Gitlab.ee? - Rails.backtrace_cleaner.add_silencer { |line| %r(^ee/lib/gitlab/database/load_balancing).match?(line) } + Rails.backtrace_cleaner.add_silencer { |line| %r(^lib/gitlab/database/load_balancing).match?(line) } end Rails.backtrace_cleaner.add_silencer { |line| !Gitlab::APP_DIRS_PATTERN.match?(line) } diff --git a/config/initializers/batch_loader.rb b/config/initializers/batch_loader.rb index d88b43fbcea..e542a26cb81 100644 --- a/config/initializers/batch_loader.rb +++ b/config/initializers/batch_loader.rb @@ -1,3 +1,13 @@ # frozen_string_literal: true Rails.application.config.middleware.use(BatchLoader::Middleware) + +# Disables replace_methods by default. +# See https://github.com/exAspArk/batch-loader#replacing-methods for more information. +module BatchLoaderWithoutMethodReplacementByDefault + def batch(replace_methods: false, **kw_args, &batch_block) + super + end +end + +BatchLoader.prepend(BatchLoaderWithoutMethodReplacementByDefault) diff --git a/config/initializers/carrierwave_patch.rb b/config/initializers/carrierwave_patch.rb index c8c6f75949c..a9c74478541 100644 --- a/config/initializers/carrierwave_patch.rb +++ b/config/initializers/carrierwave_patch.rb @@ -49,14 +49,8 @@ module CarrierWave local_file = local_directory.files.new(key: path) expire_at = options[:expire_at] || ::Fog::Time.now + @uploader.fog_authenticated_url_expiration case @uploader.fog_credentials[:provider] - when 'AWS', 'Google' - # Older versions of fog-google do not support options as a parameter - if url_options_supported?(local_file) - local_file.url(expire_at, options) - else - warn "Options hash not supported in #{local_file.class}. You may need to upgrade your Fog provider." - local_file.url(expire_at) - end + when 'AWS', 'Google', 'AzureRM' + local_file.url(expire_at, options) when 'Rackspace' connection.get_object_https_url(@uploader.fog_directory, path, expire_at, options) when 'OpenStack' diff --git a/config/initializers/database_config.rb b/config/initializers/database_config.rb index e9f10abd0b9..7aedf9013ae 100644 --- a/config/initializers/database_config.rb +++ b/config/initializers/database_config.rb @@ -1,15 +1,5 @@ # frozen_string_literal: true -def log_pool_size(db, previous_pool_size, current_pool_size) - log_message = ["#{db} connection pool size: #{current_pool_size}"] - - if previous_pool_size && current_pool_size > previous_pool_size - log_message << "(increased from #{previous_pool_size} to match thread count)" - end - - Gitlab::AppLogger.debug(log_message.join(' ')) -end - Gitlab.ee do # We need to initialize the Geo database before # setting the Geo DB connection pool size. diff --git a/config/initializers/gettext_rails_i18n_patch.rb b/config/initializers/gettext_rails_i18n_patch.rb index c23049e93c9..3c994516b2d 100644 --- a/config/initializers/gettext_rails_i18n_patch.rb +++ b/config/initializers/gettext_rails_i18n_patch.rb @@ -1,30 +1,8 @@ # frozen_string_literal: true -require 'gettext_i18n_rails/haml_parser' require 'gettext_i18n_rails_js/parser/javascript' require 'json' -VUE_TRANSLATE_REGEX = /((%[\w.-]+)(?:\s))?{{ (N|n|s)?__\((.*)\) }}/.freeze - -module GettextI18nRails - class HamlParser - singleton_class.send(:alias_method, :old_convert_to_code, :convert_to_code) - - # We need to convert text in Mustache format - # to a format that can be parsed by Gettext scripts. - # If we found a content like "{{ __('Stage') }}" - # in a HAML file we convert it to "= _('Stage')", that way - # it can be processed by the "rake gettext:find" script. - # - # Overwrites: https://github.com/grosser/gettext_i18n_rails/blob/8396387a431e0f8ead72fc1cd425cad2fa4992f2/lib/gettext_i18n_rails/haml_parser.rb#L9 - def self.convert_to_code(text) - text.gsub!(VUE_TRANSLATE_REGEX, "\\2= \\3_(\\4)") - - old_convert_to_code(text) - end - end -end - module GettextI18nRailsJs module Parser module Javascript diff --git a/config/initializers/grape_validators.rb b/config/initializers/grape_validators.rb index 07dd70822a2..1492894e1fa 100644 --- a/config/initializers/grape_validators.rb +++ b/config/initializers/grape_validators.rb @@ -10,3 +10,4 @@ Grape::Validations.register_validator(:check_assignees_count, ::API::Validations Grape::Validations.register_validator(:untrusted_regexp, ::API::Validations::Validators::UntrustedRegexp) Grape::Validations.register_validator(:email_or_email_list, ::API::Validations::Validators::EmailOrEmailList) Grape::Validations.register_validator(:iteration_id, ::API::Validations::Validators::IntegerOrCustomValue) +Grape::Validations.register_validator(:project_portable, ::API::Validations::Validators::ProjectPortable) diff --git a/config/initializers/load_balancing.rb b/config/initializers/load_balancing.rb index 2b58ae0f642..a31b11bb2be 100644 --- a/config/initializers/load_balancing.rb +++ b/config/initializers/load_balancing.rb @@ -1,28 +1,33 @@ # frozen_string_literal: true -ActiveRecord::Base.singleton_class.attr_accessor :load_balancing_proxy +Gitlab::Application.configure do |config| + config.middleware.use(Gitlab::Database::LoadBalancing::RackMiddleware) +end -if Gitlab::Database::LoadBalancing.enable? - Gitlab::Database.main.disable_prepared_statements +Gitlab::Database::LoadBalancing.base_models.each do |model| + # The load balancer needs to be configured immediately, and re-configured + # after forking. This ensures queries that run before forking use the load + # balancer, and queries running after a fork don't run into any errors when + # using dead database connections. + # + # See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63485 for more + # information. + Gitlab::Database::LoadBalancing::Setup.new(model).setup - Gitlab::Application.configure do |config| - config.middleware.use(Gitlab::Database::LoadBalancing::RackMiddleware) + # Database queries may be run before we fork, so we must set up the load + # balancer as early as possible. When we do fork, we need to make sure all the + # hosts are disconnected. + Gitlab::Cluster::LifecycleEvents.on_before_fork do + # When forking, we don't want to wait until the connections aren't in use + # any more, as this could delay the boot cycle. + model.connection.load_balancer.disconnect!(timeout: 0) end - # This hijacks the "connection" method to ensure both - # `ActiveRecord::Base.connection` and all models use the same load - # balancing proxy. - ActiveRecord::Base.singleton_class.prepend(Gitlab::Database::LoadBalancing::ActiveRecordProxy) - - Gitlab::Database::LoadBalancing.configure_proxy - - # This needs to be executed after fork of clustered processes + # Service discovery only needs to run in the worker processes, as the main one + # won't be running many (if any) database queries. Gitlab::Cluster::LifecycleEvents.on_worker_start do - # For Host-based LB, we need to re-connect as Rails discards connections on fork - Gitlab::Database::LoadBalancing.configure_proxy - - # Service discovery must be started after configuring the proxy, as service - # discovery depends on this. - Gitlab::Database::LoadBalancing.start_service_discovery + Gitlab::Database::LoadBalancing::Setup + .new(model, start_service_discovery: true) + .setup end end diff --git a/config/initializers/mailer_retries.rb b/config/initializers/mailer_retries.rb index 64fb0ffaa55..5980513af92 100644 --- a/config/initializers/mailer_retries.rb +++ b/config/initializers/mailer_retries.rb @@ -1,41 +1,5 @@ # frozen_string_literal: true -class ActiveJob::QueueAdapters::SidekiqAdapter - # With Sidekiq 6, we can do something like: - # class ActionMailer::MailDeliveryJob - # sidekiq_options retry: 3 - # end - # - # See https://gitlab.com/gitlab-org/gitlab/-/issues/329430 - raise "Update this monkey patch: #{__FILE__}" unless Sidekiq::VERSION == '5.2.9' - - def enqueue(job) #:nodoc: - # Sidekiq::Client does not support symbols as keys - job.provider_job_id = Sidekiq::Client.push \ - "class" => JobWrapper, - "wrapped" => job.class.to_s, - "queue" => job.queue_name, - "args" => [job.serialize], - "retry" => retry_for(job) - end - - def enqueue_at(job, timestamp) #:nodoc: - job.provider_job_id = Sidekiq::Client.push \ - "class" => JobWrapper, - "wrapped" => job.class.to_s, - "queue" => job.queue_name, - "args" => [job.serialize], - "at" => timestamp, - "retry" => retry_for(job) - end - - private - - def retry_for(job) - if job.queue_name == 'mailers' - 3 - else - true - end - end +Rails.application.config.after_initialize do + ActionMailer::MailDeliveryJob.sidekiq_options retry: 3 end diff --git a/config/initializers/postgres_partitioning.rb b/config/initializers/postgres_partitioning.rb index f2e2fba1559..49f382547d6 100644 --- a/config/initializers/postgres_partitioning.rb +++ b/config/initializers/postgres_partitioning.rb @@ -2,8 +2,7 @@ Gitlab::Database::Partitioning.register_models([ AuditEvent, - WebHookLog, - LooseForeignKeys::DeletedRecord + WebHookLog ]) if Gitlab.ee? diff --git a/config/initializers/postgresql_cte.rb b/config/initializers/postgresql_cte.rb index 6a9af7b4868..7d00776e460 100644 --- a/config/initializers/postgresql_cte.rb +++ b/config/initializers/postgresql_cte.rb @@ -96,7 +96,7 @@ module ActiveRecord end end - def build_arel(aliases) + def build_arel(aliases = nil) arel = super build_with(arel) if @values[:with] diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 19c5e4df854..d33550b82d1 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -27,8 +27,14 @@ use_sidekiq_daemon_memory_killer = ENV.fetch("SIDEKIQ_DAEMON_MEMORY_KILLER", 1). use_sidekiq_legacy_memory_killer = !use_sidekiq_daemon_memory_killer Sidekiq.configure_server do |config| + config.options[:strict] = false + config.options[:queues] = Gitlab::SidekiqConfig.expand_queues(config.options[:queues]) + config.options[:scheduled_enq] = Gitlab::SidekiqEnq + + Sidekiq.logger.info "Listening on queues #{config.options[:queues].uniq.sort}" + if enable_json_logs - Sidekiq.logger.formatter = Gitlab::SidekiqLogging::JSONFormatter.new + config.log_formatter = Gitlab::SidekiqLogging::JSONFormatter.new config.options[:job_logger] = Gitlab::SidekiqLogging::StructuredLogger # Remove the default-provided handler. The exception is logged inside @@ -38,11 +44,11 @@ Sidekiq.configure_server do |config| config.redis = queues_config_hash - config.server_middleware(&Gitlab::SidekiqMiddleware.server_configurator({ + config.server_middleware(&Gitlab::SidekiqMiddleware.server_configurator( metrics: Settings.monitoring.sidekiq_exporter, arguments_logger: SidekiqLogArguments.enabled? && !enable_json_logs, memory_killer: enable_sidekiq_memory_killer && use_sidekiq_legacy_memory_killer - })) + )) config.client_middleware(&Gitlab::SidekiqMiddleware.client_configurator) diff --git a/config/initializers/zz_metrics.rb b/config/initializers/zz_metrics.rb index 25e4ec0d483..8e69e1634f1 100644 --- a/config/initializers/zz_metrics.rb +++ b/config/initializers/zz_metrics.rb @@ -3,128 +3,6 @@ # This file was prefixed with zz_ because we want to load it the last! # See: https://gitlab.com/gitlab-org/gitlab-foss/issues/55611 -# Autoload all classes that we want to instrument, and instrument the methods we -# need. This takes the Gitlab::Metrics::Instrumentation module as an argument so -# that we can stub it for testing, as it is only called when metrics are -# enabled. -# -# rubocop:disable Metrics/AbcSize -def instrument_classes(instrumentation) - return if ENV['STATIC_VERIFICATION'] - - instrumentation.instrument_instance_methods(Gitlab::Shell) - - instrumentation.instrument_methods(Gitlab::Git) - - Gitlab::Git.constants.each do |name| - const = Gitlab::Git.const_get(name, false) - - next unless const.is_a?(Module) - - instrumentation.instrument_methods(const) - instrumentation.instrument_instance_methods(const) - end - - # Path to search => prefix to strip from constant - paths_to_instrument = { - %w(app finders) => %w(app finders), - %w(app mailers emails) => %w(app mailers), - # Don't instrument `app/services/concerns` - # It contains modules that are included in the services. - # The services themselves are instrumented so the methods from the modules - # are included. - %w(app services [^concerns]**) => %w(app services), - %w(lib gitlab conflicts) => ['lib'], - %w(lib gitlab email message) => ['lib'], - %w(lib gitlab checks) => ['lib'] - } - - paths_to_instrument.each do |(path, prefix)| - prefix = Rails.root.join(*prefix) - - Dir[Rails.root.join(*path + ['*.rb'])].each do |file_path| - path = Pathname.new(file_path).relative_path_from(prefix) - const = path.to_s.sub('.rb', '').camelize.constantize - - instrumentation.instrument_methods(const) - instrumentation.instrument_instance_methods(const) - end - end - - instrumentation.instrument_methods(Premailer::Adapter::Nokogiri) - instrumentation.instrument_instance_methods(Premailer::Adapter::Nokogiri) - - instrumentation.instrument_methods(Banzai::Renderer) - instrumentation.instrument_methods(Banzai::Querying) - - instrumentation.instrument_instance_methods(Banzai::ObjectRenderer) - instrumentation.instrument_instance_methods(Banzai::ReferenceRedactor) - - [Issuable, Mentionable, Participable].each do |klass| - instrumentation.instrument_instance_methods(klass) - instrumentation.instrument_instance_methods(klass::ClassMethods) - end - - instrumentation.instrument_methods(Gitlab::ReferenceExtractor) - instrumentation.instrument_instance_methods(Gitlab::ReferenceExtractor) - - # Instrument the classes used for checking if somebody has push access. - instrumentation.instrument_instance_methods(Gitlab::GitAccess) - instrumentation.instrument_instance_methods(Gitlab::GitAccessWiki) - - instrumentation.instrument_instance_methods(API::Helpers) - - instrumentation.instrument_instance_methods(RepositoryCheck::SingleRepositoryWorker) - - instrumentation.instrument_instance_methods(Rouge::Formatters::HTMLGitlab) - - [:XML, :HTML].each do |namespace| - namespace_mod = Nokogiri.const_get(namespace, false) - - instrumentation.instrument_methods(namespace_mod) - instrumentation.instrument_methods(namespace_mod::Document) - end - - instrumentation.instrument_methods(Rinku) - instrumentation.instrument_instance_methods(Repository) - - instrumentation.instrument_methods(Gitlab::Highlight) - instrumentation.instrument_instance_methods(Gitlab::Highlight) - instrumentation.instrument_instance_method(Gitlab::Ci::Config::Yaml::Tags::Resolver, :to_hash) - - Gitlab.ee do - instrumentation.instrument_instance_methods(Elastic::Latest::GitInstanceProxy) - instrumentation.instrument_instance_methods(Elastic::Latest::GitClassProxy) - - instrumentation.instrument_instance_methods(Search::GlobalService) - instrumentation.instrument_instance_methods(Search::ProjectService) - - instrumentation.instrument_instance_methods(Gitlab::Elastic::SearchResults) - instrumentation.instrument_instance_methods(Gitlab::Elastic::ProjectSearchResults) - instrumentation.instrument_instance_methods(Gitlab::Elastic::Indexer) - instrumentation.instrument_instance_methods(Gitlab::Elastic::SnippetSearchResults) - instrumentation.instrument_instance_methods(Gitlab::Elastic::Helper) - - instrumentation.instrument_instance_methods(Elastic::ApplicationVersionedSearch) - instrumentation.instrument_instance_methods(Elastic::ProjectsSearch) - instrumentation.instrument_instance_methods(Elastic::RepositoriesSearch) - instrumentation.instrument_instance_methods(Elastic::SnippetsSearch) - instrumentation.instrument_instance_methods(Elastic::WikiRepositoriesSearch) - - instrumentation.instrument_instance_methods(Gitlab::BitbucketImport::Importer) - instrumentation.instrument_instance_methods(Bitbucket::Connection) - - instrumentation.instrument_instance_methods(Geo::RepositorySyncWorker) - end - - # This is a Rails scope so we have to instrument it manually. - instrumentation.instrument_method(Project, :visible_to_user) - - # Needed for https://gitlab.com/gitlab-org/gitlab-foss/issues/30224#note_32306159 - instrumentation.instrument_instance_method(MergeRequestDiff, :load_commits) -end -# rubocop:enable Metrics/AbcSize - # With prometheus enabled by default this breaks all specs # that stubs methods using `any_instance_of` for the models reloaded here. # @@ -151,12 +29,8 @@ if Gitlab::Metrics.enabled? && !Rails.env.test? && !(Rails.env.development? && d Gitlab::Application.configure do |config| # We want to track certain metrics during the Load Balancing host resolving process. # Because of that, we need to have metrics code available earlier for Load Balancing. - if Gitlab::Database::LoadBalancing.enable? - config.middleware.insert_before Gitlab::Database::LoadBalancing::RackMiddleware, - Gitlab::Metrics::RackMiddleware - else - config.middleware.use(Gitlab::Metrics::RackMiddleware) - end + config.middleware.insert_before Gitlab::Database::LoadBalancing::RackMiddleware, + Gitlab::Metrics::RackMiddleware config.middleware.use(Gitlab::Middleware::RailsQueueDuration) config.middleware.use(Gitlab::Metrics::ElasticsearchRackMiddleware) diff --git a/config/initializers_before_autoloader/002_sidekiq.rb b/config/initializers_before_autoloader/002_sidekiq.rb index 8e2def08279..9ffcf39d6fb 100644 --- a/config/initializers_before_autoloader/002_sidekiq.rb +++ b/config/initializers_before_autoloader/002_sidekiq.rb @@ -8,10 +8,6 @@ require 'sidekiq/web' -# Disable the Sidekiq Rack session since GitLab already has its own session store. -# CSRF protection still works (https://github.com/mperham/sidekiq/commit/315504e766c4fd88a29b7772169060afc4c40329). -Sidekiq::Web.set :sessions, false - if Rails.env.development? Sidekiq.default_worker_options[:backtrace] = true end diff --git a/config/initializers_before_autoloader/grape_entity_patch.rb b/config/initializers_before_autoloader/grape_entity_patch.rb deleted file mode 100644 index 2db5876e75f..00000000000 --- a/config/initializers_before_autoloader/grape_entity_patch.rb +++ /dev/null @@ -1,27 +0,0 @@ -# frozen_string_literal: true - -# This can be removed after the problem gets fixed on upstream. -# You can follow https://github.com/ruby-grape/grape-entity/pull/355 to see the progress. -# -# For more information about the issue; -# https://github.com/ruby/did_you_mean/issues/158#issuecomment-906056018 - -require 'grape-entity' - -module Grape - class Entity - # Upstream version: https://github.com/ruby-grape/grape-entity/blob/675d3c0e20dfc1d6cf6f5ba5b46741bd404c8be7/lib/grape_entity/entity.rb#L520 - def exec_with_object(options, &block) - if block.parameters.count == 1 - instance_exec(object, &block) - else - instance_exec(object, options, &block) - end - rescue StandardError => e - # it handles: https://github.com/ruby/ruby/blob/v3_0_0_preview1/NEWS.md#language-changes point 3, Proc - raise Grape::Entity::Deprecated.new e.message, 'in ruby 3.0' if e.is_a?(ArgumentError) - - raise e - end - end -end diff --git a/config/locales/en.yml b/config/locales/en.yml index 4615c9a7390..233dca33bb8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -10,6 +10,9 @@ en: target: Target issue group: path: Group URL + member: + user: "The member's email address" + invite_email: "The member's email address" project/error_tracking_setting: token: "Auth Token" project: "Project" diff --git a/config/mail_room.yml b/config/mail_room.yml index 25bda294a13..895438dcc4e 100644 --- a/config/mail_room.yml +++ b/config/mail_room.yml @@ -29,6 +29,7 @@ :delivery_method: sidekiq :delivery_options: :redis_url: <%= config[:redis_url].to_json %> + :redis_db: <%= config[:redis_db] %> :namespace: <%= Gitlab::Redis::Queues::SIDEKIQ_NAMESPACE %> :queue: <%= config[:queue] %> :worker: <%= config[:worker] %> diff --git a/config/metrics/counts_28d/20210216175055_merge_requests.yml b/config/metrics/counts_28d/20210216175055_merge_requests.yml index dca4f81eeea..06c46964954 100644 --- a/config/metrics/counts_28d/20210216175055_merge_requests.yml +++ b/config/metrics/counts_28d/20210216175055_merge_requests.yml @@ -1,7 +1,7 @@ --- data_category: optional key_path: usage_activity_by_stage_monthly.create.merge_requests -description: Count of the number of users creating merge requests +description: Count distinct authors of merge requests product_section: dev product_stage: create product_group: group::code review diff --git a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml index 04f0f124e8f..2b43fbf8131 100644 --- a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml +++ b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml @@ -1,7 +1,7 @@ --- data_category: optional key_path: usage_activity_by_stage_monthly.create.merge_requests_users -description: Monthly count of the number of merge request users +description: Distinct count of users performing merge request actions like closed, merged, created, commented product_section: dev product_stage: create product_group: group::code review diff --git a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml index a34c679e919..76627a91d0f 100644 --- a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml +++ b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: 28d data_source: database distribution: @@ -20,3 +20,4 @@ tier: name: 'count_distinct_user_id_from_clusters_applications_cert_managers' performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml index 2cc0e937d92..ced2b454844 100644 --- a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml +++ b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: 28d data_source: database distribution: @@ -20,3 +20,4 @@ tier: name: 'count_distinct_user_id_from_clusters_applications_helm' performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml index 2cdd680eaee..eee58397947 100644 --- a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml +++ b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: 28d data_source: database distribution: @@ -20,3 +20,4 @@ tier: name: 'count_distinct_user_id_from_clusters_applications_ingress' performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml index 23114b91d1f..f12fe191220 100644 --- a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml +++ b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: 28d data_source: database distribution: @@ -20,3 +20,4 @@ tier: name: 'count_distinct_user_id_from_clusters_applications_knative' performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml index b947a6ff7ea..895746f5121 100644 --- a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml +++ b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml @@ -7,7 +7,7 @@ product_stage: monitor product_group: group::monitor product_category: metrics value_type: number -status: active +status: removed time_frame: 28d data_source: database distribution: @@ -19,3 +19,4 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml index 22702146bc5..4d676e436b2 100644 --- a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml +++ b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml @@ -7,7 +7,7 @@ product_stage: verify product_group: group::runner product_category: runner value_type: number -status: active +status: removed time_frame: 28d data_source: database distribution: @@ -19,3 +19,4 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml b/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml new file mode 100644 index 00000000000..74f9406a133 --- /dev/null +++ b/config/metrics/counts_28d/20210715094458_releases_with_milestones.yml @@ -0,0 +1,23 @@ +--- +key_path: usage_activity_by_stage_monthly.release.releases_with_milestones +description: Unique users creating releases with milestones associated +performance_indicator_type: [smau] +product_section: ops +product_stage: release +product_group: 'group::release' +product_category: Release Orchestration +value_type: number +status: active +milestone: "14.4" +introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71287' +time_frame: 28d +data_source: database +instrumentation_class: 'CountUsersAssociatingMilestonesToReleasesMetric' +data_category: Optional +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_28d/20210916080405_promoted_issues.yml b/config/metrics/counts_28d/20210916080405_promoted_issues.yml index 106c3a61289..ec73682b1f3 100644 --- a/config/metrics/counts_28d/20210916080405_promoted_issues.yml +++ b/config/metrics/counts_28d/20210916080405_promoted_issues.yml @@ -7,7 +7,7 @@ product_stage: growth product_group: group::product intelligence product_category: collection value_type: number -status: active +status: deprecated milestone: "14.3" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70485 time_frame: 28d diff --git a/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml b/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml new file mode 100644 index 00000000000..6ecc98dcad1 --- /dev/null +++ b/config/metrics/counts_28d/20210916201533_clusters_integrations_prometheus.yml @@ -0,0 +1,21 @@ +--- +data_category: optional +key_path: usage_activity_by_stage_monthly.monitor.clusters_integrations_prometheus +description: Users creating clusters with Prometheus integration enabled in last 28 days. +product_section: ops +product_stage: monitor +product_group: group::monitor +product_category: metrics +value_type: number +status: active +time_frame: 28d +data_source: database +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +performance_indicator_type: [] +milestone: "14.4" diff --git a/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml b/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml new file mode 100644 index 00000000000..4fa6d3d8843 --- /dev/null +++ b/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_build_monthly +description: '' +product_section: '' +product_stage: '' +product_group: '' +product_category: '' +value_type: number +status: active +milestone: "14.4" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71157 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_implicit_jobs_build diff --git a/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml new file mode 100644 index 00000000000..9d19a6ffa72 --- /dev/null +++ b/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_deploy_latest_monthly +description: '' +product_section: '' +product_stage: '' +product_group: '' +product_category: '' +value_type: number +status: active +milestone: "14.4" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71157 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_implicit_jobs_deploy_latest diff --git a/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml b/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml new file mode 100644 index 00000000000..5b7b7924c4a --- /dev/null +++ b/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_deploy_monthly +description: '' +product_section: '' +product_stage: '' +product_group: '' +product_category: '' +value_type: number +status: active +milestone: "14.4" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71157 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_implicit_jobs_deploy 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 new file mode 100644 index 00000000000..2812aa73cad --- /dev/null +++ b/config/metrics/counts_28d/20210930125418_github_import_project_start_monthly.yml @@ -0,0 +1,26 @@ +--- +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_group: group::import +product_category: +value_type: number +status: active +milestone: "14.4" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70012 +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +options: + events: + - github_import_project_start +performance_indicator_type: [] +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate 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 new file mode 100644 index 00000000000..ab599c67376 --- /dev/null +++ b/config/metrics/counts_28d/20210930130531_github_import_project_success_monthly.yml @@ -0,0 +1,25 @@ +--- +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_group: group::import +product_category: +value_type: number +status: active +milestone: "14.4" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70012 +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +options: + events: + - github_import_project_success +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate 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 new file mode 100644 index 00000000000..6651a770920 --- /dev/null +++ b/config/metrics/counts_28d/20210930163813_github_import_project_failure_monthly.yml @@ -0,0 +1,25 @@ +--- +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_group: group::import +product_category: +value_type: number +status: active +milestone: "14.4" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70012 +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +options: + events: + - github_import_project_failure +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20210916100524_groups_gitlab_slack_application_active.yml b/config/metrics/counts_7d/20210916100524_groups_gitlab_slack_application_active.yml new file mode 100644 index 00000000000..9a23d73b136 --- /dev/null +++ b/config/metrics/counts_7d/20210916100524_groups_gitlab_slack_application_active.yml @@ -0,0 +1,23 @@ +--- +key_path: counts.groups_gitlab_slack_application_active +name: count_groups_gitlab_slack_application_active +description: Count groups with active slack application +product_section: dev +product_stage: ecosystem +product_group: group::integrations +product_category: integrations +value_type: number +status: active +milestone: "14.3" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70496 +time_frame: 7d +data_source: database +data_category: optional +performance_indicator_type: [] +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20210916101641_projects_gitlab_slack_application_active.yml b/config/metrics/counts_7d/20210916101641_projects_gitlab_slack_application_active.yml new file mode 100644 index 00000000000..2d1124a5971 --- /dev/null +++ b/config/metrics/counts_7d/20210916101641_projects_gitlab_slack_application_active.yml @@ -0,0 +1,23 @@ +--- +key_path: counts.projects_gitlab_slack_application_active +name: count_project_gitlab_slack_application_active +description: Count projects with active slack application +product_section: dev +product_stage: ecosystem +product_group: group::integrations +product_category: integrations +value_type: number +status: active +milestone: "14.3" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70496 +time_frame: 7d +data_source: database +data_category: optional +performance_indicator_type: [] +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20210916101837_instances_gitlab_slack_application_active.yml b/config/metrics/counts_7d/20210916101837_instances_gitlab_slack_application_active.yml new file mode 100644 index 00000000000..8a04e024eba --- /dev/null +++ b/config/metrics/counts_7d/20210916101837_instances_gitlab_slack_application_active.yml @@ -0,0 +1,23 @@ +--- +key_path: counts.instances_gitlab_slack_application_active +name: count_instances_gitlab_slack_application_active +description: Count instances with active slack application +product_section: dev +product_stage: ecosystem +product_group: group::integrations +product_category: integrations +value_type: number +status: active +milestone: "14.3" +introduced_by_url: https://gilab.com/gitlab-org/gitlab/-/merge_requests/70496 +time_frame: 7d +data_source: database +data_category: optional +performance_indicator_type: [] +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml b/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml new file mode 100644 index 00000000000..d465e1b3d03 --- /dev/null +++ b/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml @@ -0,0 +1,23 @@ +--- +key_path: counts.templates_gitlab_slack_application_active +name: count_templates_gitlab_slack_application_active +description: Count templates with active slack application +product_section: dev +product_stage: ecosystem +product_group: group::integrations +product_category: integrations +value_type: number +status: active +milestone: "14.3" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70496 +time_frame: 7d +data_source: database +data_category: optional +performance_indicator_type: [] +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20210917040700_groups_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_7d/20210917040700_groups_inheriting_gitlab_slack_application_active.yml new file mode 100644 index 00000000000..2a62c45c54a --- /dev/null +++ b/config/metrics/counts_7d/20210917040700_groups_inheriting_gitlab_slack_application_active.yml @@ -0,0 +1,23 @@ +--- +key_path: counts.groups_inheriting_gitlab_slack_application_active +name: count_groups_inheriting_gitlab_slack_application_active +description: Count groups inheriting active slack application +product_section: dev +product_stage: ecosystem +product_group: group::integrations +product_category: integrations +value_type: number +status: active +milestone: "14.3" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70496 +time_frame: 7d +data_source: database +data_category: optional +performance_indicator_type: [] +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20210917040956_projects_inheriting_gitlab_slack_application_active.yml b/config/metrics/counts_7d/20210917040956_projects_inheriting_gitlab_slack_application_active.yml new file mode 100644 index 00000000000..266670159b6 --- /dev/null +++ b/config/metrics/counts_7d/20210917040956_projects_inheriting_gitlab_slack_application_active.yml @@ -0,0 +1,23 @@ +--- +key_path: counts.projects_inheriting_gitlab_slack_application_active +name: count_project_inheriting_gitlab_slack_application_active +description: Count projects inheriting active slack application +product_section: dev +product_stage: ecosystem +product_group: group::integrations +product_category: integrations +value_type: number +status: active +milestone: "14.3" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70496 +time_frame: 7d +data_source: database +data_category: optional +performance_indicator_type: [] +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml b/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml new file mode 100644 index 00000000000..f13174a4af6 --- /dev/null +++ b/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_build_weekly +description: '' +product_section: '' +product_stage: '' +product_group: '' +product_category: '' +value_type: number +status: active +milestone: "14.4" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71157 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_implicit_jobs_build diff --git a/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml new file mode 100644 index 00000000000..f4d0ac7ff98 --- /dev/null +++ b/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_deploy_latest_weekly +description: '' +product_section: '' +product_stage: '' +product_group: '' +product_category: '' +value_type: number +status: active +milestone: "14.4" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71157 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_implicit_jobs_deploy_latest diff --git a/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml b/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml new file mode 100644 index 00000000000..964b57c65be --- /dev/null +++ b/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_deploy_weekly +description: '' +product_section: '' +product_stage: '' +product_group: '' +product_category: '' +value_type: number +status: active +milestone: "14.4" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71157 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_implicit_jobs_deploy 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 new file mode 100644 index 00000000000..2c5b7d46e1a --- /dev/null +++ b/config/metrics/counts_7d/20210930125411_github_import_project_start_weekly.yml @@ -0,0 +1,26 @@ +--- +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_group: group::import +product_category: +value_type: number +status: active +milestone: "14.4" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70012 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +options: + events: + - github_import_project_start +performance_indicator_type: [] +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate 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 new file mode 100644 index 00000000000..10147658ddc --- /dev/null +++ b/config/metrics/counts_7d/20210930130525_github_import_project_success_weekly.yml @@ -0,0 +1,26 @@ +--- +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_group: group::import +product_category: +value_type: number +status: active +milestone: "14.4" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70012 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +options: + events: + - github_import_project_success +performance_indicator_type: [] +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate 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 new file mode 100644 index 00000000000..33a1902504f --- /dev/null +++ b/config/metrics/counts_7d/20210930163807_github_import_project_failure_weekly.yml @@ -0,0 +1,25 @@ +--- +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_group: group::import +product_category: +value_type: number +status: active +milestone: "14.4" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70012 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +options: + events: + - github_import_project_failure +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml index 661d809ae65..e772f669513 100644 --- a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml +++ b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -19,3 +19,4 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml index 889e701a8d7..1e31c28f543 100644 --- a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml +++ b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -19,3 +19,4 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml index a22cf9dd848..bc16040f143 100644 --- a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml +++ b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -19,3 +19,4 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml index 1fc50c89bdc..2856a0e25ac 100644 --- a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml +++ b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -19,3 +19,4 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml index b883f9cdd1b..961c9adfdb7 100644 --- a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml +++ b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -19,3 +19,4 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml index 5f9c9a9c0d0..33f8d045d2b 100644 --- a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml +++ b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -19,3 +19,4 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml index 8b5f50c6c7f..e5a80ca6385 100644 --- a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml +++ b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -19,3 +19,4 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml index fafbf8a7d47..4d5dbcd198f 100644 --- a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml +++ b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -19,3 +19,4 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml index 89c8116f0d8..85d62985fa8 100644 --- a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml +++ b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -19,3 +19,4 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml index faf7f486d32..33a8a53a8ab 100644 --- a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml +++ b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -19,3 +19,4 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml index 185ab921fd6..f97816e18c1 100644 --- a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml +++ b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -18,3 +18,4 @@ tier: - premium - ultimate milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml index 4561338a3cb..28c58e11854 100644 --- a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml +++ b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -18,3 +18,4 @@ tier: - premium - ultimate milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml index 8336b6a4048..b93198b92a4 100644 --- a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml +++ b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -18,3 +18,4 @@ tier: - premium - ultimate milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml index c5979093a18..735f3ea8e04 100644 --- a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml +++ b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -18,3 +18,4 @@ tier: - premium - ultimate milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216175627_templates_asana_active.yml b/config/metrics/counts_all/20210216175627_templates_asana_active.yml index 48025516d32..3575f359f99 100644 --- a/config/metrics/counts_all/20210216175627_templates_asana_active.yml +++ b/config/metrics/counts_all/20210216175627_templates_asana_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml index 1ab0d42a5ee..d0f203e12c5 100644 --- a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml +++ b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml index 85b10732ae8..2e97c4bf1be 100644 --- a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml +++ b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml index bc5a1238010..6d26fbfb8dd 100644 --- a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml +++ b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml index 16287a4e71a..8218ae10cae 100644 --- a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml +++ b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml index 728d3d0af48..2e8b09e4997 100644 --- a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml +++ b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml index bb2d9976110..2287415e83c 100644 --- a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml +++ b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml index c1c63d0529a..343c4c887aa 100644 --- a/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml +++ b/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175756_templates_discord_active.yml b/config/metrics/counts_all/20210216175756_templates_discord_active.yml index d0663da787f..9f057665e3a 100644 --- a/config/metrics/counts_all/20210216175756_templates_discord_active.yml +++ b/config/metrics/counts_all/20210216175756_templates_discord_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml index 6a764f64ab6..edec715a037 100644 --- a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml +++ b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml index f709aff9f07..057e3b3056b 100644 --- a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml +++ b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml index 35bbce95380..31a270395fb 100644 --- a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml +++ b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml index dc1466d2bef..74d085a4447 100644 --- a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml +++ b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml index b676501db10..fb007335b2d 100644 --- a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml +++ b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175924_templates_irker_active.yml b/config/metrics/counts_all/20210216175924_templates_irker_active.yml index fc3ed89b6e8..c3491169a7e 100644 --- a/config/metrics/counts_all/20210216175924_templates_irker_active.yml +++ b/config/metrics/counts_all/20210216175924_templates_irker_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml index 542671304b0..96938d84aee 100644 --- a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml +++ b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175946_templates_jira_active.yml b/config/metrics/counts_all/20210216175946_templates_jira_active.yml index 83d3669b7f2..964aef061d2 100644 --- a/config/metrics/counts_all/20210216175946_templates_jira_active.yml +++ b/config/metrics/counts_all/20210216175946_templates_jira_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml index 460c5e808d8..9e472a1cb54 100644 --- a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml +++ b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml index 927710d918c..97a8dccd834 100644 --- a/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml +++ b/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml index fb35802c2b7..1fed89e7932 100644 --- a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml +++ b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml index aa56cf08028..75c4f0f2428 100644 --- a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml +++ b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml index 2d81cf582e9..74629749687 100644 --- a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml +++ b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml index 7c869361d05..abc6227f431 100644 --- a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml +++ b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml index 572b5da07d4..9580fe01068 100644 --- a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml +++ b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml index a85417cbc2c..47ba5ed946b 100644 --- a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml +++ b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180126_templates_slack_active.yml b/config/metrics/counts_all/20210216180126_templates_slack_active.yml index dffa673cd47..792c965216e 100644 --- a/config/metrics/counts_all/20210216180126_templates_slack_active.yml +++ b/config/metrics/counts_all/20210216180126_templates_slack_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml index e044d6cf1dd..38bc6959318 100644 --- a/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml +++ b/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml index b3a37ebc578..63e8285e220 100644 --- a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml +++ b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml index 39facfb237e..10c7b23a308 100644 --- a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml +++ b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml index 185b538a228..1e41a8170d4 100644 --- a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml +++ b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml index a6c11918ce2..edd5aa07f59 100644 --- a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml +++ b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml index 4bf8911c666..9f8a24488ad 100644 --- a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml +++ b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml @@ -7,7 +7,8 @@ product_stage: monitor product_group: group::monitor product_category: metrics value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml index a43dc103f9c..bf567337380 100644 --- a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml +++ b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml @@ -7,7 +7,7 @@ product_stage: monitor product_group: group::monitor product_category: metrics value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -18,3 +18,4 @@ tier: - premium - ultimate milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml index 96f16043e65..3c3fc600698 100644 --- a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml +++ b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -18,3 +18,4 @@ tier: - premium - ultimate milestone: "<13.9" +milestone_removed: "14.4" diff --git a/config/metrics/counts_all/20210216182112_sast_jobs.yml b/config/metrics/counts_all/20210216182112_sast_jobs.yml deleted file mode 100644 index 1012910675b..00000000000 --- a/config/metrics/counts_all/20210216182112_sast_jobs.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -data_category: operational -key_path: counts.sast_jobs -description: Count of SAST CI jobs for the month. Job names ending in '-sast' -product_section: sec -product_stage: secure -product_group: group::static analysis -product_category: static_application_security_testing -value_type: number -status: active -time_frame: all -data_source: database -distribution: -- ce -- ee -tier: -- free -- premium -- ultimate -performance_indicator_type: [] -milestone: "<13.9" diff --git a/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml b/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml deleted file mode 100644 index 8a3d1ef15f3..00000000000 --- a/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -data_category: operational -key_path: counts.secret_detection_jobs -description: Count of all 'secret-detection' CI jobs. -product_section: sec -product_stage: secure -product_group: group::static analysis -product_category: secret_detection -value_type: number -status: active -time_frame: all -data_source: database -distribution: -- ce -- ee -tier: -- free -- premium -- ultimate -performance_indicator_type: [] -milestone: "<13.9" diff --git a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml index d2df07b8d21..975bc2164bc 100644 --- a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml +++ b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml index 1ace369980b..be61177d818 100644 --- a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml +++ b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml @@ -7,7 +7,8 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed +milestone_removed: '14.4' time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml b/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml index e36411a81e5..c20a79a2f29 100644 --- a/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml +++ b/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml @@ -7,7 +7,8 @@ product_stage: package product_group: group::package product_category: container registry value_type: number -status: deprecated +status: removed +milestone_removed: "14.4" time_frame: all data_source: redis distribution: diff --git a/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml b/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml index c9c448b642e..ff3ab7b40cd 100644 --- a/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml +++ b/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml @@ -7,7 +7,8 @@ product_stage: package product_group: group::package product_category: container registry value_type: number -status: deprecated +status: removed +milestone_removed: "14.4" time_frame: all data_source: redis distribution: diff --git a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml index 9ca8e62f68a..2c9d9a391a0 100644 --- a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml +++ b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml @@ -7,7 +7,8 @@ product_stage: package product_group: group::package product_category: container registry value_type: number -status: deprecated +status: removed +milestone_removed: "14.4" time_frame: all data_source: redis distribution: diff --git a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml index 4fe173115ca..c6f23fe0c80 100644 --- a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml +++ b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml @@ -7,7 +7,8 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed +milestone_removed: "14.4" time_frame: all data_source: redis distribution: diff --git a/config/metrics/counts_all/20210715094459_releases_with_milestones.yml b/config/metrics/counts_all/20210715094459_releases_with_milestones.yml new file mode 100644 index 00000000000..5d853604580 --- /dev/null +++ b/config/metrics/counts_all/20210715094459_releases_with_milestones.yml @@ -0,0 +1,23 @@ +--- +key_path: usage_activity_by_stage.release.releases_with_milestones +description: Unique users creating releases with milestones associated +performance_indicator_type: [] +product_section: ops +product_stage: release +product_group: 'group::release' +product_category: Release Orchestration +value_type: number +status: active +milestone: "14.4" +introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71287' +time_frame: 28d +data_source: database +instrumentation_class: 'CountUsersAssociatingMilestonesToReleasesMetric' +data_category: Optional +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml b/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml new file mode 100644 index 00000000000..1a9fe349a90 --- /dev/null +++ b/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml @@ -0,0 +1,22 @@ +--- +data_category: optional +key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_60d +description: A count of projects with the cleanup policy set delete tags older than + 60 days +product_section: ops +product_stage: package +product_group: group::package +product_category: container registry +value_type: number +status: active +time_frame: all +data_source: database +distribution: +- ee +- ce +tier: +- free +- premium +- ultimate +performance_indicator_type: [] +milestone: "14.4" diff --git a/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml new file mode 100644 index 00000000000..2e17c5d261b --- /dev/null +++ b/config/metrics/counts_all/20210916200930_clusters_integrations_prometheus.yml @@ -0,0 +1,21 @@ +--- +data_category: optional +key_path: counts.clusters_integrations_prometheus +description: Total clusters with Clusters::Integrations::Prometheus enabled +product_section: ops +product_stage: configure +product_group: group::configure +product_category: kubernetes_management +value_type: number +status: active +time_frame: all +data_source: database +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +performance_indicator_type: [] +milestone: "14.4" diff --git a/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml new file mode 100644 index 00000000000..54437cfbf36 --- /dev/null +++ b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml @@ -0,0 +1,21 @@ +--- +data_category: optional +key_path: counts.clusters_integrations_elastic_stack +description: Total clusters with Clusters::Integrations::ElasticStack enabled +product_section: ops +product_stage: configure +product_group: group::configure +product_category: kubernetes_management +value_type: number +status: active +time_frame: all +data_source: database +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +performance_indicator_type: [] +milestone: "14.4" diff --git a/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml b/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml new file mode 100644 index 00000000000..d0baa4d0751 --- /dev/null +++ b/config/metrics/counts_all/20210916202342_clusters_integrations_prometheus.yml @@ -0,0 +1,21 @@ +--- +data_category: optional +key_path: usage_activity_by_stage.monitor.clusters_integrations_prometheus +description: Users creating clusters with Prometheus integration enabled in last 28 days. +product_section: ops +product_stage: monitor +product_group: group::monitor +product_category: metrics +value_type: number +status: active +time_frame: all +data_source: database +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +performance_indicator_type: [] +milestone: "14.4" diff --git a/config/metrics/license/20210204124829_active_user_count.yml b/config/metrics/license/20210204124829_active_user_count.yml index 871a75bd97b..c6e0895a918 100644 --- a/config/metrics/license/20210204124829_active_user_count.yml +++ b/config/metrics/license/20210204124829_active_user_count.yml @@ -10,6 +10,7 @@ status: active milestone: "<13.9" data_category: subscription time_frame: none +instrumentation_class: ActiveUserCountMetric data_source: database distribution: - ce diff --git a/config/redis.cache.yml.example b/config/redis.cache.yml.example deleted file mode 100644 index 44d9f7e8632..00000000000 --- a/config/redis.cache.yml.example +++ /dev/null @@ -1,38 +0,0 @@ -# If you change this file in a merge request, please also create -# a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests -# -development: - url: redis://localhost:6379/10 - # - # url: redis://localhost:6380 - # sentinels: - # - - # host: localhost - # port: 26380 # point to sentinel, not to redis port - # - - # host: replica2 - # port: 26380 # point to sentinel, not to redis port -test: - url: redis://localhost:6379/10 - # - # url: redis://localhost:6380 -production: - # Redis (single instance) - url: unix:/var/run/redis/redis.cache.sock - ## - # Redis + Sentinel (for HA) - # - # Please read instructions carefully before using it as you may lose data: - # http://redis.io/topics/sentinel - # - # You must specify a list of a few sentinels that will handle client connection - # please read here for more information: https://docs.gitlab.com/ee/administration/redis/index.html - ## - # url: redis://master:6380 - # sentinels: - # - - # host: replica1 - # port: 26380 # point to sentinel, not to redis port - # - - # host: replica2 - # port: 26380 # point to sentinel, not to redis port diff --git a/config/redis.queues.yml.example b/config/redis.queues.yml.example deleted file mode 100644 index 4194b44cb88..00000000000 --- a/config/redis.queues.yml.example +++ /dev/null @@ -1,38 +0,0 @@ -# If you change this file in a merge request, please also create -# a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests -# -development: - url: redis://localhost:6379/11 - # - # url: redis://localhost:6381 - # sentinels: - # - - # host: localhost - # port: 26381 # point to sentinel, not to redis port - # - - # host: replica2 - # port: 26381 # point to sentinel, not to redis port -test: - url: redis://localhost:6379/11 - # - # url: redis://localhost:6381 -production: - # Redis (single instance) - url: unix:/var/run/redis/redis.queues.sock - ## - # Redis + Sentinel (for HA) - # - # Please read instructions carefully before using it as you may lose data: - # http://redis.io/topics/sentinel - # - # You must specify a list of a few sentinels that will handle client connection - # please read here for more information: https://docs.gitlab.com/ee/administration/redis/index.html - ## - # url: redis://master:6381 - # sentinels: - # - - # host: replica1 - # port: 26381 # point to sentinel, not to redis port - # - - # host: replica2 - # port: 26381 # point to sentinel, not to redis port diff --git a/config/redis.shared_state.yml.example b/config/redis.shared_state.yml.example deleted file mode 100644 index b3e0c7a8fa9..00000000000 --- a/config/redis.shared_state.yml.example +++ /dev/null @@ -1,38 +0,0 @@ -# If you change this file in a merge request, please also create -# a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests -# -development: - url: redis://localhost:6379/12 - # - # url: redis://localhost:6382 - # sentinels: - # - - # host: localhost - # port: 26382 # point to sentinel, not to redis port - # - - # host: replica2 - # port: 26382 # point to sentinel, not to redis port -test: - url: redis://localhost:6379/12 - # - # url: redis://localhost:6382 -production: - # Redis (single instance) - url: unix:/var/run/redis/redis.shared_state.sock - ## - # Redis + Sentinel (for HA) - # - # Please read instructions carefully before using it as you may lose data: - # http://redis.io/topics/sentinel - # - # You must specify a list of a few sentinels that will handle client connection - # please read here for more information: https://docs.gitlab.com/ee/administration/redis/index.html - ## - # url: redis://master:6382 - # sentinels: - # - - # host: replica1 - # port: 26382 # point to sentinel, not to redis port - # - - # host: replica2 - # port: 26382 # point to sentinel, not to redis port diff --git a/config/redis.trace_chunks.yml.example b/config/redis.trace_chunks.yml.example deleted file mode 100644 index d38b9ba4966..00000000000 --- a/config/redis.trace_chunks.yml.example +++ /dev/null @@ -1,38 +0,0 @@ -# If you change this file in a merge request, please also create -# a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests -# -development: - url: redis://localhost:6379/13 - # - # url: redis://localhost:6382 - # sentinels: - # - - # host: localhost - # port: 26382 # point to sentinel, not to redis port - # - - # host: replica2 - # port: 26382 # point to sentinel, not to redis port -test: - url: redis://localhost:6379/13 - # - # url: redis://localhost:6382 -production: - # Redis (single instance) - url: unix:/var/run/redis/redis.trace_chunks.sock - ## - # Redis + Sentinel (for HA) - # - # Please read instructions carefully before using it as you may lose data: - # http://redis.io/topics/sentinel - # - # You must specify a list of a few sentinels that will handle client connection - # please read here for more information: https://docs.gitlab.com/ee/administration/redis/index.html - ## - # url: redis://master:6382 - # sentinels: - # - - # host: replica1 - # port: 26382 # point to sentinel, not to redis port - # - - # host: replica2 - # port: 26382 # point to sentinel, not to redis port diff --git a/config/routes.rb b/config/routes.rb index 8f4c3886e88..01e57a01359 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -161,8 +161,6 @@ Rails.application.routes.draw do end end - resource :projects - draw :operations draw :jira_connect diff --git a/config/routes/admin.rb b/config/routes/admin.rb index e3b365ad276..dac1937b76a 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -38,14 +38,6 @@ namespace :admin do resources :abuse_reports, only: [:index, :destroy] resources :gitaly_servers, only: [:index] - namespace :serverless do - resources :domains, only: [:index, :create, :update, :destroy] do - member do - post '/verify', to: 'domains#verify' - end - end - end - resources :spam_logs, only: [:index, :destroy] do member do post :mark_as_ham @@ -69,6 +61,13 @@ namespace :admin do end end + resources :topics, only: [:index, :new, :create, :edit, :update] do + resource :avatar, controller: 'topics/avatars', only: [:destroy] + collection do + post :preview_markdown + end + end + resources :deploy_keys, only: [:index, :new, :create, :edit, :update, :destroy] resources :hooks, only: [:index, :create, :edit, :update, :destroy] do diff --git a/config/routes/group.rb b/config/routes/group.rb index ef31b639d33..803249f8861 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -146,5 +146,7 @@ scope format: false do constraints image: Gitlab::PathRegex.container_image_regex, sha: Gitlab::PathRegex.container_image_blob_sha_regex do get 'v2/*group_id/dependency_proxy/containers/*image/manifests/*tag' => 'groups/dependency_proxy_for_containers#manifest' # rubocop:todo Cop/PutGroupRoutesUnderScope get 'v2/*group_id/dependency_proxy/containers/*image/blobs/:sha' => 'groups/dependency_proxy_for_containers#blob' # rubocop:todo Cop/PutGroupRoutesUnderScope + post 'v2/*group_id/dependency_proxy/containers/*image/blobs/:sha/upload/authorize' => 'groups/dependency_proxy_for_containers#authorize_upload_blob' # rubocop:todo Cop/PutGroupRoutesUnderScope + post 'v2/*group_id/dependency_proxy/containers/*image/blobs/:sha/upload' => 'groups/dependency_proxy_for_containers#upload_blob' # rubocop:todo Cop/PutGroupRoutesUnderScope end end diff --git a/config/routes/import.rb b/config/routes/import.rb index 64830ef1e52..9c76c4435ff 100644 --- a/config/routes/import.rb +++ b/config/routes/import.rb @@ -12,6 +12,10 @@ end namespace :import do resources :available_namespaces, only: [:index], controller: :available_namespaces + namespace :url do + post :validate + end + resource :github, only: [:create, :new], controller: :github do post :personal_access_token get :status @@ -66,6 +70,7 @@ namespace :import do post :configure get :status get :realtime_changes + get :history end resource :manifest, only: [:create, :new], controller: :manifest do diff --git a/config/routes/project.rb b/config/routes/project.rb index cbd2f5ac839..b1be9ad2ada 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -298,6 +298,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end + resources :cluster_agents, only: [:show], param: :name + concerns :clusterable namespace :serverless do @@ -311,6 +313,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resources :terraform, only: [:index] + resources :google_cloud, only: [:index] + resources :environments, except: [:destroy] do member do post :stop diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb index 71a868175a9..e2cdf8ba606 100644 --- a/config/routes/uploads.rb +++ b/config/routes/uploads.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true scope path: :uploads do - # Note attachments and User/Group/Project avatars + # Note attachments and User/Group/Project/Topic avatars get "-/system/:model/:mounted_as/:id/:filename", to: "uploads#show", - constraints: { model: /note|user|group|project/, mounted_as: /avatar|attachment/, filename: %r{[^/]+} } + constraints: { model: %r{note|user|group|project|projects\/topic}, mounted_as: /avatar|attachment/, filename: %r{[^/]+} } # show uploads for models, snippets (notes) available for now get '-/system/:model/:id/:secret/:filename', diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index d7c6e6031aa..56183d167be 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -29,6 +29,8 @@ - 1 - - analytics_code_review_metrics - 1 +- - analytics_cycle_analytics_group_data_loader + - 1 - - analytics_devops_adoption_create_snapshot - 1 - - analytics_usage_trends_counter_job @@ -91,6 +93,10 @@ - 1 - - dependency_proxy - 1 +- - dependency_proxy_blob + - 1 +- - dependency_proxy_manifest + - 1 - - deployment - 3 - - design_management_copy_design_collection @@ -273,8 +279,6 @@ - 1 - - pages_domain_verification - 1 -- - pages_remove - - 1 - - pages_transfer - 1 - - pages_update_configuration diff --git a/config/webpack.config.js b/config/webpack.config.js index adb11548a88..e1a48ee2b41 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -342,6 +342,14 @@ module.exports = { esModule: false, }, }, + { + test: /editor\/schema\/.+\.json$/, + type: 'javascript/auto', + loader: 'file-loader', + options: { + name: '[name].[contenthash:8].[ext]', + }, + }, ], }, |