diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-30 12:09:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-30 12:09:53 +0300 |
| commit | 915a5b6e89195aab5d7eb0deb16e4825cfce509e (patch) | |
| tree | e54f4a19516ac2418a7830340194b26bcafcbae2 /lib | |
| parent | c2bfdff5d32c238ccc90b1c688b0a14479b3737e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/database/gitlab_loose_foreign_keys.yml | 11 | ||||
| -rw-r--r-- | lib/gitlab/usage_data.rb | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/lib/gitlab/database/gitlab_loose_foreign_keys.yml b/lib/gitlab/database/gitlab_loose_foreign_keys.yml index 27b8f3bbe0f..dbea7c9f690 100644 --- a/lib/gitlab/database/gitlab_loose_foreign_keys.yml +++ b/lib/gitlab/database/gitlab_loose_foreign_keys.yml @@ -2,6 +2,17 @@ chat_names: - to_table: ci_pipeline_chat_data column: chat_name_id on_delete: async_delete +ci_builds: + - to_table: dast_site_profiles_builds + column: ci_build_id + on_delete: async_delete + - to_table: dast_scanner_profiles_builds + column: ci_build_id + on_delete: async_delete +ci_pipelines: + - to_table: dast_profiles_pipelines + column: ci_pipeline_id + on_delete: async_delete ci_runners: - to_table: clusters_applications_runners column: runner_id diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 61d0f5735ee..341275fc15e 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -10,6 +10,12 @@ # alt_usage_data { Gitlab::VERSION } # redis_usage_data(Gitlab::UsageDataCounters::WikiPageCounter) # redis_usage_data { ::Gitlab::UsageCounters::PodLogs.usage_totals[:total] } + +# NOTE: +# Implementing metrics direct in `usage_data.rb` is deprecated, +# please add new instrumentation class and use add_metric method. +# For more information, see https://docs.gitlab.com/ee/development/service_ping/metrics_instrumentation.html + module Gitlab class UsageData DEPRECATED_VALUE = -1000 |