Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap b/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
index bd2e818df4f..28039321428 100644
--- a/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
+++ b/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
@@ -5,7 +5,7 @@ exports[`Dashboard template matches the default snapshot 1`] = `
   class="prometheus-graphs"
   data-qa-selector="prometheus_graphs"
   environmentstate="available"
-  metricsdashboardbasepath="/monitoring/monitor-project/-/environments/1/metrics"
+  metricsdashboardbasepath="/monitoring/monitor-project/-/metrics?environment=1"
   metricsendpoint="/monitoring/monitor-project/-/environments/1/additional_metrics.json"
 >
   <div>
@@ -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