From 8dc1e72e2b5cb6112d5468194580edb186de4659 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 13 May 2020 00:07:50 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../clusters/components/applications.vue      |   2 +-
 .../static_site_editor/router/routes.js       |   4 +
 .../clusters/applications/elastic_stack.rb    |  63 ++++----
 app/models/plan_limits.rb                     |   2 +-
 .../pod_logs/elasticsearch_service.rb         |   4 +-
 .../proxy_variable_substitution_service.rb    |  27 +---
 .../unreleased/215563-remove-ruby-syntax.yml  |   6 +
 .../unreleased/ak-official-helm-chart.yml     |   5 +
 .../feat-add-expunge-option-mailroom.yml      |   5 +
 config/gitlab.yml.example                     |   3 +
 config/mail_room.yml                          |   1 +
 doc/administration/incoming_email.md          |  12 ++
 doc/api/scim.md                               |   3 +
 doc/development/emails.md                     |   3 +
 doc/user/clusters/applications.md             |  24 +--
 doc/user/project/integrations/prometheus.md   |   7 +-
 doc/user/project/service_desk.md              |   1 +
 .../ci/templates/Deploy-ECS.gitlab-ci.yml     |  28 +---
 .../templates/Jobs/Deploy/ECS.gitlab-ci.yml   |  26 ++++
 lib/gitlab/diff/formatters/text_formatter.rb  |   3 +-
 lib/gitlab/elasticsearch/logs/lines.rb        |   8 +-
 lib/gitlab/kubernetes/helm/delete_command.rb  |   2 -
 lib/gitlab/kubernetes/helm/install_command.rb |   4 +-
 lib/gitlab/mail_room.rb                       |   3 +-
 locale/gitlab.pot                             |   6 -
 spec/config/mail_room_spec.rb                 |   3 +-
 .../prometheus_api_controller_spec.rb         |   2 +-
 .../static_site_editor_controller_spec.rb     |  15 +-
 spec/features/static_site_editor_spec.rb      |   4 +-
 spec/fixtures/config/mail_room_enabled.yml    |   2 +
 .../diff/formatters/text_formatter_spec.rb    |  18 +++
 .../gitlab/elasticsearch/logs/lines_spec.rb   |   2 +-
 .../kubernetes/helm/delete_command_spec.rb    |   6 +
 spec/lib/gitlab/mail_room/mail_room_spec.rb   |   3 +-
 .../applications/elastic_stack_spec.rb        |  59 +++++++-
 spec/models/plan_limits_spec.rb               |  74 +++++++++
 .../graphql/mutations/branches/create_spec.rb |   3 +-
 .../pod_logs/elasticsearch_service_spec.rb    |   2 +-
 ...roxy_variable_substitution_service_spec.rb | 140 +-----------------
 vendor/elastic_stack/values.yaml              | 100 +++++--------
 40 files changed, 351 insertions(+), 334 deletions(-)
 create mode 100644 changelogs/unreleased/215563-remove-ruby-syntax.yml
 create mode 100644 changelogs/unreleased/ak-official-helm-chart.yml
 create mode 100644 changelogs/unreleased/feat-add-expunge-option-mailroom.yml
 create mode 100644 lib/gitlab/ci/templates/Jobs/Deploy/ECS.gitlab-ci.yml
 create mode 100644 spec/models/plan_limits_spec.rb

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index de019593a76..f11502a7dde 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -662,7 +662,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
         :uninstall-successful="applications.elastic_stack.uninstallSuccessful"
         :uninstall-failed="applications.elastic_stack.uninstallFailed"
         :disabled="!helmInstalled"
-        title-link="https://github.com/helm/charts/tree/master/stable/elastic-stack"
+        title-link="https://gitlab.com/gitlab-org/charts/elastic-stack"
       >
         <div slot="description">
           <p>
diff --git a/app/assets/javascripts/static_site_editor/router/routes.js b/app/assets/javascripts/static_site_editor/router/routes.js
index 0f5384dc244..6fb9dbe0182 100644
--- a/app/assets/javascripts/static_site_editor/router/routes.js
+++ b/app/assets/javascripts/static_site_editor/router/routes.js
@@ -14,4 +14,8 @@ export default [
     path: '/success',
     component: Success,
   },
+  {
+    path: '*',
+    redirect: HOME_ROUTE,
+  },
 ];
diff --git a/app/models/clusters/applications/elastic_stack.rb b/app/models/clusters/applications/elastic_stack.rb
index 3ddb67d8427..0d029aabc3b 100644
--- a/app/models/clusters/applications/elastic_stack.rb
+++ b/app/models/clusters/applications/elastic_stack.rb
@@ -3,7 +3,7 @@
 module Clusters
   module Applications
     class ElasticStack < ApplicationRecord
-      VERSION = '2.0.0'
+      VERSION = '3.0.0'
 
       ELASTICSEARCH_PORT = 9200
 
@@ -18,7 +18,11 @@ module Clusters
       default_value_for :version, VERSION
 
       def chart
-        'stable/elastic-stack'
+        'elastic-stack/elastic-stack'
+      end
+
+      def repository
+        'https://charts.gitlab.io'
       end
 
       def install_command
@@ -27,8 +31,9 @@ module Clusters
           version: VERSION,
           rbac: cluster.platform_kubernetes_rbac?,
           chart: chart,
+          repository: repository,
           files: files,
-          preinstall: migrate_to_2_script,
+          preinstall: migrate_to_3_script,
           postinstall: post_install_script
         )
       end
@@ -50,7 +55,7 @@ module Clusters
         strong_memoize(:elasticsearch_client) do
           next unless kube_client
 
-          proxy_url = kube_client.proxy_url('service', 'elastic-stack-elasticsearch-client', ::Clusters::Applications::ElasticStack::ELASTICSEARCH_PORT, Gitlab::Kubernetes::Helm::NAMESPACE)
+          proxy_url = kube_client.proxy_url('service', service_name, ::Clusters::Applications::ElasticStack::ELASTICSEARCH_PORT, Gitlab::Kubernetes::Helm::NAMESPACE)
 
           Elasticsearch::Client.new(url: proxy_url) do |faraday|
             # ensures headers containing auth data are appended to original client options
@@ -70,21 +75,33 @@ module Clusters
         end
       end
 
-      def filebeat7?
+      def chart_above_v2?
         Gem::Version.new(version) >= Gem::Version.new('2.0.0')
       end
 
+      def chart_above_v3?
+        Gem::Version.new(version) >= Gem::Version.new('3.0.0')
+      end
+
       private
 
