From f562b84e6d14e6a91ba05649a61318ea7cd28aa1 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Thu, 1 Oct 2020 13:53:20 +0200 Subject: [PATCH 1/5] Bump to 7.9.3-SNAPSHOT version. Bump chart version and Docker images to 7.9.3-SNAPSHOT to test 7.9.3 development version See [New branching model](https://github.com/elastic/helm-charts/blob/master/BREAKING_CHANGES.md#new-branching-model) for more details. --- apm-server/Chart.yaml | 4 ++-- apm-server/README.md | 10 +++++----- apm-server/examples/default/README.md | 2 +- apm-server/examples/default/test/goss.yaml | 2 +- apm-server/examples/oss/README.md | 2 +- apm-server/examples/oss/test/goss.yaml | 2 +- apm-server/examples/security/README.md | 2 +- apm-server/examples/security/test/goss.yaml | 2 +- apm-server/values.yaml | 2 +- elasticsearch/Chart.yaml | 4 ++-- elasticsearch/README.md | 10 +++++----- elasticsearch/examples/config/README.md | 2 +- elasticsearch/examples/default/README.md | 2 +- elasticsearch/examples/default/test/goss.yaml | 2 +- elasticsearch/examples/docker-for-mac/README.md | 2 +- elasticsearch/examples/kubernetes-kind/README.md | 2 +- elasticsearch/examples/microk8s/README.md | 2 +- elasticsearch/examples/minikube/README.md | 2 +- elasticsearch/examples/multi/README.md | 2 +- elasticsearch/examples/openshift/README.md | 2 +- elasticsearch/examples/openshift/test/goss.yaml | 2 +- elasticsearch/examples/oss/README.md | 2 +- elasticsearch/examples/oss/test/goss.yaml | 2 +- elasticsearch/examples/security/README.md | 2 +- elasticsearch/examples/upgrade/README.md | 4 ++-- elasticsearch/examples/upgrade/test/goss.yaml | 2 +- elasticsearch/values.yaml | 2 +- filebeat/Chart.yaml | 4 ++-- filebeat/README.md | 10 +++++----- filebeat/examples/default/README.md | 2 +- filebeat/examples/default/test/goss.yaml | 4 ++-- filebeat/examples/oss/README.md | 2 +- filebeat/examples/oss/test/goss.yaml | 2 +- filebeat/examples/security/README.md | 2 +- filebeat/examples/security/test/goss.yaml | 2 +- filebeat/values.yaml | 2 +- helpers/examples.mk | 2 +- kibana/Chart.yaml | 4 ++-- kibana/README.md | 10 +++++----- kibana/examples/default/README.md | 2 +- kibana/examples/default/test/goss.yaml | 2 +- kibana/examples/openshift/README.md | 2 +- kibana/examples/oss/README.md | 2 +- kibana/examples/security/README.md | 2 +- kibana/values.yaml | 2 +- logstash/Chart.yaml | 4 ++-- logstash/README.md | 10 +++++----- logstash/examples/default/README.md | 2 +- logstash/examples/default/test/goss.yaml | 2 +- logstash/examples/elasticsearch/README.md | 2 +- logstash/examples/elasticsearch/test/goss.yaml | 2 +- logstash/examples/oss/README.md | 2 +- logstash/examples/oss/test/goss.yaml | 2 +- logstash/examples/security/README.md | 2 +- logstash/examples/security/test/goss.yaml | 2 +- logstash/values.yaml | 2 +- metricbeat/Chart.yaml | 4 ++-- metricbeat/README.md | 10 +++++----- metricbeat/examples/default/README.md | 2 +- metricbeat/examples/default/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/default/test/goss.yaml | 6 +++--- metricbeat/examples/oss/README.md | 2 +- metricbeat/examples/oss/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/oss/test/goss.yaml | 6 +++--- metricbeat/examples/security/README.md | 2 +- metricbeat/examples/security/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/security/test/goss.yaml | 6 +++--- metricbeat/values.yaml | 2 +- 68 files changed, 112 insertions(+), 112 deletions(-) diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml index 0fb71dc46..e773db2de 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: 7.9.2 -appVersion: 7.9.2 +version: 7.9.3-SNAPSHOT +appVersion: 7.9.3-SNAPSHOT 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 c9c9affb6..b26ddb7ea 100644 --- a/apm-server/README.md +++ b/apm-server/README.md @@ -8,7 +8,7 @@ The design and code is less mature than official GA features and is being 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 [7.9.2][https://github.com/elastic/helm-charts/releases/tag/7.9.2] release for released version. @@ -40,7 +40,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.9.2 version. +This chart is tested with the latest 7.9.3-SNAPSHOT version. ### Install released version using Helm repository @@ -48,8 +48,8 @@ This chart is tested with the latest 7.9.2 version. `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name apm-server --version 7.9.2 elastic/apm-server` - - with [Helm 3 (beta)][]: `helm install apm-server --version 7.9.2 elastic/apm-server` + - with Helm 2: `helm install --name apm-server --version 7.9.3-SNAPSHOT elastic/apm-server` + - with [Helm 3 (beta)][]: `helm install apm-server --version 7.9.3-SNAPSHOT elastic/apm-server` ## Upgrading @@ -87,7 +87,7 @@ as a reference. They are also used in the automated testing of this chart. | `fullnameOverride` | Overrides the full name of the resources. If not set the name will default to `.Release.Name` - `.Values.nameOverride` or `.Chart.Name` | `""` | | `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 | `7.9.2` | +| `imageTag` | The APM Server Docker image tag | `7.9.3-SNAPSHOT` | | `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 | `{}` | diff --git a/apm-server/examples/default/README.md b/apm-server/examples/default/README.md index 380b0656c..ef17f81e3 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 7.9.2 using [default values][]. +This example deploy APM Server 7.9.3-SNAPSHOT using [default values][]. ## Usage diff --git a/apm-server/examples/default/test/goss.yaml b/apm-server/examples/default/test/goss.yaml index 1b7a065e4..15a2f3f1a 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: - - '7.9.2' + - '7.9.3' diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md index 579fac20a..0a888cd83 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 7.9.2 using [APM Server OSS][] version. +This example deploy APM Server 7.9.3-SNAPSHOT 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 1b7a065e4..15a2f3f1a 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: - - '7.9.2' + - '7.9.3' diff --git a/apm-server/examples/security/README.md b/apm-server/examples/security/README.md index d0c3a9b10..8c925ac68 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 7.9.2 using authentication and TLS to connect to +This example deploy APM Server 7.9.3-SNAPSHOT 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 1b7a065e4..15a2f3f1a 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: - - '7.9.2' + - '7.9.3' diff --git a/apm-server/values.yaml b/apm-server/values.yaml index 54c1c11c1..ee0f87991 100755 --- a/apm-server/values.yaml +++ b/apm-server/values.yaml @@ -62,7 +62,7 @@ extraVolumes: [] # emptyDir: {} image: "docker.elastic.co/apm/apm-server" -imageTag: "7.9.2" +imageTag: "7.9.3-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index c7ff7b56b..6ddc1f577 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.9.2 -appVersion: 7.9.2 +version: 7.9.3-SNAPSHOT +appVersion: 7.9.3-SNAPSHOT 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 18cc07e68..1ec4f4056 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -3,7 +3,7 @@ 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 [7.9.2][https://github.com/elastic/helm-charts/releases/tag/7.9.2] release for released version. @@ -50,7 +50,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.9.2 version. +This chart is tested with the latest 7.9.3-SNAPSHOT version. ### Install released version using Helm repository @@ -58,8 +58,8 @@ This chart is tested with the latest 7.9.2 version. `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name elasticsearch --version 7.9.2 elastic/elasticsearch` - - with [Helm 3 (beta)][]: `helm install elasticsearch --version 7.9.2 elastic/elasticsearch` + - with Helm 2: `helm install --name elasticsearch --version 7.9.3-SNAPSHOT elastic/elasticsearch` + - with [Helm 3 (beta)][]: `helm install elasticsearch --version 7.9.3-SNAPSHOT elastic/elasticsearch` ## Upgrading @@ -115,7 +115,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 | `7.9.2` | +| `imageTag` | The Elasticsearch Docker image tag | `7.9.3-SNAPSHOT` | | `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 | `{}` | diff --git a/elasticsearch/examples/config/README.md b/elasticsearch/examples/config/README.md index dbd0c0f28..a54d3bda8 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 7.9.2 with authentication and +This example deploy a single node Elasticsearch 7.9.3-SNAPSHOT with authentication and custom [values][]. diff --git a/elasticsearch/examples/default/README.md b/elasticsearch/examples/default/README.md index 16f9c113a..032751622 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 7.9.2 cluster using +This example deploy a 3 nodes Elasticsearch 7.9.3-SNAPSHOT cluster using [default values][]. diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml index 664b74156..f081a3991 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.9.2"' + - '"number" : "7.9.3"' - '"cluster_name" : "elasticsearch"' - '"name" : "elasticsearch-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/docker-for-mac/README.md b/elasticsearch/examples/docker-for-mac/README.md index 90f3977a0..6ea54dcbf 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 7.9.2 cluster on [Docker for Mac][] +This example deploy a 3 nodes Elasticsearch 7.9.3-SNAPSHOT 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 56cfab0f2..0b8496fad 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 7.9.2 cluster on [Kind][] +This example deploy a 3 nodes Elasticsearch 7.9.3-SNAPSHOT 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 42e6995c6..fe59bb8b4 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 7.9.2 cluster on [MicroK8S][] +This example deploy a 3 nodes Elasticsearch 7.9.3-SNAPSHOT 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 d879208fd..bd5ef7de9 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 7.9.2 cluster on [Minikube][] +This example deploy a 3 nodes Elasticsearch 7.9.3-SNAPSHOT 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 c0735c290..dcf6d53d5 100644 --- a/elasticsearch/examples/multi/README.md +++ b/elasticsearch/examples/multi/README.md @@ -1,6 +1,6 @@ # Multi -This example deploy an Elasticsearch 7.9.2 cluster composed of 2 different Helm +This example deploy an Elasticsearch 7.9.3-SNAPSHOT cluster composed of 2 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 61f666a69..007c02eb8 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 7.9.2 cluster on [OpenShift][] +This example deploy a 3 nodes Elasticsearch 7.9.3-SNAPSHOT cluster on [OpenShift][] using [custom values][]. ## Usage diff --git a/elasticsearch/examples/openshift/test/goss.yaml b/elasticsearch/examples/openshift/test/goss.yaml index f72dd6e79..782e797d1 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.9.2"' + - '"number" : "7.9.3"' - '"cluster_name" : "elasticsearch"' - '"name" : "elasticsearch-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/oss/README.md b/elasticsearch/examples/oss/README.md index a6303ff8d..460daf87e 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 7.9.2 cluster using +This example deploy a 3 nodes Elasticsearch 7.9.3-SNAPSHOT cluster using [Elasticsearch OSS][] version. ## Usage diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml index 53f9272d3..efef71fd1 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.9.2"' + - '"number" : "7.9.3"' - '"cluster_name" : "oss"' - '"name" : "oss-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/security/README.md b/elasticsearch/examples/security/README.md index ecb59a1ae..3f5e64bc5 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 7.9.2 with authentication and +This example deploy a 3 nodes Elasticsearch 7.9.3-SNAPSHOT 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/README.md b/elasticsearch/examples/upgrade/README.md index 492d4c051..53a920144 100644 --- a/elasticsearch/examples/upgrade/README.md +++ b/elasticsearch/examples/upgrade/README.md @@ -1,7 +1,7 @@ # Upgrade This example will deploy a 3 node Elasticsearch cluster using an old chart version, -then upgrade it to version 7.9.2. +then upgrade it to version 7.9.3-SNAPSHOT. The following upgrades are tested: - Upgrade from [7.0.0-alpha1][] version on K8S <1.16 @@ -11,7 +11,7 @@ not compatible with K8S >= 1.16) ## Usage -Running `make install` command will do first install and 7.9.2 upgrade. +Running `make install` command will do first install and 7.9.3-SNAPSHOT upgrade. Note: [jq][] is a requirement for this make target. diff --git a/elasticsearch/examples/upgrade/test/goss.yaml b/elasticsearch/examples/upgrade/test/goss.yaml index f6406f690..0610b4484 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.9.2"' + - '"number" : "7.9.3"' - '"cluster_name" : "upgrade"' - '"name" : "upgrade-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index fd21af68c..c8aa5cdea 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -51,7 +51,7 @@ secretMounts: [] # defaultMode: 0755 image: "docker.elastic.co/elasticsearch/elasticsearch" -imageTag: "7.9.2" +imageTag: "7.9.3-SNAPSHOT" imagePullPolicy: "IfNotPresent" podAnnotations: {} diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index bad60dbbf..7122b9553 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.9.2 -appVersion: 7.9.2 +version: 7.9.3-SNAPSHOT +appVersion: 7.9.3-SNAPSHOT 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 8c60b0d58..79e89d8b5 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -3,7 +3,7 @@ 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 [7.9.2][https://github.com/elastic/helm-charts/releases/tag/7.9.2] release for released version. @@ -37,7 +37,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.9.2 version. +This chart is tested with the latest 7.9.3-SNAPSHOT version. ### Install released version using Helm repository @@ -45,8 +45,8 @@ This chart is tested with the latest 7.9.2 version. `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name filebeat --version 7.9.2 elastic/filebeat` - - with [Helm 3 (beta)][]: `helm install filebeat --version 7.9.2 elastic/filebeat` + - with Helm 2: `helm install --name filebeat --version 7.9.3-SNAPSHOT elastic/filebeat` + - with [Helm 3 (beta)][]: `helm install filebeat --version 7.9.3-SNAPSHOT elastic/filebeat` ## Upgrading @@ -94,7 +94,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 | `7.9.2` | +| `imageTag` | The Filebeat Docker image tag | `7.9.3-SNAPSHOT` | | `image` | The Filebeat Docker image | `docker.elastic.co/beats/filebeat` | | `labels` | Configurable [labels][] applied to all Filebeat pods | `{}` | | `livenessProbe` | Parameters to pass to liveness [probe][] checks for values such as timeouts and thresholds | see [values.yaml][] | diff --git a/filebeat/examples/default/README.md b/filebeat/examples/default/README.md index 10c506995..cda3899ab 100644 --- a/filebeat/examples/default/README.md +++ b/filebeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Filebeat 7.9.2 using [default values][]. +This example deploy Filebeat 7.9.3-SNAPSHOT using [default values][]. ## Usage diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml index 97d197416..2034bdc26 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.9.2' + - 'filebeat-7.9.3' file: /usr/share/filebeat/filebeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.9.2' + - 'version: 7.9.3' diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md index 030faa89d..da3fad338 100644 --- a/filebeat/examples/oss/README.md +++ b/filebeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Filebeat 7.9.2 using [Filebeat OSS][] version. +This example deploy Filebeat 7.9.3-SNAPSHOT using [Filebeat OSS][] version. ## Usage diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml index 5e02aae5b..dd5cd6b47 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.9.2' + - 'filebeat-7.9.3' diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md index c1c7c356b..47344f57f 100644 --- a/filebeat/examples/security/README.md +++ b/filebeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Filebeat 7.9.2 using authentication and TLS to connect to +This example deploy Filebeat 7.9.3-SNAPSHOT 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 5dbf2c6c8..f8aea3f23 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.9.2' + - 'filebeat-7.9.3' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' diff --git a/filebeat/values.yaml b/filebeat/values.yaml index 267a4f9b4..9b983c8fb 100755 --- a/filebeat/values.yaml +++ b/filebeat/values.yaml @@ -52,7 +52,7 @@ envFrom: [] hostPathRoot: /var/lib hostNetworking: false image: "docker.elastic.co/beats/filebeat" -imageTag: "7.9.2" +imageTag: "7.9.3-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/helpers/examples.mk b/helpers/examples.mk index 8044386d6..26637d13b 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.9.2 +STACK_VERSION := 7.9.3-SNAPSHOT .PHONY: help help: ## Display this help diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index ae0a81ac8..7ee2e2603 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.9.2 -appVersion: 7.9.2 +version: 7.9.3-SNAPSHOT +appVersion: 7.9.3-SNAPSHOT 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 4833b190b..5e3c1fc78 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -3,7 +3,7 @@ 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 [7.9.2][https://github.com/elastic/helm-charts/releases/tag/7.9.2] release for released version. @@ -38,7 +38,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.9.2 version. +This chart is tested with the latest 7.9.3-SNAPSHOT version. ### Install released version using Helm repository @@ -46,8 +46,8 @@ This chart is tested with the latest 7.9.2 version. `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name kibana --version 7.9.2 elastic/kibana` - - with [Helm 3 (beta)][]: `helm install kibana --version 7.9.2 elastic/kibana` + - with Helm 2: `helm install --name kibana --version 7.9.3-SNAPSHOT elastic/kibana` + - with [Helm 3 (beta)][]: `helm install kibana --version 7.9.3-SNAPSHOT elastic/kibana` ## Upgrading @@ -80,7 +80,7 @@ as a reference. They are also used in the automated testing of this chart. | `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 | `7.9.2` | +| `imageTag` | The Kibana Docker image tag | `7.9.3-SNAPSHOT` | | `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 | `{}` | diff --git a/kibana/examples/default/README.md b/kibana/examples/default/README.md index 251384e59..fcc9835e9 100644 --- a/kibana/examples/default/README.md +++ b/kibana/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Kibana 7.9.2 using [default values][]. +This example deploy Kibana 7.9.3-SNAPSHOT using [default values][]. ## Usage diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml index 294345e58..e89a264e6 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.9.2"' + - '"number":"7.9.3"' http://localhost:5601/app/kibana: status: 200 diff --git a/kibana/examples/openshift/README.md b/kibana/examples/openshift/README.md index 2957e5aae..5e1e62fb7 100644 --- a/kibana/examples/openshift/README.md +++ b/kibana/examples/openshift/README.md @@ -1,6 +1,6 @@ # OpenShift -This example deploy Kibana 7.9.2 on [OpenShift][] using [custom values][]. +This example deploy Kibana 7.9.3-SNAPSHOT on [OpenShift][] using [custom values][]. ## Usage diff --git a/kibana/examples/oss/README.md b/kibana/examples/oss/README.md index 00c09d802..43270c644 100644 --- a/kibana/examples/oss/README.md +++ b/kibana/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Kibana 7.9.2 using [Kibana OSS][] version. +This example deploy Kibana 7.9.3-SNAPSHOT using [Kibana OSS][] version. ## Usage diff --git a/kibana/examples/security/README.md b/kibana/examples/security/README.md index dc37845c9..a7a8e7202 100644 --- a/kibana/examples/security/README.md +++ b/kibana/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Kibana 7.9.2 using authentication and TLS to connect to +This example deploy Kibana 7.9.3-SNAPSHOT using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/kibana/values.yaml b/kibana/values.yaml index e964e9faf..8822a1d1e 100755 --- a/kibana/values.yaml +++ b/kibana/values.yaml @@ -29,7 +29,7 @@ secretMounts: [] # subPath: kibana.keystore # optional image: "docker.elastic.co/kibana/kibana" -imageTag: "7.9.2" +imageTag: "7.9.3-SNAPSHOT" imagePullPolicy: "IfNotPresent" # additionals labels diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml index c1497adf0..88eb9dbb1 100755 --- a/logstash/Chart.yaml +++ b/logstash/Chart.yaml @@ -5,8 +5,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: logstash -version: 7.9.2 -appVersion: 7.9.2 +version: 7.9.3-SNAPSHOT +appVersion: 7.9.3-SNAPSHOT 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 69db3d4ca..2d1f4d74c 100644 --- a/logstash/README.md +++ b/logstash/README.md @@ -8,7 +8,7 @@ The design and code is less mature than official GA features and is being 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 [7.9.2][https://github.com/elastic/helm-charts/releases/tag/7.9.2] release for released version. @@ -40,7 +40,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.9.2 version. +This chart is tested with the latest 7.9.3-SNAPSHOT version. ### Install released version using Helm repository @@ -48,8 +48,8 @@ This chart is tested with the latest 7.9.2 version. `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name logstash --version 7.9.2 elastic/logstash` - - with [Helm 3 (beta)][]: `helm install logstash --version 7.9.2 elastic/logstash` + - with Helm 2: `helm install --name logstash --version 7.9.3-SNAPSHOT elastic/logstash` + - with [Helm 3 (beta)][]: `helm install logstash --version 7.9.3-SNAPSHOT elastic/logstash` ## Upgrading @@ -103,7 +103,7 @@ using `http.host: 127.0.0.1`, default probes should be disabled or overrided | `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 | `7.9.2` | +| `imageTag` | The Logstash Docker image tag | `7.9.3-SNAPSHOT` | | `image` | The Logstash Docker image | `docker.elastic.co/logstash/logstash` | | `labels` | Configurable [labels][] applied to all Logstash pods | `{}` | | `lifecycle` | Allows you to add lifecycle configuration. See [values.yaml][] for an example of the formatting | `{}` | diff --git a/logstash/examples/default/README.md b/logstash/examples/default/README.md index a6da29950..376a2071c 100644 --- a/logstash/examples/default/README.md +++ b/logstash/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Logstash 7.9.2 using [default values][]. +This example deploy Logstash 7.9.3-SNAPSHOT using [default values][]. ## Usage diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml index 7e24911a2..867c1fc05 100644 --- a/logstash/examples/default/test/goss.yaml +++ b/logstash/examples/default/test/goss.yaml @@ -10,7 +10,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-default-logstash-0"' - - '"version" : "7.9.2"' + - '"version" : "7.9.3"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-default-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/elasticsearch/README.md b/logstash/examples/elasticsearch/README.md index fe1582d57..ef426e474 100644 --- a/logstash/examples/elasticsearch/README.md +++ b/logstash/examples/elasticsearch/README.md @@ -1,6 +1,6 @@ # Elasticsearch -This example deploy Logstash 7.9.2 which connects to Elasticsearch (see +This example deploy Logstash 7.9.3-SNAPSHOT which connects to Elasticsearch (see [values][]). diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml index d32e218a4..e4ee58da3 100644 --- a/logstash/examples/elasticsearch/test/goss.yaml +++ b/logstash/examples/elasticsearch/test/goss.yaml @@ -22,7 +22,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-elasticsearch-logstash-0"' - - '"version" : "7.9.2"' + - '"version" : "7.9.3"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-elasticsearch-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/oss/README.md b/logstash/examples/oss/README.md index 62d335a6c..198357cea 100644 --- a/logstash/examples/oss/README.md +++ b/logstash/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Logstash 7.9.2 using [Logstash OSS][] version. +This example deploy Logstash 7.9.3-SNAPSHOT using [Logstash OSS][] version. ## Usage diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml index 61fca6c5f..9379a2df7 100644 --- a/logstash/examples/oss/test/goss.yaml +++ b/logstash/examples/oss/test/goss.yaml @@ -10,7 +10,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-oss-logstash-0"' - - '"version" : "7.9.2"' + - '"version" : "7.9.3"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-oss-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/security/README.md b/logstash/examples/security/README.md index ef2365029..10341b375 100644 --- a/logstash/examples/security/README.md +++ b/logstash/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Logstash 7.9.2 which connects to Elasticsearch using TLS +This example deploy Logstash 7.9.3-SNAPSHOT which connects to Elasticsearch using TLS (see [values][]). diff --git a/logstash/examples/security/test/goss.yaml b/logstash/examples/security/test/goss.yaml index 562304370..20318b5e8 100644 --- a/logstash/examples/security/test/goss.yaml +++ b/logstash/examples/security/test/goss.yaml @@ -22,7 +22,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-security-logstash-0"' - - '"version" : "7.9.2"' + - '"version" : "7.9.3"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-security-logstash-0"' - '"status" : "green"' diff --git a/logstash/values.yaml b/logstash/values.yaml index a29187d4d..f9fd41ced 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -60,7 +60,7 @@ secrets: [] secretMounts: [] image: "docker.elastic.co/logstash/logstash" -imageTag: "7.9.2" +imageTag: "7.9.3-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index e4fe4361b..20db0eafd 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.9.2 -appVersion: 7.9.2 +version: 7.9.3-SNAPSHOT +appVersion: 7.9.3-SNAPSHOT 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 b445efd1b..9a42f338a 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -3,7 +3,7 @@ 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 [7.9.2][https://github.com/elastic/helm-charts/releases/tag/7.9.2] release for released version. @@ -37,7 +37,7 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 7.9.2 version. +This chart is tested with the latest 7.9.3-SNAPSHOT version. ### Install released version using Helm repository @@ -45,8 +45,8 @@ This chart is tested with the latest 7.9.2 version. `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name metricbeat --version 7.9.2 elastic/metricbeat` - - with [Helm 3 (beta)][]: `helm install metricbeat --version 7.9.2 elastic/metricbeat` + - with Helm 2: `helm install --name metricbeat --version 7.9.3-SNAPSHOT elastic/metricbeat` + - with [Helm 3 (beta)][]: `helm install metricbeat --version 7.9.3-SNAPSHOT elastic/metricbeat` ## Upgrading @@ -112,7 +112,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 | `7.9.2` | +| `imageTag` | The Metricbeat Docker image tag | `7.9.3-SNAPSHOT` | | `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` | `""` | diff --git a/metricbeat/examples/default/README.md b/metricbeat/examples/default/README.md index 362ab0948..7b83a5312 100644 --- a/metricbeat/examples/default/README.md +++ b/metricbeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Metricbeat 7.9.2 using [default values][]. +This example deploy Metricbeat 7.9.3-SNAPSHOT using [default values][]. ## Usage diff --git a/metricbeat/examples/default/test/goss-metrics.yaml b/metricbeat/examples/default/test/goss-metrics.yaml index 6ada6c738..69f7ca5a6 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.9.2' + - 'metricbeat-7.9.3' 'http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.9.2' + - 'metricbeat-7.9.3' file: /usr/share/metricbeat/metricbeat.yml: @@ -41,4 +41,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.9.2' + - 'version: 7.9.3' diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml index 5fa689792..2991243cb 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-7.9.2' + - 'metricbeat-7.9.3' 'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.9.2' + - 'metricbeat-7.9.3' file: /usr/share/metricbeat/metricbeat.yml: @@ -45,4 +45,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.9.2' + - 'version: 7.9.3' diff --git a/metricbeat/examples/oss/README.md b/metricbeat/examples/oss/README.md index dbc45bfb6..ba03cd4b4 100644 --- a/metricbeat/examples/oss/README.md +++ b/metricbeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Metricbeat 7.9.2 using [Metricbeat OSS][] version. +This example deploy Metricbeat 7.9.3-SNAPSHOT using [Metricbeat OSS][] version. ## Usage diff --git a/metricbeat/examples/oss/test/goss-metrics.yaml b/metricbeat/examples/oss/test/goss-metrics.yaml index a298d7cc7..5332726a7 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.9.2' + - 'metricbeat-7.9.3' http://oss-master:9200/_search?q=metricset.name:state_deployment: status: 200 timeout: 2000 body: - - 'metricbeat-7.9.2' + - 'metricbeat-7.9.3' file: /usr/share/metricbeat/metricbeat.yml: @@ -39,4 +39,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.9.2' + - 'version: 7.9.3' diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml index 45b6c6486..22a88b5fd 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-7.9.2' + - 'metricbeat-7.9.3' http://oss-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-7.9.2' + - 'metricbeat-7.9.3' file: /usr/share/metricbeat/metricbeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.9.2' + - 'version: 7.9.3' diff --git a/metricbeat/examples/security/README.md b/metricbeat/examples/security/README.md index 6ba88b90d..23f35a3c0 100644 --- a/metricbeat/examples/security/README.md +++ b/metricbeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Metricbeat 7.9.2 using authentication and TLS to connect to +This example deploy Metricbeat 7.9.3-SNAPSHOT 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 248cc5193..54a2fa9f7 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.9.2' + - 'metricbeat-7.9.3' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.9.2' + - 'metricbeat-7.9.3' 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: 7.9.2' + - 'version: 7.9.3' diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml index 9fd75df03..237ac178a 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-7.9.2' + - 'metricbeat-7.9.3' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -33,7 +33,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.9.2' + - 'metricbeat-7.9.3' 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: 7.9.2' + - 'version: 7.9.3' diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 313acba5e..74daaf0d0 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -167,7 +167,7 @@ extraInitContainers: "" hostPathRoot: /var/lib image: "docker.elastic.co/beats/metricbeat" -imageTag: "7.9.2" +imageTag: "7.9.3-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] From 88fd51991abfc212a06ebc358ad2466229fc1d79 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Thu, 1 Oct 2020 14:00:10 +0200 Subject: [PATCH 2/5] Update install instructions Do not hard code the version and provide instructions for both devel and released version. --- apm-server/README.md | 14 ++++++++++++-- elasticsearch/README.md | 14 ++++++++++++-- filebeat/README.md | 14 ++++++++++++-- kibana/README.md | 14 ++++++++++++-- logstash/README.md | 14 ++++++++++++-- metricbeat/README.md | 14 ++++++++++++-- 6 files changed, 72 insertions(+), 12 deletions(-) diff --git a/apm-server/README.md b/apm-server/README.md index b26ddb7ea..d2f3b4401 100644 --- a/apm-server/README.md +++ b/apm-server/README.md @@ -17,6 +17,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 from a branch](#install-development-version-from-a-branch) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -48,9 +49,18 @@ This chart is tested with the latest 7.9.3-SNAPSHOT version. `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name apm-server --version 7.9.3-SNAPSHOT elastic/apm-server` - - with [Helm 3 (beta)][]: `helm install apm-server --version 7.9.3-SNAPSHOT elastic/apm-server` + - with Helm 2: `helm install --name apm-server --version elastic/apm-server` + - with [Helm 3 (beta)][]: `helm install apm-server --version elastic/apm-server` +### Install development version from a branch + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Checkout the branch : `git checkout 7.9` + +* Install it: + - with Helm 2: `helm install --name apm-server ./helm-charts/apm-server` + - with [Helm 3 (beta)][]: `helm install apm-server ./helm-charts/apm-server` ## Upgrading diff --git a/elasticsearch/README.md b/elasticsearch/README.md index 1ec4f4056..5e81e1163 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -12,6 +12,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 from a branch](#install-development-version-from-a-branch) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -58,9 +59,18 @@ This chart is tested with the latest 7.9.3-SNAPSHOT version. `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name elasticsearch --version 7.9.3-SNAPSHOT elastic/elasticsearch` - - with [Helm 3 (beta)][]: `helm install elasticsearch --version 7.9.3-SNAPSHOT elastic/elasticsearch` + - with Helm 2: `helm install --name elasticsearch --version elastic/elasticsearch` + - with [Helm 3 (beta)][]: `helm install elasticsearch --version elastic/elasticsearch` +### Install development version from a branch + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Checkout the branch : `git checkout 7.9` + +* Install it: + - with Helm 2: `helm install --name elasticsearch ./helm-charts/elasticsearch` + - with [Helm 3 (beta)][]: `helm install elasticsearch ./helm-charts/elasticsearch` ## Upgrading diff --git a/filebeat/README.md b/filebeat/README.md index 79e89d8b5..f7714f1cd 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -12,6 +12,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 from a branch](#install-development-version-from-a-branch) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -45,9 +46,18 @@ This chart is tested with the latest 7.9.3-SNAPSHOT version. `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name filebeat --version 7.9.3-SNAPSHOT elastic/filebeat` - - with [Helm 3 (beta)][]: `helm install filebeat --version 7.9.3-SNAPSHOT elastic/filebeat` + - with Helm 2: `helm install --name filebeat --version elastic/filebeat` + - with [Helm 3 (beta)][]: `helm install filebeat --version elastic/filebeat` +### Install development version from a branch + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Checkout the branch : `git checkout 7.9` + +* Install it: + - with Helm 2: `helm install --name filebeat ./helm-charts/filebeat` + - with [Helm 3 (beta)][]: `helm install filebeat ./helm-charts/filebeat` ## Upgrading diff --git a/kibana/README.md b/kibana/README.md index 5e3c1fc78..ddb63c2d7 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -12,6 +12,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 from a branch](#install-development-version-from-a-branch) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -46,9 +47,18 @@ This chart is tested with the latest 7.9.3-SNAPSHOT version. `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name kibana --version 7.9.3-SNAPSHOT elastic/kibana` - - with [Helm 3 (beta)][]: `helm install kibana --version 7.9.3-SNAPSHOT elastic/kibana` + - with Helm 2: `helm install --name kibana --version elastic/kibana` + - with [Helm 3 (beta)][]: `helm install kibana --version elastic/kibana` +### Install development version from a branch + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Checkout the branch : `git checkout 7.9` + +* Install it: + - with Helm 2: `helm install --name kibana ./helm-charts/kibana` + - with [Helm 3 (beta)][]: `helm install kibana ./helm-charts/kibana` ## Upgrading diff --git a/logstash/README.md b/logstash/README.md index 2d1f4d74c..22307cfb3 100644 --- a/logstash/README.md +++ b/logstash/README.md @@ -17,6 +17,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 from a branch](#install-development-version-from-a-branch) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -48,9 +49,18 @@ This chart is tested with the latest 7.9.3-SNAPSHOT version. `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name logstash --version 7.9.3-SNAPSHOT elastic/logstash` - - with [Helm 3 (beta)][]: `helm install logstash --version 7.9.3-SNAPSHOT elastic/logstash` + - with Helm 2: `helm install --name logstash --version elastic/logstash` + - with [Helm 3 (beta)][]: `helm install logstash --version elastic/logstash` +### Install development version from a branch + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Checkout the branch : `git checkout 7.9` + +* Install it: + - with Helm 2: `helm install --name logstash ./helm-charts/logstash` + - with [Helm 3 (beta)][]: `helm install logstash ./helm-charts/logstash` ## Upgrading diff --git a/metricbeat/README.md b/metricbeat/README.md index 9a42f338a..c42249eac 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -12,6 +12,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 from a branch](#install-development-version-from-a-branch) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -45,9 +46,18 @@ This chart is tested with the latest 7.9.3-SNAPSHOT version. `helm repo add elastic https://helm.elastic.co` * Install it: - - with Helm 2: `helm install --name metricbeat --version 7.9.3-SNAPSHOT elastic/metricbeat` - - with [Helm 3 (beta)][]: `helm install metricbeat --version 7.9.3-SNAPSHOT elastic/metricbeat` + - with Helm 2: `helm install --name metricbeat --version elastic/metricbeat` + - with [Helm 3 (beta)][]: `helm install metricbeat --version elastic/metricbeat` +### Install development version from a branch + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Checkout the branch : `git checkout 7.9` + +* Install it: + - with Helm 2: `helm install --name metricbeat ./helm-charts/metricbeat` + - with [Helm 3 (beta)][]: `helm install metricbeat ./helm-charts/metricbeat` ## Upgrading From 1e3b73d698c27bea6e27f4c94c93358e9e009278 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Thu, 1 Oct 2020 17:53:44 +0200 Subject: [PATCH 3/5] Specify version in devel install instructions --- apm-server/README.md | 4 ++-- elasticsearch/README.md | 4 ++-- filebeat/README.md | 4 ++-- kibana/README.md | 4 ++-- logstash/README.md | 4 ++-- metricbeat/README.md | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apm-server/README.md b/apm-server/README.md index d2f3b4401..3b515ec49 100644 --- a/apm-server/README.md +++ b/apm-server/README.md @@ -59,8 +59,8 @@ This chart is tested with the latest 7.9.3-SNAPSHOT version. * Checkout the branch : `git checkout 7.9` * Install it: - - with Helm 2: `helm install --name apm-server ./helm-charts/apm-server` - - with [Helm 3 (beta)][]: `helm install apm-server ./helm-charts/apm-server` + - with Helm 2: `helm install --name apm-server --version 7.9.3-SNAPSHOT ./helm-charts/apm-server` + - with [Helm 3 (beta)][]: `helm install apm-server --version 7.9.3-SNAPSHOT ./helm-charts/apm-server` ## Upgrading diff --git a/elasticsearch/README.md b/elasticsearch/README.md index 5e81e1163..dd5fdea38 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -69,8 +69,8 @@ This chart is tested with the latest 7.9.3-SNAPSHOT version. * Checkout the branch : `git checkout 7.9` * Install it: - - with Helm 2: `helm install --name elasticsearch ./helm-charts/elasticsearch` - - with [Helm 3 (beta)][]: `helm install elasticsearch ./helm-charts/elasticsearch` + - with Helm 2: `helm install --name elasticsearch --version 7.9.3-SNAPSHOT ./helm-charts/elasticsearch` + - with [Helm 3 (beta)][]: `helm install elasticsearch --version 7.9.3-SNAPSHOT ./helm-charts/elasticsearch` ## Upgrading diff --git a/filebeat/README.md b/filebeat/README.md index f7714f1cd..5c2e8ba6c 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -56,8 +56,8 @@ This chart is tested with the latest 7.9.3-SNAPSHOT version. * Checkout the branch : `git checkout 7.9` * Install it: - - with Helm 2: `helm install --name filebeat ./helm-charts/filebeat` - - with [Helm 3 (beta)][]: `helm install filebeat ./helm-charts/filebeat` + - with Helm 2: `helm install --name filebeat --version 7.9.3-SNAPSHOT ./helm-charts/filebeat` + - with [Helm 3 (beta)][]: `helm install filebeat --version 7.9.3-SNAPSHOT ./helm-charts/filebeat` ## Upgrading diff --git a/kibana/README.md b/kibana/README.md index ddb63c2d7..4a34b14d1 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -57,8 +57,8 @@ This chart is tested with the latest 7.9.3-SNAPSHOT version. * Checkout the branch : `git checkout 7.9` * Install it: - - with Helm 2: `helm install --name kibana ./helm-charts/kibana` - - with [Helm 3 (beta)][]: `helm install kibana ./helm-charts/kibana` + - with Helm 2: `helm install --name kibana --version 7.9.3-SNAPSHOT ./helm-charts/kibana` + - with [Helm 3 (beta)][]: `helm install kibana --version 7.9.3-SNAPSHOT ./helm-charts/kibana` ## Upgrading diff --git a/logstash/README.md b/logstash/README.md index 22307cfb3..823aafc50 100644 --- a/logstash/README.md +++ b/logstash/README.md @@ -59,8 +59,8 @@ This chart is tested with the latest 7.9.3-SNAPSHOT version. * Checkout the branch : `git checkout 7.9` * Install it: - - with Helm 2: `helm install --name logstash ./helm-charts/logstash` - - with [Helm 3 (beta)][]: `helm install logstash ./helm-charts/logstash` + - with Helm 2: `helm install --name logstash --version 7.9.3-SNAPSHOT ./helm-charts/logstash` + - with [Helm 3 (beta)][]: `helm install logstash --version 7.9.3-SNAPSHOT ./helm-charts/logstash` ## Upgrading diff --git a/metricbeat/README.md b/metricbeat/README.md index c42249eac..6b6ca7e55 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -56,8 +56,8 @@ This chart is tested with the latest 7.9.3-SNAPSHOT version. * Checkout the branch : `git checkout 7.9` * Install it: - - with Helm 2: `helm install --name metricbeat ./helm-charts/metricbeat` - - with [Helm 3 (beta)][]: `helm install metricbeat ./helm-charts/metricbeat` + - with Helm 2: `helm install --name metricbeat --version 7.9.3-SNAPSHOT ./helm-charts/metricbeat` + - with [Helm 3 (beta)][]: `helm install metricbeat --version 7.9.3-SNAPSHOT ./helm-charts/metricbeat` ## Upgrading From 1fd0183f2081ed42cdbdf418dcbee369274216d3 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Thu, 1 Oct 2020 18:01:10 +0200 Subject: [PATCH 4/5] Add the -SNAPSHOT suffix to goss files --- elasticsearch/examples/default/test/goss.yaml | 2 +- elasticsearch/examples/openshift/test/goss.yaml | 2 +- elasticsearch/examples/oss/test/goss.yaml | 2 +- elasticsearch/examples/upgrade/test/goss.yaml | 2 +- filebeat/examples/default/test/goss.yaml | 4 ++-- filebeat/examples/oss/test/goss.yaml | 2 +- filebeat/examples/security/test/goss.yaml | 2 +- kibana/examples/default/test/goss.yaml | 2 +- logstash/examples/default/test/goss.yaml | 2 +- logstash/examples/elasticsearch/test/goss.yaml | 2 +- logstash/examples/oss/test/goss.yaml | 2 +- logstash/examples/security/test/goss.yaml | 2 +- metricbeat/examples/default/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/default/test/goss.yaml | 6 +++--- metricbeat/examples/oss/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/oss/test/goss.yaml | 6 +++--- metricbeat/examples/security/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/security/test/goss.yaml | 6 +++--- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml index f081a3991..2806fbf3f 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.9.3"' + - '"number" : "7.9.3-SNAPSHOT"' - '"cluster_name" : "elasticsearch"' - '"name" : "elasticsearch-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/examples/openshift/test/goss.yaml b/elasticsearch/examples/openshift/test/goss.yaml index 782e797d1..a9e9ed039 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.9.3"' + - '"number" : "7.9.3-SNAPSHOT"' - '"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 efef71fd1..fa6f3a3ea 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.9.3"' + - '"number" : "7.9.3-SNAPSHOT"' - '"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 0610b4484..766403252 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.9.3"' + - '"number" : "7.9.3-SNAPSHOT"' - '"cluster_name" : "upgrade"' - '"name" : "upgrade-master-0"' - 'You Know, for Search' diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml index 2034bdc26..2d20b45a3 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.9.3' + - 'filebeat-7.9.3-SNAPSHOT' file: /usr/share/filebeat/filebeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.9.3' + - 'version: 7.9.3-SNAPSHOT' diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml index dd5cd6b47..87b3bed08 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.9.3' + - 'filebeat-7.9.3-SNAPSHOT' diff --git a/filebeat/examples/security/test/goss.yaml b/filebeat/examples/security/test/goss.yaml index f8aea3f23..0c0f2a795 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.9.3' + - 'filebeat-7.9.3-SNAPSHOT' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml index e89a264e6..5c9bcc292 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.9.3"' + - '"number":"7.9.3-SNAPSHOT"' http://localhost:5601/app/kibana: status: 200 diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml index 867c1fc05..7df554e77 100644 --- a/logstash/examples/default/test/goss.yaml +++ b/logstash/examples/default/test/goss.yaml @@ -10,7 +10,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-default-logstash-0"' - - '"version" : "7.9.3"' + - '"version" : "7.9.3-SNAPSHOT"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-default-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml index e4ee58da3..cb6b89244 100644 --- a/logstash/examples/elasticsearch/test/goss.yaml +++ b/logstash/examples/elasticsearch/test/goss.yaml @@ -22,7 +22,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-elasticsearch-logstash-0"' - - '"version" : "7.9.3"' + - '"version" : "7.9.3-SNAPSHOT"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-elasticsearch-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml index 9379a2df7..1b4dbb5c8 100644 --- a/logstash/examples/oss/test/goss.yaml +++ b/logstash/examples/oss/test/goss.yaml @@ -10,7 +10,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-oss-logstash-0"' - - '"version" : "7.9.3"' + - '"version" : "7.9.3-SNAPSHOT"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-oss-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/security/test/goss.yaml b/logstash/examples/security/test/goss.yaml index 20318b5e8..bc7400434 100644 --- a/logstash/examples/security/test/goss.yaml +++ b/logstash/examples/security/test/goss.yaml @@ -22,7 +22,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-security-logstash-0"' - - '"version" : "7.9.3"' + - '"version" : "7.9.3-SNAPSHOT"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-security-logstash-0"' - '"status" : "green"' diff --git a/metricbeat/examples/default/test/goss-metrics.yaml b/metricbeat/examples/default/test/goss-metrics.yaml index 69f7ca5a6..2b2547cf5 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.9.3' + - 'metricbeat-7.9.3-SNAPSHOT' 'http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.9.3' + - 'metricbeat-7.9.3-SNAPSHOT' file: /usr/share/metricbeat/metricbeat.yml: @@ -41,4 +41,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.9.3' + - 'version: 7.9.3-SNAPSHOT' diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml index 2991243cb..e6932bafd 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-7.9.3' + - 'metricbeat-7.9.3-SNAPSHOT' 'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.9.3' + - 'metricbeat-7.9.3-SNAPSHOT' file: /usr/share/metricbeat/metricbeat.yml: @@ -45,4 +45,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.9.3' + - 'version: 7.9.3-SNAPSHOT' diff --git a/metricbeat/examples/oss/test/goss-metrics.yaml b/metricbeat/examples/oss/test/goss-metrics.yaml index 5332726a7..f403025a0 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.9.3' + - 'metricbeat-7.9.3-SNAPSHOT' http://oss-master:9200/_search?q=metricset.name:state_deployment: status: 200 timeout: 2000 body: - - 'metricbeat-7.9.3' + - 'metricbeat-7.9.3-SNAPSHOT' file: /usr/share/metricbeat/metricbeat.yml: @@ -39,4 +39,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.9.3' + - 'version: 7.9.3-SNAPSHOT' diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml index 22a88b5fd..d7a40ca18 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-7.9.3' + - 'metricbeat-7.9.3-SNAPSHOT' http://oss-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-7.9.3' + - 'metricbeat-7.9.3-SNAPSHOT' file: /usr/share/metricbeat/metricbeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.9.3' + - 'version: 7.9.3-SNAPSHOT' diff --git a/metricbeat/examples/security/test/goss-metrics.yaml b/metricbeat/examples/security/test/goss-metrics.yaml index 54a2fa9f7..ab2eed0e7 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.9.3' + - 'metricbeat-7.9.3-SNAPSHOT' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.9.3' + - 'metricbeat-7.9.3-SNAPSHOT' 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: 7.9.3' + - 'version: 7.9.3-SNAPSHOT' diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml index 237ac178a..9bc1c30bf 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-7.9.3' + - 'metricbeat-7.9.3-SNAPSHOT' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -33,7 +33,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.9.3' + - 'metricbeat-7.9.3-SNAPSHOT' 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: 7.9.3' + - 'version: 7.9.3-SNAPSHOT' From 536474c2ef4251621d2c6dcdf1316b19c0b820b1 Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Fri, 2 Oct 2020 14:02:17 +0200 Subject: [PATCH 5/5] Remove -SNAPSHOT for products other than ES --- filebeat/examples/default/test/goss.yaml | 4 ++-- filebeat/examples/oss/test/goss.yaml | 2 +- filebeat/examples/security/test/goss.yaml | 2 +- kibana/examples/default/test/goss.yaml | 2 +- logstash/examples/default/test/goss.yaml | 2 +- logstash/examples/elasticsearch/test/goss.yaml | 2 +- logstash/examples/oss/test/goss.yaml | 2 +- logstash/examples/security/test/goss.yaml | 2 +- metricbeat/examples/default/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/default/test/goss.yaml | 6 +++--- metricbeat/examples/oss/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/oss/test/goss.yaml | 6 +++--- metricbeat/examples/security/test/goss-metrics.yaml | 6 +++--- metricbeat/examples/security/test/goss.yaml | 6 +++--- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml index 2d20b45a3..2034bdc26 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.9.3-SNAPSHOT' + - 'filebeat-7.9.3' file: /usr/share/filebeat/filebeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.9.3-SNAPSHOT' + - 'version: 7.9.3' diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml index 87b3bed08..dd5cd6b47 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.9.3-SNAPSHOT' + - 'filebeat-7.9.3' diff --git a/filebeat/examples/security/test/goss.yaml b/filebeat/examples/security/test/goss.yaml index 0c0f2a795..f8aea3f23 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.9.3-SNAPSHOT' + - 'filebeat-7.9.3' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml index 5c9bcc292..e89a264e6 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.9.3-SNAPSHOT"' + - '"number":"7.9.3"' http://localhost:5601/app/kibana: status: 200 diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml index 7df554e77..867c1fc05 100644 --- a/logstash/examples/default/test/goss.yaml +++ b/logstash/examples/default/test/goss.yaml @@ -10,7 +10,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-default-logstash-0"' - - '"version" : "7.9.3-SNAPSHOT"' + - '"version" : "7.9.3"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-default-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml index cb6b89244..e4ee58da3 100644 --- a/logstash/examples/elasticsearch/test/goss.yaml +++ b/logstash/examples/elasticsearch/test/goss.yaml @@ -22,7 +22,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-elasticsearch-logstash-0"' - - '"version" : "7.9.3-SNAPSHOT"' + - '"version" : "7.9.3"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-elasticsearch-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml index 1b4dbb5c8..9379a2df7 100644 --- a/logstash/examples/oss/test/goss.yaml +++ b/logstash/examples/oss/test/goss.yaml @@ -10,7 +10,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-oss-logstash-0"' - - '"version" : "7.9.3-SNAPSHOT"' + - '"version" : "7.9.3"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-oss-logstash-0"' - '"status" : "green"' diff --git a/logstash/examples/security/test/goss.yaml b/logstash/examples/security/test/goss.yaml index bc7400434..20318b5e8 100644 --- a/logstash/examples/security/test/goss.yaml +++ b/logstash/examples/security/test/goss.yaml @@ -22,7 +22,7 @@ http: timeout: 2000 body: - '"host" : "helm-logstash-security-logstash-0"' - - '"version" : "7.9.3-SNAPSHOT"' + - '"version" : "7.9.3"' - '"http_address" : "0.0.0.0:9600"' - '"name" : "helm-logstash-security-logstash-0"' - '"status" : "green"' diff --git a/metricbeat/examples/default/test/goss-metrics.yaml b/metricbeat/examples/default/test/goss-metrics.yaml index 2b2547cf5..69f7ca5a6 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.9.3-SNAPSHOT' + - 'metricbeat-7.9.3' 'http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.9.3-SNAPSHOT' + - 'metricbeat-7.9.3' file: /usr/share/metricbeat/metricbeat.yml: @@ -41,4 +41,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.9.3-SNAPSHOT' + - 'version: 7.9.3' diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml index e6932bafd..2991243cb 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-7.9.3-SNAPSHOT' + - 'metricbeat-7.9.3' 'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.9.3-SNAPSHOT' + - 'metricbeat-7.9.3' file: /usr/share/metricbeat/metricbeat.yml: @@ -45,4 +45,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.9.3-SNAPSHOT' + - 'version: 7.9.3' diff --git a/metricbeat/examples/oss/test/goss-metrics.yaml b/metricbeat/examples/oss/test/goss-metrics.yaml index f403025a0..5332726a7 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.9.3-SNAPSHOT' + - 'metricbeat-7.9.3' http://oss-master:9200/_search?q=metricset.name:state_deployment: status: 200 timeout: 2000 body: - - 'metricbeat-7.9.3-SNAPSHOT' + - 'metricbeat-7.9.3' file: /usr/share/metricbeat/metricbeat.yml: @@ -39,4 +39,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.9.3-SNAPSHOT' + - 'version: 7.9.3' diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml index d7a40ca18..22a88b5fd 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-7.9.3-SNAPSHOT' + - 'metricbeat-7.9.3' http://oss-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-7.9.3-SNAPSHOT' + - 'metricbeat-7.9.3' file: /usr/share/metricbeat/metricbeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.9.3-SNAPSHOT' + - 'version: 7.9.3' diff --git a/metricbeat/examples/security/test/goss-metrics.yaml b/metricbeat/examples/security/test/goss-metrics.yaml index ab2eed0e7..54a2fa9f7 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.9.3-SNAPSHOT' + - 'metricbeat-7.9.3' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.9.3-SNAPSHOT' + - 'metricbeat-7.9.3' 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: 7.9.3-SNAPSHOT' + - 'version: 7.9.3' diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml index 9bc1c30bf..237ac178a 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-7.9.3-SNAPSHOT' + - 'metricbeat-7.9.3' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -33,7 +33,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.9.3-SNAPSHOT' + - 'metricbeat-7.9.3' 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: 7.9.3-SNAPSHOT' + - 'version: 7.9.3'