# HG changeset patch
# User Clemens Beck <cbeck@gitlab.com>
# Date 1721022827 0
#      Mon Jul 15 05:53:47 2024 +0000
# Node ID 0616626576fa378123277792f95042b08e9754ad
# Parent  3fbea41436e716c303569d80107fcaa3fa183cbb
Remove Grafana deprecation message

Remove the Grafana deprecation message which was accidentally re-added
in https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7550.

Relates https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8601

Relates https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8200

diff --git a/files/gitlab-cookbooks/package/libraries/deprecations.rb b/files/gitlab-cookbooks/package/libraries/deprecations.rb
--- a/files/gitlab-cookbooks/package/libraries/deprecations.rb
+++ b/files/gitlab-cookbooks/package/libraries/deprecations.rb
@@ -606,12 +606,6 @@
         messages += deprecate_only_if_value(incoming_version, existing_config, type, ['praefect'], 'failover_election_strategy', 'sql', '13.12', '14.0', note: praefect_note, ignore_deprecation: true)
         messages += deprecate_only_if_value(incoming_version, existing_config, type, ['praefect'], 'failover_election_strategy', 'local', '13.12', '14.0', note: praefect_note, ignore_deprecation: true)
 
-        grafana_note = <<~EOS
-          The bundled Grafana is deprecated and no longer available. We recommond following
-          https://docs.gitlab.com/ee/administration/monitoring/performance/grafana_configuration.html#deprecation.
-        EOS
-        messages += deprecate_only_if_value(incoming_version, existing_config, type, ['monitoring', 'grafana'], 'enable', true, '16.0', '16.3', note: grafana_note)
-
         messages += deprecate_registry_notifications(incoming_version, existing_config, type, ['registry', 'notifications'], 'threshold', 17.1, 18.0)
 
         messages
diff --git a/files/gitlab-cookbooks/package/libraries/helpers/logging_helper.rb b/files/gitlab-cookbooks/package/libraries/helpers/logging_helper.rb
--- a/files/gitlab-cookbooks/package/libraries/helpers/logging_helper.rb
+++ b/files/gitlab-cookbooks/package/libraries/helpers/logging_helper.rb
@@ -86,6 +86,11 @@
     new_messages = generated.map { |m| m[:message] }
     puts new_messages.join("\n")
     puts
+
+    return unless [:removal, :deprecation].include?(type)
+
+    puts "Update the configuration in your gitlab.rb file or GITLAB_OMNIBUS_CONFIG environment."
+    puts
   end
 
   # Report on any messages generated during reconfigure
diff --git a/spec/chef/cookbooks/package/libraries/helpers/logging_helper_spec.rb b/spec/chef/cookbooks/package/libraries/helpers/logging_helper_spec.rb
--- a/spec/chef/cookbooks/package/libraries/helpers/logging_helper_spec.rb
+++ b/spec/chef/cookbooks/package/libraries/helpers/logging_helper_spec.rb
@@ -148,11 +148,15 @@
         one
         two
 
+        Update the configuration in your gitlab.rb file or GITLAB_OMNIBUS_CONFIG environment.
+
 
         Deprecations:
         three
         four
 
+        Update the configuration in your gitlab.rb file or GITLAB_OMNIBUS_CONFIG environment.
+
 
         Warnings:
         five