+      def service_name
+        chart_above_v3? ? 'elastic-stack-elasticsearch-master' : 'elastic-stack-elasticsearch-client'
+      end
+
+      def pvc_selector
+        chart_above_v3? ? "app=elastic-stack-elasticsearch-master" : "release=elastic-stack"
+      end
+
       def post_install_script
         [
-          "timeout -t60 sh /data/helm/elastic-stack/config/wait-for-elasticsearch.sh http://elastic-stack-elasticsearch-client:9200"
+          "timeout -t60 sh /data/helm/elastic-stack/config/wait-for-elasticsearch.sh http://elastic-stack-elasticsearch-master:9200"
         ]
       end
 
       def post_delete_script
         [
-          Gitlab::Kubernetes::KubectlCmd.delete("pvc", "--selector", "release=elastic-stack")
+          Gitlab::Kubernetes::KubectlCmd.delete("pvc", "--selector", pvc_selector, "--namespace", Gitlab::Kubernetes::Helm::NAMESPACE)
         ]
       end
 
@@ -92,25 +109,19 @@ module Clusters
         cluster&.kubeclient&.core_client
       end
 
-      def migrate_to_2_script
-        # Updating the chart to 2.0.0 includes an update of the filebeat chart from 1.7.0 to 3.1.1 https://github.com/helm/charts/pull/21640
-        # This includes the following commit that changes labels on the filebeat deployment https://github.com/helm/charts/commit/9b009170686c6f4b202c36ceb1da4bb9ba15ddd0
-        # Unfortunately those fields are immutable, and we can't use `helm upgrade` to change them. We first have to delete the associated filebeat resources
-        # The following pre-install command runs before updating to 2.0.0 and sets filebeat.enable=false so the filebeat deployment is deleted.
-        # Then the main install command re-creates them properly
-        if updating? && !filebeat7?
-          [
-            Gitlab::Kubernetes::Helm::InstallCommand.new(
-              name: 'elastic-stack',
-              version: version,
-              rbac: cluster.platform_kubernetes_rbac?,
-              chart: chart,
-              files: files
-            ).install_command + ' --set filebeat.enabled\\=false'
-          ]
-        else
-          []
-        end
+      def migrate_to_3_script
+        return [] if !updating? || chart_above_v3?
+
+        # Chart version 3.0.0 moves to our own chart at https://gitlab.com/gitlab-org/charts/elastic-stack
+        # and is not compatible with pre-existing resources. We first remove them.
+        [
+          Gitlab::Kubernetes::Helm::DeleteCommand.new(
+            name: 'elastic-stack',
+            rbac: cluster.platform_kubernetes_rbac?,
+            files: files
+          ).delete_command,
+          Gitlab::Kubernetes::KubectlCmd.delete("pvc", "--selector", "release=elastic-stack", "--namespace", Gitlab::Kubernetes::Helm::NAMESPACE)
+        ]
       end
     end
   end
diff --git a/app/models/plan_limits.rb b/app/models/plan_limits.rb
index 7f5c9b8b6b4..575105cfd79 100644
--- a/app/models/plan_limits.rb
+++ b/app/models/plan_limits.rb
@@ -11,7 +11,7 @@ class PlanLimits < ApplicationRecord
     else
       # object.count >= limit value is slower than checking
       # if a record exists at the limit value - 1 position.
-      object.limit(1).offset(read_attribute(limit_name) - 1).exists?
+      object.offset(read_attribute(limit_name) - 1).exists?
     end
   end
 
diff --git a/app/services/pod_logs/elasticsearch_service.rb b/app/services/pod_logs/elasticsearch_service.rb
index b73ebc4227d..f79562c8ab3 100644
--- a/app/services/pod_logs/elasticsearch_service.rb
+++ b/app/services/pod_logs/elasticsearch_service.rb
@@ -70,7 +70,7 @@ module PodLogs
       client = cluster&.application_elastic_stack&.elasticsearch_client
       return error(_('Unable to connect to Elasticsearch')) unless client
 
-      filebeat7 = cluster.application_elastic_stack.filebeat7?
+      chart_above_v2 = cluster.application_elastic_stack.chart_above_v2?
 
       response = ::Gitlab::Elasticsearch::Logs::Lines.new(client).pod_logs(
         namespace,
@@ -80,7 +80,7 @@ module PodLogs
         start_time: result[:start_time],
         end_time: result[:end_time],
         cursor: result[:cursor],
-        filebeat7: filebeat7
+        chart_above_v2: chart_above_v2
       )
 
       result.merge!(response)
diff --git a/app/services/prometheus/proxy_variable_substitution_service.rb b/app/services/prometheus/proxy_variable_substitution_service.rb
index c3d28232c68..aa3a09ba05c 100644
--- a/app/services/prometheus/proxy_variable_substitution_service.rb
+++ b/app/services/prometheus/proxy_variable_substitution_service.rb
@@ -17,8 +17,7 @@ module Prometheus
     steps :validate_variables,
       :add_params_to_result,
       :substitute_params,
-      :substitute_ruby_variables,
-      :substitute_liquid_variables
+      :substitute_variables
 
     def initialize(environment, params = {})
       @environment, @params = environment, params.deep_dup
@@ -56,7 +55,7 @@ module Prometheus
       success(result)
     end
 
-    def substitute_liquid_variables(result)
+    def substitute_variables(result)
       return success(result) unless query(result)
 
       result[:params][:query] = gsub(query(result), full_context)
@@ -64,24 +63,6 @@ module Prometheus
       success(result)
     end
 
-    def substitute_ruby_variables(result)
-      return success(result) unless query(result)
-
-      # The % operator doesn't replace variables if the hash contains string
-      # keys.
-      result[:params][:query] = query(result) % predefined_context.symbolize_keys
-
-      success(result)
-    rescue TypeError, ArgumentError => exception
-      log_error(exception.message)
-      Gitlab::ErrorTracking.track_exception(exception, {
-        template_string: query(result),
-        variables: predefined_context
-      })
-
-      error(_('Malformed string'))
-    end
-
     def gsub(string, context)
       # Search for variables of the form `{{variable}}` in the string and replace
       # them with their value.
@@ -95,11 +76,11 @@ module Prometheus
     end
 
     def predefined_context
-      @predefined_context ||= Gitlab::Prometheus::QueryVariables.call(@environment)
+      Gitlab::Prometheus::QueryVariables.call(@environment).stringify_keys
     end
 
     def full_context
-      @full_context ||= predefined_context.stringify_keys.reverse_merge(variables_hash)
+      @full_context ||= predefined_context.reverse_merge(variables_hash)
     end
 
     def variables
diff --git a/changelogs/unreleased/215563-remove-ruby-syntax.yml b/changelogs/unreleased/215563-remove-ruby-syntax.yml
new file mode 100644
index 00000000000..0a57c24d02c
--- /dev/null
+++ b/changelogs/unreleased/215563-remove-ruby-syntax.yml
@@ -0,0 +1,6 @@
+---
+title: Remove support for Ruby format variable interpolation (`%{variable}`) in custom
+  dashboards
+merge_request: 31581
+author:
+type: removed
diff --git a/changelogs/unreleased/ak-official-helm-chart.yml b/changelogs/unreleased/ak-official-helm-chart.yml
new file mode 100644
index 00000000000..f981f6fbe18
--- /dev/null
+++ b/changelogs/unreleased/ak-official-helm-chart.yml
@@ -0,0 +1,5 @@
+---
+title: Move to supported Elastic helm charts
+merge_request: 30528
+author:
+type: changed
diff --git a/changelogs/unreleased/feat-add-expunge-option-mailroom.yml b/changelogs/unreleased/feat-add-expunge-option-mailroom.yml
new file mode 100644
index 00000000000..efdc0eefb13
--- /dev/null
+++ b/changelogs/unreleased/feat-add-expunge-option-mailroom.yml
@@ -0,0 +1,5 @@
+---
+title: Add expunge deleted messages option to mailroom
+merge_request: 31531
+author: Diego Louzán
+type: added
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 1a042f0e349..9a2e470f852 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -202,6 +202,9 @@ production: &base
     #
     # log_path: log/mail_room_json.log
 
+    # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery
+    expunge_deleted: false
+
   ## Build Artifacts
   artifacts:
     enabled: true
diff --git a/config/mail_room.yml b/config/mail_room.yml
index da37ef60587..23170acbf65 100644
--- a/config/mail_room.yml
+++ b/config/mail_room.yml
@@ -17,6 +17,7 @@
       :name: <%= config[:mailbox].to_json %>
 
       :delete_after_delivery: true
+      :expunge_deleted: <%= config[:expunge_deleted].to_json %>
 
       :delivery_method: sidekiq
       :delivery_options:
diff --git a/doc/administration/incoming_email.md b/doc/administration/incoming_email.md
index dcc590bea9c..9efee00e468 100644
--- a/doc/administration/incoming_email.md
+++ b/doc/administration/incoming_email.md
@@ -182,6 +182,9 @@ gitlab_rails['incoming_email_start_tls'] = false
 gitlab_rails['incoming_email_mailbox_name'] = "inbox"
 # The IDLE command timeout.
 gitlab_rails['incoming_email_idle_timeout'] = 60
+
+# Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery
+gitlab_rails['incoming_email_expunge_deleted'] = true
 ```
 
 Example for source installs:
@@ -214,6 +217,9 @@ incoming_email:
     mailbox: "inbox"
     # The IDLE command timeout.
     idle_timeout: 60
+
+    # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery
+    expunge_deleted: true
 ```
 
 #### Gmail
@@ -249,6 +255,9 @@ gitlab_rails['incoming_email_start_tls'] = false
 gitlab_rails['incoming_email_mailbox_name'] = "inbox"
 # The IDLE command timeout.
 gitlab_rails['incoming_email_idle_timeout'] = 60
+
+# Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery
+gitlab_rails['incoming_email_expunge_deleted'] = true
 ```
 
 Example for source installs:
@@ -281,6 +290,9 @@ incoming_email:
     mailbox: "inbox"
     # The IDLE command timeout.
     idle_timeout: 60
+
+    # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery
+    expunge_deleted: true
 ```
 
 #### Microsoft Exchange Server
