diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml index 7bbf21b1c..a621d268b 100755 --- a/apm-server/Chart.yaml +++ b/apm-server/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: apm-server -version: 6.8.19-SNAPSHOT -appVersion: 6.8.19-SNAPSHOT +version: 6.8.21 +appVersion: 6.8.21 sources: - https://github.com/elastic/apm icon: https://helm.elastic.co/icons/apm.png diff --git a/apm-server/README.md b/apm-server/README.md index 750c2af1d..7cac119fa 100644 --- a/apm-server/README.md +++ b/apm-server/README.md @@ -11,7 +11,6 @@ provided as-is with no warranties. Alpha features are not subject to the support SLA of official GA features (see [supported configurations][] for more details). -**Warning**: This branch is used for development, please use the latest [6.x][] release for released version. @@ -19,7 +18,7 @@ SLA of official GA features (see [supported configurations][] for more details). - [Requirements](#requirements) - [Installing](#installing) - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 6.8 branch and 6.8.19-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) + - [Install development version using 6.8 branch and 6.8.21 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -43,7 +42,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.19-SNAPSHOT version. +This chart is tested with the latest 6.8.21 version. ### Install released version using Helm repository @@ -54,15 +53,15 @@ This chart is tested with the latest 6.8.19-SNAPSHOT version. - with Helm 3: `helm install apm-server --version elastic/apm-server` - with Helm 2 (deprecated): `helm install --name apm-server --version elastic/apm-server` -### Install development version using 6.8 branch and 6.8.19-SNAPSHOT versions +### Install development version using 6.8 branch and 6.8.21 versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` * Checkout the branch : git checkout 6.8 * Install it: - - with Helm 3: `helm install apm-server ./helm-charts/apm-server --set imageTag=6.8.19-SNAPSHOT` - - with Helm 2 (deprecated): `helm install --name apm-server ./helm-charts/apm-server --set imageTag=6.8.19-SNAPSHOT` + - with Helm 3: `helm install apm-server ./helm-charts/apm-server --set imageTag=6.8.21` + - with Helm 2 (deprecated): `helm install --name apm-server ./helm-charts/apm-server --set imageTag=6.8.21` ## Upgrading @@ -101,7 +100,7 @@ as a reference. They are also used in the automated testing of this chart. | `hostAliases` | Configurable [hostAliases][] | `[]` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The APM Server Docker image tag | `6.8.19-SNAPSHOT` | +| `imageTag` | The APM Server Docker image tag | `6.8.21` | | `image` | The APM Server Docker image | `docker.elastic.co/apm/apm-server` | | `ingress` | Configurable [ingress][] to expose the APM Server service | see [values.yaml][] | | `labels` | Configurable [labels][] applied to all APM server pods | `{}` | @@ -150,7 +149,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. [6.x]: https://github.com/elastic/helm-charts/releases -[6.8.19-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.19-SNAPSHOT/apm-server/README.md +[6.8.21]: https://github.com/elastic/helm-charts/blob/6.8.21/apm-server/README.md [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md diff --git a/apm-server/examples/default/README.md b/apm-server/examples/default/README.md index 74b9ba50a..33e69724f 100644 --- a/apm-server/examples/default/README.md +++ b/apm-server/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy APM Server 6.8.19-SNAPSHOT using [default values][]. +This example deploy APM Server 6.8.21 using [default values][]. ## Usage diff --git a/apm-server/examples/default/test/goss.yaml b/apm-server/examples/default/test/goss.yaml index 5764ec539..b6ae7e5bb 100644 --- a/apm-server/examples/default/test/goss.yaml +++ b/apm-server/examples/default/test/goss.yaml @@ -3,4 +3,4 @@ http: status: 200 timeout: 2000 body: - - '6.8.19' + - '6.8.21' diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md index 0061e18c3..4d21dca40 100644 --- a/apm-server/examples/oss/README.md +++ b/apm-server/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy APM Server 6.8.19-SNAPSHOT using [APM Server OSS][] version. +This example deploy APM Server 6.8.21 using [APM Server OSS][] version. ## Usage diff --git a/apm-server/examples/oss/test/goss.yaml b/apm-server/examples/oss/test/goss.yaml index 5764ec539..b6ae7e5bb 100644 --- a/apm-server/examples/oss/test/goss.yaml +++ b/apm-server/examples/oss/test/goss.yaml @@ -3,4 +3,4 @@ http: status: 200 timeout: 2000 body: - - '6.8.19' + - '6.8.21' diff --git a/apm-server/examples/security/README.md b/apm-server/examples/security/README.md index aa694a262..9b93c9e69 100644 --- a/apm-server/examples/security/README.md +++ b/apm-server/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy APM Server 6.8.19-SNAPSHOT using authentication and TLS to connect to +This example deploy APM Server 6.8.21 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/apm-server/examples/security/test/goss.yaml b/apm-server/examples/security/test/goss.yaml index 5764ec539..b6ae7e5bb 100644 --- a/apm-server/examples/security/test/goss.yaml +++ b/apm-server/examples/security/test/goss.yaml @@ -3,4 +3,4 @@ http: status: 200 timeout: 2000 body: - - '6.8.19' + - '6.8.21' diff --git a/apm-server/examples/upgrade/test/goss.yaml b/apm-server/examples/upgrade/test/goss.yaml index b53957426..7260b4306 100644 --- a/apm-server/examples/upgrade/test/goss.yaml +++ b/apm-server/examples/upgrade/test/goss.yaml @@ -3,4 +3,4 @@ http: status: 200 timeout: 2000 body: - - "6.8.19" + - "6.8.21" diff --git a/apm-server/values.yaml b/apm-server/values.yaml index 3d2bf7fdb..61d5b4141 100755 --- a/apm-server/values.yaml +++ b/apm-server/values.yaml @@ -68,7 +68,7 @@ hostAliases: [] # - "bar.local" image: "docker.elastic.co/apm/apm-server" -imageTag: "6.8.19-SNAPSHOT" +imageTag: "6.8.21" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index 59832fd0e..1093eee5f 100755 --- a/elasticsearch/Chart.yaml +++ b/elasticsearch/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: elasticsearch -version: 6.8.19-SNAPSHOT -appVersion: 6.8.19-SNAPSHOT +version: 6.8.21 +appVersion: 6.8.21 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 a7c0290c5..90dd0f428 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -6,7 +6,6 @@ This Helm chart is a lightweight way to configure and run our official [Elasticsearch Docker image][]. -**Warning**: This branch is used for development, please use the latest [6.x][] release for released version. @@ -14,7 +13,7 @@ This Helm chart is a lightweight way to configure and run our official - [Requirements](#requirements) - [Installing](#installing) - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 6.8 branch and 6.8.19-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) + - [Install development version using 6.8 branch and 6.8.21 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -54,7 +53,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.19-SNAPSHOT version. +This chart is tested with the latest 6.8.21 version. ### Install released version using Helm repository @@ -66,15 +65,15 @@ This chart is tested with the latest 6.8.19-SNAPSHOT version. - with Helm 2 (deprecated): `helm install --name elasticsearch --version elastic/elasticsearch` -### Install development version using 6.8 branch and 6.8.19-SNAPSHOT versions +### Install development version using 6.8 branch and 6.8.21 versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` * Checkout the branch : git checkout 6.8 * Install it: - - with Helm 3: `helm install elasticsearch ./helm-charts/elasticsearch --set imageTag=6.8.19-SNAPSHOT` - - with Helm 2 (deprecated): `helm install --name elasticsearch ./helm-charts/elasticsearch --set imageTag=6.8.19-SNAPSHOT` + - with Helm 3: `helm install elasticsearch ./helm-charts/elasticsearch --set imageTag=6.8.21` + - with Helm 2 (deprecated): `helm install --name elasticsearch ./helm-charts/elasticsearch --set imageTag=6.8.21` ## Upgrading @@ -132,7 +131,7 @@ support multiple versions with minimal changes. | `httpPort` | The http port that Kubernetes will use for the healthchecks and the service. If you change this you will also need to set [http.port][] in `extraEnvs` | `9200` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The Elasticsearch Docker image tag | `6.8.19-SNAPSHOT` | +| `imageTag` | The Elasticsearch Docker image tag | `6.8.21` | | `image` | The Elasticsearch Docker image | `docker.elastic.co/elasticsearch/elasticsearch` | | `ingress` | Configurable [ingress][] to expose the Elasticsearch service. See [values.yaml][] for an example | see [values.yaml][] | | `initResources` | Allows you to set the [resources][] for the `initContainer` in the StatefulSet | `{}` | @@ -398,7 +397,7 @@ about our development and testing process. [6.x]: https://github.com/elastic/helm-charts/releases [#63]: https://github.com/elastic/helm-charts/issues/63 -[6.8.19-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.19-SNAPSHOT/elasticsearch/README.md +[6.8.21]: https://github.com/elastic/helm-charts/blob/6.8.21/elasticsearch/README.md [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md diff --git a/elasticsearch/examples/config/README.md b/elasticsearch/examples/config/README.md index 469ad0228..5bbb859f9 100644 --- a/elasticsearch/examples/config/README.md +++ b/elasticsearch/examples/config/README.md @@ -1,6 +1,6 @@ # Config -This example deploy a single node Elasticsearch 6.8.19-SNAPSHOT with authentication and +This example deploy a single node Elasticsearch 6.8.21 with authentication and custom [values][]. diff --git a/elasticsearch/examples/default/README.md b/elasticsearch/examples/default/README.md index a7b5ee677..67d4e7938 100644 --- a/elasticsearch/examples/default/README.md +++ b/elasticsearch/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy a 3 nodes Elasticsearch 6.8.19-SNAPSHOT cluster using +This example deploy a 3 nodes Elasticsearch 6.8.21 cluster using [default values][]. diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml index d35ccc8f6..8a87e23b6 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" : "6.8.19"' + - '"number" : "6.8.21"' - '"cluster_name" : "elasticsearch"' - "You Know, for Search" diff --git a/elasticsearch/examples/docker-for-mac/README.md b/elasticsearch/examples/docker-for-mac/README.md index a1507c547..5731db460 100644 --- a/elasticsearch/examples/docker-for-mac/README.md +++ b/elasticsearch/examples/docker-for-mac/README.md @@ -1,6 +1,6 @@ # Docker for Mac -This example deploy a 3 nodes Elasticsearch 6.8.19-SNAPSHOT cluster on [Docker for Mac][] +This example deploy a 3 nodes Elasticsearch 6.8.21 cluster on [Docker for Mac][] using [custom values][]. Note that this configuration should be used for test only and isn't recommended diff --git a/elasticsearch/examples/kubernetes-kind/README.md b/elasticsearch/examples/kubernetes-kind/README.md index 739841118..8d47d07da 100644 --- a/elasticsearch/examples/kubernetes-kind/README.md +++ b/elasticsearch/examples/kubernetes-kind/README.md @@ -1,6 +1,6 @@ # KIND -This example deploy a 3 nodes Elasticsearch 6.8.19-SNAPSHOT cluster on [Kind][] +This example deploy a 3 nodes Elasticsearch 6.8.21 cluster on [Kind][] using [custom values][]. Note that this configuration should be used for test only and isn't recommended diff --git a/elasticsearch/examples/microk8s/README.md b/elasticsearch/examples/microk8s/README.md index 8b152e964..16e7d5ce6 100644 --- a/elasticsearch/examples/microk8s/README.md +++ b/elasticsearch/examples/microk8s/README.md @@ -1,6 +1,6 @@ # MicroK8S -This example deploy a 3 nodes Elasticsearch 6.8.19-SNAPSHOT cluster on [MicroK8S][] +This example deploy a 3 nodes Elasticsearch 6.8.21 cluster on [MicroK8S][] using [custom values][]. Note that this configuration should be used for test only and isn't recommended diff --git a/elasticsearch/examples/minikube/README.md b/elasticsearch/examples/minikube/README.md index f4af358a3..5f17ae37a 100644 --- a/elasticsearch/examples/minikube/README.md +++ b/elasticsearch/examples/minikube/README.md @@ -1,6 +1,6 @@ # Minikube -This example deploy a 3 nodes Elasticsearch 6.8.19-SNAPSHOT cluster on [Minikube][] +This example deploy a 3 nodes Elasticsearch 6.8.21 cluster on [Minikube][] using [custom values][]. If helm or kubectl timeouts occur, you may consider creating a minikube VM with diff --git a/elasticsearch/examples/multi/README.md b/elasticsearch/examples/multi/README.md index 2ac14acfc..8e54ed55b 100644 --- a/elasticsearch/examples/multi/README.md +++ b/elasticsearch/examples/multi/README.md @@ -1,6 +1,6 @@ # Multi -This example deploy an Elasticsearch 6.8.19-SNAPSHOT cluster composed of 3 different Helm +This example deploy an Elasticsearch 6.8.21 cluster composed of 3 different Helm releases: - `helm-es-multi-master` for the 3 master nodes using [master values][] diff --git a/elasticsearch/examples/openshift/README.md b/elasticsearch/examples/openshift/README.md index c64b4d220..d7b4be6b6 100644 --- a/elasticsearch/examples/openshift/README.md +++ b/elasticsearch/examples/openshift/README.md @@ -1,6 +1,6 @@ # OpenShift -This example deploy a 3 nodes Elasticsearch 6.8.19-SNAPSHOT cluster on [OpenShift][] +This example deploy a 3 nodes Elasticsearch 6.8.21 cluster on [OpenShift][] using [custom values][]. ## Usage diff --git a/elasticsearch/examples/openshift/test/goss.yaml b/elasticsearch/examples/openshift/test/goss.yaml index 5c7327632..7b6c95c83 100644 --- a/elasticsearch/examples/openshift/test/goss.yaml +++ b/elasticsearch/examples/openshift/test/goss.yaml @@ -11,6 +11,6 @@ http: status: 200 timeout: 2000 body: - - '"number" : "6.8.19"' + - '"number" : "6.8.21"' - '"cluster_name" : "elasticsearch"' - "You Know, for Search" diff --git a/elasticsearch/examples/oss/README.md b/elasticsearch/examples/oss/README.md index 33668be15..4daea7c24 100644 --- a/elasticsearch/examples/oss/README.md +++ b/elasticsearch/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy a 3 nodes Elasticsearch 6.8.19-SNAPSHOT cluster using +This example deploy a 3 nodes Elasticsearch 6.8.21 cluster using [Elasticsearch OSS][] version. ## Usage diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml index 74cab7762..4691feb58 100644 --- a/elasticsearch/examples/oss/test/goss.yaml +++ b/elasticsearch/examples/oss/test/goss.yaml @@ -11,6 +11,6 @@ http: status: 200 timeout: 2000 body: - - '"number" : "6.8.19"' + - '"number" : "6.8.21"' - '"cluster_name" : "oss"' - 'You Know, for Search' diff --git a/elasticsearch/examples/security/README.md b/elasticsearch/examples/security/README.md index bc9604a63..924d503cc 100644 --- a/elasticsearch/examples/security/README.md +++ b/elasticsearch/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy a 3 nodes Elasticsearch 6.8.19-SNAPSHOT with authentication and +This example deploy a 3 nodes Elasticsearch 6.8.21 with authentication and autogenerated certificates for TLS (see [values][]). Note that this configuration should be used for test only. For a production diff --git a/elasticsearch/examples/upgrade/test/goss.yaml b/elasticsearch/examples/upgrade/test/goss.yaml index af40191a3..98bbad33e 100644 --- a/elasticsearch/examples/upgrade/test/goss.yaml +++ b/elasticsearch/examples/upgrade/test/goss.yaml @@ -11,6 +11,6 @@ http: status: 200 timeout: 2000 body: - - '"number" : "6.8.19"' + - '"number" : "6.8.21"' - '"cluster_name" : "upgrade"' - "You Know, for Search" diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index e86cd7f8e..b3cd453b9 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -57,7 +57,7 @@ hostAliases: [] # - "bar.local" image: "docker.elastic.co/elasticsearch/elasticsearch" -imageTag: "6.8.19-SNAPSHOT" +imageTag: "6.8.21" imagePullPolicy: "IfNotPresent" podAnnotations: {} diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index abcb71b73..fa1675b14 100755 --- a/filebeat/Chart.yaml +++ b/filebeat/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: filebeat -version: 6.8.19-SNAPSHOT -appVersion: 6.8.19-SNAPSHOT +version: 6.8.21 +appVersion: 6.8.21 sources: - https://github.com/elastic/beats icon: https://helm.elastic.co/icons/beats.png diff --git a/filebeat/README.md b/filebeat/README.md index b66bb9ad6..4637e1d96 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -6,7 +6,6 @@ This Helm chart is a lightweight way to configure and run our official [Filebeat Docker image][]. -**Warning**: This branch is used for development, please use the latest [6.x][] release for released version. @@ -14,7 +13,7 @@ This Helm chart is a lightweight way to configure and run our official - [Requirements](#requirements) - [Installing](#installing) - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 6.8 branch and 6.8.19-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) + - [Install development version using 6.8 branch and 6.8.21 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -42,7 +41,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.19-SNAPSHOT version. +This chart is tested with the latest 6.8.21 version. ### Install released version using Helm repository @@ -54,15 +53,15 @@ This chart is tested with the latest 6.8.19-SNAPSHOT version. - with Helm 2 (deprecated): `helm install --name filebeat --version elastic/filebeat` -### Install development version using 6.8 branch and 6.8.19-SNAPSHOT versions +### Install development version using 6.8 branch and 6.8.21 versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` * Checkout the branch : git checkout 6.8 * Install it: - - with Helm 3: `helm install filebeat ./helm-charts/filebeat --set imageTag=6.8.19-SNAPSHOT` - - with Helm 2 (deprecated): `helm install --name filebeat ./helm-charts/filebeat --set imageTag=6.8.19-SNAPSHOT` + - with Helm 3: `helm install filebeat ./helm-charts/filebeat --set imageTag=6.8.21` + - with Helm 2 (deprecated): `helm install --name filebeat ./helm-charts/filebeat --set imageTag=6.8.21` ## Upgrading @@ -137,7 +136,7 @@ as a reference. They are also used in the automated testing of this chart. | `hostPathRoot` | Fully-qualified [hostPath][] that will be used to persist filebeat registry data | `/var/lib` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The filebeat Docker image tag | `6.8.19-SNAPSHOT-SNAPSHOT` | +| `imageTag` | The filebeat Docker image tag | `6.8.21-SNAPSHOT` | | `image` | The filebeat Docker image | `docker.elastic.co/beats/filebeat` | | `livenessProbe` | Parameters to pass to liveness [probe][] checks for values such as timeouts and thresholds | see [values.yaml][] | | `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` | @@ -236,7 +235,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. [6.x]: https://github.com/elastic/helm-charts/releases -[6.8.19-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.19-SNAPSHOT/filebeat/README.md +[6.8.21]: https://github.com/elastic/helm-charts/blob/6.8.21/filebeat/README.md [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md diff --git a/filebeat/examples/default/README.md b/filebeat/examples/default/README.md index a36b55906..b2580b613 100644 --- a/filebeat/examples/default/README.md +++ b/filebeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Filebeat 6.8.19-SNAPSHOT using [default values][]. +This example deploy Filebeat 6.8.21 using [default values][]. ## Usage diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml index 707fed594..46644a23c 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-6.8.19' + - 'filebeat-6.8.21' file: /usr/share/filebeat/filebeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 6.8.19' + - 'version: 6.8.21' diff --git a/filebeat/examples/deployment/README.md b/filebeat/examples/deployment/README.md index d4b3391ad..0897a417e 100644 --- a/filebeat/examples/deployment/README.md +++ b/filebeat/examples/deployment/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Filebeat 6.8.19-SNAPSHOT-SNAPSHOT using [default values][] as a Kubernetes Deployment. +This example deploy Filebeat 6.8.21-SNAPSHOT using [default values][] as a Kubernetes Deployment. ## Usage diff --git a/filebeat/examples/deployment/test/goss.yaml b/filebeat/examples/deployment/test/goss.yaml index cbe4687a7..7dee03402 100644 --- a/filebeat/examples/deployment/test/goss.yaml +++ b/filebeat/examples/deployment/test/goss.yaml @@ -3,4 +3,4 @@ http: status: 200 timeout: 2000 body: - - 'filebeat-6.8.19' + - 'filebeat-6.8.21' diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md index b0709c8f0..3f91dcbbf 100644 --- a/filebeat/examples/oss/README.md +++ b/filebeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Filebeat 6.8.19-SNAPSHOT using [Filebeat OSS][] version. +This example deploy Filebeat 6.8.21 using [Filebeat OSS][] version. ## Usage diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml index 0b81c2117..80c7abb59 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-6.8.19' + - 'filebeat-6.8.21' diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md index 8aee0c398..0aadad394 100644 --- a/filebeat/examples/security/README.md +++ b/filebeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Filebeat 6.8.19-SNAPSHOT using authentication and TLS to connect to +This example deploy Filebeat 6.8.21 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/filebeat/examples/security/test/goss.yaml b/filebeat/examples/security/test/goss.yaml index 00c7c2bb5..341dd2837 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-6.8.19' + - 'filebeat-6.8.21' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' diff --git a/filebeat/examples/upgrade/test/goss.yaml b/filebeat/examples/upgrade/test/goss.yaml index 314e61762..4a96a8e7c 100644 --- a/filebeat/examples/upgrade/test/goss.yaml +++ b/filebeat/examples/upgrade/test/goss.yaml @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - "filebeat-6.8.19" + - "filebeat-6.8.21" file: /usr/share/filebeat/filebeat.yml: diff --git a/filebeat/values.yaml b/filebeat/values.yaml index 2e18347d1..3749b188a 100755 --- a/filebeat/values.yaml +++ b/filebeat/values.yaml @@ -157,7 +157,7 @@ hostAliases: [] # - "foo.local" # - "bar.local" image: "docker.elastic.co/beats/filebeat" -imageTag: "6.8.19-SNAPSHOT" +imageTag: "6.8.21" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/helpers/examples.mk b/helpers/examples.mk index 8edce54eb..1abd118b0 100644 --- a/helpers/examples.mk +++ b/helpers/examples.mk @@ -2,7 +2,7 @@ SHELL := /bin/bash GOSS_VERSION := v0.3.6 GOSS_FILE ?= goss.yaml GOSS_SELECTOR ?= release=$(RELEASE) -STACK_VERSION := 6.8.19-SNAPSHOT +STACK_VERSION := 6.8.21 TIMEOUT := 900s .PHONY: help diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index 3548cc4c2..d86c6e938 100755 --- a/kibana/Chart.yaml +++ b/kibana/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: kibana -version: 6.8.19-SNAPSHOT -appVersion: 6.8.19-SNAPSHOT +version: 6.8.21 +appVersion: 6.8.21 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 cdd18f6ef..60d992ed8 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -6,14 +6,13 @@ This Helm chart is a lightweight way to configure and run our official [Kibana Docker image][]. -**Warning**: This branch is used for development, please use the latest [6.x][] release for released version. - [Requirements](#requirements) - [Installing](#installing) - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 6.8 branch and 6.8.19-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) + - [Install development version using 6.8 branch and 6.8.21 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -40,7 +39,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.19-SNAPSHOT version. +This chart is tested with the latest 6.8.21 version. ### Install released version using Helm repository @@ -51,15 +50,15 @@ This chart is tested with the latest 6.8.19-SNAPSHOT version. - with Helm 3: `helm install kibana --version elastic/kibana` - with Helm 2 (deprecated): `helm install --name kibana --version elastic/kibana` -### Install development version using 6.8 branch and 6.8.19-SNAPSHOT versions +### Install development version using 6.8 branch and 6.8.21 versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` * Checkout the branch : git checkout 6.8 * Install it: - - with Helm 3: `helm install kibana ./helm-charts/kibana --set imageTag=6.8.19-SNAPSHOT` - - with Helm 2 (deprecated): `helm install --name kibana ./helm-charts/kibana --set imageTag=6.8.19-SNAPSHOT` + - with Helm 3: `helm install kibana ./helm-charts/kibana --set imageTag=6.8.21` + - with Helm 2 (deprecated): `helm install --name kibana ./helm-charts/kibana --set imageTag=6.8.21` ## Upgrading @@ -87,15 +86,15 @@ as a reference. They are also used in the automated testing of this chart. | `extraContainers` | Templatable string of additional containers to be passed to the `tpl` function | `""` | | `extraEnvs` | Extra [environment variables][] which will be appended to the `env:` definition for the container | see [values.yaml][] | | `extraInitContainers` | Templatable string of additional containers to be passed to the `tpl` function | `""` | -| `extraVolumeMounts` | Configuration for additional `volumeMounts` | see [values.yaml][] | -| `extraVolumes` | Configuration for additional `volumes` | see [values.yaml][] | +| `extraVolumeMounts` | Configuration for additional `volumeMounts` | see [values.yaml][] | +| `extraVolumes` | Configuration for additional `volumes` | see [values.yaml][] | | `fullnameOverride` | Overrides the full name of the resources. If not set the name will default to " `.Release.Name` - `.Values.nameOverride orChart.Name` " | `""` | | `healthCheckPath` | The path used for the readinessProbe to check that Kibana is ready. If you are setting `server.basePath` you will also need to update this to `/${basePath}/app/kibana` | `/app/kibana` | | `hostAliases` | Configurable [hostAliases][] | `[]` | | `httpPort` | The http port that Kubernetes will use for the healthchecks and the service | `5601` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy][]value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The Kibana Docker image tag | `6.8.19-SNAPSHOT` | +| `imageTag` | The Kibana Docker image tag | `6.8.21` | | `image` | The Kibana Docker image | `docker.elastic.co/kibana/kibana` | | `ingress` | Configurable [ingress][] to expose the Kibana service. | see [values.yaml][] | | `kibanaConfig` | Allows you to add any config files in `/usr/share/kibana/config/` such as `kibana.yml` See [values.yaml][] for an example of the formatting | `{}` | @@ -207,7 +206,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. [6.x]: https://github.com/elastic/helm-charts/releases -[6.8.19-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.19-SNAPSHOT/kibana/README.md +[6.8.21]: https://github.com/elastic/helm-charts/blob/6.8.21/kibana/README.md [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md diff --git a/kibana/examples/default/README.md b/kibana/examples/default/README.md index f3e81cda8..8eadfe152 100644 --- a/kibana/examples/default/README.md +++ b/kibana/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Kibana 6.8.19-SNAPSHOT using [default values][]. +This example deploy Kibana 6.8.21 using [default values][]. ## Usage diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml index 4f3835d5f..9ef8f5d6d 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":"6.8.19"' + - '"number":"6.8.21"' http://localhost:5601/app/kibana: status: 200 diff --git a/kibana/examples/openshift/README.md b/kibana/examples/openshift/README.md index 1837f728e..ed9b0342c 100644 --- a/kibana/examples/openshift/README.md +++ b/kibana/examples/openshift/README.md @@ -1,6 +1,6 @@ # OpenShift -This example deploy Kibana 6.8.19-SNAPSHOT on [OpenShift][] using [custom values][]. +This example deploy Kibana 6.8.21 on [OpenShift][] using [custom values][]. ## Usage diff --git a/kibana/examples/oss/README.md b/kibana/examples/oss/README.md index 389ce7ee0..a7bd12cc5 100644 --- a/kibana/examples/oss/README.md +++ b/kibana/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Kibana 6.8.19-SNAPSHOT using [Kibana OSS][] version. +This example deploy Kibana 6.8.21 using [Kibana OSS][] version. ## Usage diff --git a/kibana/examples/security/README.md b/kibana/examples/security/README.md index 9d1cb7341..4f2c5b76a 100644 --- a/kibana/examples/security/README.md +++ b/kibana/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Kibana 6.8.19-SNAPSHOT using authentication and TLS to connect to +This example deploy Kibana 6.8.21 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/kibana/examples/upgrade/test/goss.yaml b/kibana/examples/upgrade/test/goss.yaml index 9a6bf4645..193620667 100644 --- a/kibana/examples/upgrade/test/goss.yaml +++ b/kibana/examples/upgrade/test/goss.yaml @@ -3,7 +3,7 @@ http: status: 200 timeout: 2000 body: - - '"number":"6.8.19"' + - '"number":"6.8.21"' http://localhost:5601/app/kibana: status: 200 diff --git a/kibana/values.yaml b/kibana/values.yaml index cb61c1dba..ac33007e1 100755 --- a/kibana/values.yaml +++ b/kibana/values.yaml @@ -35,7 +35,7 @@ hostAliases: [] # - "bar.local" image: "docker.elastic.co/kibana/kibana" -imageTag: "6.8.19-SNAPSHOT" +imageTag: "6.8.21" imagePullPolicy: "IfNotPresent" # additionals labels diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml index 26e8776c8..24457a44a 100755 --- a/logstash/Chart.yaml +++ b/logstash/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: logstash -version: 6.8.19-SNAPSHOT -appVersion: 6.8.19-SNAPSHOT +version: 6.8.21 +appVersion: 6.8.21 sources: - https://github.com/elastic/logstash icon: https://helm.elastic.co/icons/logstash.png diff --git a/logstash/README.md b/logstash/README.md index 19fa1e48c..02dbc1abc 100644 --- a/logstash/README.md +++ b/logstash/README.md @@ -11,7 +11,6 @@ provided as-is with no warranties. Alpha features are not subject to the support SLA of official GA features (see [supported configurations][] for more details). -**Warning**: This branch is used for development, please use the latest [6.x][] release for released version. @@ -19,7 +18,7 @@ SLA of official GA features (see [supported configurations][] for more details). - [Requirements](#requirements) - [Installing](#installing) - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 6.8 branch and 6.8.19-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) + - [Install development version using 6.8 branch and 6.8.21 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -42,7 +41,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.19-SNAPSHOT version. +This chart is tested with the latest 6.8.21 version. ### Install released version using Helm repository @@ -54,15 +53,15 @@ This chart is tested with the latest 6.8.19-SNAPSHOT version. - with Helm 2 (deprecated): `helm install --name logstash --version elastic/logstash` -### Install development version using 6.8 branch and 6.8.19-SNAPSHOT versions +### Install development version using 6.8 branch and 6.8.21 versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` * Checkout the branch : git checkout 6.8 * Install it: - - with Helm 3: `helm install logstash ./helm-charts/logstash --set imageTag=6.8.19-SNAPSHOT` - - with Helm 2 (deprecated): `helm install --name logstash ./helm-charts/logstash --set imageTag=6.8.19-SNAPSHOT` + - with Helm 3: `helm install logstash ./helm-charts/logstash --set imageTag=6.8.21` + - with Helm 2 (deprecated): `helm install --name logstash ./helm-charts/logstash --set imageTag=6.8.21` ## Upgrading @@ -119,7 +118,7 @@ useful for the [http input plugin][], for instance. | `httpPort` | The http port that Kubernetes will use for the healthchecks and the service | `9600` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The Logstash Docker image tag | `6.8.19-SNAPSHOT` | +| `imageTag` | The Logstash Docker image tag | `6.8.21` | | `image` | The Logstash Docker image | `docker.elastic.co/logstash/logstash` | | `labels` | Configurable [labels][] applied to all Logstash pods | `{}` | | `ingress` | Configurable [ingress][] for external access to Logstash HTTP port. | see [values.yaml][] | @@ -128,12 +127,12 @@ useful for the [http input plugin][], for instance. | `logstashConfig` | Allows you to add any config files in `/usr/share/logstash/config/` such as `logstash.yml` and `log4j2.properties` See [values.yaml][] for an example of the formatting | `{}` | | `logstashJavaOpts` | Java options for Logstash. This is where you should configure the JVM heap size | `-Xmx1g -Xms1g` | | `logstashPipeline` | Allows you to add any pipeline files in `/usr/share/logstash/pipeline/` | `{}` | -| `logstashPatternDir` | Allows you to define a custom directory to store pattern files | `/usr/share/logstash/patterns/` | -| `logstashPattern` | Allows you to add any pattern files in `logstashPatternDir` | `{}` | +| `logstashPatternDir` | Allows you to define a custom directory to store pattern files | `/usr/share/logstash/patterns/` | +| `logstashPattern` | Allows you to add any pattern files in `logstashPatternDir` | `{}` | | `maxUnavailable` | The [maxUnavailable][] value for the pod disruption budget. By default this will prevent Kubernetes from having more than 1 unhealthy pod in the node group | `1` | | `nameOverride` | Overrides the chart name for resources. If not set the name will default to `.Chart.Name` | `""` | | `nodeAffinity` | Value for the [node affinity settings][] | `{}` | -| `podAffinity` | Value for the [pod affinity settings][] | `{}` | +| `podAffinity` | Value for the [pod affinity settings][] | `{}` | | `nodeSelector` | Configurable [nodeSelector][] so that you can target specific nodes for your Logstash cluster | `{}` | | `persistence` | Enables a persistent volume for Logstash data | see [values.yaml][] | | `podAnnotations` | Configurable [annotations][] applied to all Logstash pods | `{}` | @@ -197,7 +196,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. [6.x]: https://github.com/elastic/helm-charts/releases -[6.8.19-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.19-SNAPSHOT/logstash/README.md +[6.8.21]: https://github.com/elastic/helm-charts/blob/6.8.21/logstash/README.md [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md diff --git a/logstash/examples/default/README.md b/logstash/examples/default/README.md index 86d988726..ff026e527 100644 --- a/logstash/examples/default/README.md +++ b/logstash/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Logstash 6.8.19-SNAPSHOT using [default values][]. +This example deploy Logstash 6.8.21 using [default values][]. ## Usage diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml index 72960d8e4..c7a9d9d39 100644 --- a/logstash/examples/default/test/goss.yaml +++ b/logstash/examples/default/test/goss.yaml @@ -9,7 +9,7 @@ http: status: 200 timeout: 2000 body: - - '"version" : "6.8.19"' + - '"version" : "6.8.21"' - '"http_address" : "0.0.0.0:9600"' file: diff --git a/logstash/examples/elasticsearch/README.md b/logstash/examples/elasticsearch/README.md index 683537159..8bd7834cb 100644 --- a/logstash/examples/elasticsearch/README.md +++ b/logstash/examples/elasticsearch/README.md @@ -1,6 +1,6 @@ # Elasticsearch -This example deploy Logstash 6.8.19-SNAPSHOT which connects to Elasticsearch (see +This example deploy Logstash 6.8.21 which connects to Elasticsearch (see [values][]). diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml index 8c8d55509..636e99ded 100644 --- a/logstash/examples/elasticsearch/test/goss.yaml +++ b/logstash/examples/elasticsearch/test/goss.yaml @@ -21,7 +21,7 @@ http: status: 200 timeout: 2000 body: - - '"version" : "6.8.19"' + - '"version" : "6.8.21"' - '"http_address" : "0.0.0.0:9600"' http://elasticsearch-master:9200/_cat/indices: status: 200 diff --git a/logstash/examples/oss/README.md b/logstash/examples/oss/README.md index c55841184..e0e83aa46 100644 --- a/logstash/examples/oss/README.md +++ b/logstash/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Logstash 6.8.19-SNAPSHOT using [Logstash OSS][] version. +This example deploy Logstash 6.8.21 using [Logstash OSS][] version. ## Usage diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml index fa301e8bd..d1a8986c6 100644 --- a/logstash/examples/oss/test/goss.yaml +++ b/logstash/examples/oss/test/goss.yaml @@ -9,7 +9,7 @@ http: status: 200 timeout: 2000 body: - - '"version" : "6.8.19"' + - '"version" : "6.8.21"' - '"http_address" : "0.0.0.0:9600"' file: diff --git a/logstash/examples/security/test/goss.yaml b/logstash/examples/security/test/goss.yaml index d145115f2..77aedd2c1 100644 --- a/logstash/examples/security/test/goss.yaml +++ b/logstash/examples/security/test/goss.yaml @@ -21,7 +21,7 @@ http: status: 200 timeout: 2000 body: - - '"version" : "6.8.19"' + - '"version" : "6.8.21"' - '"http_address" : "0.0.0.0:9600"' https://security-master:9200/_cat/indices: status: 200 diff --git a/logstash/examples/upgrade/test/goss.yaml b/logstash/examples/upgrade/test/goss.yaml index 72960d8e4..c7a9d9d39 100644 --- a/logstash/examples/upgrade/test/goss.yaml +++ b/logstash/examples/upgrade/test/goss.yaml @@ -9,7 +9,7 @@ http: status: 200 timeout: 2000 body: - - '"version" : "6.8.19"' + - '"version" : "6.8.21"' - '"http_address" : "0.0.0.0:9600"' file: diff --git a/logstash/values.yaml b/logstash/values.yaml index 5b0ad6e2c..f6ee444d1 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -72,7 +72,7 @@ hostAliases: [] # - "bar.local" image: "docker.elastic.co/logstash/logstash" -imageTag: "6.8.19-SNAPSHOT" +imageTag: "6.8.21" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index ce6a1b7f4..e6642cd6b 100755 --- a/metricbeat/Chart.yaml +++ b/metricbeat/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: metricbeat -version: 6.8.19-SNAPSHOT -appVersion: 6.8.19-SNAPSHOT +version: 6.8.21 +appVersion: 6.8.21 sources: - https://github.com/elastic/beats icon: https://helm.elastic.co/icons/beats.png diff --git a/metricbeat/README.md b/metricbeat/README.md index 557459a48..58190d291 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -6,7 +6,6 @@ This Helm chart is a lightweight way to configure and run our official [Metricbeat Docker image][]. -**Warning**: This branch is used for development, please use the latest [6.x][] release for released version. @@ -14,7 +13,7 @@ This Helm chart is a lightweight way to configure and run our official - [Requirements](#requirements) - [Installing](#installing) - [Install released version using Helm repository](#install-released-version-using-helm-repository) - - [Install development version using 6.8 branch and 6.8.19-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) + - [Install development version using 6.8 branch and 6.8.21 versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -40,7 +39,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.19-SNAPSHOT version. +This chart is tested with the latest 6.8.21 version. ### Install released version using Helm repository @@ -52,15 +51,15 @@ This chart is tested with the latest 6.8.19-SNAPSHOT version. - with Helm 3: `helm install metricbeat --version elastic/metricbeat` - with Helm 2 (deprecated): `helm install --name metricbeat --version elastic/metricbeat` -### Install development version using 6.8 branch and 6.8.19-SNAPSHOT versions +### Install development version using 6.8 branch and 6.8.21 versions * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` * Checkout the branch : git checkout 6.8 * Install it: - - with Helm 3: `helm install metricbeat ./helm-charts/metricbeat --set imageTag=6.8.19-SNAPSHOT` - - with Helm 2 (deprecated): `helm install --name metricbeat ./helm-charts/metricbeat --set imageTag=6.8.19-SNAPSHOT` + - with Helm 3: `helm install metricbeat ./helm-charts/metricbeat --set imageTag=6.8.21` + - with Helm 2 (deprecated): `helm install --name metricbeat ./helm-charts/metricbeat --set imageTag=6.8.21` ## Upgrading @@ -130,7 +129,7 @@ as a reference. They are also used in the automated testing of this chart. | `hostPathRoot` | Fully-qualified [hostPath][] that will be used to persist Metricbeat registry data | `/var/lib` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The Metricbeat Docker image tag | `6.8.19-SNAPSHOT` | +| `imageTag` | The Metricbeat Docker image tag | `6.8.21` | | `image` | The Metricbeat Docker image | `docker.elastic.co/beats/metricbeat` | | `kube_state_metrics.enabled` | Install [kube-state-metrics](https://github.com/helm/charts/tree/master/stable/kube-state-metrics) as a dependency | `true` | | `kube_state_metrics.host` | Define kube-state-metrics endpoint for an existing deployment. Works only if `kube_state_metrics.enabled: false` | `""` | @@ -224,7 +223,7 @@ about our development and testing process. [6.x]: https://github.com/elastic/helm-charts/releases [#471]: https://github.com/elastic/helm-charts/pull/471 -[6.8.19-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.19-SNAPSHOT/metricbeat/README.md +[6.8.21]: https://github.com/elastic/helm-charts/blob/6.8.21/metricbeat/README.md [BREAKING_CHANGES.md]: https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md [CHANGELOG.md]: https://github.com/elastic/helm-charts/blob/master/CHANGELOG.md [CONTRIBUTING.md]: https://github.com/elastic/helm-charts/blob/master/CONTRIBUTING.md diff --git a/metricbeat/examples/default/README.md b/metricbeat/examples/default/README.md index 36778fd64..297c6322f 100644 --- a/metricbeat/examples/default/README.md +++ b/metricbeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Metricbeat 6.8.19-SNAPSHOT using [default values][]. +This example deploy Metricbeat 6.8.21 using [default values][]. ## Usage diff --git a/metricbeat/examples/default/test/goss-metrics.yaml b/metricbeat/examples/default/test/goss-metrics.yaml index 1fe340c74..31f823a0c 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-6.8.19' + - 'metricbeat-6.8.21' 'http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-6.8.19' + - 'metricbeat-6.8.21' file: /usr/share/metricbeat/metricbeat.yml: @@ -41,4 +41,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 6.8.19' + - 'version: 6.8.21' diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml index f596b0d21..2135de4c2 100644 --- a/metricbeat/examples/default/test/goss.yaml +++ b/metricbeat/examples/default/test/goss.yaml @@ -25,12 +25,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.19' + - 'metricbeat-6.8.21' 'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-6.8.19' + - 'metricbeat-6.8.21' file: /usr/share/metricbeat/metricbeat.yml: @@ -45,4 +45,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 6.8.19' + - 'version: 6.8.21' diff --git a/metricbeat/examples/oss/README.md b/metricbeat/examples/oss/README.md index 65077ddfd..0b6c82fe5 100644 --- a/metricbeat/examples/oss/README.md +++ b/metricbeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Metricbeat 6.8.19-SNAPSHOT using [Metricbeat OSS][] version. +This example deploy Metricbeat 6.8.21 using [Metricbeat OSS][] version. ## Usage diff --git a/metricbeat/examples/oss/test/goss-metrics.yaml b/metricbeat/examples/oss/test/goss-metrics.yaml index 98b30badf..e671e8ef1 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-6.8.19' + - 'metricbeat-6.8.21' http://oss-master:9200/_search?q=metricset.name:state_deployment: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.19' + - 'metricbeat-6.8.21' file: /usr/share/metricbeat/metricbeat.yml: @@ -39,4 +39,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 6.8.19' + - 'version: 6.8.21' diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml index 9adf27c8b..cf05e99fb 100644 --- a/metricbeat/examples/oss/test/goss.yaml +++ b/metricbeat/examples/oss/test/goss.yaml @@ -25,12 +25,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.19' + - 'metricbeat-6.8.21' http://oss-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.19' + - 'metricbeat-6.8.21' file: /usr/share/metricbeat/metricbeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 6.8.19' + - 'version: 6.8.21' diff --git a/metricbeat/examples/security/README.md b/metricbeat/examples/security/README.md index a184096c9..6d0004344 100644 --- a/metricbeat/examples/security/README.md +++ b/metricbeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Metricbeat 6.8.19-SNAPSHOT using authentication and TLS to connect to +This example deploy Metricbeat 6.8.21 using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/metricbeat/examples/security/test/goss-metrics.yaml b/metricbeat/examples/security/test/goss-metrics.yaml index 125c85379..5f6b9aeb3 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-6.8.19' + - 'metricbeat-6.8.21' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.19' + - 'metricbeat-6.8.21' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -45,4 +45,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: https://security-master:9200' - - 'version: 6.8.19' + - 'version: 6.8.21' diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml index 99b13ee70..915f4ae3c 100644 --- a/metricbeat/examples/security/test/goss.yaml +++ b/metricbeat/examples/security/test/goss.yaml @@ -25,7 +25,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.19' + - 'metricbeat-6.8.21' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -33,7 +33,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.19' + - 'metricbeat-6.8.21' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -50,4 +50,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: https://security-master:9200' - - 'version: 6.8.19' + - 'version: 6.8.21' diff --git a/metricbeat/examples/upgrade/test/goss-metrics.yaml b/metricbeat/examples/upgrade/test/goss-metrics.yaml index e4043c89f..db65115f6 100644 --- a/metricbeat/examples/upgrade/test/goss-metrics.yaml +++ b/metricbeat/examples/upgrade/test/goss-metrics.yaml @@ -21,13 +21,13 @@ http: status: 200 timeout: 2000 body: - - "metricbeat-6.8.19" + - "metricbeat-6.8.21" http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat: status: 200 timeout: 2000 body: - - "metricbeat-6.8.19" + - "metricbeat-6.8.21" file: /usr/share/metricbeat/metricbeat.yml: diff --git a/metricbeat/examples/upgrade/test/goss.yaml b/metricbeat/examples/upgrade/test/goss.yaml index 265940e52..1813476f6 100644 --- a/metricbeat/examples/upgrade/test/goss.yaml +++ b/metricbeat/examples/upgrade/test/goss.yaml @@ -25,12 +25,12 @@ http: status: 200 timeout: 2000 body: - - "metricbeat-6.8.19" + - "metricbeat-6.8.21" 'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - "metricbeat-6.8.19" + - "metricbeat-6.8.21" file: /usr/share/metricbeat/metricbeat.yml: diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 1dc4d54fa..b979bc80a 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -181,7 +181,7 @@ extraInitContainers: "" hostPathRoot: /var/lib image: "docker.elastic.co/beats/metricbeat" -imageTag: "6.8.19-SNAPSHOT" +imageTag: "6.8.21" imagePullPolicy: "IfNotPresent" imagePullSecrets: []