From 7c2feea561c7b6626d8fe8710aed1bb4dc8ff92d Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Tue, 8 Jan 2019 11:05:20 +0100 Subject: [PATCH] metricbeat: add a variable for the protocol to use with Elasticsearch --- CHANGELOG.md | 1 + metricbeat/defaults/main.yml | 1 + metricbeat/tasks/main.yml | 9 +++++++++ 3 files changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b64d002..44cbf7b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The **patch** part changes incrementally at each release. ### Added * apache: add Munin configuration for Apache server-status URL * evomaintenance: database variables must be set or the task fails +* metricbeat: add a variable for the protocol to use with Elasticsearch * rbenv: add pkg-config to the list of packages to install * redis: Configure munin when working in instance mode * redis: add a variable for renamed/disabled commands diff --git a/metricbeat/defaults/main.yml b/metricbeat/defaults/main.yml index 28b7e084..ee4cee34 100644 --- a/metricbeat/defaults/main.yml +++ b/metricbeat/defaults/main.yml @@ -1,6 +1,7 @@ --- elastic_stack_version: "6.x" +metricbeat_elasticsearch_protocol: "" metricbeat_elasticsearch_hosts: - "localhost:9200" metricbeat_elasticsearch_auth_username: "" diff --git a/metricbeat/tasks/main.yml b/metricbeat/tasks/main.yml index 3e7fbea7..ed51dd1f 100644 --- a/metricbeat/tasks/main.yml +++ b/metricbeat/tasks/main.yml @@ -50,6 +50,15 @@ when: - metricbeat_elasticsearch_hosts +- name: Metricbeat protocol for Elasticsearch + lineinfile: + dest: /etc/metricbeat/metricbeat.yml + regexp: '^ #?protocol: .*' + line: " protocol: \"{{ metricbeat_elasticsearch_protocol }}\"" + insertafter: "output.elasticsearch:" + notify: restart metricbeat + when: metricbeat_elasticsearch_protocol == "http" or metricbeat_elasticsearch_protocol == "https" + - name: Metricbeat auth/username for Elasticsearch are configured lineinfile: dest: /etc/metricbeat/metricbeat.yml