diff --git a/doc/api/scim.md b/doc/api/scim.md
index c0650b8a0aa..3daa243908a 100644
--- a/doc/api/scim.md
+++ b/doc/api/scim.md
@@ -4,6 +4,9 @@
 
 The SCIM API implements the [the RFC7644 protocol](https://tools.ietf.org/html/rfc7644).
 
+CAUTION: **Caution:**
+This API is for internal system use for connecting with a SCIM provider. While it can be used directly, it is subject to change without notice.
+
 NOTE: **Note:**
 [Group SSO](../user/group/saml_sso/index.md) must be enabled for the group. For more information, see [SCIM setup documentation](../user/group/saml_sso/scim_setup.md#requirements).
 
diff --git a/doc/development/emails.md b/doc/development/emails.md
index 01e39a13e4d..e6e2ea8aae7 100644
--- a/doc/development/emails.md
+++ b/doc/development/emails.md
@@ -57,6 +57,9 @@ See the [Rails guides](https://guides.rubyonrails.org/action_mailer_basics.html#
      mailbox: "inbox"
      # The IDLE command timeout.
      idle_timeout: 60
+
+     # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery
+     expunge_deleted: false
    ```
 
    As mentioned, the part after `+` is ignored, and this will end up in the mailbox for `gitlab-incoming@gmail.com`.
diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md
index 697d62c9d79..4ef02895d76 100644
--- a/doc/user/clusters/applications.md
+++ b/doc/user/clusters/applications.md
@@ -505,20 +505,23 @@ Log data is automatically deleted after 30 days using [Curator](https://www.elas
 
 To enable log shipping:
 
+1. Ensure your cluster contains at least 3 nodes of instance types larger than
+   `f1-micro`, `g1-small`, or `n1-standard-1`.
 1. Navigate to **{cloud-gear}** **Operations > Kubernetes**.
 1. In **Kubernetes Cluster**, select a cluster.
 1. In the **Applications** section, find **Elastic Stack** and click **Install**.
 
 NOTE: **Note:**
-The [`stable/elastic-stack`](https://github.com/helm/charts/tree/master/stable/elastic-stack)
+The [`gitlab/elastic-stack`](https://gitlab.com/gitlab-org/charts/elastic-stack)
 chart is used to install this application with a
 [`values.yaml`](https://gitlab.com/gitlab-org/gitlab/blob/master/vendor/elastic_stack/values.yaml)
 file.
 
 NOTE: **Note:**
-The chart will deploy 5 Elasticsearch nodes: 2 masters, 2 data and 1 client node,
-with resource requests totalling 0.125 CPU and 4.5GB RAM. Each data node requests 1.5GB of memory,
-which makes it incompatible with clusters of `f1-micro` and `g1-small` instance types.
+The chart deploys 3 identical Elasticsearch pods which can't be colocated, and each
+require 1 CPU and 2 GB of RAM, making them incompatible with clusters containing
+fewer than 3 nodes or consisting of `f1-micro`, `g1-small`, `n1-standard-1`, or
+`*-highcpu-2` instance types.
 
 NOTE: **Note:**
 The Elastic Stack cluster application is intended as a log aggregation solution and is not related to our
@@ -542,20 +545,23 @@ logstash:
 
 kibana:
   enabled: true
-  env:
-    ELASTICSEARCH_HOSTS: http://elastic-stack-elasticsearch-client.gitlab-managed-apps.svc.cluster.local:9200
+  elasticsearchHosts: http://elastic-stack-elasticsearch-master.gitlab-managed-apps.svc.cluster.local:9200
+
+elasticseach-curator:
+  enabled: false
 ```
 
 Then install it on your cluster:
 
 ```shell
-helm install --name kibana stable/elastic-stack --values kibana.yml
+helm repo add gitlab https://charts.gitlab.io
+helm install --name kibana gitlab/elastic-stack --values kibana.yml
 ```
 
 To access Kibana, forward the port to your local machine:
 
 ```shell
-kubectl port-forward svc/kibana 5601:443
+kubectl port-forward svc/kibana 5601:5601
 ```
 
 Then, you can visit Kibana at `http://localhost:5601`.
@@ -1069,7 +1075,7 @@ You can check the default [`values.yaml`](https://gitlab.com/gitlab-org/gitlab/-
 You can customize the installation of Elastic Stack by defining
 `.gitlab/managed-apps/elastic-stack/values.yaml` file in your cluster
 management project. Refer to the
-[chart](https://github.com/helm/charts/blob/master/stable/elastic-stack/values.yaml) for the
+[chart](https://gitlab.com/gitlab-org/charts/elastic-stack) for the
 available configuration options.
 
 NOTE: **Note:**
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md
index 30f24a5cf3e..48164a53727 100644
--- a/doc/user/project/integrations/prometheus.md
+++ b/doc/user/project/integrations/prometheus.md
@@ -192,10 +192,11 @@ GitLab supports a limited set of [CI variables](../../../ci/variables/README.md)
 NOTE: **Note:**
 Variables for Prometheus queries must be lowercase.
 
-There are 2 methods to specify a variable in a query or dashboard:
+Variables can be specified using double curly braces, such as `"{{ci_environment_slug}}"` ([added](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20793) in GitLab 12.7).
 
-1. Variables can be specified using double curly braces, such as `{{ci_environment_slug}}` ([added](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20793) in GitLab 12.7).
-1. You can also enclose it in quotation marks with curly braces with a leading percent, for example `"%{ci_environment_slug}"`. This method is deprecated though and support will be [removed in the next major release](https://gitlab.com/gitlab-org/gitlab/issues/37990).
+Support for the `"%{ci_environment_slug}"` format was
+[removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31581) in GitLab 13.0.
+Queries that continue to use the old format will show no data.
 
 #### Query Variables from URL
 
diff --git a/doc/user/project/service_desk.md b/doc/user/project/service_desk.md
index b8aa797cb7b..d021f259015 100644
--- a/doc/user/project/service_desk.md
+++ b/doc/user/project/service_desk.md
@@ -151,6 +151,7 @@ service_desk_email:
   log_path: "log/mailroom.log"
   mailbox: "inbox"
   idle_timeout: 60
+  expunge_deleted: true
 ```
 
 In this case, suppose the `mygroup/myproject` project Service Desk settings has the project name
diff --git a/lib/gitlab/ci/templates/Deploy-ECS.gitlab-ci.yml b/lib/gitlab/ci/templates/Deploy-ECS.gitlab-ci.yml
index a41b399032f..9e6c1c8d7be 100644
--- a/lib/gitlab/ci/templates/Deploy-ECS.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Deploy-ECS.gitlab-ci.yml
@@ -7,30 +7,4 @@ stages:
 
 include:
   - template: Jobs/Build.gitlab-ci.yml
-
-.deploy_to_ecs:
-  image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-ecs:latest
-  script:
-    - ecs update-task-definition
-
-review:
-  extends: .deploy_to_ecs
-  stage: review
-  environment:
-    name: review/$CI_COMMIT_REF_NAME
-  only:
-    refs:
-      - branches
-      - tags
-  except:
-    refs:
-      - master
-
-production:
-  extends: .deploy_to_ecs
-  stage: production
-  environment:
-    name: production
-  only:
-    refs:
-      - master
+  - template: Jobs/Deploy/ECS.gitlab-ci.yml
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy/ECS.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy/ECS.gitlab-ci.yml
new file mode 100644
index 00000000000..6579aab2b42
--- /dev/null
+++ b/lib/gitlab/ci/templates/Jobs/Deploy/ECS.gitlab-ci.yml
@@ -0,0 +1,26 @@
+.deploy_to_ecs:
+  image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-ecs:latest
+  script:
+    - ecs update-task-definition
+
+review:
+  extends: .deploy_to_ecs
+  stage: review
+  environment:
+    name: review/$CI_COMMIT_REF_NAME
+  only:
+    refs:
+      - branches
+      - tags
+  except:
+    refs:
+      - master
+
+production:
+  extends: .deploy_to_ecs
+  stage: production
+  environment:
+    name: production
+  only:
+    refs:
+      - master
diff --git a/lib/gitlab/diff/formatters/text_formatter.rb b/lib/gitlab/diff/formatters/text_formatter.rb
index 728457b3139..9ea9bdfdf15 100644
--- a/lib/gitlab/diff/formatters/text_formatter.rb
+++ b/lib/gitlab/diff/formatters/text_formatter.rb
@@ -45,7 +45,8 @@ module Gitlab
         def ==(other)
           other.is_a?(self.class) &&
             new_line == other.new_line &&
-            old_line == other.old_line
+            old_line == other.old_line &&
+            line_range == other.line_range
         end
       end
     end
diff --git a/lib/gitlab/elasticsearch/logs/lines.rb b/lib/gitlab/elasticsearch/logs/lines.rb
index f799147a1c6..ff9185dd331 100644
--- a/lib/gitlab/elasticsearch/logs/lines.rb
+++ b/lib/gitlab/elasticsearch/logs/lines.rb
@@ -13,7 +13,7 @@ module Gitlab
           @client = client
         end
 
-        def pod_logs(namespace, pod_name: nil, container_name: nil, search: nil, start_time: nil, end_time: nil, cursor: nil, filebeat7: true)
+        def pod_logs(namespace, pod_name: nil, container_name: nil, search: nil, start_time: nil, end_time: nil, cursor: nil, chart_above_v2: true)
           query = { bool: { must: [] } }.tap do |q|
             filter_pod_name(q, pod_name)
             filter_namespace(q, namespace)
@@ -22,7 +22,7 @@ module Gitlab
             filter_times(q, start_time, end_time)
           end
 
-          body = build_body(query, cursor, filebeat7)
+          body = build_body(query, cursor, chart_above_v2)
           response = @client.search body: body
 
           format_response(response)
@@ -30,8 +30,8 @@ module Gitlab
 
         private
 
-        def build_body(query, cursor = nil, filebeat7 = true)
-          offset_field = filebeat7 ? "log.offset" : "offset"
+        def build_body(query, cursor = nil, chart_above_v2 = true)
+          offset_field = chart_above_v2 ? "log.offset" : "offset"
           body = {
             query: query,
             # reverse order so we can query N-most recent records
diff --git a/lib/gitlab/kubernetes/helm/delete_command.rb b/lib/gitlab/kubernetes/helm/delete_command.rb
index 9d0fd30ba8f..771444ee9ee 100644
--- a/lib/gitlab/kubernetes/helm/delete_command.rb
+++ b/lib/gitlab/kubernetes/helm/delete_command.rb
@@ -36,8 +36,6 @@ module Gitlab
           @rbac
         end
 
-        private
-
         def delete_command
           command = ['helm', 'delete', '--purge', name] + tls_flags_if_remote_tiller
 
diff --git a/lib/gitlab/kubernetes/helm/install_command.rb b/lib/gitlab/kubernetes/helm/install_command.rb
index 757247f6765..3784aecccb5 100644
--- a/lib/gitlab/kubernetes/helm/install_command.rb
+++ b/lib/gitlab/kubernetes/helm/install_command.rb
@@ -37,6 +37,8 @@ module Gitlab
           @rbac
         end
 
+        private
+
         # Uses `helm upgrade --install` which means we can use this for both
         # installation and uprade of applications
         def install_command
@@ -53,8 +55,6 @@ module Gitlab
           command.shelljoin
         end
 
-        private
-
         def install_flag
           ['--install']
         end
diff --git a/lib/gitlab/mail_room.rb b/lib/gitlab/mail_room.rb
index bd69843adf1..0633efc6b0c 100644
--- a/lib/gitlab/mail_room.rb
+++ b/lib/gitlab/mail_room.rb
@@ -19,7 +19,8 @@ module Gitlab
       start_tls: false,
       mailbox: 'inbox',
       idle_timeout: 60,
-      log_path: RAILS_ROOT_DIR.join('log', 'mail_room_json.log')
+      log_path: RAILS_ROOT_DIR.join('log', 'mail_room_json.log'),
+      expunge_deleted: false
     }.freeze
 
     # Email specific configuration which is merged with configuration
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index e0cfe7342f1..ecd16804a27 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -12763,9 +12763,6 @@ msgstr ""
 msgid "Makes this issue confidential."
 msgstr ""
 
-msgid "Malformed string"
-msgstr ""
-
 msgid "Manage"
 msgstr ""
 
@@ -23697,9 +23694,6 @@ msgstr ""
 msgid "VulnerabilityManagement|Confirmed %{timeago} by %{user}"
 msgstr ""
 
-msgid "VulnerabilityManagement|Create issue"
-msgstr ""
-
 msgid "VulnerabilityManagement|Detected %{timeago} in pipeline %{pipelineLink}"
 msgstr ""
 
diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb
index fcef4e7a9b0..bd8269fb2c5 100644
--- a/spec/config/mail_room_spec.rb
+++ b/spec/config/mail_room_spec.rb
@@ -53,7 +53,8 @@ describe 'mail_room.yml' do
         email: 'gitlab-incoming@gmail.com',
         password: '[REDACTED]',
         name: 'inbox',
-        idle_timeout: 60
+        idle_timeout: 60,
+        expunge_deleted: true
       }
       expected_options = {
         redis_url: gitlab_redis_queues.url,
diff --git a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
index fcb9293d4a9..64f90e44bb6 100644
--- a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
+++ b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
@@ -55,7 +55,7 @@ describe Projects::Environments::PrometheusApiController do
           end
 
           it 'replaces variables with values' do
-            get :proxy, params: environment_params.merge(query: 'up{environment="%{ci_environment_slug}"}')
+            get :proxy, params: environment_params.merge(query: 'up{environment="{{ci_environment_slug}}"}')
 
             expect(Prometheus::ProxyService).to have_received(:new)
               .with(environment, 'GET', 'query', expected_params)
diff --git a/spec/controllers/projects/static_site_editor_controller_spec.rb b/spec/controllers/projects/static_site_editor_controller_spec.rb
index f5d93122f59..7b470254de1 100644
--- a/spec/controllers/projects/static_site_editor_controller_spec.rb
+++ b/spec/controllers/projects/static_site_editor_controller_spec.rb
@@ -3,7 +3,8 @@
 require 'spec_helper'
 
 describe Projects::StaticSiteEditorController do
-  let(:project) { create(:project, :public, :repository) }
+  let_it_be(:project) { create(:project, :public, :repository) }
+  let_it_be(:user) { create(:user) }
 
   describe 'GET show' do
     let(:default_params) do
@@ -27,8 +28,6 @@ describe Projects::StaticSiteEditorController do
       end
 
       context 'as guest' do
-        let(:user) { create(:user) }
-
         before do
           project.add_guest(user)
           sign_in(user)
@@ -42,10 +41,11 @@ describe Projects::StaticSiteEditorController do
 
       %w[developer maintainer].each do |role|
         context "as #{role}" do
-          let(:user) { create(:user) }
+          before_all do
+            project.add_role(user, role)
+          end
 
           before do
-            project.add_role(user, role)
             sign_in(user)
             get :show, params: default_params
           end
@@ -54,11 +54,8 @@ describe Projects::StaticSiteEditorController do
             expect(response).to render_template(:show)
           end
 
-          it 'assigns a config variable' do
+          it 'assigns a required variables' do
             expect(assigns(:config)).to be_a(Gitlab::StaticSiteEditor::Config)
-          end
-
-          it 'correctly assigns ref and path' do
             expect(assigns(:ref)).to eq('master')
             expect(assigns(:path)).to eq('README.md')
           end
diff --git a/spec/features/static_site_editor_spec.rb b/spec/features/static_site_editor_spec.rb
index c457002f888..de000ee2b9f 100644
--- a/spec/features/static_site_editor_spec.rb
+++ b/spec/features/static_site_editor_spec.rb
@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe 'Static Site Editor' do
-  let(:user) { create(:user) }
-  let(:project) { create(:project, :public, :repository) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :public, :repository) }
 
   before do
     project.add_maintainer(user)
diff --git a/spec/fixtures/config/mail_room_enabled.yml b/spec/fixtures/config/mail_room_enabled.yml
index e1f4c2f44de..535528b32ca 100644
--- a/spec/fixtures/config/mail_room_enabled.yml
+++ b/spec/fixtures/config/mail_room_enabled.yml
@@ -9,6 +9,7 @@ test:
     ssl: true
     start_tls: false
     mailbox: "inbox"
+    expunge_deleted: true
 
   service_desk_email:
     enabled: true
@@ -20,3 +21,4 @@ test:
     ssl: true
     start_tls: false
     mailbox: "inbox"
+    expunge_deleted: true
diff --git a/spec/lib/gitlab/diff/formatters/text_formatter_spec.rb b/spec/lib/gitlab/diff/formatters/text_formatter_spec.rb
index e275ebef2c9..fa129a20e58 100644
--- a/spec/lib/gitlab/diff/formatters/text_formatter_spec.rb
+++ b/spec/lib/gitlab/diff/formatters/text_formatter_spec.rb
@@ -26,6 +26,7 @@ describe Gitlab::Diff::Formatters::TextFormatter do
 
   # Specific text formatter examples
   let!(:formatter) { described_class.new(attrs) }
+  let(:attrs) { base }
 
   describe '#line_age' do
     subject { formatter.line_age }
@@ -42,4 +43,21 @@ describe Gitlab::Diff::Formatters::TextFormatter do
       it { is_expected.to eq('old') }
     end
   end
+
+  describe "#==" do
+    it "is false when the line_range changes" do
+      formatter_1 = described_class.new(base.merge(line_range: { start_line_code: "foo", end_line_code: "bar" }))
+      formatter_2 = described_class.new(base.merge(line_range: { start_line_code: "foo", end_line_code: "baz" }))
+
+      expect(formatter_1).not_to eq(formatter_2)
+    end
+
+    it "is true when the line_range doesn't change" do
+      attrs = base.merge({ line_range: { start_line_code: "foo", end_line_code: "baz" } })
+      formatter_1 = described_class.new(attrs)
+      formatter_2 = described_class.new(attrs)
+
+      expect(formatter_1).to eq(formatter_2)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/elasticsearch/logs/lines_spec.rb b/spec/lib/gitlab/elasticsearch/logs/lines_spec.rb
index 0561133f17e..45a262c0e77 100644
--- a/spec/lib/gitlab/elasticsearch/logs/lines_spec.rb
+++ b/spec/lib/gitlab/elasticsearch/logs/lines_spec.rb
@@ -90,7 +90,7 @@ describe Gitlab::Elasticsearch::Logs::Lines do
     it 'can search on filebeat 6' do
       expect(client).to receive(:search).with(body: a_hash_equal_to_json(body_with_filebeat_6)).and_return(es_response)
 
-      result = subject.pod_logs(namespace, pod_name: pod_name, filebeat7: false)
+      result = subject.pod_logs(namespace, pod_name: pod_name, chart_above_v2: false)
       expect(result).to eq(logs: [es_message_4, es_message_3, es_message_2, es_message_1], cursor: cursor)
     end
   end
diff --git a/spec/lib/gitlab/kubernetes/helm/delete_command_spec.rb b/spec/lib/gitlab/kubernetes/helm/delete_command_spec.rb
index e1ca56b0ba6..95d60c18d56 100644
--- a/spec/lib/gitlab/kubernetes/helm/delete_command_spec.rb
+++ b/spec/lib/gitlab/kubernetes/helm/delete_command_spec.rb
@@ -75,4 +75,10 @@ describe Gitlab::Kubernetes::Helm::DeleteCommand do
   it_behaves_like 'helm command' do
     let(:command) { delete_command }
   end
+
+  describe '#delete_command' do
+    it 'deletes the release' do
+      expect(subject.delete_command).to eq('helm delete --purge app-name')
+    end
+  end
 end
diff --git a/spec/lib/gitlab/mail_room/mail_room_spec.rb b/spec/lib/gitlab/mail_room/mail_room_spec.rb
index 5d41ee06263..4b09205a181 100644
--- a/spec/lib/gitlab/mail_room/mail_room_spec.rb
+++ b/spec/lib/gitlab/mail_room/mail_room_spec.rb
@@ -13,7 +13,8 @@ describe Gitlab::MailRoom do
       start_tls: false,
       mailbox: 'inbox',
       idle_timeout: 60,
-      log_path: Rails.root.join('log', 'mail_room_json.log').to_s
+      log_path: Rails.root.join('log', 'mail_room_json.log').to_s,
+      expunge_deleted: false
     }
   end
 
diff --git a/spec/models/clusters/applications/elastic_stack_spec.rb b/spec/models/clusters/applications/elastic_stack_spec.rb
index 6b8cd37dca2..02ada219e32 100644
--- a/spec/models/clusters/applications/elastic_stack_spec.rb
+++ b/spec/models/clusters/applications/elastic_stack_spec.rb
@@ -19,8 +19,9 @@ describe Clusters::Applications::ElasticStack do
 
     it 'is initialized with elastic stack arguments' do
       expect(subject.name).to eq('elastic-stack')
-      expect(subject.chart).to eq('stable/elastic-stack')
-      expect(subject.version).to eq('2.0.0')
+      expect(subject.chart).to eq('elastic-stack/elastic-stack')
+      expect(subject.version).to eq('3.0.0')
+      expect(subject.repository).to eq('https://charts.gitlab.io')
       expect(subject).to be_rbac
       expect(subject.files).to eq(elastic_stack.files)
       expect(subject.preinstall).to be_empty
@@ -42,7 +43,19 @@ describe Clusters::Applications::ElasticStack do
 
       it 'includes a preinstall script' do
         expect(subject.preinstall).not_to be_empty
-        expect(subject.preinstall.first).to include("filebeat.enable")
+        expect(subject.preinstall.first).to include("delete")
+      end
+    end
+
+    context 'on versions older than 3' do
+      before do
+        elastic_stack.status = elastic_stack.status_states[:updating]
+        elastic_stack.version = "2.9.0"
+      end
+
+      it 'includes a preinstall script' do
+        expect(subject.preinstall).not_to be_empty
+        expect(subject.preinstall.first).to include("delete")
       end
     end
 
@@ -50,11 +63,47 @@ describe Clusters::Applications::ElasticStack do
       let(:elastic_stack) { create(:clusters_applications_elastic_stack, :errored, version: '0.0.1') }
 
       it 'is initialized with the locked version' do
-        expect(subject.version).to eq('2.0.0')
+        expect(subject.version).to eq('3.0.0')
       end
     end
   end
 
+  describe '#chart_above_v2?' do
+    let(:elastic_stack) { create(:clusters_applications_elastic_stack, version: version) }
+
+    subject { elastic_stack.chart_above_v2? }
+
+    context 'on v1.9.0' do
+      let(:version) { '1.9.0' }
+
+      it { is_expected.to be_falsy }
+    end
+
+    context 'on v2.0.0' do
+      let(:version) { '2.0.0' }
+
+      it { is_expected.to be_truthy }
+    end
+  end
+
+  describe '#chart_above_v3?' do
+    let(:elastic_stack) { create(:clusters_applications_elastic_stack, version: version) }
+
+    subject { elastic_stack.chart_above_v3? }
+
+    context 'on v1.9.0' do
+      let(:version) { '1.9.0' }
+
+      it { is_expected.to be_falsy }
+    end
+
+    context 'on v3.0.0' do
+      let(:version) { '3.0.0' }
+
+      it { is_expected.to be_truthy }
+    end
+  end
+
   describe '#uninstall_command' do
     let!(:elastic_stack) { create(:clusters_applications_elastic_stack) }
 
@@ -70,7 +119,7 @@ describe Clusters::Applications::ElasticStack do
 
     it 'specifies a post delete command to remove custom resource definitions' do
       expect(subject.postdelete).to eq([
-        'kubectl delete pvc --selector release\\=elastic-stack'
+        'kubectl delete pvc --selector app\\=elastic-stack-elasticsearch-master --namespace gitlab-managed-apps'
       ])
     end
   end
diff --git a/spec/models/plan_limits_spec.rb b/spec/models/plan_limits_spec.rb
new file mode 100644
index 00000000000..1366f088623
--- /dev/null
+++ b/spec/models/plan_limits_spec.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe PlanLimits do
+  let(:plan_limits) { create(:plan_limits) }
+  let(:model) { ProjectHook }
+  let(:count) { model.count }
+
+  before do
+    create(:project_hook)
+  end
+
+  context 'without plan limits configured' do
+    describe '#exceeded?' do
+      it 'does not exceed any relation offset' do
+        expect(plan_limits.exceeded?(:project_hooks, model)).to be false
+        expect(plan_limits.exceeded?(:project_hooks, count)).to be false
+      end
+    end
+  end
+
+  context 'with plan limits configured' do
+    before do
+      plan_limits.update!(project_hooks: 2)
+    end
+
+    describe '#exceeded?' do
+      it 'does not exceed the relation offset' do
+        expect(plan_limits.exceeded?(:project_hooks, model)).to be false
+        expect(plan_limits.exceeded?(:project_hooks, count)).to be false
+      end
+    end
+
+    context 'with boundary values' do
+      before do
+        create(:project_hook)
+      end
+
+      describe '#exceeded?' do
+        it 'does exceed the relation offset' do
+          expect(plan_limits.exceeded?(:project_hooks, model)).to be true
+          expect(plan_limits.exceeded?(:project_hooks, count)).to be true
+        end
+      end
+    end
+  end
+
+  context 'validates default values' do
+    let(:columns_with_zero) do
+      %w[
+        ci_active_pipelines
+        ci_pipeline_size
+        ci_active_jobs
+      ]
+    end
+
+    it "has positive values for enabled limits" do
+      attributes = plan_limits.attributes
+      attributes = attributes.except(described_class.primary_key)
+      attributes = attributes.except(described_class.reflections.values.map(&:foreign_key))
+      attributes = attributes.except(*columns_with_zero)
+
+      expect(attributes).to all(include(be_positive))
+    end
+
+    it "has zero values for disabled limits" do
+      attributes = plan_limits.attributes
+      attributes = attributes.slice(*columns_with_zero)
+
+      expect(attributes).to all(include(be_zero))
+    end
+  end
+end
diff --git a/spec/requests/api/graphql/mutations/branches/create_spec.rb b/spec/requests/api/graphql/mutations/branches/create_spec.rb
index 8340f5a7db2..b3c378ec2bc 100644
--- a/spec/requests/api/graphql/mutations/branches/create_spec.rb
+++ b/spec/requests/api/graphql/mutations/branches/create_spec.rb
@@ -6,7 +6,7 @@ describe 'Creation of a new branch' do
   include GraphqlHelpers
 
   let_it_be(:current_user) { create(:user) }
-  let(:project) { create(:project, :public, :repository) }
+  let_it_be(:project) { create(:project, :public, :empty_repo) }
   let(:input) { { project_path: project.full_path, name: new_branch, ref: ref } }
   let(:new_branch) { 'new_branch' }
   let(:ref) { 'master' }
@@ -35,6 +35,7 @@ describe 'Creation of a new branch' do
     end
 
     context 'when ref is not correct' do
+      let(:new_branch) { 'another_branch' }
       let(:ref) { 'unknown' }
 
       it_behaves_like 'a mutation that returns errors in the response',
diff --git a/spec/services/pod_logs/elasticsearch_service_spec.rb b/spec/services/pod_logs/elasticsearch_service_spec.rb
index c5a691f2254..8060d07461a 100644
--- a/spec/services/pod_logs/elasticsearch_service_spec.rb
+++ b/spec/services/pod_logs/elasticsearch_service_spec.rb
@@ -255,7 +255,7 @@ describe ::PodLogs::ElasticsearchService do
         .and_return(Elasticsearch::Transport::Client.new)
       allow_any_instance_of(::Gitlab::Elasticsearch::Logs::Lines)
         .to receive(:pod_logs)
-        .with(namespace, pod_name: pod_name, container_name: container_name, search: search, start_time: start_time, end_time: end_time, cursor: cursor, filebeat7: true)
+        .with(namespace, pod_name: pod_name, container_name: container_name, search: search, start_time: start_time, end_time: end_time, cursor: cursor, chart_above_v2: true)
         .and_return({ logs: expected_logs, cursor: expected_cursor })
 
       result = subject.send(:pod_logs, result_arg)
diff --git a/spec/services/prometheus/proxy_variable_substitution_service_spec.rb b/spec/services/prometheus/proxy_variable_substitution_service_spec.rb
index 621b4c1f7be..82ea356d599 100644
--- a/spec/services/prometheus/proxy_variable_substitution_service_spec.rb
+++ b/spec/services/prometheus/proxy_variable_substitution_service_spec.rb
@@ -6,7 +6,7 @@ describe Prometheus::ProxyVariableSubstitutionService do
   describe '#execute' do
     let_it_be(:environment) { create(:environment) }
 
-    let(:params_keys) { { query: 'up{environment="%{ci_environment_slug}"}' } }
+    let(:params_keys) { { query: 'up{environment="{{ci_environment_slug}}"}' } }
     let(:params) { ActionController::Parameters.new(params_keys).permit! }
     let(:result) { subject.execute }
 
@@ -32,21 +32,13 @@ describe Prometheus::ProxyVariableSubstitutionService do
 
         expect(params).to eq(
           ActionController::Parameters.new(
-            query: 'up{environment="%{ci_environment_slug}"}'
+            query: 'up{environment="{{ci_environment_slug}}"}'
           ).permit!
         )
       end
     end
 
     context 'with predefined variables' do
-      let(:params_keys) { { query: 'up{%{environment_filter}}' } }
-
-      it_behaves_like 'success' do
-        let(:expected_query) do
-          %Q[up{container_name!="POD",environment="#{environment.slug}"}]
-        end
-      end
-
       context 'with nil query' do
         let(:params_keys) { {} }
 
@@ -64,18 +56,6 @@ describe Prometheus::ProxyVariableSubstitutionService do
           let(:expected_query) { %Q[up{environment="#{environment.slug}"}] }
         end
       end
-
-      context 'with ruby and liquid formats' do
-        let(:params_keys) do
-          { query: 'up{%{environment_filter},env2="{{ci_environment_slug}}"}' }
-        end
-
-        it_behaves_like 'success' do
-          let(:expected_query) do
-            %Q[up{container_name!="POD",environment="#{environment.slug}",env2="#{environment.slug}"}]
-          end
-        end
-      end
     end
 
     context 'with custom variables' do
@@ -92,20 +72,6 @@ describe Prometheus::ProxyVariableSubstitutionService do
         let(:expected_query) { %q[up{pod_name="pod1"}] }
       end
 
-      context 'with ruby variable interpolation format' do
-        let(:params_keys) do
-          {
-            query: 'up{pod_name="%{pod_name}"}',
-            variables: ['pod_name', pod_name]
-          }
-        end
-
-        it_behaves_like 'success' do
-          # Custom variables cannot be used with the Ruby interpolation format.
-          let(:expected_query) { "up{pod_name=\"%{pod_name}\"}" }
-        end
-      end
-
       context 'with predefined variables in variables parameter' do
         let(:params_keys) do
           {
@@ -145,108 +111,6 @@ describe Prometheus::ProxyVariableSubstitutionService do
           let(:expected_query) { 'up{pod_name="{{pod_name}}"}' }
         end
       end
-
-      context 'with ruby and liquid variables' do
-        let(:params_keys) do
-          {
-            query: 'up{env1="%{ruby_variable}",env2="{{ liquid_variable }}"}',
-            variables: %w(ruby_variable value liquid_variable env_slug)
-          }
-        end
-
-        it_behaves_like 'success' do
-          # It should replace only liquid variables with their values
-          let(:expected_query) { %q[up{env1="%{ruby_variable}",env2="env_slug"}] }
-        end
-      end
-    end
-
-    context 'ruby template rendering' do
-      let(:params_keys) do
-        { query: 'up{env=%{ci_environment_slug},%{environment_filter}}' }
-      end
-
-      it_behaves_like 'success' do
-        let(:expected_query) do
-          "up{env=#{environment.slug},container_name!=\"POD\"," \
-          "environment=\"#{environment.slug}\"}"
-        end
-      end
-
-      context 'with multiple occurrences of variable in string' do
-        let(:params_keys) do
-          { query: 'up{env1=%{ci_environment_slug},env2=%{ci_environment_slug}}' }
-        end
-
-        it_behaves_like 'success' do
-          let(:expected_query) { "up{env1=#{environment.slug},env2=#{environment.slug}}" }
-        end
-      end
-
-      context 'with multiple variables in string' do
-        let(:params_keys) do
-          { query: 'up{env=%{ci_environment_slug},%{environment_filter}}' }
-        end
-
-        it_behaves_like 'success' do
-          let(:expected_query) do
-            "up{env=#{environment.slug}," \
-            "container_name!=\"POD\",environment=\"#{environment.slug}\"}"
-          end
-        end
-      end
-
-      context 'with unknown variables in string' do
-        let(:params_keys) { { query: 'up{env=%{env_slug}}' } }
-
-        it_behaves_like 'success' do
-          let(:expected_query) { 'up{env=%{env_slug}}' }
-        end
-      end
-
-      # This spec is needed if there are multiple keys in the context provided
-      # by `Gitlab::Prometheus::QueryVariables.call(environment)` which is
-      # passed to the Ruby `%` operator.
-      # If the number of keys in the context is one, there is no need for
-      # this spec.
-      context 'with extra variables in context' do
-        let(:params_keys) { { query: 'up{env=%{ci_environment_slug}}' } }
-
-        it_behaves_like 'success' do
-          let(:expected_query) { "up{env=#{environment.slug}}" }
-        end
-
-        it 'has more than one variable in context' do
-          expect(Gitlab::Prometheus::QueryVariables.call(environment).size).to be > 1
-        end
-      end
-
-      # The ruby % operator will not replace known variables if there are unknown
-      # variables also in the string. It doesn't raise an error
-      # (though the `sprintf` and `format` methods do).
-      context 'with unknown and known variables in string' do
-        let(:params_keys) do
-          { query: 'up{env=%{ci_environment_slug},other_env=%{env_slug}}' }
-        end
-
-        it_behaves_like 'success' do
-          let(:expected_query) { 'up{env=%{ci_environment_slug},other_env=%{env_slug}}' }
-        end
-      end
-
-      context 'when rendering raises error' do
-        context 'when TypeError is raised' do
-          let(:params_keys) { { query: '{% a %}' } }
-
-          it_behaves_like 'error', 'Malformed string'
-        end
-
-        context 'when ArgumentError is raised' do
-          let(:params_keys) { { query: '%<' } }
-
-          it_behaves_like 'error', 'Malformed string'
-        end
-      end
     end
 
     context 'gsub variable substitution tolerance for weirdness' do
diff --git a/vendor/elastic_stack/values.yaml b/vendor/elastic_stack/values.yaml
index ec05f163cf0..21352dd35e2 100644
--- a/vendor/elastic_stack/values.yaml
+++ b/vendor/elastic_stack/values.yaml
@@ -1,60 +1,41 @@
+# Default values for elastic-stack.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
 elasticsearch:
   enabled: true
-  cluster:
-    env:
-      MINIMUM_MASTER_NODES: "1"
-  master:
-    replicas: 2
-  client:
-    replicas: 1
-  data:
-    replicas: 2
-
-kibana:
-  enabled: false
-
-logstash:
-  enabled: false
+  # prefix elasticsearch resources with the name of the releases
+  # looks like we can't use {{ .Release.Name }}-elasticsearch
+  # https://github.com/helm/helm/issues/2133
+  clusterName: "elastic-stack-elasticsearch"
 
 filebeat:
   enabled: true
-  config:
-    output.file.enabled: false
-    output.elasticsearch:
-      enabled: true
-      hosts: ["http://elastic-stack-elasticsearch-client:9200"]
-    filebeat.inputs:
-    - type: log
-      enabled: true
-      paths:
-        - /var/log/*.log
-        - /var/log/messages
-        - /var/log/syslog
-    - type: docker
-      containers.ids:
-      - "*"
-      json.keys_under_root: true
-      json.ignore_decoding_error: true
-      processors:
-        - add_kubernetes_metadata:
-        - drop_event:
-            when:
-              equals:
-                kubernetes.container.name: "filebeat"
-        - decode_json_fields:
-            fields: ["message"]
-            when:
-              equals:
-                kubernetes.container.name: "modsecurity-log"
-
-fluentd:
-  enabled: false
-
-fluent-bit:
-  enabled: false
-
-nginx-ldapauth-proxy:
+  filebeatConfig:
+    filebeat.yml: |
+      output.file.enabled: false
+      output.elasticsearch:
+        hosts: ["http://elastic-stack-elasticsearch-master:9200"]
+      filebeat.inputs:
+      - type: container
+        paths:
+          - '/var/lib/docker/containers/*/*.log'
+        json.keys_under_root: true
+        json.ignore_decoding_error: true
+        processors:
+          - add_id:
+              target_field: tie_breaker_id
+          - add_cloud_metadata: ~
+          - add_kubernetes_metadata: ~
+          - decode_json_fields:
+              fields: ["message"]
+              when:
+                equals:
+                  kubernetes.container.namespace: "gitlab-managed-apps"
+                  kubernetes.container.name: "modsecurity-log"
+kibana:
   enabled: false
+  elasticsearchHosts: "http://elastic-stack-elasticsearch-master:9200"
 
 elasticsearch-curator:
   enabled: true
@@ -63,7 +44,7 @@ elasticsearch-curator:
       ---
       client:
         hosts:
-          - elastic-stack-elasticsearch-client
+          - elastic-stack-elasticsearch-master
         port: 9200
     action_file_yml: |-
       ---
@@ -76,6 +57,7 @@ elasticsearch-curator:
             actionable list of indices (ignore_empty_list) and exit cleanly.
           options:
             ignore_empty_list: True
+            allow_ilm_indices: True
           filters:
           - filtertype: pattern
             kind: prefix
@@ -86,17 +68,3 @@ elasticsearch-curator:
             timestring: '%Y.%m.%d'
             unit: days
             unit_count: 30
-        2:
-          action: delete_indices
-          description: >-
-            Indices created by filebeat 6.7.0 are incompatible with filebeat 7,
-            so they will be deleted.
-          options:
-            ignore_empty_list: True
-          filters:
-          - filtertype: pattern
-            kind: prefix
-            value: filebeat-6.7.0-
-
-elasticsearch-exporter:
-  enabled: false