diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml index 43e8cb4ed..d46670ec7 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.12 -appVersion: 6.8.12 +version: 6.8.13-SNAPSHOT +appVersion: 6.8.13-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 68846c118..d8b30ce5f 100644 --- a/apm-server/README.md +++ b/apm-server/README.md @@ -8,6 +8,9 @@ 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 [6.8.12][] release +for released version. + @@ -15,6 +18,8 @@ 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.13-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -38,7 +43,9 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.12 version. +This chart is tested with the latest 6.8.13-SNAPSHOT version. + +## Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` @@ -47,6 +54,14 @@ This chart is tested with the latest 6.8.12 version. - with Helm 2: `helm install --name apm-server --version 6.8.12 elastic/apm-server` - with [Helm 3 (beta)][]: `helm install apm-server --version 6.8.12 elastic/apm-server` +### Install development version using 6.8 branch and 6.8.13-SNAPSHOT versions + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* 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 @@ -83,7 +98,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 | `6.8.12` | +| `imageTag` | The APM Server Docker image tag | `6.8.13-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 | `{}` | @@ -132,7 +147,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[6.8.12]: https://github.com/elastic/helm-charts/blob/6.8.12/apm-server/README.md +[6.8.13-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.13-SNAPSHOT/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 d58a088c5..c27b6cdaa 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.12 using [default values][]. +This example deploy APM Server 6.8.13-SNAPSHOT using [default values][]. ## Usage diff --git a/apm-server/examples/default/test/goss.yaml b/apm-server/examples/default/test/goss.yaml index 4a77bb4ff..bda8918fd 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.12' + - '6.8.13' diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md index 7d020d915..1bf67a778 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.12 using [APM Server OSS][] version. +This example deploy APM Server 6.8.13-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 4a77bb4ff..bda8918fd 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.12' + - '6.8.13' diff --git a/apm-server/examples/security/README.md b/apm-server/examples/security/README.md index b329e2fc9..f32c2a554 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.12 using authentication and TLS to connect to +This example deploy APM Server 6.8.13-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 4a77bb4ff..bda8918fd 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.12' + - '6.8.13' diff --git a/apm-server/values.yaml b/apm-server/values.yaml index a9a3faf97..242cf2c91 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: "6.8.12" +imageTag: "6.8.13-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index e3fdb1d08..c1eb544fa 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.12 -appVersion: 6.8.12 +version: 6.8.13-SNAPSHOT +appVersion: 6.8.13-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 c5085e737..b63e0c0df 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -8,6 +8,9 @@ The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta 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 [6.8.12][] release +for released version. + @@ -15,6 +18,8 @@ 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.13-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -53,7 +58,9 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.12 version. +This chart is tested with the latest 6.8.13-SNAPSHOT version. + +### Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` @@ -62,6 +69,15 @@ This chart is tested with the latest 6.8.12 version. - with Helm 2: `helm install --name elasticsearch --version 6.8.12 elastic/elasticsearch` - with [Helm 3 (beta)][]: `helm install elasticsearch --version 6.8.12 elastic/elasticsearch` +### Install development version using 6.8 branch and 6.8.13-SNAPSHOT versions + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Install it: + - with Helm 2: `helm install --name elasticsearch ./helm-charts/elasticsearch` + - with [Helm 3 (beta)][]: `helm install elasticsearch ./helm-charts/elasticsearch` + + ## Upgrading Please always check [CHANGELOG.md][] and [BREAKING_CHANGES.md][] before @@ -115,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.12` | +| `imageTag` | The Elasticsearch Docker image tag | `6.8.13-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 | `{}` | @@ -377,7 +393,7 @@ about our development and testing process. [#63]: https://github.com/elastic/helm-charts/issues/63 -[6.8.12]: https://github.com/elastic/helm-charts/blob/6.8.12/elasticsearch/README.md +[6.8.13-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.13-SNAPSHOT/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 ef996a902..96204994a 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.12 with authentication and +This example deploy a single node Elasticsearch 6.8.13-SNAPSHOT with authentication and custom [values][]. diff --git a/elasticsearch/examples/default/README.md b/elasticsearch/examples/default/README.md index 3f1312f1c..e9339e2fc 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.12 cluster using +This example deploy a 3 nodes Elasticsearch 6.8.13-SNAPSHOT cluster using [default values][]. diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml index 28c3bb09d..11adc54b9 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.12"' + - '"number" : "6.8.13"' - '"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 1924ca679..c9a47613d 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.12 cluster on [Docker for Mac][] +This example deploy a 3 nodes Elasticsearch 6.8.13-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 429193d83..9eedcb9ca 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.12 cluster on [Kind][] +This example deploy a 3 nodes Elasticsearch 6.8.13-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 5df76fb4c..0afcac11e 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.12 cluster on [MicroK8S][] +This example deploy a 3 nodes Elasticsearch 6.8.13-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 13aa9d513..b35a7e534 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.12 cluster on [Minikube][] +This example deploy a 3 nodes Elasticsearch 6.8.13-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 c605abff4..0780cca57 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.12 cluster composed of 2 different Helm +This example deploy an Elasticsearch 6.8.13-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 0472afac0..9c4684f03 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.12 cluster on [OpenShift][] +This example deploy a 3 nodes Elasticsearch 6.8.13-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 ed52c7b3b..57b7abb00 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" : "6.8.12"' + - '"number" : "6.8.13"' - '"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 07764113e..d8569616f 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.12 cluster using +This example deploy a 3 nodes Elasticsearch 6.8.13-SNAPSHOT cluster using [Elasticsearch OSS][] version. ## Usage diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml index dd2b3020b..f9fda4d94 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" : "6.8.12"' + - '"number" : "6.8.13"' - '"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 dee60618d..30593c982 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.12 with authentication and +This example deploy a 3 nodes Elasticsearch 6.8.13-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/values.yaml b/elasticsearch/values.yaml index 5dae982a5..89dbb66cd 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -51,7 +51,7 @@ secretMounts: [] # defaultMode: 0755 image: "docker.elastic.co/elasticsearch/elasticsearch" -imageTag: "6.8.12" +imageTag: "6.8.13-SNAPSHOT" imagePullPolicy: "IfNotPresent" podAnnotations: {} diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index 79e874cc4..c8a725cf2 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.12 -appVersion: 6.8.12 +version: 6.8.13-SNAPSHOT +appVersion: 6.8.13-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 4a477f65e..17ea203ee 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -8,6 +8,9 @@ The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta 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 [6.8.12][] release +for released version. + @@ -15,6 +18,8 @@ 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.13-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -40,8 +45,9 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.12 version. +This chart is tested with the latest 6.8.13-SNAPSHOT version. +### Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` @@ -50,6 +56,15 @@ This chart is tested with the latest 6.8.12 version. - with Helm 2: `helm install --name filebeat --version 6.8.12 elastic/filebeat` - with [Helm 3 (beta)][]: `helm install filebeat --version 6.8.12 elastic/filebeat` +### Install development version using 6.8 branch and 6.8.13-SNAPSHOT versions + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Install it: + - with Helm 2: `helm install --name filebeat ./helm-charts/filebeat` + - with [Helm 3 (beta)][]: `helm install filebeat ./helm-charts/filebeat` + + ## Upgrading Please always check [CHANGELOG.md][] and [BREAKING_CHANGES.md][] before @@ -95,7 +110,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.12` | +| `imageTag` | The Filebeat Docker image tag | `6.8.13-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][] | @@ -175,7 +190,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[6.8.12]: https://github.com/elastic/helm-charts/blob/6.8.12/filebeat/README.md +[6.8.13-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.13-SNAPSHOT/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 10676bb88..4c4066a8e 100644 --- a/filebeat/examples/default/README.md +++ b/filebeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Filebeat 6.8.12 using [default values][]. +This example deploy Filebeat 6.8.13-SNAPSHOT using [default values][]. ## Usage diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml index a0f646489..7eabd8393 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.12' + - 'filebeat-6.8.13' file: /usr/share/filebeat/filebeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 6.8.12' + - 'version: 6.8.13' diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md index 45f884119..313adc551 100644 --- a/filebeat/examples/oss/README.md +++ b/filebeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Filebeat 6.8.12 using [Filebeat OSS][] version. +This example deploy Filebeat 6.8.13-SNAPSHOT using [Filebeat OSS][] version. ## Usage diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml index f7f721144..69eaf054b 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.12' + - 'filebeat-6.8.13' diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md index 61b80a1cf..6c0d4cb08 100644 --- a/filebeat/examples/security/README.md +++ b/filebeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Filebeat 6.8.12 using authentication and TLS to connect to +This example deploy Filebeat 6.8.13-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 6b5db0dcf..65e659fc8 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.12' + - 'filebeat-6.8.13' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' diff --git a/filebeat/values.yaml b/filebeat/values.yaml index ad05f5280..5541f02a7 100755 --- a/filebeat/values.yaml +++ b/filebeat/values.yaml @@ -48,7 +48,7 @@ envFrom: [] hostPathRoot: /var/lib hostNetworking: false image: "docker.elastic.co/beats/filebeat" -imageTag: "6.8.12" +imageTag: "6.8.13-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/helpers/bumper.py b/helpers/bumper.py index 2ac7010a3..9dcf547b9 100755 --- a/helpers/bumper.py +++ b/helpers/bumper.py @@ -19,7 +19,7 @@ os.chdir(os.path.join(os.path.dirname(__file__), "..")) versions = { - 6: os.environ.get("BUMPER_VERSION_6", "6.8.12"), + 6: os.environ.get("BUMPER_VERSION_6", "6.8.13-SNAPSHOT"), } chart_version = versions[6] diff --git a/helpers/examples.mk b/helpers/examples.mk index 56ec248eb..28908f4c2 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 := 6.8.12 +STACK_VERSION := 6.8.13-SNAPSHOT .PHONY: help help: ## Display this help diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index f03f10721..54fbb5bd8 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.12 -appVersion: 6.8.12 +version: 6.8.13-SNAPSHOT +appVersion: 6.8.13-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 0917158b9..1d844c121 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -8,6 +8,8 @@ The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta 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 [6.8.12][] release +for released version. @@ -16,6 +18,8 @@ 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.13-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -42,8 +46,9 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.12 version. +This chart is tested with the latest 6.8.13-SNAPSHOT version. +### Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` @@ -52,6 +57,14 @@ This chart is tested with the latest 6.8.12 version. - with Helm 2: `helm install --name kibana --version 6.8.12 elastic/kibana` - with [Helm 3 (beta)][]: `helm install kibana --version 6.8.12 elastic/kibana` +### Install development version using 6.8 branch and 6.8.13-SNAPSHOT versions + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Install it: + - with Helm 2: `helm install --name kibana ./helm-charts/kibana` + - with [Helm 3 (beta)][]: `helm install kibana ./helm-charts/kibana` + ## Upgrading @@ -83,7 +96,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 | `6.8.12` | +| `imageTag` | The Kibana Docker image tag | `6.8.13-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 | `{}` | @@ -195,7 +208,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[6.8.12]: https://github.com/elastic/helm-charts/blob/6.8.12/kibana/README.md +[6.8.13-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.13-SNAPSHOT/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 cd12fb729..bc5e44b9d 100644 --- a/kibana/examples/default/README.md +++ b/kibana/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Kibana 6.8.12 using [default values][]. +This example deploy Kibana 6.8.13-SNAPSHOT using [default values][]. ## Usage diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml index 4cc82e1ec..dca23fc68 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.12"' + - '"number":"6.8.13"' http://localhost:5601/app/kibana: status: 200 diff --git a/kibana/examples/openshift/README.md b/kibana/examples/openshift/README.md index 564070759..bdf5fe7e7 100644 --- a/kibana/examples/openshift/README.md +++ b/kibana/examples/openshift/README.md @@ -1,6 +1,6 @@ # OpenShift -This example deploy Kibana 6.8.12 on [OpenShift][] using [custom values][]. +This example deploy Kibana 6.8.13-SNAPSHOT on [OpenShift][] using [custom values][]. ## Usage diff --git a/kibana/examples/oss/README.md b/kibana/examples/oss/README.md index ed85aaa66..23e5e71fc 100644 --- a/kibana/examples/oss/README.md +++ b/kibana/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Kibana 6.8.12 using [Kibana OSS][] version. +This example deploy Kibana 6.8.13-SNAPSHOT using [Kibana OSS][] version. ## Usage diff --git a/kibana/examples/security/README.md b/kibana/examples/security/README.md index 91bceca12..f21ef2918 100644 --- a/kibana/examples/security/README.md +++ b/kibana/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Kibana 6.8.12 using authentication and TLS to connect to +This example deploy Kibana 6.8.13-SNAPSHOT using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/kibana/values.yaml b/kibana/values.yaml index c811255ca..ac5e1214b 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: "6.8.12" +imageTag: "6.8.13-SNAPSHOT" imagePullPolicy: "IfNotPresent" # additionals labels diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml index 7892dd47f..c56683c1e 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.12 -appVersion: 6.8.12 +version: 6.8.13-SNAPSHOT +appVersion: 6.8.13-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 432f420b1..11627663a 100644 --- a/logstash/README.md +++ b/logstash/README.md @@ -8,6 +8,8 @@ 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 [6.8.12][] release +for released version. @@ -16,6 +18,8 @@ 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.13-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -39,8 +43,9 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.12 version. +This chart is tested with the latest 6.8.13-SNAPSHOT version. +### Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` @@ -49,6 +54,14 @@ This chart is tested with the latest 6.8.12 version. - with Helm 2: `helm install --name logstash --version 6.8.12 elastic/logstash` - with [Helm 3 (beta)][]: `helm install logstash --version 6.8.12 elastic/logstash` +### Install development version using 6.8 branch and 6.8.13-SNAPSHOT versions + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Install it: + - with Helm 2: `helm install --name logstash ./helm-charts/logstash` + - with [Helm 3 (beta)][]: `helm install logstash ./helm-charts/logstash` + ## Upgrading @@ -101,7 +114,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 | `6.8.12` | +| `imageTag` | The Logstash Docker image tag | `6.8.13-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 | `{}` | @@ -175,7 +188,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. -[6.8.12]: https://github.com/elastic/helm-charts/blob/6.8.12/logstash/README.md +[6.8.13-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.13-SNAPSHOT/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 91f62f561..94233c3e8 100644 --- a/logstash/examples/default/README.md +++ b/logstash/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Logstash 6.8.12 using [default values][]. +This example deploy Logstash 6.8.13-SNAPSHOT using [default values][]. ## Usage diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml index 530dd2ddf..2162769da 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.12"' + - '"version" : "6.8.13"' - '"http_address" : "0.0.0.0:9600"' file: diff --git a/logstash/examples/elasticsearch/README.md b/logstash/examples/elasticsearch/README.md index 7f5f5746b..ca540cfc5 100644 --- a/logstash/examples/elasticsearch/README.md +++ b/logstash/examples/elasticsearch/README.md @@ -1,6 +1,6 @@ # Elasticsearch -This example deploy Logstash 6.8.12 which connects to Elasticsearch (see +This example deploy Logstash 6.8.13-SNAPSHOT which connects to Elasticsearch (see [values][]). diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml index d16fc3564..6486735e8 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.12"' + - '"version" : "6.8.13"' - '"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 ad75cb15e..33792dc3e 100644 --- a/logstash/examples/oss/README.md +++ b/logstash/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Logstash 6.8.12 using [Logstash OSS][] version. +This example deploy Logstash 6.8.13-SNAPSHOT using [Logstash OSS][] version. ## Usage diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml index cdf2cd41c..f5bab683d 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.12"' + - '"version" : "6.8.13"' - '"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 6c7870437..128669dee 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.12"' + - '"version" : "6.8.13"' - '"http_address" : "0.0.0.0:9600"' https://security-master:9200/_cat/indices: status: 200 diff --git a/logstash/values.yaml b/logstash/values.yaml index d3558c63c..11671d7ea 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -60,7 +60,7 @@ secrets: [] secretMounts: [] image: "docker.elastic.co/logstash/logstash" -imageTag: "6.8.12" +imageTag: "6.8.13-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index afc0295cc..efa81a34f 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.12 -appVersion: 6.8.12 +version: 6.8.13-SNAPSHOT +appVersion: 6.8.13-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 8601f5b34..61797055f 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -8,6 +8,9 @@ The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta 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 [6.8.12][] release +for released version. + @@ -15,6 +18,8 @@ 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.13-SNAPSHOT versions](#install-development-version-using-68-branch-and-6813-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -40,8 +45,9 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with the latest 6.8.12 version. +This chart is tested with the latest 6.8.13-SNAPSHOT version. +### Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` @@ -50,6 +56,14 @@ This chart is tested with the latest 6.8.12 version. - with Helm 2: `helm install --name apm-server --version 6.8.12 elastic/apm-server` - with [Helm 3 (beta)][]: `helm install apm-server --version 6.8.12 elastic/apm-server` +### Install development version using 6.8 branch and 6.8.13-SNAPSHOT versions + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* 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 @@ -114,7 +128,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.12` | +| `imageTag` | The Metricbeat Docker image tag | `6.8.13-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` | `""` | @@ -199,7 +213,7 @@ about our development and testing process. [#471]: https://github.com/elastic/helm-charts/pull/471 -[6.8.12]: https://github.com/elastic/helm-charts/blob/6.8.12/metricbeat/README.md +[6.8.13-SNAPSHOT]: https://github.com/elastic/helm-charts/blob/6.8.13-SNAPSHOT/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 893a04b97..c03eb2d2c 100644 --- a/metricbeat/examples/default/README.md +++ b/metricbeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Metricbeat 6.8.12 using [default values][]. +This example deploy Metricbeat 6.8.13-SNAPSHOT using [default values][]. ## Usage diff --git a/metricbeat/examples/default/test/goss-metrics.yaml b/metricbeat/examples/default/test/goss-metrics.yaml index 96af35af0..ec5ddc940 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.12' + - 'metricbeat-6.8.13' 'http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-6.8.12' + - 'metricbeat-6.8.13' file: /usr/share/metricbeat/metricbeat.yml: @@ -41,4 +41,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 6.8.12' + - 'version: 6.8.13' diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml index b6dd70797..f4b2b2aa4 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.12' + - 'metricbeat-6.8.13' 'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-6.8.12' + - 'metricbeat-6.8.13' file: /usr/share/metricbeat/metricbeat.yml: @@ -45,4 +45,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 6.8.12' + - 'version: 6.8.13' diff --git a/metricbeat/examples/oss/README.md b/metricbeat/examples/oss/README.md index c4c1853e6..d9a078e07 100644 --- a/metricbeat/examples/oss/README.md +++ b/metricbeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Metricbeat 6.8.12 using [Metricbeat OSS][] version. +This example deploy Metricbeat 6.8.13-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 17e41c85a..fb95c1a11 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.12' + - 'metricbeat-6.8.13' http://oss-master:9200/_search?q=metricset.name:state_deployment: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.12' + - 'metricbeat-6.8.13' file: /usr/share/metricbeat/metricbeat.yml: @@ -39,4 +39,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 6.8.12' + - 'version: 6.8.13' diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml index 2a379916c..e9a88f025 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.12' + - 'metricbeat-6.8.13' http://oss-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.12' + - 'metricbeat-6.8.13' file: /usr/share/metricbeat/metricbeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 6.8.12' + - 'version: 6.8.13' diff --git a/metricbeat/examples/security/README.md b/metricbeat/examples/security/README.md index ff7ff5cdc..ea1e7c598 100644 --- a/metricbeat/examples/security/README.md +++ b/metricbeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Metricbeat 6.8.12 using authentication and TLS to connect to +This example deploy Metricbeat 6.8.13-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 38772448c..bbfa28c2a 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.12' + - 'metricbeat-6.8.13' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.12' + - 'metricbeat-6.8.13' 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.12' + - 'version: 6.8.13' diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml index 784aa7f7a..633a7d0a3 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.12' + - 'metricbeat-6.8.13' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -33,7 +33,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-6.8.12' + - 'metricbeat-6.8.13' 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.12' + - 'version: 6.8.13' diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 4704d33c4..1dd10226c 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -167,7 +167,7 @@ extraInitContainers: "" hostPathRoot: /var/lib image: "docker.elastic.co/beats/metricbeat" -imageTag: "6.8.12" +imageTag: "6.8.13-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: []