Add latest changes from gitlab-org/gitlab@master

1 files changed, 24 insertions, 0 deletions

diff --git a/data/removals/15_0/15-0-sidekiq-metrics-health-check-config.yml b/data/removals/15_0/15-0-sidekiq-metrics-health-check-config.yml
new file mode 100644
index 00000000000..cfd0d5f5b13
--- /dev/null
+++ b/data/removals/15_0/15-0-sidekiq-metrics-health-check-config.yml
@@ -0,0 +1,24 @@
+- name: "Sidekiq configuration for metrics and health checks"
+  announcement_milestone: "14.7"
+  announcement_date: "2021-01-22"
+  removal_milestone: "15.0"
+  removal_date: "2022-05-22"
+  breaking_change: true
+  body: |  # Do not modify this line, instead modify the lines below.
+    In GitLab 15.0, you can no longer serve Sidekiq metrics and health checks over a single address and port.
+
+    To improve stability, availability, and prevent data loss in edge cases, GitLab now serves
+    [Sidekiq metrics and health checks from two separate servers](https://gitlab.com/groups/gitlab-org/-/epics/6409).
+
+    When you use Omnibus or Helm charts, if GitLab is configured for both servers to bind to the same address,
+    a configuration error occurs.
+    To prevent this error, choose different ports for the metrics and health check servers:
+
+    - [Configure Sidekiq health checks](https://docs.gitlab.com/ee/administration/sidekiq.html#configure-health-checks)
+    - [Configure the Sidekiq metrics server](https://docs.gitlab.com/ee/administration/sidekiq.html#configure-the-sidekiq-metrics-server)
+
+    If you installed GitLab from source, verify manually that both servers are configured to bind to separate addresses and ports.
+  stage: Enablement
+  tiers: [Free, Premium, Ultimate]
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347509
+  documentation_url: https://docs.gitlab.com/ee/administration/sidekiq.html