Merge branch '356728-update-deprecation-text' into 'master'

Update monitor deprecation notices

See merge request gitlab-org/gitlab!85065

app/assets/javascripts/logs/components/environment_logs.vue

@@ -163,7 +163,7 @@ export default {
       <gl-sprintf
         :message="
           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.',
           )
         "
       >

app/assets/javascripts/monitoring/components/dashboard.vue

@@ -409,17 +409,13 @@ export default {
     <div>
       <gl-alert
         v-if="!isDeprecationNoticeDismissed"
-        :title="__('Feature deprecation and removal')"
+        :title="__('Feature deprecation')"
         class="mb-3"
-        variant="danger"
+        variant="warning"
         @dismiss="isDeprecationNoticeDismissed = true"
       >
         <gl-sprintf
-          :message="
-            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.',
-            )
-          "
+          :message="s__('Deprecations|The metrics feature was deprecated in GitLab 14.7.')"
         >
           <template #epic="{ content }">
             <gl-link href="https://gitlab.com/groups/gitlab-org/-/epics/7188" target="_blank">{{

app/views/projects/settings/operations/show.html.haml

@@ -15,7 +15,7 @@
         = s_('Deprecations|Feature deprecation and removal')
       .gl-alert-body
         %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/tracing'

app/views/projects/tracings/show.html.haml

@@ -14,7 +14,7 @@
         = s_('Deprecations|Feature deprecation and removal')
       .gl-alert-body
         %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?
   %h3.page-title= _('Tracing')

locale/gitlab.pot

@@ -12654,10 +12654,16 @@ msgstr ""
 msgid "Deprecations|For information on a possible replacement %{epicStart} learn more about Opstrace %{epicEnd}."
 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 ""
 
-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 ""
 
 msgid "Deprioritize label"
@@ -15646,7 +15652,7 @@ msgstr ""
 msgid "Feature Flags"
 msgstr ""
 
-msgid "Feature deprecation and removal"
+msgid "Feature deprecation"
 msgstr ""
 
 msgid "Feature flag status"

spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap

@@ -17,11 +17,11 @@ exports[`Dashboard template matches the default snapshot 1`] = `
       primarybuttontext=""
       secondarybuttonlink=""
       secondarybuttontext=""
-      title="Feature deprecation and removal"
-      variant="danger"
+      title="Feature deprecation"
+      variant="warning"
     >
       <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