From ff275efd95b76582b41c83e52cd8b199907f4dc6 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Tue, 29 Jan 2019 16:57:45 +0100 Subject: [PATCH] filebeat: disable cloud_metadata processor by default --- CHANGELOG.md | 1 + filebeat/defaults/main.yml | 2 ++ filebeat/handlers/main.yml | 6 ++++++ filebeat/tasks/main.yml | 16 ++++++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 filebeat/handlers/main.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 8551fc81..d969a3f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The **patch** part changes incrementally at each release. ## [Unreleased] ### Added +* filebeat: disable cloud_metadata processor by default * redis: add variable for configure unixsocketperm ### Changed diff --git a/filebeat/defaults/main.yml b/filebeat/defaults/main.yml index 75c8ae0f..008daa27 100644 --- a/filebeat/defaults/main.yml +++ b/filebeat/defaults/main.yml @@ -2,3 +2,5 @@ elastic_stack_version: "6.x" filebeat_logstash_plugin: False + +filebeat_processors_cloud_metadata: False diff --git a/filebeat/handlers/main.yml b/filebeat/handlers/main.yml new file mode 100644 index 00000000..0a6d83f9 --- /dev/null +++ b/filebeat/handlers/main.yml @@ -0,0 +1,6 @@ +--- + +- name: restart filebeat + systemd: + name: filebeat + state: restarted diff --git a/filebeat/tasks/main.yml b/filebeat/tasks/main.yml index eebbd8ee..e02ff6ab 100644 --- a/filebeat/tasks/main.yml +++ b/filebeat/tasks/main.yml @@ -64,3 +64,19 @@ - filebeat_logstash_plugin - logstash_plugin.stat.exists - not logstash_plugin_installed | success + +- name: cloud_metadata processor is disabled + replace: + dest: /etc/filebeat/filebeat.yml + regexp: '^(\s+)(- add_cloud_metadata:)' + replace: '\1# \2' + notify: restart filebeat + when: not filebeat_processors_cloud_metadata + +- name: cloud_metadata processor is disabled + lineinfile: + dest: /etc/filebeat/filebeat.yml + line: " - add_cloud_metadata: ~" + insert_after: '^processors:' + notify: restart filebeat + when: filebeat_processors_cloud_metadata