From c8e7675a49c7e3e9de13fab251ce847c266da589 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Tue, 29 Jan 2019 17:04:36 +0100 Subject: [PATCH] metricbeat: disable cloud_metadata processor by default --- CHANGELOG.md | 1 + metricbeat/defaults/main.yml | 2 ++ metricbeat/handlers/main.yml | 6 ++++++ metricbeat/tasks/main.yml | 16 ++++++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 metricbeat/handlers/main.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index d969a3f6..67d108b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The **patch** part changes incrementally at each release. ### Added * filebeat: disable cloud_metadata processor by default +* metricbeat: disable cloud_metadata processor by default * redis: add variable for configure unixsocketperm ### Changed diff --git a/metricbeat/defaults/main.yml b/metricbeat/defaults/main.yml index ee4cee34..df2d9649 100644 --- a/metricbeat/defaults/main.yml +++ b/metricbeat/defaults/main.yml @@ -6,3 +6,5 @@ metricbeat_elasticsearch_hosts: - "localhost:9200" metricbeat_elasticsearch_auth_username: "" metricbeat_elasticsearch_auth_password: "" + +metricbeat_processors_cloud_metadata: False diff --git a/metricbeat/handlers/main.yml b/metricbeat/handlers/main.yml new file mode 100644 index 00000000..cd83ab5d --- /dev/null +++ b/metricbeat/handlers/main.yml @@ -0,0 +1,6 @@ +--- + +- name: restart metricbeat + systemd: + name: metricbeat + state: restarted diff --git a/metricbeat/tasks/main.yml b/metricbeat/tasks/main.yml index ed51dd1f..535037ec 100644 --- a/metricbeat/tasks/main.yml +++ b/metricbeat/tasks/main.yml @@ -72,3 +72,19 @@ when: - metricbeat_elasticsearch_auth_username != "" - metricbeat_elasticsearch_auth_password != "" + +- name: disable cloud_metadata + replace: + dest: /etc/metricbeat/metricbeat.yml + regexp: '^(\s+)(- add_cloud_metadata:)' + replace: '\1# \2' + notify: restart metricbeat + when: not metricbeat_processors_cloud_metadata + +- name: cloud_metadata processor is disabled + lineinfile: + dest: /etc/metricbeat/metricbeat.yml + line: " - add_cloud_metadata: ~" + insert_after: '^processors:' + notify: restart metricbeat + when: metricbeat_processors_cloud_metadata