Skip to content
Snippets Groups Projects
Commit 56a6304f44a7 authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch 'cb-remove-grafana-deprecation-again' into 'master'

Remove Grafana deprecation message

Closes #8601

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7750



Merged-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: default avatarClemens Beck <cbeck@gitlab.com>
No related branches found
No related tags found
1 merge request!147Upstream merge up to the 17.2 branching point
......@@ -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
......
......@@ -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
......
......@@ -148,8 +148,10 @@
one
two
Update the configuration in your gitlab.rb file or GITLAB_OMNIBUS_CONFIG environment.
Deprecations:
three
four
......@@ -151,8 +153,10 @@
Deprecations:
three
four
Update the configuration in your gitlab.rb file or GITLAB_OMNIBUS_CONFIG environment.
Warnings:
five
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment