From 0656a19501ce8f7640af639e7c917a5710d2a523 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Mon, 16 Jan 2017 12:19:22 +0000 Subject: [PATCH] Reporting should not be declared as x-pack feature --- README.md | 2 +- defaults/main.yml | 2 +- tasks/elasticsearch-plugins.yml | 2 +- templates/elasticsearch.yml.j2 | 4 ---- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8cd376e..57819a6 100644 --- a/README.md +++ b/README.md @@ -209,7 +209,7 @@ ansible-playbook -i hosts ./your-playbook.yml X-Pack features, such as Security, are supported. This feature is currently experimental. To enable X-Pack set the parameter `es_enable_xpack` to true and list the required features in the parameter `es_xpack_features`. -The parameter `es_xpack_features` by default enables all features i.e. it defaults to ["alerting","monitoring","graph","security","reporting"] +The parameter `es_xpack_features` by default enables all features i.e. it defaults to ["alerting","monitoring","graph","security"] The following additional parameters allow X-Pack to be configured: diff --git a/defaults/main.yml b/defaults/main.yml index 03cef9f..178e84f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -24,7 +24,7 @@ es_work_dir: "/tmp/elasticsearch" es_max_open_files: 65536 es_allow_downgrades: false es_enable_xpack: false -es_xpack_features: ["alerting","monitoring","graph","security","reporting"] +es_xpack_features: ["alerting","monitoring","graph","security"] #These are used for internal operations performed by ansible. #They do not effect the current configuration es_api_host: "localhost" diff --git a/tasks/elasticsearch-plugins.yml b/tasks/elasticsearch-plugins.yml index 752911f..eab6109 100644 --- a/tasks/elasticsearch-plugins.yml +++ b/tasks/elasticsearch-plugins.yml @@ -9,7 +9,7 @@ #List currently installed plugins - ignore xpack if > v 2.0 - name: Check installed elasticsearch plugins - shell: "{{es_home}}/bin/elasticsearch-plugin list | grep -vE 'x-pack|license'" + shell: "{{es_home}}/bin/elasticsearch-plugin list | grep -vE 'x-pack'" register: installed_plugins failed_when: "'ERROR' in installed_plugins.stdout" changed_when: False diff --git a/templates/elasticsearch.yml.j2 b/templates/elasticsearch.yml.j2 index fb57827..2bbc5c2 100644 --- a/templates/elasticsearch.yml.j2 +++ b/templates/elasticsearch.yml.j2 @@ -34,8 +34,4 @@ xpack.monitoring.enabled: false {% if not "alerting" in es_xpack_features %} xpack.watcher.enabled: false -{% endif %} - -{% if not "reporting" in es_xpack_features %} -xpack.reporting.enabled: false {% endif %} \ No newline at end of file