Commit f5c88c1e authored by Sean Arnold's avatar Sean Arnold

Update monitor deprecation notices

Changelog: changed
parent 8fafec15
...@@ -163,7 +163,7 @@ export default { ...@@ -163,7 +163,7 @@ export default {
<gl-sprintf <gl-sprintf
:message=" :message="
s__( s__(
'Deprecations|The metrics, logs and tracing features were deprecated in GitLab 14.7 and are %{epicStart} scheduled for removal %{epicEnd} in GitLab 15.0.', 'Deprecations|The logs and tracing features were deprecated in GitLab 14.7 and are %{epicStart} scheduled for removal %{epicEnd} in GitLab 15.0.',
) )
" "
> >
......
...@@ -409,17 +409,13 @@ export default { ...@@ -409,17 +409,13 @@ export default {
<div> <div>
<gl-alert <gl-alert
v-if="!isDeprecationNoticeDismissed" v-if="!isDeprecationNoticeDismissed"
:title="__('Feature deprecation and removal')" :title="__('Feature deprecation')"
class="mb-3" class="mb-3"
variant="danger" variant="warning"
@dismiss="isDeprecationNoticeDismissed = true" @dismiss="isDeprecationNoticeDismissed = true"
> >
<gl-sprintf <gl-sprintf
:message=" :message="s__('Deprecations|The metrics feature was deprecated in GitLab 14.7.')"
s__(
'Deprecations|The metrics, logs and tracing features were deprecated in GitLab 14.7 and are %{epicStart} scheduled for removal %{epicEnd} in GitLab 15.0.',
)
"
> >
<template #epic="{ content }"> <template #epic="{ content }">
<gl-link href="https://gitlab.com/groups/gitlab-org/-/epics/7188" target="_blank">{{ <gl-link href="https://gitlab.com/groups/gitlab-org/-/epics/7188" target="_blank">{{
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
= s_('Deprecations|Feature deprecation and removal') = s_('Deprecations|Feature deprecation and removal')
.gl-alert-body .gl-alert-body
%p %p
= html_escape(s_('Deprecations|The metrics, logs and tracing features were deprecated in GitLab 14.7, and are %{removal_link_start} scheduled for removal %{link_end} in GitLab 15.0. For information on a possible replacement, %{opstrace_link_start} learn more about Opstrace %{link_end}.')) % {removal_link_start: removal_epic_link_start, opstrace_link_start: opstrace_link_start, link_end: link_end } = html_escape(s_('Deprecations|The metrics feature was deprecated in GitLab 14.7. The logs and tracing features were also deprecated in GitLab 14.7, and are %{removal_link_start} scheduled for removal %{link_end} in GitLab 15.0. For information on a possible replacement, %{opstrace_link_start} learn more about Opstrace %{link_end}.')) % {removal_link_start: removal_epic_link_start, opstrace_link_start: opstrace_link_start, link_end: link_end }
= render 'projects/settings/operations/metrics_dashboard' = render 'projects/settings/operations/metrics_dashboard'
= render 'projects/settings/operations/tracing' = render 'projects/settings/operations/tracing'
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
= s_('Deprecations|Feature deprecation and removal') = s_('Deprecations|Feature deprecation and removal')
.gl-alert-body .gl-alert-body
%p %p
= html_escape(s_('Deprecations|The metrics, logs and tracing features were deprecated in GitLab 14.7, and are %{removal_link_start} scheduled for removal %{link_end} in GitLab 15.0. For information on a possible replacement, %{opstrace_link_start} learn more about Opstrace %{link_end}.')) % {removal_link_start: removal_epic_link_start, opstrace_link_start: opstrace_link_start, link_end: link_end } = html_escape(s_('Deprecations|The logs and tracing features were deprecated in GitLab 14.7, and are %{removal_link_start} scheduled for removal %{link_end} in GitLab 15.0. For information on a possible replacement, %{opstrace_link_start} learn more about Opstrace %{link_end}.')) % {removal_link_start: removal_epic_link_start, opstrace_link_start: opstrace_link_start, link_end: link_end }
- if @project.tracing_external_url.present? - if @project.tracing_external_url.present?
%h3.page-title= _('Tracing') %h3.page-title= _('Tracing')
......
...@@ -12654,10 +12654,16 @@ msgstr "" ...@@ -12654,10 +12654,16 @@ msgstr ""
msgid "Deprecations|For information on a possible replacement %{epicStart} learn more about Opstrace %{epicEnd}." msgid "Deprecations|For information on a possible replacement %{epicStart} learn more about Opstrace %{epicEnd}."
msgstr "" msgstr ""
msgid "Deprecations|The metrics, logs and tracing features were deprecated in GitLab 14.7 and are %{epicStart} scheduled for removal %{epicEnd} in GitLab 15.0." msgid "Deprecations|The logs and tracing features were deprecated in GitLab 14.7 and are %{epicStart} scheduled for removal %{epicEnd} in GitLab 15.0."
msgstr "" msgstr ""
msgid "Deprecations|The metrics, logs and tracing features were deprecated in GitLab 14.7, and are %{removal_link_start} scheduled for removal %{link_end} in GitLab 15.0. For information on a possible replacement, %{opstrace_link_start} learn more about Opstrace %{link_end}." msgid "Deprecations|The logs and tracing features were deprecated in GitLab 14.7, and are %{removal_link_start} scheduled for removal %{link_end} in GitLab 15.0. For information on a possible replacement, %{opstrace_link_start} learn more about Opstrace %{link_end}."
msgstr ""
msgid "Deprecations|The metrics feature was deprecated in GitLab 14.7."
msgstr ""
msgid "Deprecations|The metrics feature was deprecated in GitLab 14.7. The logs and tracing features were also deprecated in GitLab 14.7, and are %{removal_link_start} scheduled for removal %{link_end} in GitLab 15.0. For information on a possible replacement, %{opstrace_link_start} learn more about Opstrace %{link_end}."
msgstr "" msgstr ""
msgid "Deprioritize label" msgid "Deprioritize label"
...@@ -15646,7 +15652,7 @@ msgstr "" ...@@ -15646,7 +15652,7 @@ msgstr ""
msgid "Feature Flags" msgid "Feature Flags"
msgstr "" msgstr ""
msgid "Feature deprecation and removal" msgid "Feature deprecation"
msgstr "" msgstr ""
msgid "Feature flag status" msgid "Feature flag status"
......
...@@ -17,11 +17,11 @@ exports[`Dashboard template matches the default snapshot 1`] = ` ...@@ -17,11 +17,11 @@ exports[`Dashboard template matches the default snapshot 1`] = `
primarybuttontext="" primarybuttontext=""
secondarybuttonlink="" secondarybuttonlink=""
secondarybuttontext="" secondarybuttontext=""
title="Feature deprecation and removal" title="Feature deprecation"
variant="danger" variant="warning"
> >
<gl-sprintf-stub <gl-sprintf-stub
message="The metrics, logs and tracing features were deprecated in GitLab 14.7 and are %{epicStart} scheduled for removal %{epicEnd} in GitLab 15.0." message="The metrics feature was deprecated in GitLab 14.7."
/> />
<gl-sprintf-stub <gl-sprintf-stub
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment