Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Commit

Permalink
Rebase on master and bump to latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
@Crazybus
Crazybus committed Jul 1, 2019
1 parent a71ece6 commit 1e90f5e
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions metricbeat/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions metricbeat/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
```


Expand All @@ -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` |
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/examples/6.x/test/goss.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -48,4 +48,4 @@ command:
exit-status: 0
stdout:
- 'elasticsearch: http://six-master:9200'
- 'version: 6.7.2'
- 'version: 6.8.1'
2 changes: 1 addition & 1 deletion metricbeat/examples/6.x/values.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
imageTag: 6.7.2
imageTag: 6.8.1

extraEnvs:
- name: ELASTICSEARCH_HOSTS
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/examples/default/test/goss.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -49,4 +49,4 @@ command:
exit-status: 0
stdout:
- 'elasticsearch: http://elasticsearch-master:9200'
- 'version: 7.0.1'
- 'version: 7.2.0'
6 changes: 3 additions & 3 deletions metricbeat/examples/oss/test/goss.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -48,4 +48,4 @@ command:
exit-status: 0
stdout:
- 'elasticsearch: http://oss-master:9200'
- 'version: 7.0.1'
- 'version: 7.2.0'
6 changes: 3 additions & 3 deletions metricbeat/examples/security/test/goss.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ 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 }}'
https://security-master:9200/_search?q=metricset.name:container:
status: 200
timeout: 2000
body:
- 'metricbeat-7.0.1'
- 'metricbeat-7.2.0'
allow-insecure: true
username: '{{ .Env.ELASTICSEARCH_USERNAME }}'
password: '{{ .Env.ELASTICSEARCH_PASSWORD }}'
Expand All @@ -54,4 +54,4 @@ command:
exit-status: 0
stdout:
- 'elasticsearch: https://security-master:9200'
- 'version: 7.0.1'
- 'version: 7.2.0'
2 changes: 1 addition & 1 deletion metricbeat/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: []

Expand Down

0 comments on commit 1e90f5e

Please sign in to comment.