Add latest changes from gitlab-org/gitlab@master

2 files changed, 27 insertions, 1 deletions

diff --git a/data/deprecations/14-8-gitaly-deprecate-legacy-config-options.yml b/data/deprecations/14-8-gitaly-deprecate-legacy-config-options.yml
index 68ef00e5cd9..ea28b60796d 100644
--- a/data/deprecations/14-8-gitaly-deprecate-legacy-config-options.yml
+++ b/data/deprecations/14-8-gitaly-deprecate-legacy-config-options.yml
@@ -1,6 +1,6 @@
 - title: "Deprecate legacy Gitaly configuration methods"  # The name of the feature to be deprecated
   announcement_milestone: "14.8"  # The milestone when this feature was first announced as deprecated.
-  removal_milestone: "15.0"  # The milestone when this feature is planned to be removed
+  removal_milestone: "16.0"  # The milestone when this feature is planned to be removed
   breaking_change: true  # If this deprecation is a breaking change, set this value to true
   reporter: mjwood  # GitLab username of the person reporting the deprecation
   body: |  # Do not modify this line, instead modify the lines below.
diff --git a/data/deprecations/15-9-praefect-metrics-config-variable.yml b/data/deprecations/15-9-praefect-metrics-config-variable.yml
new file mode 100644
index 00000000000..d5a4a9c69fc
--- /dev/null
+++ b/data/deprecations/15-9-praefect-metrics-config-variable.yml
@@ -0,0 +1,26 @@
+# REQUIRED FIELDS
+#
+- title: "Support for Praefect custom metrics endpoint configuration"
+  announcement_milestone: "15.9"  # (required) The milestone when this feature was first announced as deprecated.
+  removal_milestone: "16.0"  # (required) The milestone when this feature is planned to be removed
+  breaking_change: true  # (required) Change to false if this is not a breaking change.
+  reporter: mjwood  # (required) GitLab username of the person reporting the change
+  stage: Gitaly  # (required) String value of the stage that the feature was created in. e.g., Growth
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390266  # (required) Link to the deprecation issue in GitLab
+  body: |  # (required) Do not modify this line, instead modify the lines below.
+    Support for using the `prometheus_exclude_database_from_default_metrics` configuration value is deprecated because using it is non-performant. Instead, all metrics
+    that scrape the Praefect database will be exported to the `/db_metrics` endpoint. This may require updating your metrics collection targets.
+#
+# OPTIONAL END OF SUPPORT FIELDS
+#
+# If an End of Support period applies, the announcement should be shared with GitLab Support
+# in the `#spt_managers` channel in Slack, and mention `@gitlab-com/support` in this MR.
+#
+  end_of_support_milestone:  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
+  #
+  # OTHER OPTIONAL FIELDS
+  #
+  tiers:  # (optional - may be required in the future) An array of tiers that the feature is available in currently.  e.g., [Free, Silver, Gold, Core, Premium, Ultimate]
+  documentation_url:  # (optional) This is a link to the current documentation page
+  image_url:  # (optional) This is a link to a thumbnail image depicting the feature
+  video_url:  # (optional) Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg