From 1f9e8a4f8a4edbf2773b4553953abb6074ee77ce Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Tue, 22 Oct 2019 11:53:06 +0200 Subject: [PATCH 1/6] 7.4.1 release --- CHANGELOG.md | 42 +++++++++++++---- elasticsearch/Chart.yaml | 4 +- elasticsearch/README.md | 8 ++-- elasticsearch/examples/6.x/test/goss.yaml | 2 +- elasticsearch/examples/6.x/values.yaml | 2 +- elasticsearch/examples/default/test/goss.yaml | 2 +- .../examples/kubernetes-kind/values.yaml | 4 +- .../examples/openshift/test/goss.yaml | 2 +- elasticsearch/examples/oss/test/goss.yaml | 2 +- elasticsearch/examples/upgrade/test/goss.yaml | 2 +- elasticsearch/values.yaml | 2 +- filebeat/Chart.yaml | 4 +- filebeat/README.md | 8 ++-- filebeat/examples/6.x/test/goss.yaml | 2 +- filebeat/examples/6.x/values.yaml | 2 +- filebeat/examples/default/test/goss.yaml | 4 +- filebeat/examples/oss/test/goss.yaml | 2 +- filebeat/examples/security/test/goss.yaml | 2 +- filebeat/values.yaml | 2 +- helpers/bumper.py | 6 +-- helpers/examples.mk | 2 +- kibana/Chart.yaml | 4 +- kibana/README.md | 8 ++-- kibana/examples/6.x/test/goss.yaml | 2 +- kibana/examples/6.x/values.yml | 2 +- kibana/examples/default/test/goss.yaml | 2 +- kibana/values.yaml | 2 +- logstash/examples/beats/Makefile | 16 +++++++ logstash/examples/beats/test/goss.yaml | 45 +++++++++++++++++++ logstash/examples/beats/values.yaml | 18 ++++++++ metricbeat/Chart.yaml | 4 +- metricbeat/README.md | 8 ++-- .../examples/6.x/test/goss-metrics.yaml | 6 +-- metricbeat/examples/6.x/test/goss.yaml | 6 +-- metricbeat/examples/6.x/values.yaml | 2 +- .../examples/default/test/goss-metrics.yaml | 6 +-- metricbeat/examples/default/test/goss.yaml | 6 +-- .../examples/oss/test/goss-metrics.yaml | 6 +-- metricbeat/examples/oss/test/goss.yaml | 6 +-- .../examples/security/test/goss-metrics.yaml | 6 +-- metricbeat/examples/security/test/goss.yaml | 6 +-- metricbeat/values.yaml | 2 +- 42 files changed, 187 insertions(+), 82 deletions(-) create mode 100644 logstash/examples/beats/Makefile create mode 100644 logstash/examples/beats/test/goss.yaml create mode 100644 logstash/examples/beats/values.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index dfde04495..cd93cd502 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,33 @@ # Changelog +## 7.4.1 - 2019/10/22 + +* 7.4.1 as the default stack version +* 6.8.4 as 6.x tested version + +### Elasticsearch + +| PR | Author | Title | +| ------------------------------------------------------- | ----------------------------------------- | -------------------------------------------- | +|[#313](https://github.com/elastic/helm-charts/pull/313) | [@Crazybus](https://github.com/Crazybus) | Add logging when adding password to keystore | +|[#301](https://github.com/elastic/helm-charts/pull/301) | [@ravishivt](https://github.com/ravishivt) | Fix bug in keystore initContainer | +|[#274](https://github.com/elastic/helm-charts/pull/274) | [@salaboy](https://github.com/salaboy) | Add Example for Kubernetes KIND | +|[#335](https://github.com/elastic/helm-charts/pull/335) | [@jmlrt](https://github.com/jmlrt) | Fix deprecated note | +|[#337](https://github.com/elastic/helm-charts/pull/337) | [@jmlrt](https://github.com/jmlrt) | Remove unused default value | + +### Kibana + +| PR | Author | Title | +| ------------------------------------------------------ | ---------------------------------- | ------------------------------- | +|[#326](https://github.com/elastic/helm-charts/pull/326) | [@jmlrt](https://github.com/jmlrt) | Remove unused antiAffinity keys | + +### Metricbeat + +| PR | Author | Title | +| ------------------------------------------------------ | ---------------------------------- | ------------------------------------------------------ | +|[#339](https://github.com/elastic/helm-charts/pull/339) | [@jmlrt](https://github.com/jmlrt) | Allow adding additional labels to Metricbeat Daemonset | + + ## 7.4.0 - 2019/10/01 * 7.4.0 as the default stack version @@ -101,7 +129,7 @@ | [#225](https://github.com/elastic/helm-charts/pull/225) | [@plumcraft](https://github.com/plumcraft) | Add configurable pod labels | | [#230](https://github.com/elastic/helm-charts/pull/230) | [@Crazybus](https://github.com/Crazybus) | Add subPath support to secretMounts | ---- + ## 7.2.1-0 - 2019/07/18 * [#195](https://github.com/elastic/helm-charts/pull/195) - @cclauss - Initial steps started to move all python2 code to python3 @@ -131,7 +159,7 @@ * [#127](https://github.com/elastic/helm-charts/pull/127) - @Crazybus - Add metricbeat chart * [#128](https://github.com/elastic/helm-charts/pull/128) - @Crazybus - Add ci jobs for metricbeat ---- + ## 7.2.0 - 2019/07/01 * 7.2.0 as the default stack version @@ -148,7 +176,6 @@ * [#186](https://github.com/elastic/helm-charts/pull/186) - @Crazybus - Fix pvc annotations with multiple fields * [#189](https://github.com/elastic/helm-charts/pull/189) - @gnatpat - Add resources to sidecar container - ### Kibana * [#160](https://github.com/elastic/helm-charts/pull/160) - @Crazybus - Add configurable nodePort to the service spec @@ -162,7 +189,7 @@ * [#182](https://github.com/elastic/helm-charts/pull/182) - @hxquangnhat - Fix secretName field for secretMounts * [#188](https://github.com/elastic/helm-charts/pull/188) - @cclauss - Fix octal literal to work in both Python 2 and Python 3 ---- + ## 7.1.1 - 2019/06/07 * 7.1.1 as the default stack version @@ -180,7 +207,7 @@ * [#140](https://github.com/elastic/helm-charts/pull/140) - @Crazybus - Remove fsGroup from container level security context ---- + ## 7.1.0 - 2019/05/21 * 7.1.0 as the default stack version @@ -204,7 +231,7 @@ * [#121](https://github.com/elastic/helm-charts/pull/121) - @Crazybus - Add integration tests and other tweaks * [#129](https://github.com/elastic/helm-charts/pull/129) - @tylerjl - Add usage notes for filebeat ---- + ## 7.0.1-alpha1 - 2019/05/01 * 7.0.1 as the default stack version @@ -218,12 +245,11 @@ * [#114](https://github.com/elastic/helm-charts/pull/114) - @Crazybus - Make persistent volumes optional * [#115](https://github.com/elastic/helm-charts/pull/115) - @Crazybus - Added an integration test for upgrading from the previous release and testing rolling upgrades - ### Kibana * [#107](https://github.com/elastic/helm-charts/pull/107) - @Crazybus - Make the health check path configurable to support webroots and other customizations. ---- + ## 7.0.0-alpha1 - 2019/04/17 * [#96](https://github.com/elastic/helm-charts/pull/96) - @Crazybus - 7.0.0 as the default stack version diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index 1ce656815..8a5db51ff 100755 --- a/elasticsearch/Chart.yaml +++ b/elasticsearch/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: elasticsearch -version: 7.4.0 -appVersion: 7.4.0 +version: 7.4.1 +appVersion: 7.4.1 sources: - https://github.com/elastic/elasticsearch icon: https://helm.elastic.co/icons/elasticsearch.png diff --git a/elasticsearch/README.md b/elasticsearch/README.md index d37a2ef39..32a8dea9f 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -42,14 +42,14 @@ This chart is tested with the latest supported versions. The currently tested ve | 6.x | 7.x | | ----- | ----- | -| 6.8.3 | 7.4.0 | +| 6.8.4 | 7.4.1 | Examples of installing older major versions can be found in the [examples](./examples) directory. -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: +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.1` of Elasticsearch it would look like this: ``` -helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.4.0 +helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.4.1 ``` ## Configuration @@ -70,7 +70,7 @@ helm install --name elasticsearch elastic/elasticsearch --set imageTag=7.4.0 | `extraInitContainers` | Templatable string of additional init containers to be passed to the `tpl` function | `""` | | `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 | `[]` | | `image` | The Elasticsearch docker image | `docker.elastic.co/elasticsearch/elasticsearch` | -| `imageTag` | The Elasticsearch docker image tag | `7.4.0` | +| `imageTag` | The Elasticsearch docker image tag | `7.4.1` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` | | `podAnnotations` | Configurable [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) applied to all Elasticsearch pods | `{}` | | `labels` | Configurable [label](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) applied to all Elasticsearch pods | `{}` | diff --git a/elasticsearch/examples/6.x/test/goss.yaml b/elasticsearch/examples/6.x/test/goss.yaml index b3e98b1c1..be15386ae 100644 --- a/elasticsearch/examples/6.x/test/goss.yaml +++ b/elasticsearch/examples/6.x/test/goss.yaml @@ -11,7 +11,7 @@ http: status: 200 timeout: 2000 body: - - '"number" : "6.8.3"' + - '"number" : "6.8.4"' - '"cluster_name" : "six"' - '"name" : "six-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/6.x/values.yaml b/elasticsearch/examples/6.x/values.yaml index 858a5ec58..aef2284d4 100644 --- a/elasticsearch/examples/6.x/values.yaml +++ b/elasticsearch/examples/6.x/values.yaml @@ -1,4 +1,4 @@ --- clusterName: "six" -imageTag: "6.8.3" +imageTag: "6.8.4" diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml index 49b1994c1..f5c405684 100644 --- a/elasticsearch/examples/default/test/goss.yaml +++ b/elasticsearch/examples/default/test/goss.yaml @@ -15,7 +15,7 @@ http: status: 200 timeout: 2000 body: - - '"number" : "7.4.0"' + - '"number" : "7.4.1"' - '"cluster_name" : "elasticsearch"' - '"name" : "elasticsearch-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/kubernetes-kind/values.yaml b/elasticsearch/examples/kubernetes-kind/values.yaml index 15f667173..ffa7b624c 100644 --- a/elasticsearch/examples/kubernetes-kind/values.yaml +++ b/elasticsearch/examples/kubernetes-kind/values.yaml @@ -23,7 +23,7 @@ volumeClaimTemplate: extraInitContainers: | - name: create image: busybox:1.28 - command: ['mkdir', '/usr/share/elasticsearch/data/nodes/'] + command: ['mkdir', '/usr/share/elasticsearch/data/nodes/'] volumeMounts: - mountPath: /usr/share/elasticsearch/data name: elasticsearch-master @@ -33,4 +33,4 @@ extraInitContainers: | volumeMounts: - mountPath: /usr/share/elasticsearch/data name: elasticsearch-master - + diff --git a/elasticsearch/examples/openshift/test/goss.yaml b/elasticsearch/examples/openshift/test/goss.yaml index 3a7a1b07e..67a392002 100644 --- a/elasticsearch/examples/openshift/test/goss.yaml +++ b/elasticsearch/examples/openshift/test/goss.yaml @@ -11,7 +11,7 @@ http: status: 200 timeout: 2000 body: - - '"number" : "7.4.0"' + - '"number" : "7.4.1"' - '"cluster_name" : "elasticsearch"' - '"name" : "elasticsearch-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml index 1eec5a8fb..888a41e1d 100644 --- a/elasticsearch/examples/oss/test/goss.yaml +++ b/elasticsearch/examples/oss/test/goss.yaml @@ -11,7 +11,7 @@ http: status: 200 timeout: 2000 body: - - '"number" : "7.4.0"' + - '"number" : "7.4.1"' - '"cluster_name" : "oss"' - '"name" : "oss-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/upgrade/test/goss.yaml b/elasticsearch/examples/upgrade/test/goss.yaml index f7dbf1057..9a0d0869e 100644 --- a/elasticsearch/examples/upgrade/test/goss.yaml +++ b/elasticsearch/examples/upgrade/test/goss.yaml @@ -11,7 +11,7 @@ http: status: 200 timeout: 2000 body: - - '"number" : "7.4.0"' + - '"number" : "7.4.1"' - '"cluster_name" : "upgrade"' - '"name" : "upgrade-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index 10840e7c3..72bf2b47c 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -43,7 +43,7 @@ secretMounts: [] # path: /usr/share/elasticsearch/config/certs image: "docker.elastic.co/elasticsearch/elasticsearch" -imageTag: "7.4.0" +imageTag: "7.4.1" imagePullPolicy: "IfNotPresent" podAnnotations: {} diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index 48dbb4f6a..85aaeb3b3 100755 --- a/filebeat/Chart.yaml +++ b/filebeat/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: filebeat -version: 7.4.0 -appVersion: 7.4.0 +version: 7.4.1 +appVersion: 7.4.1 sources: - https://github.com/elastic/beats icon: https://helm.elastic.co/icons/filebeat.png diff --git a/filebeat/README.md b/filebeat/README.md index d8b57c9bd..75deed3cd 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -30,14 +30,14 @@ This chart is tested with the latest supported versions. The currently tested ve | 6.x | 7.x | | ----- | ----- | -| 6.8.3 | 7.4.0 | +| 6.8.4 | 7.4.1 | Examples of installing older major versions can be found in the [examples](./examples) directory. -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: +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.1` of Filebeat it would look like this: ``` -helm install --name filebeat elastic/filebeat --set imageTag=7.4.0 +helm install --name filebeat elastic/filebeat --set imageTag=7.4.1 ``` @@ -50,7 +50,7 @@ helm install --name filebeat elastic/filebeat --set imageTag=7.4.0 | `extraVolumes` | Templatable string of additional volumes to be passed to the `tpl` function | `""` | | `hostPathRoot` | Fully-qualified [hostPath](https://kubernetes.io/docs/concepts/storage/volumes/#hostpath) that will be used to persist Filebeat registry data | `/var/lib` | | `image` | The Filebeat docker image | `docker.elastic.co/beats/filebeat` | -| `imageTag` | The Filebeat docker image tag | `7.4.0` | +| `imageTag` | The Filebeat docker image tag | `7.4.1` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` | | `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 | `[]` | | `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` | diff --git a/filebeat/examples/6.x/test/goss.yaml b/filebeat/examples/6.x/test/goss.yaml index 00216d8b3..548931117 100644 --- a/filebeat/examples/6.x/test/goss.yaml +++ b/filebeat/examples/6.x/test/goss.yaml @@ -18,4 +18,4 @@ http: status: 200 timeout: 2000 body: - - 'filebeat-6.8.3' + - 'filebeat-6.8.4' diff --git a/filebeat/examples/6.x/values.yaml b/filebeat/examples/6.x/values.yaml index faff356ef..d943f7c3c 100644 --- a/filebeat/examples/6.x/values.yaml +++ b/filebeat/examples/6.x/values.yaml @@ -1,4 +1,4 @@ -imageTag: 6.8.3 +imageTag: 6.8.4 extraEnvs: - name: ELASTICSEARCH_HOSTS diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml index 671334894..a05b72d22 100644 --- a/filebeat/examples/default/test/goss.yaml +++ b/filebeat/examples/default/test/goss.yaml @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'filebeat-7.4.0' + - 'filebeat-7.4.1' file: /usr/share/filebeat/filebeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.4.0' + - 'version: 7.4.1' diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml index f38cbfefd..dabef5803 100644 --- a/filebeat/examples/oss/test/goss.yaml +++ b/filebeat/examples/oss/test/goss.yaml @@ -19,4 +19,4 @@ http: status: 200 timeout: 2000 body: - - 'filebeat-7.4.0' + - 'filebeat-7.4.1' diff --git a/filebeat/examples/security/test/goss.yaml b/filebeat/examples/security/test/goss.yaml index a7ef6c3c7..f9d47c889 100644 --- a/filebeat/examples/security/test/goss.yaml +++ b/filebeat/examples/security/test/goss.yaml @@ -3,7 +3,7 @@ http: status: 200 timeout: 2000 body: - - 'filebeat-7.4.0' + - 'filebeat-7.4.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' diff --git a/filebeat/values.yaml b/filebeat/values.yaml index 1e6af7585..0adcae1f1 100755 --- a/filebeat/values.yaml +++ b/filebeat/values.yaml @@ -34,7 +34,7 @@ extraVolumes: "" hostPathRoot: /var/lib image: "docker.elastic.co/beats/filebeat" -imageTag: "7.4.0" +imageTag: "7.4.1" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/helpers/bumper.py b/helpers/bumper.py index 5d4f0d602..0cc756147 100755 --- a/helpers/bumper.py +++ b/helpers/bumper.py @@ -7,11 +7,11 @@ os.chdir(os.path.join(os.path.dirname(__file__), '..')) -chart_version = '7.4.0' +chart_version = '7.4.1' versions = { - 6: '6.8.3', - 7: '7.4.0', + 6: '6.8.4', + 7: '7.4.1', } file_patterns = [ diff --git a/helpers/examples.mk b/helpers/examples.mk index 56f749c70..94b7d2af8 100644 --- a/helpers/examples.mk +++ b/helpers/examples.mk @@ -1,7 +1,7 @@ GOSS_VERSION := v0.3.6 GOSS_FILE ?= goss.yaml GOSS_SELECTOR ?= release=$(RELEASE) -STACK_VERSION := 7.4.0 +STACK_VERSION := 7.4.1 goss: GOSS_CONTAINER=$$(kubectl get --no-headers=true pods -l $(GOSS_SELECTOR) -o custom-columns=:metadata.name | sed -n 1p ) && \ diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index 946bcd90c..318c04ac7 100755 --- a/kibana/Chart.yaml +++ b/kibana/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: kibana -version: 7.4.0 -appVersion: 7.4.0 +version: 7.4.1 +appVersion: 7.4.1 sources: - https://github.com/elastic/kibana icon: https://helm.elastic.co/icons/kibana.png diff --git a/kibana/README.md b/kibana/README.md index 5d7e68633..cfefde9f4 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -26,14 +26,14 @@ This chart is tested with the latest supported versions. The currently tested ve | 6.x | 7.x | | ----- | ----- | -| 6.8.3 | 7.4.0 | +| 6.8.4 | 7.4.1 | Examples of installing older major versions can be found in the [examples](./examples) directory. -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: +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.1` of Kibana it would look like this: ``` -helm install --name kibana elastic/kibana --set imageTag=7.4.0 +helm install --name kibana elastic/kibana --set imageTag=7.4.1 ``` ## Configuration @@ -46,7 +46,7 @@ helm install --name kibana elastic/kibana --set imageTag=7.4.0 | `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 | `[]` | | `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 | `[]` | | `image` | The Kibana docker image | `docker.elastic.co/kibana/kibana` | -| `imageTag` | The Kibana docker image tag | `7.4.0` | +| `imageTag` | The Kibana docker image tag | `7.4.1` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` | | `podAnnotations` | Configurable [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) applied to all Kibana pods | `{}` | | `resources` | Allows you to set the [resources](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) for the statefulset | `requests.cpu: 100m`
`requests.memory: 500Mi`
`limits.cpu: 1000m`
`limits.memory: 2Gi` | diff --git a/kibana/examples/6.x/test/goss.yaml b/kibana/examples/6.x/test/goss.yaml index 629d2fc35..50bdc3142 100644 --- a/kibana/examples/6.x/test/goss.yaml +++ b/kibana/examples/6.x/test/goss.yaml @@ -3,7 +3,7 @@ http: status: 200 timeout: 2000 body: - - '"number":"6.8.3"' + - '"number":"6.8.4"' http://localhost:5601/app/kibana: status: 200 diff --git a/kibana/examples/6.x/values.yml b/kibana/examples/6.x/values.yml index 3f9cdeda2..2c59f7672 100644 --- a/kibana/examples/6.x/values.yml +++ b/kibana/examples/6.x/values.yml @@ -1,4 +1,4 @@ --- -imageTag: 6.8.3 +imageTag: 6.8.4 elasticsearchHosts: "http://six-master:9200" diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml index 2bafc00a2..4bd704ce2 100644 --- a/kibana/examples/default/test/goss.yaml +++ b/kibana/examples/default/test/goss.yaml @@ -3,7 +3,7 @@ http: status: 200 timeout: 2000 body: - - '"number":"7.4.0"' + - '"number":"7.4.1"' http://localhost:5601/app/kibana: status: 200 diff --git a/kibana/values.yaml b/kibana/values.yaml index 6791cd388..77ed94f4e 100755 --- a/kibana/values.yaml +++ b/kibana/values.yaml @@ -22,7 +22,7 @@ secretMounts: [] # subPath: kibana.keystore # optional image: "docker.elastic.co/kibana/kibana" -imageTag: "7.4.0" +imageTag: "7.4.1" imagePullPolicy: "IfNotPresent" # additionals labels diff --git a/logstash/examples/beats/Makefile b/logstash/examples/beats/Makefile new file mode 100644 index 000000000..4efeb1a64 --- /dev/null +++ b/logstash/examples/beats/Makefile @@ -0,0 +1,16 @@ +default: test + +include ../../../helpers/examples.mk + +RELEASE := helm-logstash-beats + +install: + helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../ + +restart: + helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) ../../ + +test: install goss + +purge: + helm del --purge $(RELEASE) diff --git a/logstash/examples/beats/test/goss.yaml b/logstash/examples/beats/test/goss.yaml new file mode 100644 index 000000000..51e508d53 --- /dev/null +++ b/logstash/examples/beats/test/goss.yaml @@ -0,0 +1,45 @@ +port: + tcp:9600: + listening: true + ip: + - '0.0.0.0' + tcp:5045: + listening: true + ip: + - '0.0.0.0' + +user: + logstash: + exists: true + uid: 1000 + gid: 1000 + +http: + http://localhost:9600?pretty: + status: 200 + timeout: 2000 + body: + - '"host" : "helm-logstash-beats-logstash-0"' + - '"version" : "7.4.1"' + - '"http_address" : "0.0.0.0:9600"' + - '"name" : "helm-logstash-beats-logstash-0"' + - '"status" : "green"' + - '"workers" : 1' + - '"batch_size" : 125' + - '"batch_delay" : 50' + http://elasticsearch-master:9200/_cat/indices: + status: 200 + timeout: 2000 + body: + - 'logstash' + +file: + /usr/share/logstash/pipeline/beats.conf: + exists: true + mode: "0644" + owner: root + group: logstash + filetype: file + contains: + - 'input { beats { port => 5045 } }' + - 'output { elasticsearch { hosts => ["http://elasticsearch-master:9200"] index => "logstash" } }' diff --git a/logstash/examples/beats/values.yaml b/logstash/examples/beats/values.yaml new file mode 100644 index 000000000..4564f8f9c --- /dev/null +++ b/logstash/examples/beats/values.yaml @@ -0,0 +1,18 @@ +logstashConfig: + logstash.yml: | + http.host: 0.0.0.0 + xpack.monitoring.enabled: false + +logstashPipeline: + beats.conf: | + input { beats { port => 5045 } } + output { elasticsearch { hosts => ["http://elasticsearch-master:9200"] index => "logstash" } } + +service: + annotations: {} + type: ClusterIP + ports: + - name: beats + port: 5045 + protocol: TCP + targetPort: 5045 diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index b3010fff2..f4465160b 100755 --- a/metricbeat/Chart.yaml +++ b/metricbeat/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: metricbeat -version: 7.4.0 -appVersion: 7.4.0 +version: 7.4.1 +appVersion: 7.4.1 sources: - https://github.com/elastic/beats icon: https://helm.elastic.co/icons/metricbeat.png diff --git a/metricbeat/README.md b/metricbeat/README.md index 7130945f8..918269190 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -26,14 +26,14 @@ This chart is tested with the latest supported versions. The currently tested ve | 6.x | 7.x | | ----- | ----- | -| 6.8.3 | 7.4.0 | +| 6.8.4 | 7.4.1 | Examples of installing older major versions can be found in the [examples](./examples) directory. -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: +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.1` of metricbeat it would look like this: ``` -helm install --name metricbeat elastic/metricbeat --set imageTag=7.4.0 +helm install --name metricbeat elastic/metricbeat --set imageTag=7.4.1 ``` @@ -46,7 +46,7 @@ helm install --name metricbeat elastic/metricbeat --set imageTag=7.4.0 | `extraVolumes` | Templatable string of additional volumes to be passed to the `tpl` function | `""` | | `hostPathRoot` | Fully-qualified [hostPath](https://kubernetes.io/docs/concepts/storage/volumes/#hostpath) that will be used to persist Metricbeat registry data | `/var/lib` | | `image` | The Metricbeat docker image | `docker.elastic.co/beats/metricbeat` | -| `imageTag` | The Metricbeat docker image tag | `7.4.0` | +| `imageTag` | The Metricbeat docker image tag | `7.4.1` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` | | `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 | `[]` | | `labels` | Configurable [label](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) applied to all Metricbeat pods | `{}` | diff --git a/metricbeat/examples/6.x/test/goss-metrics.yaml b/metricbeat/examples/6.x/test/goss-metrics.yaml index 915e0d628..2457cfda9 100644 --- a/metricbeat/examples/6.x/test/goss-metrics.yaml +++ b/metricbeat/examples/6.x/test/goss-metrics.yaml @@ -21,12 +21,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.3' + - 'metricbeat-6.8.4' http://six-master:9200/_search?q=metricset.name:state_deployment: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.3' + - 'metricbeat-6.8.4' file: /usr/share/metricbeat/metricbeat.yml: @@ -40,4 +40,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://six-master:9200' - - 'version: 6.8.3' + - 'version: 6.8.4' diff --git a/metricbeat/examples/6.x/test/goss.yaml b/metricbeat/examples/6.x/test/goss.yaml index f57b46408..4ced77a51 100644 --- a/metricbeat/examples/6.x/test/goss.yaml +++ b/metricbeat/examples/6.x/test/goss.yaml @@ -29,12 +29,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.3' + - 'metricbeat-6.8.4' http://six-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.3' + - 'metricbeat-6.8.4' file: /usr/share/metricbeat/metricbeat.yml: @@ -48,4 +48,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://six-master:9200' - - 'version: 6.8.3' + - 'version: 6.8.4' diff --git a/metricbeat/examples/6.x/values.yaml b/metricbeat/examples/6.x/values.yaml index faff356ef..d943f7c3c 100644 --- a/metricbeat/examples/6.x/values.yaml +++ b/metricbeat/examples/6.x/values.yaml @@ -1,4 +1,4 @@ -imageTag: 6.8.3 +imageTag: 6.8.4 extraEnvs: - name: ELASTICSEARCH_HOSTS diff --git a/metricbeat/examples/default/test/goss-metrics.yaml b/metricbeat/examples/default/test/goss-metrics.yaml index b4e5163d5..6503e5d21 100644 --- a/metricbeat/examples/default/test/goss-metrics.yaml +++ b/metricbeat/examples/default/test/goss-metrics.yaml @@ -21,13 +21,13 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.4.0' + - 'metricbeat-7.4.1' 'http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.4.0' + - 'metricbeat-7.4.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -42,4 +42,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.4.0' + - 'version: 7.4.1' diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml index c1614ab56..47f4f37bf 100644 --- a/metricbeat/examples/default/test/goss.yaml +++ b/metricbeat/examples/default/test/goss.yaml @@ -29,12 +29,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.4.0' + - 'metricbeat-7.4.1' 'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.4.0' + - 'metricbeat-7.4.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -49,4 +49,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.4.0' + - 'version: 7.4.1' diff --git a/metricbeat/examples/oss/test/goss-metrics.yaml b/metricbeat/examples/oss/test/goss-metrics.yaml index ea98e763f..861a40b9e 100644 --- a/metricbeat/examples/oss/test/goss-metrics.yaml +++ b/metricbeat/examples/oss/test/goss-metrics.yaml @@ -21,12 +21,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.4.0' + - 'metricbeat-7.4.1' http://oss-master:9200/_search?q=metricset.name:state_deployment: status: 200 timeout: 2000 body: - - 'metricbeat-7.4.0' + - 'metricbeat-7.4.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -40,4 +40,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.4.0' + - 'version: 7.4.1' diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml index 3b5c52313..742df15aa 100644 --- a/metricbeat/examples/oss/test/goss.yaml +++ b/metricbeat/examples/oss/test/goss.yaml @@ -29,12 +29,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.4.0' + - 'metricbeat-7.4.1' http://oss-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-7.4.0' + - 'metricbeat-7.4.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -48,4 +48,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.4.0' + - 'version: 7.4.1' diff --git a/metricbeat/examples/security/test/goss-metrics.yaml b/metricbeat/examples/security/test/goss-metrics.yaml index ecb788fa9..ff9a83253 100644 --- a/metricbeat/examples/security/test/goss-metrics.yaml +++ b/metricbeat/examples/security/test/goss-metrics.yaml @@ -21,7 +21,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.4.0' + - 'metricbeat-7.4.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.4.0' + - 'metricbeat-7.4.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -46,4 +46,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: https://security-master:9200' - - 'version: 7.4.0' + - 'version: 7.4.1' diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml index 0e2f04c7f..fbbeea247 100644 --- a/metricbeat/examples/security/test/goss.yaml +++ b/metricbeat/examples/security/test/goss.yaml @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.4.0' + - 'metricbeat-7.4.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -37,7 +37,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.4.0' + - 'metricbeat-7.4.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -54,4 +54,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: https://security-master:9200' - - 'version: 7.4.0' + - 'version: 7.4.1' diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 1afd33771..fea0deafd 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -86,7 +86,7 @@ extraVolumes: "" hostPathRoot: /var/lib image: "docker.elastic.co/beats/metricbeat" -imageTag: "7.4.0" +imageTag: "7.4.1" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] From e0d479502979279cb8721027eb58e2c6082deaea Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 23 Oct 2019 14:11:59 +0200 Subject: [PATCH 2/6] [helm] update changelog with helm 2.15.1 support --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd93cd502..5b87d9c83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * 7.4.1 as the default stack version * 6.8.4 as 6.x tested version +* Helm 2.15.1 support in [#309](https://github.com/elastic/helm-charts/pull/338) [@jmlrt](https://github.com/jmlrt) ### Elasticsearch From f8ef8d9fb615b16a7daa6ecf95b47f3278fd7127 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 23 Oct 2019 16:29:49 +0200 Subject: [PATCH 3/6] [helm] add some notice about tested helm version --- README.md | 4 +++- elasticsearch/README.md | 2 +- filebeat/README.md | 2 +- kibana/README.md | 2 +- metricbeat/README.md | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1c2732d68..be9d8bbd3 100644 --- a/README.md +++ b/README.md @@ -19,5 +19,7 @@ Please look in the chart directories for the documentation for each chart. These The charts are [currently tested](https://devops-ci.elastic.co/job/elastic+helm-charts+master/) against all GKE versions available. The exact versions are defined under `KUBERNETES_VERSIONS` in [helpers/matrix.yml](/helpers/matrix.yml) +## Helm versions - +While we are checking backward compatibility, the charts are only tested with Helm version mentioned in [helm-tester Dockerfile](helpers/helm-tester/Dockerfile) (currently 2.15.1). +Note that we don't support [Helm 3](https://v3.helm.sh/) version. diff --git a/elasticsearch/README.md b/elasticsearch/README.md index 32a8dea9f..cfc2a01a3 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -6,7 +6,7 @@ This helm chart is a lightweight way to configure and run our official [Elastics ## Requirements -* [Helm](https://helm.sh/) >= 2.8.0 +* [Helm](https://helm.sh/) >= 2.8.0 (see parent [README](../README.md) for more details) * Kubernetes >= 1.8 * Minimum cluster requirements include the following to run this chart with default settings. All of these settings are configurable. * Three Kubernetes nodes to respect the default "hard" affinity settings diff --git a/filebeat/README.md b/filebeat/README.md index 75deed3cd..c27a5887e 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -7,7 +7,7 @@ This helm chart is a lightweight way to configure and run our official [Filebeat ## Requirements * Kubernetes >= 1.9 -* [Helm](https://helm.sh/) >= 2.8.0 +* [Helm](https://helm.sh/) >= 2.8.0 (see parent [README](../README.md) for more details) ## Usage notes and getting started * The default Filebeat configuration file for this chart is configured to use an Elasticsearch endpoint. Without any additional changes, Filebeat will send documents to the service URL that the Elasticsearch helm chart sets up by default. You may either set the `ELASTICSEARCH_HOSTS` environment variable in `extraEnvs` to override this endpoint or modify the default `filebeatConfig` to change this behavior. diff --git a/kibana/README.md b/kibana/README.md index cfefde9f4..cbeedfe83 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -7,7 +7,7 @@ This helm chart is a lightweight way to configure and run our official [Kibana d ## Requirements * Kubernetes >= 1.9 -* [Helm](https://helm.sh/) >= 2.8.0 +* [Helm](https://helm.sh/) >= 2.8.0 (see parent [README](../README.md) for more details) ## Installing diff --git a/metricbeat/README.md b/metricbeat/README.md index 918269190..df86e0622 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -7,7 +7,7 @@ This helm chart is a lightweight way to configure and run our official [Metricbe ## Requirements * Kubernetes >= 1.9 -* [Helm](https://helm.sh/) >= 2.8.0 +* [Helm](https://helm.sh/) >= 2.8.0 (see parent [README](../README.md) for more details) ## Installing From a4472c8b79983b84c6f84a80997e8cebfe9620d2 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 23 Oct 2019 16:51:14 +0200 Subject: [PATCH 4/6] remove files commited by mistake --- logstash/examples/beats/Makefile | 16 --------- logstash/examples/beats/test/goss.yaml | 45 -------------------------- logstash/examples/beats/values.yaml | 18 ----------- 3 files changed, 79 deletions(-) delete mode 100644 logstash/examples/beats/Makefile delete mode 100644 logstash/examples/beats/test/goss.yaml delete mode 100644 logstash/examples/beats/values.yaml diff --git a/logstash/examples/beats/Makefile b/logstash/examples/beats/Makefile deleted file mode 100644 index 4efeb1a64..000000000 --- a/logstash/examples/beats/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -default: test - -include ../../../helpers/examples.mk - -RELEASE := helm-logstash-beats - -install: - helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../ - -restart: - helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) ../../ - -test: install goss - -purge: - helm del --purge $(RELEASE) diff --git a/logstash/examples/beats/test/goss.yaml b/logstash/examples/beats/test/goss.yaml deleted file mode 100644 index 51e508d53..000000000 --- a/logstash/examples/beats/test/goss.yaml +++ /dev/null @@ -1,45 +0,0 @@ -port: - tcp:9600: - listening: true - ip: - - '0.0.0.0' - tcp:5045: - listening: true - ip: - - '0.0.0.0' - -user: - logstash: - exists: true - uid: 1000 - gid: 1000 - -http: - http://localhost:9600?pretty: - status: 200 - timeout: 2000 - body: - - '"host" : "helm-logstash-beats-logstash-0"' - - '"version" : "7.4.1"' - - '"http_address" : "0.0.0.0:9600"' - - '"name" : "helm-logstash-beats-logstash-0"' - - '"status" : "green"' - - '"workers" : 1' - - '"batch_size" : 125' - - '"batch_delay" : 50' - http://elasticsearch-master:9200/_cat/indices: - status: 200 - timeout: 2000 - body: - - 'logstash' - -file: - /usr/share/logstash/pipeline/beats.conf: - exists: true - mode: "0644" - owner: root - group: logstash - filetype: file - contains: - - 'input { beats { port => 5045 } }' - - 'output { elasticsearch { hosts => ["http://elasticsearch-master:9200"] index => "logstash" } }' diff --git a/logstash/examples/beats/values.yaml b/logstash/examples/beats/values.yaml deleted file mode 100644 index 4564f8f9c..000000000 --- a/logstash/examples/beats/values.yaml +++ /dev/null @@ -1,18 +0,0 @@ -logstashConfig: - logstash.yml: | - http.host: 0.0.0.0 - xpack.monitoring.enabled: false - -logstashPipeline: - beats.conf: | - input { beats { port => 5045 } } - output { elasticsearch { hosts => ["http://elasticsearch-master:9200"] index => "logstash" } } - -service: - annotations: {} - type: ClusterIP - ports: - - name: beats - port: 5045 - protocol: TCP - targetPort: 5045 From 5e73a0881e137bf705e890b395a719e8224966f4 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 23 Oct 2019 16:56:08 +0200 Subject: [PATCH 5/6] fix changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b87d9c83..665dcb45f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ # Changelog -## 7.4.1 - 2019/10/22 +## 7.4.1 - 2019/10/23 * 7.4.1 as the default stack version * 6.8.4 as 6.x tested version -* Helm 2.15.1 support in [#309](https://github.com/elastic/helm-charts/pull/338) [@jmlrt](https://github.com/jmlrt) +* Helm 2.15.1 support in [#309](https://github.com/elastic/helm-charts/pull/309) [@jmlrt](https://github.com/jmlrt) ### Elasticsearch From 2701eee35caf9fe3091f7429bcdb9ff2ac2adaa8 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Wed, 23 Oct 2019 17:06:55 +0200 Subject: [PATCH 6/6] fix the fix :facepalm: --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 665dcb45f..2ad65cc6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * 7.4.1 as the default stack version * 6.8.4 as 6.x tested version -* Helm 2.15.1 support in [#309](https://github.com/elastic/helm-charts/pull/309) [@jmlrt](https://github.com/jmlrt) +* Helm 2.15.1 support in [#338](https://github.com/elastic/helm-charts/pull/338) [@jmlrt](https://github.com/jmlrt) ### Elasticsearch