Add RC2 changes to 9-3-stable

Adds the changes from b1bf6d88 to 9-3-stable

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/33536

spec/support/prometheus_helpers.rb

@@ -88,10 +88,8 @@ module PrometheusHelpers
       metrics: {
         memory_values: prometheus_values_body('matrix').dig(:data, :result),
         memory_current: prometheus_value_body('vector').dig(:data, :result),
-        memory_previous: prometheus_value_body('vector').dig(:data, :result),
         cpu_values: prometheus_values_body('matrix').dig(:data, :result),
-        cpu_current: prometheus_value_body('vector').dig(:data, :result),
-        cpu_previous: prometheus_value_body('vector').dig(:data, :result)
+        cpu_current: prometheus_value_body('vector').dig(:data, :result)
       },
       last_update: last_update
     }