diff --git a/.ci/jobs.t/elastic+helm-charts+{branch}+staging.yml b/.ci/jobs.t/elastic+helm-charts+{branch}+staging.yml index 2cef76997..5d1eb2cbb 100644 --- a/.ci/jobs.t/elastic+helm-charts+{branch}+staging.yml +++ b/.ci/jobs.t/elastic+helm-charts+{branch}+staging.yml @@ -7,7 +7,7 @@ parameters: - string: name: BUILD_ID - description: "The buildId for the staging images. (Example: 7.8.0-abcdabcd)" + description: "The buildId for the staging images. (Example: 7.8.1-abcdabcd)" project-type: multijob scm: - git: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3e44b6801..ef563f4af 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -72,7 +72,7 @@ official Kibana repo, which we'll refer to in later code snippets. * All work on the next major release (`8.0.0`) goes into master. * Past major release branches are named `{majorVersion}.x`. They contain work that will go into the next minor release. For example, if the next minor release -is `7.8.0`, work for it should go into the `7.x` branch. +is `7.8.1`, work for it should go into the `7.x` branch. * Past minor release branches are named `{majorVersion}.{minorVersion}`. They contain work that will go into the next patch release. For example, if the next patch release is `7.8.1`, work for it should go into the `7.8` branch. @@ -191,7 +191,7 @@ Just like with the rest of the stack, all versions in this helm chart repo are bumped and released at the same time. There is no need to bump the version in your pull request. -Charts are released from version branchs (example `7.7` branch). +Charts are released from version branchs (example `7.8` branch). [Elastic Helm repository][] is updated only during releases. diff --git a/apm-server/Chart.yaml b/apm-server/Chart.yaml index eb10409a8..fc38bb2b1 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.8.0 -appVersion: 7.8.0 +version: 7.8.1-SNAPSHOT +appVersion: 7.8.1-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 3dde0a6ec..5b79de887 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 [7.8.0][] 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 7.8 branch and 7.8.1-SNAPSHOT versions](#install-development-version-using-78-branch-and-781-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -38,13 +43,21 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with 7.8.0 version. +This chart is tested with the latest 7.8.1-SNAPSHOT versions. + +### Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install 7.8.0 release: -`helm install --name apm-server --version 7.8.0 elastic/apm-server` +* Install the latest 7.8 release: +`helm install --name apm-server elastic/apm-server` + +### Install development version using 7.8 branch and 7.8.1-SNAPSHOT versions + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Install it: `helm install --name apm-server ./helm-charts/apm-server` ## Upgrading @@ -82,7 +95,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.8.0` | +| `imageTag` | The APM Server Docker image tag | `7.8.1-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 | `{}` | @@ -130,6 +143,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. +[7.8.0]: https://github.com/elastic/helm-charts/blob/7.8.0/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 638bf4344..793dfd66d 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.8.0 using [default values][]. +This example deploy APM Server 7.8.1-SNAPSHOT using [default values][]. ## Usage diff --git a/apm-server/examples/default/test/goss.yaml b/apm-server/examples/default/test/goss.yaml index a2e5df9fa..e58a6d7cc 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.8.0' + - '7.8.1' diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md index 2637d874e..09edb11b5 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.8.0 using [APM Server OSS][] version. +This example deploy APM Server 7.8.1-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 a2e5df9fa..e58a6d7cc 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.8.0' + - '7.8.1' diff --git a/apm-server/examples/security/README.md b/apm-server/examples/security/README.md index 93b52b3cd..1cb862569 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.8.0 using authentication and TLS to connect to +This example deploy APM Server 7.8.1-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 a2e5df9fa..e58a6d7cc 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.8.0' + - '7.8.1' diff --git a/apm-server/values.yaml b/apm-server/values.yaml index 33bc0054d..3fed89a95 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.8.0" +imageTag: "7.8.1-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index 19003660c..7f349c1d5 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.8.0 -appVersion: 7.8.0 +version: 7.8.1-SNAPSHOT +appVersion: 7.8.1-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 f9252b02e..68eedd300 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -3,6 +3,9 @@ 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.8.0][] release +for released version. + @@ -10,6 +13,8 @@ This Helm chart is a lightweight way to configure and run our official - [Requirements](#requirements) - [Installing](#installing) + - [Install released version using Helm repository](#install-released-version-using-helm-repository) + - [Install development version using 7.8 branch and 7.8.1-SNAPSHOT versions](#install-development-version-using-78-branch-and-781-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -46,16 +51,23 @@ default settings. All of these settings are configurable. See [supported configurations][] for more details. - ## Installing -This chart is tested with 7.8.0 version. +This chart is tested with the latest 7.8.1-SNAPSHOT versions. + +### Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install 7.8.0 release: -`helm install --name elasticsearch --version 7.8.0 elastic/elasticsearch` +* Install the latest 7.8 release: +`helm install --name elasticsearch elastic/elasticsearch` + +### Install development version using 7.8 branch and 7.8.1-SNAPSHOT versions + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Install it: `helm install --name elasticsearch ./helm-charts/elasticsearch` ## Upgrading @@ -111,7 +123,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.8.0` | +| `imageTag` | The Elasticsearch Docker image tag | `7.8.1-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 | `{}` | @@ -373,6 +385,7 @@ about our development and testing process. [#63]: https://github.com/elastic/helm-charts/issues/63 +[7.8.0]: https://github.com/elastic/helm-charts/blob/7.8.0/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 4be1621e8..57a76bcd2 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.8.0 with authentication and +This example deploy a single node Elasticsearch 7.8.1-SNAPSHOT with authentication and custom [values][]. diff --git a/elasticsearch/examples/default/README.md b/elasticsearch/examples/default/README.md index 0ed9cec73..c010e040a 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.8.0 cluster using +This example deploy a 3 nodes Elasticsearch 7.8.1-SNAPSHOT cluster using [default values][]. diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml index 563760470..16a74b926 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.8.0"' + - '"number" : "7.8.1-SNAPSHOT"' - '"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 063dbef6f..c8f7c097d 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.8.0 cluster on [Docker for Mac][] +This example deploy a 3 nodes Elasticsearch 7.8.1-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 2e0a362ea..b36616e23 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.8.0 cluster on [Kind][] +This example deploy a 3 nodes Elasticsearch 7.8.1-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 6d4ca56a3..fdfae73ea 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.8.0 cluster on [MicroK8S][] +This example deploy a 3 nodes Elasticsearch 7.8.1-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 2444ccf7e..a3d471bd4 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.8.0 cluster on [Minikube][] +This example deploy a 3 nodes Elasticsearch 7.8.1-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 4ee24a823..069e13bb8 100644 --- a/elasticsearch/examples/multi/README.md +++ b/elasticsearch/examples/multi/README.md @@ -1,6 +1,6 @@ # Multi -This example deploy an Elasticsearch 7.8.0 cluster composed of 2 different Helm +This example deploy an Elasticsearch 7.8.1-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 9706bb9e0..84346eb99 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.8.0 cluster on [OpenShift][] +This example deploy a 3 nodes Elasticsearch 7.8.1-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 878dd0cb5..dd3dc71e1 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.8.0"' + - '"number" : "7.8.1"' - '"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 da82f243a..f7911550b 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.8.0 cluster using +This example deploy a 3 nodes Elasticsearch 7.8.1-SNAPSHOT cluster using [Elasticsearch OSS][] version. ## Usage diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml index f94274cc7..c9f0db179 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.8.0"' + - '"number" : "7.8.1-SNAPSHOT"' - '"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 49047d28c..8a40fbd93 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.8.0 with authentication and +This example deploy a 3 nodes Elasticsearch 7.8.1-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 bd467e4c9..919898744 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.8.0. +then upgrade it to version 7.8.1-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.8.0 upgrade. +Running `make install` command will do first install and 7.8.1-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 f319de7a5..241c63050 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.8.0"' + - '"number" : "7.8.1-SNAPSHOT"' - '"cluster_name" : "upgrade"' - '"name" : "upgrade-master-0"' - 'You Know, for Search' diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index bbe004ab0..52ef64ced 100755 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -51,7 +51,7 @@ secretMounts: [] # defaultMode: 0755 image: "docker.elastic.co/elasticsearch/elasticsearch" -imageTag: "7.8.0" +imageTag: "7.8.1-SNAPSHOT" imagePullPolicy: "IfNotPresent" podAnnotations: {} diff --git a/filebeat/Chart.yaml b/filebeat/Chart.yaml index 5959c1389..bd1b8153b 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.8.0 -appVersion: 7.8.0 +version: 7.8.1-SNAPSHOT +appVersion: 7.8.1-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 5922ff7da..82c15a81f 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -3,6 +3,9 @@ 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.8.0][] release +for released version. + @@ -10,6 +13,8 @@ This Helm chart is a lightweight way to configure and run our official - [Requirements](#requirements) - [Installing](#installing) + - [Install released version using Helm repository](#install-released-version-using-helm-repository) + - [Install development version using 7.8 branch and 7.8.1-SNAPSHOT versions](#install-development-version-using-78-branch-and-781-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -34,13 +39,21 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with 7.8.0 version. +This chart is tested with the latest 7.8.1-SNAPSHOT versions. + +### Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install 7.8.0 release: -`helm install --name apm-server --version 7.8.0 elastic/filebeat` +* Install the latest 7.8 release: +`helm install --name filebeat elastic/filebeat` + +### Install development version using 7.8 branch and 7.8.1-SNAPSHOT versions + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Install it: `helm install --name filebeat ./helm-charts/filebeat` ## Upgrading @@ -88,7 +101,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.8.0` | +| `imageTag` | The Filebeat Docker image tag | `7.8.1-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][] | @@ -145,6 +158,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. +[7.8.0]: https://github.com/elastic/helm-charts/blob/7.8.0/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 d108d3550..75766df2c 100644 --- a/filebeat/examples/default/README.md +++ b/filebeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Filebeat 7.8.0 using [default values][]. +This example deploy Filebeat 7.8.1-SNAPSHOT using [default values][]. ## Usage diff --git a/filebeat/examples/default/test/goss.yaml b/filebeat/examples/default/test/goss.yaml index 71c870739..4fbad1f79 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.8.0' + - 'filebeat-7.8.1' file: /usr/share/filebeat/filebeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.8.0' + - 'version: 7.8.1' diff --git a/filebeat/examples/oss/README.md b/filebeat/examples/oss/README.md index a840691ed..346229654 100644 --- a/filebeat/examples/oss/README.md +++ b/filebeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Filebeat 7.8.0 using [Filebeat OSS][] version. +This example deploy Filebeat 7.8.1-SNAPSHOT using [Filebeat OSS][] version. ## Usage diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml index da2d94e32..90bf67b25 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.8.0' + - 'filebeat-7.8.1' diff --git a/filebeat/examples/security/README.md b/filebeat/examples/security/README.md index 677cf7e3f..1411d38b0 100644 --- a/filebeat/examples/security/README.md +++ b/filebeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Filebeat 7.8.0 using authentication and TLS to connect to +This example deploy Filebeat 7.8.1-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 8871dde92..7a5d1e992 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.8.0' + - 'filebeat-7.8.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' diff --git a/filebeat/values.yaml b/filebeat/values.yaml index 378ba402b..19d7394ad 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.8.0" +imageTag: "7.8.1-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/helpers/bumper.py b/helpers/bumper.py index 1034e5d9a..c94aa5de5 100755 --- a/helpers/bumper.py +++ b/helpers/bumper.py @@ -20,7 +20,7 @@ os.chdir(os.path.join(os.path.dirname(__file__), "..")) versions = { - 7: os.environ.get("BUMPER_VERSION_7", "7.8.0"), + 7: os.environ.get("BUMPER_VERSION_7", "7.8.1-SNAPSHOT"), } chart_version = versions[7] diff --git a/helpers/examples.mk b/helpers/examples.mk index 6e141fe35..09d14fba1 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.8.0 +STACK_VERSION := 7.8.1-SNAPSHOT .PHONY: help help: ## Display this help diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index 32cc4d826..affcea62d 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.8.0 -appVersion: 7.8.0 +version: 7.8.1-SNAPSHOT +appVersion: 7.8.1-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 ae7ce6f03..246b299ba 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -3,6 +3,9 @@ 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.8.0][] release +for released version. + @@ -10,6 +13,8 @@ This Helm chart is a lightweight way to configure and run our official - [Requirements](#requirements) - [Installing](#installing) + - [Install released version using Helm repository](#install-released-version-using-helm-repository) + - [Install development version using 7.8 branch and 7.8.1-SNAPSHOT versions](#install-development-version-using-78-branch-and-781-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -34,16 +39,23 @@ This Helm chart is a lightweight way to configure and run our official See [supported configurations][] for more details. - ## Installing -This chart is tested with 7.8.0 version. +This chart is tested with the latest 7.8.1-SNAPSHOT versions. + +### Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install 7.8.0 release: -`helm install --name kibana --version 7.8.0 elastic/kibana` +* Install the latest 7.8 release: +`helm install --name kibana elastic/kibana` + +### Install development version using 7.8 branch and 7.8.1-SNAPSHOT versions + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Install it: `helm install --name kibana ./helm-charts/kibana` ## Upgrading @@ -76,7 +88,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.8.0` | +| `imageTag` | The Kibana Docker image tag | `7.8.1-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 | `{}` | @@ -130,7 +142,7 @@ An example can be found in [examples/security][]. Deploying OSS version of Elasticsearch can be done by setting `image` value to [kibana OSS Docker image][] -An example of APM Server deployment using OSS version can be found in +An example of Kibana deployment using OSS version can be found in [examples/oss][]. ### How to install plugins? @@ -188,6 +200,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. +[7.8.0]: https://github.com/elastic/helm-charts/blob/7.8.0/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 e2e8fa32d..fe7fe73f0 100644 --- a/kibana/examples/default/README.md +++ b/kibana/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Kibana 7.8.0 using [default values][]. +This example deploy Kibana 7.8.1-SNAPSHOT using [default values][]. ## Usage diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml index 101aa5552..ce0d384f6 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.8.0"' + - '"number":"7.8.1"' http://localhost:5601/app/kibana: status: 200 diff --git a/kibana/examples/openshift/README.md b/kibana/examples/openshift/README.md index e096e920d..c25dd1cd4 100644 --- a/kibana/examples/openshift/README.md +++ b/kibana/examples/openshift/README.md @@ -1,6 +1,6 @@ # OpenShift -This example deploy Kibana 7.8.0 on [OpenShift][] using [custom values][]. +This example deploy Kibana 7.8.1-SNAPSHOT on [OpenShift][] using [custom values][]. ## Usage diff --git a/kibana/examples/oss/README.md b/kibana/examples/oss/README.md index eb3f99c2c..273f68ae6 100644 --- a/kibana/examples/oss/README.md +++ b/kibana/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Kibana 7.8.0 using [Kibana OSS][] version. +This example deploy Kibana 7.8.1-SNAPSHOT using [Kibana OSS][] version. ## Usage diff --git a/kibana/examples/security/README.md b/kibana/examples/security/README.md index f1461a837..04880341a 100644 --- a/kibana/examples/security/README.md +++ b/kibana/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Kibana 7.8.0 using authentication and TLS to connect to +This example deploy Kibana 7.8.1-SNAPSHOT using authentication and TLS to connect to Elasticsearch (see [values][]). diff --git a/kibana/values.yaml b/kibana/values.yaml index 91021e27d..1987333da 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.8.0" +imageTag: "7.8.1-SNAPSHOT" imagePullPolicy: "IfNotPresent" # additionals labels diff --git a/logstash/Chart.yaml b/logstash/Chart.yaml index 841f72d1f..163bf8fb3 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.8.0 -appVersion: 7.8.0 +version: 7.8.1-SNAPSHOT +appVersion: 7.8.1-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 c7a20ab59..d03c198d1 100644 --- a/logstash/README.md +++ b/logstash/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 [7.8.0][] 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 7.8 branch and 7.8.1-SNAPSHOT versions](#install-development-version-using-78-branch-and-781-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -38,13 +43,21 @@ See [supported configurations][] for more details. ## Installing -This chart is tested with 7.8.0 version. +This chart is tested with the latest 7.8.1-SNAPSHOT versions. + +### Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install 7.8.0 release: -`helm install --name apm-server --version 7.8.0 elastic/logstash` +* Install the latest 7.8 release: +`helm install --name logstash elastic/logstash` + +### Install development version using 7.8 branch and 7.8.1-SNAPSHOT versions + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Install it: `helm install --name logstash ./helm-charts/logstash` ## Upgrading @@ -98,7 +111,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.8.0` | +| `imageTag` | The Logstash Docker image tag | `7.8.1-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 | `{}` | @@ -137,7 +150,7 @@ using `http.host: 127.0.0.1`, default probes should be disabled or overrided Deploying OSS version of Elasticsearch can be done by setting `image` value to [Logstash OSS Docker image][] -An example of APM Server deployment using OSS version can be found in +An example of Logstash Server deployment using OSS version can be found in [examples/oss][]. ### How to install plugins? @@ -171,6 +184,7 @@ Please check [CONTRIBUTING.md][] before any contribution or for any questions about our development and testing process. +[7.8.0]: https://github.com/elastic/helm-charts/blob/7.8.0/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 36c959349..5e0f50f60 100644 --- a/logstash/examples/default/README.md +++ b/logstash/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Logstash 7.8.0 using [default values][]. +This example deploy Logstash 7.8.1-SNAPSHOT using [default values][]. ## Usage diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml index 9e6912433..baa412958 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.8.0"' + - '"version" : "7.8.1"' - '"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 8a7c29873..900e87bf6 100644 --- a/logstash/examples/elasticsearch/README.md +++ b/logstash/examples/elasticsearch/README.md @@ -1,6 +1,6 @@ # Elasticsearch -This example deploy Logstash 7.8.0 which connects to Elasticsearch (see +This example deploy Logstash 7.8.1-SNAPSHOT which connects to Elasticsearch (see [values][]). diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml index 4194138c0..652aeb7a8 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.8.0"' + - '"version" : "7.8.1"' - '"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 2d5551fb2..92d0ae4b1 100644 --- a/logstash/examples/oss/README.md +++ b/logstash/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Logstash 7.8.0 using [Logstash OSS][] version. +This example deploy Logstash 7.8.1-SNAPSHOT using [Logstash OSS][] version. ## Usage diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml index 7d9bfefbe..ccf623a18 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.8.0"' + - '"version" : "7.8.1"' - '"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 2bf128743..039cf8b2c 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.8.0"' + - '"version" : "7.8.1"' - '"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 181f9e571..c2ab9f583 100755 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -43,7 +43,7 @@ envFrom: [] secretMounts: [] image: "docker.elastic.co/logstash/logstash" -imageTag: "7.8.0" +imageTag: "7.8.1-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: [] diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index c8eb88bfb..4c19d7ce7 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.8.0 -appVersion: 7.8.0 +version: 7.8.1-SNAPSHOT +appVersion: 7.8.1-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 34b8d6691..ee96c1785 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -3,6 +3,9 @@ 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.8.0][] release +for released version. + @@ -10,6 +13,8 @@ This Helm chart is a lightweight way to configure and run our official - [Requirements](#requirements) - [Installing](#installing) + - [Install released version using Helm repository](#install-released-version-using-helm-repository) + - [Install development version using 7.8 branch and 7.8.1-SNAPSHOT versions](#install-development-version-using-78-branch-and-781-snapshot-versions) - [Upgrading](#upgrading) - [Usage notes](#usage-notes) - [Configuration](#configuration) @@ -33,16 +38,23 @@ This Helm chart is a lightweight way to configure and run our official See [supported configurations][] for more details. - ## Installing -This chart is tested with 7.8.0 version. +This chart is tested with the latest 7.8.1-SNAPSHOT versions. + +### Install released version using Helm repository * Add the Elastic Helm charts repo: `helm repo add elastic https://helm.elastic.co` -* Install 7.8.0 release: -`helm install --name apm-server --version 7.8.0 elastic/metricbeat` +* Install the latest 7.8 release: +`helm install --name metricbeat elastic/metricbeat` + +### Install development version using 7.8 branch and 7.8.1-SNAPSHOT versions + +* Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` + +* Install it: `helm install --name metricbeat ./helm-charts/metricbeat` ## Upgrading @@ -104,7 +116,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.8.0` | +| `imageTag` | The Metricbeat Docker image tag | `7.8.1-SNAPSHOT` | | `image` | The Metricbeat Docker image | `docker.elastic.co/beats/metricbeat` | | `labels` | Configurable [labels][] applied to all Metricbeat pods | `{}` | | `livenessProbe` | Parameters to pass to liveness [probe][] checks for values such as timeouts and thresholds | see [values.yaml][] | @@ -186,6 +198,7 @@ about our development and testing process. [#471]: https://github.com/elastic/helm-charts/pull/471 +[7.8.0]: https://github.com/elastic/helm-charts/blob/7.8.0/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 7513f7491..64d230ff3 100644 --- a/metricbeat/examples/default/README.md +++ b/metricbeat/examples/default/README.md @@ -1,6 +1,6 @@ # Default -This example deploy Metricbeat 7.8.0 using [default values][]. +This example deploy Metricbeat 7.8.1-SNAPSHOT using [default values][]. ## Usage diff --git a/metricbeat/examples/default/test/goss-metrics.yaml b/metricbeat/examples/default/test/goss-metrics.yaml index d053187a5..5ba36c449 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.8.0' + - 'metricbeat-7.8.1' 'http://elasticsearch-master:9200/_search?q=metricset.name:state_container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -41,4 +41,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.8.0' + - 'version: 7.8.1' diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml index 57729b462..4a54c4f2f 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.8.0' + - 'metricbeat-7.8.1' 'http://elasticsearch-master:9200/_search?q=metricset.name:container%20AND%20kubernetes.container.name:metricbeat': status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -45,4 +45,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.8.0' + - 'version: 7.8.1' diff --git a/metricbeat/examples/oss/README.md b/metricbeat/examples/oss/README.md index 85ff6d608..f6b5993ac 100644 --- a/metricbeat/examples/oss/README.md +++ b/metricbeat/examples/oss/README.md @@ -1,6 +1,6 @@ # OSS -This example deploy Metricbeat 7.8.0 using [Metricbeat OSS][] version. +This example deploy Metricbeat 7.8.1-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 a8af07519..1cf90ac63 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.8.0' + - 'metricbeat-7.8.1' http://oss-master:9200/_search?q=metricset.name:state_deployment: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -39,4 +39,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.8.0' + - 'version: 7.8.1' diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml index 8a1bf3baa..b6d645fcf 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.8.0' + - 'metricbeat-7.8.1' http://oss-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -44,4 +44,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.8.0' + - 'version: 7.8.1' diff --git a/metricbeat/examples/security/README.md b/metricbeat/examples/security/README.md index 0255dc291..203dc9f1d 100644 --- a/metricbeat/examples/security/README.md +++ b/metricbeat/examples/security/README.md @@ -1,6 +1,6 @@ # Security -This example deploy Metricbeat 7.8.0 using authentication and TLS to connect to +This example deploy Metricbeat 7.8.1-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 cf215bd65..84c17cb0b 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.8.0' + - 'metricbeat-7.8.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' 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.8.0' + - 'version: 7.8.1' diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml index 58213e2e0..2c49075a2 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.8.0' + - 'metricbeat-7.8.1' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -33,7 +33,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.8.0' + - 'metricbeat-7.8.1' 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.8.0' + - 'version: 7.8.1' diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 8aaa8735c..02b8adb7f 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -159,7 +159,7 @@ extraInitContainers: "" hostPathRoot: /var/lib image: "docker.elastic.co/beats/metricbeat" -imageTag: "7.8.0" +imageTag: "7.8.1-SNAPSHOT" imagePullPolicy: "IfNotPresent" imagePullSecrets: []