From 04facee450ee534a3fd6028df9d797b972552dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Mathieu?= Date: Mon, 24 Jun 2019 17:43:58 +0200 Subject: [PATCH] [stable/filebeat] Support filebeat 7.0.1 (#13752) * Support filebeat 7.0.1 Signed-off-by: Theo Mathieu * put back filebeat.config.modules Signed-off-by: Theo Mathieu * bump chart major version Signed-off-by: Theo Mathieu --- stable/filebeat/Chart.yaml | 4 ++-- stable/filebeat/README.md | 4 +--- stable/filebeat/values.yaml | 9 ++------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/stable/filebeat/Chart.yaml b/stable/filebeat/Chart.yaml index 3b03210ee4..acaf6f6aca 100644 --- a/stable/filebeat/Chart.yaml +++ b/stable/filebeat/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 description: A Helm chart to collect Kubernetes logs with filebeat icon: https://www.elastic.co/assets/blt47799dcdcf08438d/logo-elastic-beats-lt.svg name: filebeat -version: 1.7.0 -appVersion: 6.7.0 +version: 2.0.0 +appVersion: 7.0.1 home: https://www.elastic.co/products/beats/filebeat sources: - https://www.elastic.co/guide/en/beats/filebeat/current/index.html diff --git a/stable/filebeat/README.md b/stable/filebeat/README.md index bd8188c47f..e21adf2f2f 100644 --- a/stable/filebeat/README.md +++ b/stable/filebeat/README.md @@ -28,12 +28,10 @@ The following table lists the configurable parameters of the filebeat chart and | `image.tag` | Docker image tag | `6.7.0` | | `image.pullPolicy` | Docker image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify image pull secrets | `nil` | -| `config.filebeat.config.prospectors.path` | Mounted `filebeat-prospectors` configmap | `${path.config}/prospectors.d/*.yml` | -| `config.filebeat.config.prospectors.reload.enabled` | Reload prospectors configs as they change | `false` | | `config.filebeat.config.modules.path` | | `${path.config}/modules.d/*.yml` | | `config.filebeat.config.modules.reload.enabled` | Reload module configs as they change | `false` | | `config.processors` | | `- add_cloud_metadata` | -| `config.filebeat.prospectors` | | see values.yaml | +| `config.filebeat.inputs` | | see values.yaml | | `config.output.file.path` | | `"/usr/share/filebeat/data"` | | `config.output.file.filename` | | `filebeat` | | `config.output.file.rotate_every_kb` | | `10000` | diff --git a/stable/filebeat/values.yaml b/stable/filebeat/values.yaml index 3b3000af98..b54ced2c16 100644 --- a/stable/filebeat/values.yaml +++ b/stable/filebeat/values.yaml @@ -1,15 +1,10 @@ image: repository: docker.elastic.co/beats/filebeat-oss - tag: 6.7.0 + tag: 7.0.1 pullPolicy: IfNotPresent config: filebeat.config: - prospectors: - # Mounted `filebeat-prospectors` configmap: - path: ${path.config}/prospectors.d/*.yml - # Reload prospectors configs as they change: - reload.enabled: false modules: path: ${path.config}/modules.d/*.yml # Reload module configs as they change: @@ -18,7 +13,7 @@ config: processors: - add_cloud_metadata: - filebeat.prospectors: + filebeat.inputs: - type: log enabled: true paths: