From 1e90f5ecf55cd3ecd0c3f0e05d307d316a9c452d Mon Sep 17 00:00:00 2001 From: Michael Russell Date: Mon, 1 Jul 2019 13:32:42 +0200 Subject: [PATCH] Rebase on master and bump to latest version --- metricbeat/Chart.yaml | 4 ++-- metricbeat/README.md | 10 +++++----- metricbeat/examples/6.x/test/goss.yaml | 6 +++--- metricbeat/examples/6.x/values.yaml | 2 +- metricbeat/examples/default/test/goss.yaml | 6 +++--- metricbeat/examples/oss/test/goss.yaml | 6 +++--- metricbeat/examples/security/test/goss.yaml | 6 +++--- metricbeat/values.yaml | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/metricbeat/Chart.yaml b/metricbeat/Chart.yaml index fa505920e..debbbe01c 100755 --- a/metricbeat/Chart.yaml +++ b/metricbeat/Chart.yaml @@ -4,8 +4,8 @@ maintainers: - email: helm-charts@elastic.co name: Elastic name: metricbeat -version: 7.0.1-alpha1 -appVersion: 7.0.1 +version: 7.2.0 +appVersion: 7.2.0 sources: - https://github.com/elastic/beats icon: https://helm.elastic.co/icons/metricbeat.png diff --git a/metricbeat/README.md b/metricbeat/README.md index 559d488f3..4517460d3 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -17,7 +17,7 @@ This helm chart is a lightweight way to configure and run our official [Metricbe ``` * Install it ``` - helm install --name metricbeat elastic/metricbeat --version 7.0.1-alpha1 + helm install --name metricbeat elastic/metricbeat --version 7.2.0 ``` ## Compatibility @@ -26,14 +26,14 @@ This chart is tested with the latest supported versions. The currently tested ve | 5.x | 6.x | 7.x | | ------ | ----- | ----- | -| 5.6.16 | 6.7.2 | 7.0.1 | +| 5.6.16 | 6.8.1 | 7.2.0 | Examples of installing older major versions can be found in the [examples](./examples) directory. -While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.0.1` of metricbeat it would look like this: +While only the latest releases are tested, it is possible to easily install old or new releases by overriding the `imageTag`. To install version `7.2.0` of metricbeat it would look like this: ``` -helm install --name metricbeat elastic/metricbeat --version 7.0.1-alpha1 --set imageTag=7.0.1 +helm install --name metricbeat elastic/metricbeat --version 7.2.0 --set imageTag=7.2.0 ``` @@ -46,7 +46,7 @@ helm install --name metricbeat elastic/metricbeat --version 7.0.1-alpha1 --set i | `extraVolumes` | Any extra volumes to define for the pod | `[]` | | `hostPathRoot` | Fully-qualified [hostPath](https://kubernetes.io/docs/concepts/storage/volumes/#hostpath) that will be used to persist Metricbeat registry data | `/var/lib` | | `image` | The Metricbeat docker image | `docker.elastic.co/beats/metricbeat` | -| `imageTag` | The Metricbeat docker image tag | `7.0.1` | +| `imageTag` | The Metricbeat docker image tag | `7.2.0` | | `imagePullPolicy` | The Kubernetes [imagePullPolicy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret) so that you can use a private registry for your image | `[]` | | `managedServiceAccount` | Whether the `serviceAccount` should be managed by this helm chart. Set this to `false` in order to manage your own service account and related roles. | `true` | diff --git a/metricbeat/examples/6.x/test/goss.yaml b/metricbeat/examples/6.x/test/goss.yaml index 4a44473fd..ba21aab47 100644 --- a/metricbeat/examples/6.x/test/goss.yaml +++ b/metricbeat/examples/6.x/test/goss.yaml @@ -29,12 +29,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-6.7.2' + - 'metricbeat-6.8.1' http://six-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-6.7.2' + - 'metricbeat-6.8.1' file: /usr/share/metricbeat/metricbeat.yml: @@ -48,4 +48,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://six-master:9200' - - 'version: 6.7.2' + - 'version: 6.8.1' diff --git a/metricbeat/examples/6.x/values.yaml b/metricbeat/examples/6.x/values.yaml index cc8084b1e..d0eeea620 100644 --- a/metricbeat/examples/6.x/values.yaml +++ b/metricbeat/examples/6.x/values.yaml @@ -1,4 +1,4 @@ -imageTag: 6.7.2 +imageTag: 6.8.1 extraEnvs: - name: ELASTICSEARCH_HOSTS diff --git a/metricbeat/examples/default/test/goss.yaml b/metricbeat/examples/default/test/goss.yaml index 172dd1434..edc9fdd2f 100644 --- a/metricbeat/examples/default/test/goss.yaml +++ b/metricbeat/examples/default/test/goss.yaml @@ -29,12 +29,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.0.1' + - 'metricbeat-7.2.0' http://elasticsearch-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-7.0.1' + - 'metricbeat-7.2.0' file: /usr/share/metricbeat/metricbeat.yml: @@ -49,4 +49,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://elasticsearch-master:9200' - - 'version: 7.0.1' + - 'version: 7.2.0' diff --git a/metricbeat/examples/oss/test/goss.yaml b/metricbeat/examples/oss/test/goss.yaml index 0598585a8..e7788dd04 100644 --- a/metricbeat/examples/oss/test/goss.yaml +++ b/metricbeat/examples/oss/test/goss.yaml @@ -29,12 +29,12 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.0.1' + - 'metricbeat-7.2.0' http://oss-master:9200/_search?q=metricset.name:container: status: 200 timeout: 2000 body: - - 'metricbeat-7.0.1' + - 'metricbeat-7.2.0' file: /usr/share/metricbeat/metricbeat.yml: @@ -48,4 +48,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: http://oss-master:9200' - - 'version: 7.0.1' + - 'version: 7.2.0' diff --git a/metricbeat/examples/security/test/goss.yaml b/metricbeat/examples/security/test/goss.yaml index 41c920ff9..05d6d0a87 100644 --- a/metricbeat/examples/security/test/goss.yaml +++ b/metricbeat/examples/security/test/goss.yaml @@ -29,7 +29,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.0.1' + - 'metricbeat-7.2.0' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -37,7 +37,7 @@ http: status: 200 timeout: 2000 body: - - 'metricbeat-7.0.1' + - 'metricbeat-7.2.0' allow-insecure: true username: '{{ .Env.ELASTICSEARCH_USERNAME }}' password: '{{ .Env.ELASTICSEARCH_PASSWORD }}' @@ -54,4 +54,4 @@ command: exit-status: 0 stdout: - 'elasticsearch: https://security-master:9200' - - 'version: 7.0.1' + - 'version: 7.2.0' diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 256389e74..2d9e85a8d 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -85,7 +85,7 @@ extraVolumes: [] hostPathRoot: /var/lib image: "docker.elastic.co/beats/metricbeat" -imageTag: "7.0.1" +imageTag: "7.2.0" imagePullPolicy: "IfNotPresent" imagePullSecrets: []