meta-starlingx/meta-stx-flock/stx-monitor-armada-app/monitor-helm-elastic/0004-Update-to-Elastic-7.4.0-Release.patch

   1 From 560555d13b524eb5209ab42144a3d40989cc2ac7 Mon Sep 17 00:00:00 2001
   2 From: John Kung <john.kung@windriver.com>
   3 Date: Tue, 15 Oct 2019 12:56:39 -0400
   4 Subject: [PATCH 1/1] Update to Elastic 7.4.0 Release
   5
   6 ---
   7  CHANGELOG.md                                       | 45 ++++++++++++++++++++--
   8  elasticsearch/Chart.yaml                           |  4 +-
   9  elasticsearch/README.md                            |  8 ++--
  10  elasticsearch/examples/default/test/goss.yaml      |  2 +-
  11  elasticsearch/examples/openshift/test/goss.yaml    |  2 +-
  12  elasticsearch/examples/oss/test/goss.yaml          |  2 +-
  13  elasticsearch/examples/upgrade/test/goss.yaml      |  2 +-
  14  elasticsearch/values.yaml                          |  2 +-
  15  filebeat/Chart.yaml                                |  4 +-
  16  filebeat/README.md                                 |  8 ++--
  17  filebeat/examples/default/test/goss.yaml           |  4 +-
  18  filebeat/examples/oss/test/goss.yaml               |  2 +-
  19  filebeat/examples/security/test/goss.yaml          |  2 +-
  20  filebeat/values.yaml                               |  2 +-
  21  helpers/bumper.py                                  |  4 +-
  22  helpers/examples.mk                                |  2 +-
  23  kibana/Chart.yaml                                  |  4 +-
  24  kibana/README.md                                   |  8 ++--
  25  kibana/examples/default/test/goss.yaml             |  2 +-
  26  kibana/values.yaml                                 |  2 +-
  27  metricbeat/Chart.yaml                              |  4 +-
  28  metricbeat/README.md                               |  8 ++--
  29  metricbeat/examples/default/test/goss-metrics.yaml |  6 +--
  30  metricbeat/examples/default/test/goss.yaml         |  6 +--
  31  metricbeat/examples/oss/test/goss-metrics.yaml     |  6 +--
  32  metricbeat/examples/oss/test/goss.yaml             |  6 +--
  33  .../examples/security/test/goss-metrics.yaml       |  6 +--
  34  metricbeat/examples/security/test/goss.yaml        |  6 +--
  35  metricbeat/values.yaml                             |  2 +-
  36  29 files changed, 99 insertions(+), 62 deletions(-)
  37
  38 diff --git a/CHANGELOG.md b/CHANGELOG.md
  39 index 250d11a..bb2fc24 100644
  40 --- a/CHANGELOG.md
  41 +++ b/CHANGELOG.md
  42 @@ -1,9 +1,46 @@
  43  # Changelog
  44
  45 +## 7.4.0 - 2019/10/01
  46 +
  47 +* 7.4.0 as the default stack version
  48 +* Helm-tester Docker image migrated to Python 3 in [#297](https://github.com/elastic/helm-charts/pull/297) [@jmlrt](https://github.com/jmlrt)
  49 +* Helm-tester Python dependencies freeze in [#309](https://github.com/elastic/helm-charts/pull/309) [@jmlrt](https://github.com/jmlrt)
  50 +
  51 +### Elasticsearch
  52 +
  53 +| PR                                                      | Author                                             | Title                                                                               |
  54 +| ------------------------------------------------------- | -------------------------------------------------- | ----------------------------------------------------------------------------------- |
  55 +|[#296](https://github.com/elastic/helm-charts/pull/296)  | [@jmlrt](https://github.com/jmlrt)                 | Fix "; \" when there is no additional command in the Makefiles                      |
  56 +|[#298](https://github.com/elastic/helm-charts/pull/298)  | [@floretan](https://github.com/floretan)           | Make it possible to override the endpoint template.                                 |
  57 +|[#263](https://github.com/elastic/helm-charts/pull/263)  | [@Crazybus](https://github.com/Crazybus)           | Add working examples for running Elasticsearch and Kibana on OpenShift              |
  58 +|[#301](https://github.com/elastic/helm-charts/pull/301)  | [@ravishivt](https://github.com/ravishivt)         | Fix bug in keystore initContainer                                                   |
  59 +
  60 +### Kibana
  61 +
  62 +| PR                                                      | Author                                             | Title                                                                               |
  63 +| ------------------------------------------------------- | -------------------------------------------------- | ----------------------------------------------------------------------------------- |
  64 +|[#295](https://github.com/elastic/helm-charts/pull/295)  | [@karlbohlmark](https://github.com/karlbohlmark)   | Allow configuring lifecycle events                                                  |
  65 +|[#263](https://github.com/elastic/helm-charts/pull/263)  | [@Crazybus](https://github.com/Crazybus)           | Add working examples for running Elasticsearch and Kibana on OpenShift              |
  66 +|[#303](https://github.com/elastic/helm-charts/pull/303)  | [@code-chris](https://github.com/code-chris)       | Add compatibility for k8s 1.16 and change min k8s version due to ingress apiVersion |
  67 +
  68 +
  69 +### Filebeat
  70 +
  71 +| PR                                                      | Author                                             | Title                                                                               |
  72 +| ------------------------------------------------------- | -------------------------------------------------- | ----------------------------------------------------------------------------------- |
  73 +|[#304](https://github.com/elastic/helm-charts/pull/304)  | [@code-chris](https://github.com/code-chris)       | Change min k8s version due to daemonset apiVersion                                  |
  74 +
  75 +### Metricbeat
  76 +
  77 +| PR                                                      | Author                                             | Title                                                                               |
  78 +| ------------------------------------------------------- | -------------------------------------------------- | ----------------------------------------------------------------------------------- |
  79 +|[#305](https://github.com/elastic/helm-charts/pull/305)  | [@code-chris](https://github.com/code-chris)       | Change min k8s version due to used apiVersions                                      |
  80 +
  81 +
  82  ## 7.3.2 - 2019/09/19
  83
  84  * 7.3.2 as the default stack version
  85 -* Testing of GKE for 1.11 dropped and 1.14 added [#287](https://github.com/elastic/helm-charts/pull/287))
  86 +* Testing of GKE for 1.11 dropped and 1.14 added [#287](https://github.com/elastic/helm-charts/pull/287)
  87  * Make helper scripts python3 compatible [#255](https://github.com/elastic/helm-charts/pull/255) [@cclauss](https://github.com/cclauss)
  88
  89  ### Elasticsearch
  90 @@ -176,14 +213,14 @@
  91
  92  ### Elasticsearch
  93
  94 -* [#100](https://github.com/elastic/helm-charts/pull/100) - @kuisathaverat - Remove deprecated zen ping unicast hosts setting
  95 +* [#100](https://github.com/elastic/helm-charts/pull/100) - @kuisathaverat - Remove deprecated zen ping unicast hosts setting
  96  * [#114](https://github.com/elastic/helm-charts/pull/114) - @Crazybus - Make persistent volumes optional
  97  * [#115](https://github.com/elastic/helm-charts/pull/115) - @Crazybus - Added an integration test for upgrading from the previous release and testing rolling upgrades
  98
  99
 100  ### Kibana
 101
 102 -* [#107](https://github.com/elastic/helm-charts/pull/107) - @Crazybus - Make the health check path configurable to support webroots and other customizations.
 103 +* [#107](https://github.com/elastic/helm-charts/pull/107) - @Crazybus - Make the health check path configurable to support webroots and other customizations.
 104
 105  ---
 106  ## 7.0.0-alpha1 - 2019/04/17
 107 @@ -203,7 +240,7 @@ esMajorVersion: 6
 108  imageTag: 6.7.1
 109  ```
 110
 111 -If you are upgrading an existing cluster that did not override the default `storageClassName` you will now need to specify the `storageClassName`. This only affects existing clusters and was changed in https://github.com/elastic/helm-charts/pull/94. The advantage of this is that now the helm chart will just use the default storageClassName rather than needing to override it for any providers where it is not called `standard`.
 112 +If you are upgrading an existing cluster that did not override the default `storageClassName` you will now need to specify the `storageClassName`. This only affects existing clusters and was changed in https://github.com/elastic/helm-charts/pull/94. The advantage of this is that now the helm chart will just use the default storageClassName rather than needing to override it for any providers where it is not called `standard`.
 113
 114  ```
 115  volumeClaimTemplate:
 116 diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml
 117 index cfb40d8..e9d5d24 100755
 118 --- a/elasticsearch/Chart.yaml
 119 +++ b/elasticsearch/Chart.yaml
 120 @@ -4,8 +4,8 @@ maintainers:
 121  - email: helm-charts@elastic.co
 122    name: Elastic
 123  name: elasticsearch
 124 -version: 7.3.2
 125 -appVersion: 7.3.2
 126 +version: 7.4.0
 127 +appVersion: 7.4.0
 128  sources:
 129    - https://github.com/elastic/elasticsearch
 130  icon: https://helm.elastic.co/icons/elasticsearch.png
 131 diff --git a/elasticsearch/README.md b/elasticsearch/README.md
 132 index ff90f09..ab9fe7f 100644
 133 --- a/elasticsearch/README.md
 134 +++ b/elasticsearch/README.md
 135 @@ -43,14 +43,14 @@ This chart is tested with the latest supported versions. The currently tested ve
 136
 137  | 6.x   | 7.x   |
 138  | ----- | ----- |
 139 -| 6.8.3 | 7.3.2 |
 140 +| 6.8.3 | 7.4.0 |
 141
 142  Examples of installing older major versions can be found in the [examples](./examples) directory.
 143
 144 -While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.3.2` of Elasticsearch it would look like this:
 145 +While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.4.0` of Elasticsearch it would look like this:
 146
 147  ```
 148 -helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.3.2
 149 +helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.4.0
 150  ```
 151
 152  ## Configuration
 153 @@ -71,7 +71,7 @@ helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.3.2
 154  | `extraInitContainers`         | Templatable string of additional init containers to be passed to the `tpl` function                                                                                                                                                                                                                                        | `""`                                                                                                                      |
 155  | `secretMounts`                | Allows you easily mount a secret as a file inside the statefulset. Useful for mounting certificates and other secrets. See [values.yaml](./values.yaml) for an example                                                                                                                                                     | `[]`                                                                                                                      |
 156  | `image`                       | The Elasticsearch docker image                                                                                                                                                                                                                                                                                             | `docker.elastic.co/elasticsearch/elasticsearch`                                                                           |
 157 -| `imageTag`                    | The Elasticsearch docker image tag                                                                                                                                                                                                                                                                                         | `7.3.2`                                                                                                                   |
 158 +| `imageTag`                    | The Elasticsearch docker image tag                                                                                                                                                                                                                                                                                         | `7.4.0`                                                                                                                   |
 159  | `imagePullPolicy`             | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value                                                                                                                                                                                                             | `IfNotPresent`                                                                                                            |
 160  | `podAnnotations`              | Configurable [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) applied to all Elasticsearch pods                                                                                                                                                                               | `{}`                                                                                                                      |
 161  | `labels`                      | Configurable [label](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) applied to all Elasticsearch pods                                                                                                                                                                                          | `{}`                                                                                                                      |
 162 diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml
 163 index 182981d..49b1994 100644
 164 --- a/elasticsearch/examples/default/test/goss.yaml
 165 +++ b/elasticsearch/examples/default/test/goss.yaml
 166 @@ -15,7 +15,7 @@ http:
 167      status: 200
 168      timeout: 2000
 169      body:
 170 -      - '"number" : "7.3.2"'
 171 +      - '"number" : "7.4.0"'
 172        - '"cluster_name" : "elasticsearch"'
 173        - '"name" : "elasticsearch-master-0"'
 174        - 'You Know, for Search'
 175 diff --git a/elasticsearch/examples/openshift/test/goss.yaml b/elasticsearch/examples/openshift/test/goss.yaml
 176 index 275754b..3a7a1b0 100644
 177 --- a/elasticsearch/examples/openshift/test/goss.yaml
 178 +++ b/elasticsearch/examples/openshift/test/goss.yaml
 179 @@ -11,7 +11,7 @@ http:
 180      status: 200
 181      timeout: 2000
 182      body:
 183 -      - '"number" : "7.3.0"'
 184 +      - '"number" : "7.4.0"'
 185        - '"cluster_name" : "elasticsearch"'
 186        - '"name" : "elasticsearch-master-0"'
 187        - 'You Know, for Search'
 188 diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml
 189 index 21e268b..1eec5a8 100644
 190 --- a/elasticsearch/examples/oss/test/goss.yaml
 191 +++ b/elasticsearch/examples/oss/test/goss.yaml
 192 @@ -11,7 +11,7 @@ http:
 193      status: 200
 194      timeout: 2000
 195      body:
 196 -      - '"number" : "7.3.2"'
 197 +      - '"number" : "7.4.0"'
 198        - '"cluster_name" : "oss"'
 199        - '"name" : "oss-master-0"'
 200        - 'You Know, for Search'
 201 diff --git a/elasticsearch/examples/upgrade/test/goss.yaml b/elasticsearch/examples/upgrade/test/goss.yaml
 202 index 5e20f7f..f7dbf10 100644
 203 --- a/elasticsearch/examples/upgrade/test/goss.yaml
 204 +++ b/elasticsearch/examples/upgrade/test/goss.yaml
 205 @@ -11,7 +11,7 @@ http:
 206      status: 200
 207      timeout: 2000
 208      body:
 209 -      - '"number" : "7.3.2"'
 210 +      - '"number" : "7.4.0"'
 211        - '"cluster_name" : "upgrade"'
 212        - '"name" : "upgrade-master-0"'
 213        - 'You Know, for Search'
 214 diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
 215 index f4fca1f..6175540 100755
 216 --- a/elasticsearch/values.yaml
 217 +++ b/elasticsearch/values.yaml
 218 @@ -43,7 +43,7 @@ secretMounts: []
 219  #    path: /usr/share/elasticsearch/config/certs
 220
 221  image: "docker.elastic.co/elasticsearch/elasticsearch-oss"
 222 -imageTag: "7.3.2"
 223 +imageTag: "7.4.0"
 224  imagePullPolicy: "IfNotPresent"
 225
 226  podAnnotations: {}
 227 diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml
 228 index 59d7ebe..42cffb3 100755
 229 --- a/filebeat/Chart.yaml
 230 +++ b/filebeat/Chart.yaml
 231 @@ -4,8 +4,8 @@ maintainers:
 232  - email: helm-charts@elastic.co
 233    name: Elastic
 234  name: filebeat
 235 -version: 7.3.2
 236 -appVersion: 7.3.2
 237 +version: 7.4.0
 238 +appVersion: 7.4.0
 239  sources:
 240    - https://github.com/elastic/beats
 241  icon: https://helm.elastic.co/icons/filebeat.png
 242 diff --git a/filebeat/README.md b/filebeat/README.md
 243 index 901515d..5b56ca1 100644
 244 --- a/filebeat/README.md
 245 +++ b/filebeat/README.md
 246 @@ -30,14 +30,14 @@ This chart is tested with the latest supported versions. The currently tested ve
 247
 248  | 6.x   | 7.x   |
 249  | ----- | ----- |
 250 -| 6.8.3 | 7.3.2 |
 251 +| 6.8.3 | 7.4.0 |
 252
 253  Examples of installing older major versions can be found in the [examples](./examples) directory.
 254
 255 -While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.3.2` of Filebeat it would look like this:
 256 +While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.4.0` of Filebeat it would look like this:
 257
 258  ```
 259 -helm install --name filebeat elastic/filebeat --set imageTag=7.3.2
 260 +helm install --name filebeat elastic/filebeat --set imageTag=7.4.0
 261  ```
 262
 263
 264 @@ -50,7 +50,7 @@ helm install --name filebeat elastic/filebeat --set imageTag=7.3.2
 265  | `extraVolumes`           | Templatable string of additional volumes to be passed to the `tpl` function                                                                                                                                                                                                 | `""`                                                                                                                      |
 266  | `hostPathRoot`           | Fully-qualified [hostPath](https://kubernetes.io/docs/concepts/storage/volumes/#hostpath) that will be used to persist Filebeat registry data                                                                                                                               | `/var/lib`                                                                                                                |
 267  | `image`                  | The Filebeat docker image                                                                                                                                                                                                                                                   | `docker.elastic.co/beats/filebeat`                                                                                        |
 268 -| `imageTag`               | The Filebeat docker image tag                                                                                                                                                                                                                                               | `7.3.2`                                                                                                                   |
 269 +| `imageTag`               | The Filebeat docker image tag                                                                                                                                                                                                                                               | `7.4.0`                                                                                                                   |
 270  | `imagePullPolicy`        | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value                                                                                                                                                              | `IfNotPresent`                                                                                                            |
 271  | `imagePullSecrets`       | Configuration for [imagePullSecrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret) so that you can use a private registry for your image                                                        | `[]`                                                                                                                      |
 272  | `managedServiceAccount`  | Whether the `serviceAccount` should be managed by this helm chart. Set this to `false` in order to manage your own service account and related roles.                                                                                                                       | `true`                                                                                                                    |
 273 diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml
 274 index ea0ca18..6713348 100644
 275 --- a/filebeat/examples/default/test/goss.yaml
 276 +++ b/filebeat/examples/default/test/goss.yaml
 277 @@ -29,7 +29,7 @@ http:
 278      status: 200
 279      timeout: 2000
 280      body:
 281 -      - 'filebeat-7.3.2'
 282 +      - 'filebeat-7.4.0'
 283
 284  file:
 285    /usr/share/filebeat/filebeat.yml:
 286 @@ -44,4 +44,4 @@ command:
 287      exit-status: 0
 288      stdout:
 289        - 'elasticsearch: http://elasticsearch-master:9200'
 290 -      - 'version: 7.3.2'
 291 +      - 'version: 7.4.0'
 292 diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml
 293 index cf9d0a9..f38cbfe 100644
 294 --- a/filebeat/examples/oss/test/goss.yaml
 295 +++ b/filebeat/examples/oss/test/goss.yaml
 296 @@ -19,4 +19,4 @@ http:
 297      status: 200
 298      timeout: 2000
 299      body:
 300 -      - 'filebeat-7.3.2'
 301 +      - 'filebeat-7.4.0'
 302 diff --git a/filebeat/examples/security/test/goss.yaml b/filebeat/examples/security/test/goss.yaml
 303 index f5efc42..a7ef6c3 100644
 304 --- a/filebeat/examples/security/test/goss.yaml
 305 +++ b/filebeat/examples/security/test/goss.yaml
 306 @@ -3,7 +3,7 @@ http:
 307      status: 200
 308      timeout: 2000
 309      body:
 310 -      - 'filebeat-7.3.2'
 311 +      - 'filebeat-7.4.0'
 312      allow-insecure: true
 313      username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
 314      password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
 315 diff --git a/filebeat/values.yaml b/filebeat/values.yaml
 316 index 284185a..1e6af75 100755
 317 --- a/filebeat/values.yaml
 318 +++ b/filebeat/values.yaml
 319 @@ -34,7 +34,7 @@ extraVolumes: ""
 320  hostPathRoot: /var/lib
 321
 322  image: "docker.elastic.co/beats/filebeat"
 323 -imageTag: "7.3.2"
 324 +imageTag: "7.4.0"
 325  imagePullPolicy: "IfNotPresent"
 326  imagePullSecrets: []
 327
 328 diff --git a/helpers/bumper.py b/helpers/bumper.py
 329 index c1cf2a8..5d4f0d6 100755
 330 --- a/helpers/bumper.py
 331 +++ b/helpers/bumper.py
 332 @@ -7,11 +7,11 @@ import fileinput
 333
 334  os.chdir(os.path.join(os.path.dirname(__file__), '..'))
 335
 336 -chart_version = '7.3.2'
 337 +chart_version = '7.4.0'
 338
 339  versions = {
 340      6: '6.8.3',
 341 -    7: '7.3.2',
 342 +    7: '7.4.0',
 343  }
 344
 345  file_patterns = [
 346 diff --git a/helpers/examples.mk b/helpers/examples.mk
 347 index 9a429f8..56f749c 100644
 348 --- a/helpers/examples.mk
 349 +++ b/helpers/examples.mk
 350 @@ -1,7 +1,7 @@
 351  GOSS_VERSION := v0.3.6
 352  GOSS_FILE ?= goss.yaml
 353  GOSS_SELECTOR ?= release=$(RELEASE)
 354 -STACK_VERSION := 7.3.2
 355 +STACK_VERSION := 7.4.0
 356
 357  goss:
 358         GOSS_CONTAINER=$$(kubectl get --no-headers=true pods -l $(GOSS_SELECTOR) -o custom-columns=:metadata.name | sed -n 1p ) && \
 359 diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml
 360 index 2754b57..d858b0a 100755
 361 --- a/kibana/Chart.yaml
 362 +++ b/kibana/Chart.yaml
 363 @@ -4,8 +4,8 @@ maintainers:
 364  - email: helm-charts@elastic.co
 365    name: Elastic
 366  name: kibana
 367 -version: 7.3.2
 368 -appVersion: 7.3.2
 369 +version: 7.4.0
 370 +appVersion: 7.4.0
 371  sources:
 372    - https://github.com/elastic/kibana
 373  icon: https://helm.elastic.co/icons/kibana.png
 374 diff --git a/kibana/README.md b/kibana/README.md
 375 index ef30957..6f2cf2e 100644
 376 --- a/kibana/README.md
 377 +++ b/kibana/README.md
 378 @@ -26,14 +26,14 @@ This chart is tested with the latest supported versions. The currently tested ve
 379
 380  | 6.x   | 7.x   |
 381  | ----- | ----- |
 382 -| 6.8.3 | 7.3.2 |
 383 +| 6.8.3 | 7.4.0 |
 384
 385  Examples of installing older major versions can be found in the [examples](./examples) directory.
 386
 387 -While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.3.2` of Kibana it would look like this:
 388 +While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.4.0` of Kibana it would look like this:
 389
 390  ```
 391 -helm install --name kibana elastic/kibana --set imageTag=7.3.2
 392 +helm install --name kibana elastic/kibana --set imageTag=7.4.0
 393  ```
 394
 395  ## Configuration
 396 @@ -46,7 +46,7 @@ helm install --name kibana elastic/kibana --set imageTag=7.3.2
 397  | `extraEnvs`               | Extra [environment variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/#using-environment-variables-inside-of-your-config) which will be appended to the `env:` definition for the container                                                                                                             | `[]`                                                                                                                      |
 398  | `secretMounts`            | Allows you easily mount a secret as a file inside the deployment. Useful for mounting certificates and other secrets. See [values.yaml](./values.yaml) for an example                                                                                                                                                                                          | `[]`                                                                                                                      |
 399  | `image`                   | The Kibana docker image                                                                                                                                                                                                                                                                                                                                        | `docker.elastic.co/kibana/kibana`                                                                                         |
 400 -| `imageTag`                | The Kibana docker image tag                                                                                                                                                                                                                                                                                                                                    | `7.3.2`                                                                                                                   |
 401 +| `imageTag`                | The Kibana docker image tag                                                                                                                                                                                                                                                                                                                                    | `7.4.0`                                                                                                                   |
 402  | `imagePullPolicy`         | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value                                                                                                                                                                                                                                                 | `IfNotPresent`                                                                                                            |
 403  | `podAnnotations`          | Configurable [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) applied to all Kibana pods                                                                                                                                                                                                                          | `{}`                                                                                                                      |
 404  | `resources`               | Allows you to set the [resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) for the statefulset                                                                                                                                                                                                                   | `requests.cpu: 100m`<br>`requests.memory: 500Mi`<br>`limits.cpu: 1000m`<br>`limits.memory: 2Gi`                             |
 405 diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml
 406 index 760d38a..2bafc00 100644
 407 --- a/kibana/examples/default/test/goss.yaml
 408 +++ b/kibana/examples/default/test/goss.yaml
 409 @@ -3,7 +3,7 @@ http:
 410      status: 200
 411      timeout: 2000
 412      body:
 413 -      - '"number":"7.3.2"'
 414 +      - '"number":"7.4.0"'
 415
 416    http://localhost:5601/app/kibana:
 417      status: 200
 418 diff --git a/kibana/values.yaml b/kibana/values.yaml
 419 index 1af52b8..4e3668c 100755
 420 --- a/kibana/values.yaml
 421 +++ b/kibana/values.yaml
 422 @@ -22,7 +22,7 @@ secretMounts: []
 423  #    subPath: kibana.keystore # optional
 424
 425  image: "docker.elastic.co/kibana/kibana"
 426 -imageTag: "7.3.2"
 427 +imageTag: "7.4.0"
 428  imagePullPolicy: "IfNotPresent"
 429
 430  # additionals labels
 431 diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml
 432 index 569d47c..d6f0f4b 100755
 433 --- a/metricbeat/Chart.yaml
 434 +++ b/metricbeat/Chart.yaml
 435 @@ -4,8 +4,8 @@ maintainers:
 436  - email: helm-charts@elastic.co
 437    name: Elastic
 438  name: metricbeat
 439 -version: 7.3.2
 440 -appVersion: 7.3.2
 441 +version: 7.4.0
 442 +appVersion: 7.4.0
 443  sources:
 444    - https://github.com/elastic/beats
 445  icon: https://helm.elastic.co/icons/metricbeat.png
 446 diff --git a/metricbeat/README.md b/metricbeat/README.md
 447 index 1e53f47..ecca6f4 100644
 448 --- a/metricbeat/README.md
 449 +++ b/metricbeat/README.md
 450 @@ -26,14 +26,14 @@ This chart is tested with the latest supported versions. The currently tested ve
 451
 452  | 6.x   | 7.x   |
 453  | ----- | ----- |
 454 -| 6.8.3 | 7.3.2 |
 455 +| 6.8.3 | 7.4.0 |
 456
 457  Examples of installing older major versions can be found in the [examples](./examples) directory.
 458
 459 -While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.3.2` of metricbeat it would look like this:
 460 +While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.4.0` of metricbeat it would look like this:
 461
 462  ```
 463 -helm install --name metricbeat elastic/metricbeat --set imageTag=7.3.2
 464 +helm install --name metricbeat elastic/metricbeat --set imageTag=7.4.0
 465  ```
 466
 467
 468 @@ -46,7 +46,7 @@ helm install --name metricbeat elastic/metricbeat --set imageTag=7.3.2
 469  | `extraVolumes`           | Templatable string of additional volumes to be passed to the `tpl` function                                                                                                                                                                                                 | `""`                                                                                                                      |
 470  | `hostPathRoot`           | Fully-qualified [hostPath](https://kubernetes.io/docs/concepts/storage/volumes/#hostpath) that will be used to persist Metricbeat registry data                                                                                                                             | `/var/lib`                                                                                                                |
 471  | `image`                  | The Metricbeat docker image                                                                                                                                                                                                                                                 | `docker.elastic.co/beats/metricbeat`                                                                                      |
 472 -| `imageTag`               | The Metricbeat docker image tag                                                                                                                                                                                                                                             | `7.3.2`                                                                                                                   |
 473 +| `imageTag`               | The Metricbeat docker image tag                                                                                                                                                                                                                                             | `7.4.0`                                                                                                                   |
 474  | `imagePullPolicy`        | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value                                                                                                                                                              | `IfNotPresent`                                                                                                            |
 475  | `imagePullSecrets`       | Configuration for [imagePullSecrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret) so that you can use a private registry for your image                                                        | `[]`                                                                                                                      |
 476  | `managedServiceAccount`  | Whether the `serviceAccount` should be managed by this helm chart. Set this to `false` in order to manage your own service account and related roles.                                                                                                                       | `true`                                                                                                                    |
 477 diff --git a/metricbeat/examples/default/test/goss-metrics.yaml b/metricbeat/examples/default/test/goss-metrics.yaml
 478 index 3e0304d..b4e5163 100644
 479 --- a/metricbeat/examples/default/test/goss-metrics.yaml
 480 +++ b/metricbeat/examples/default/test/goss-metrics.yaml
 481 @@ -21,13 +21,13 @@ http:
 482      status: 200
 483      timeout: 2000
 484      body:
 485 -      - 'metricbeat-7.3.2'
 486 +      - 'metricbeat-7.4.0'
 487
 488    'http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat':
 489      status: 200
 490      timeout: 2000
 491      body:
 492 -      - 'metricbeat-7.3.2'
 493 +      - 'metricbeat-7.4.0'
 494
 495  file:
 496    /usr/share/metricbeat/metricbeat.yml:
 497 @@ -42,4 +42,4 @@ command:
 498      exit-status: 0
 499      stdout:
 500        - 'elasticsearch: http://elasticsearch-master:9200'
 501 -      - 'version: 7.3.2'
 502 +      - 'version: 7.4.0'
 503 diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml
 504 index edb4e13..c1614ab 100644
 505 --- a/metricbeat/examples/default/test/goss.yaml
 506 +++ b/metricbeat/examples/default/test/goss.yaml
 507 @@ -29,12 +29,12 @@ http:
 508      status: 200
 509      timeout: 2000
 510      body:
 511 -      - 'metricbeat-7.3.2'
 512 +      - 'metricbeat-7.4.0'
 513    'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat':
 514      status: 200
 515      timeout: 2000
 516      body:
 517 -      - 'metricbeat-7.3.2'
 518 +      - 'metricbeat-7.4.0'
 519
 520  file:
 521    /usr/share/metricbeat/metricbeat.yml:
 522 @@ -49,4 +49,4 @@ command:
 523      exit-status: 0
 524      stdout:
 525        - 'elasticsearch: http://elasticsearch-master:9200'
 526 -      - 'version: 7.3.2'
 527 +      - 'version: 7.4.0'
 528 diff --git a/metricbeat/examples/oss/test/goss-metrics.yaml b/metricbeat/examples/oss/test/goss-metrics.yaml
 529 index 947a71d..ea98e76 100644
 530 --- a/metricbeat/examples/oss/test/goss-metrics.yaml
 531 +++ b/metricbeat/examples/oss/test/goss-metrics.yaml
 532 @@ -21,12 +21,12 @@ http:
 533      status: 200
 534      timeout: 2000
 535      body:
 536 -      - 'metricbeat-7.3.2'
 537 +      - 'metricbeat-7.4.0'
 538    http://oss-master:9200/_search?q=metricset.name:state_deployment:
 539      status: 200
 540      timeout: 2000
 541      body:
 542 -      - 'metricbeat-7.3.2'
 543 +      - 'metricbeat-7.4.0'
 544
 545  file:
 546    /usr/share/metricbeat/metricbeat.yml:
 547 @@ -40,4 +40,4 @@ command:
 548      exit-status: 0
 549      stdout:
 550        - 'elasticsearch: http://oss-master:9200'
 551 -      - 'version: 7.3.2'
 552 +      - 'version: 7.4.0'
 553 diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml
 554 index d39d1b2..3b5c523 100644
 555 --- a/metricbeat/examples/oss/test/goss.yaml
 556 +++ b/metricbeat/examples/oss/test/goss.yaml
 557 @@ -29,12 +29,12 @@ http:
 558      status: 200
 559      timeout: 2000
 560      body:
 561 -      - 'metricbeat-7.3.2'
 562 +      - 'metricbeat-7.4.0'
 563    http://oss-master:9200/_search?q=metricset.name:container:
 564      status: 200
 565      timeout: 2000
 566      body:
 567 -      - 'metricbeat-7.3.2'
 568 +      - 'metricbeat-7.4.0'
 569
 570  file:
 571    /usr/share/metricbeat/metricbeat.yml:
 572 @@ -48,4 +48,4 @@ command:
 573      exit-status: 0
 574      stdout:
 575        - 'elasticsearch: http://oss-master:9200'
 576 -      - 'version: 7.3.2'
 577 +      - 'version: 7.4.0'
 578 diff --git a/metricbeat/examples/security/test/goss-metrics.yaml b/metricbeat/examples/security/test/goss-metrics.yaml
 579 index 80d57a8..ecb788f 100644
 580 --- a/metricbeat/examples/security/test/goss-metrics.yaml
 581 +++ b/metricbeat/examples/security/test/goss-metrics.yaml
 582 @@ -21,7 +21,7 @@ http:
 583      status: 200
 584      timeout: 2000
 585      body:
 586 -      - 'metricbeat-7.3.2'
 587 +      - 'metricbeat-7.4.0'
 588      allow-insecure: true
 589      username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
 590      password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
 591 @@ -29,7 +29,7 @@ http:
 592      status: 200
 593      timeout: 2000
 594      body:
 595 -      - 'metricbeat-7.3.2'
 596 +      - 'metricbeat-7.4.0'
 597      allow-insecure: true
 598      username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
 599      password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
 600 @@ -46,4 +46,4 @@ command:
 601      exit-status: 0
 602      stdout:
 603        - 'elasticsearch: https://security-master:9200'
 604 -      - 'version: 7.3.2'
 605 +      - 'version: 7.4.0'
 606 diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml
 607 index d25b9de..0e2f04c 100644
 608 --- a/metricbeat/examples/security/test/goss.yaml
 609 +++ b/metricbeat/examples/security/test/goss.yaml
 610 @@ -29,7 +29,7 @@ http:
 611      status: 200
 612      timeout: 2000
 613      body:
 614 -      - 'metricbeat-7.3.2'
 615 +      - 'metricbeat-7.4.0'
 616      allow-insecure: true
 617      username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
 618      password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
 619 @@ -37,7 +37,7 @@ http:
 620      status: 200
 621      timeout: 2000
 622      body:
 623 -      - 'metricbeat-7.3.2'
 624 +      - 'metricbeat-7.4.0'
 625      allow-insecure: true
 626      username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
 627      password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
 628 @@ -54,4 +54,4 @@ command:
 629      exit-status: 0
 630      stdout:
 631        - 'elasticsearch: https://security-master:9200'
 632 -      - 'version: 7.3.2'
 633 +      - 'version: 7.4.0'
 634 diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml
 635 index 5c85249..3f9f0b1 100755
 636 --- a/metricbeat/values.yaml
 637 +++ b/metricbeat/values.yaml
 638 @@ -86,7 +86,7 @@ extraVolumes: ""
 639  hostPathRoot: /var/lib
 640
 641  image: "docker.elastic.co/beats/metricbeat"
 642 -imageTag: "7.3.2"
 643 +imageTag: "7.4.0"
 644  imagePullPolicy: "IfNotPresent"
 645  imagePullSecrets: []
 646
 647 --
 648 1.8.3.1
 649