From bef955f8373ee87ed93b79bfde85f2c12f720dc4 Mon Sep 17 00:00:00 2001 From: Nicolas Lastra Date: Wed, 13 Oct 2021 15:02:06 -0300 Subject: [PATCH 1/3] 638-opendistro-documentation-from4.2 --- .../opendistro/opendistro-elasticsearch/tasks/Debian.yml | 1 + roles/opendistro/opendistro-elasticsearch/tasks/main.yml | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml b/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml index 41011ddc..a964ad8d 100644 --- a/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml +++ b/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml @@ -14,6 +14,7 @@ repo: "{{ package_repos.apt.openjdk.baseurl }}" state: present update_cache: yes + when: (ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_major_version'] == "9") - name: Install openjdk-11-jdk apt: diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml index bea869a9..7d7a6573 100644 --- a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml +++ b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml @@ -11,9 +11,18 @@ - import_tasks: Debian.yml when: ansible_os_family == 'Debian' + - name: Check if performance-analyzer is installed + become: true + command: ./elasticsearch-plugin list | grep 'opendistro-performance-analyzer' + register: elasticsearch_performance + args: + chdir: /usr/share/elasticsearch/bin/ + - name: Remove performance analyzer plugin from elasticsearch become: true command: ./elasticsearch-plugin remove opendistro-performance-analyzer + when: elasticsearch_performance == 'opendistro-performance-analyzer' + ignore_errors: true args: chdir: /usr/share/elasticsearch/bin/ From e1bc568a5504533ec5e8489b003d003cc7f56183 Mon Sep 17 00:00:00 2001 From: Nicolas Lastra Date: Thu, 14 Oct 2021 12:22:50 -0300 Subject: [PATCH 2/3] routine optimization --- roles/opendistro/opendistro-elasticsearch/tasks/main.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml index 7d7a6573..4ceb8805 100644 --- a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml +++ b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml @@ -11,17 +11,10 @@ - import_tasks: Debian.yml when: ansible_os_family == 'Debian' - - name: Check if performance-analyzer is installed - become: true - command: ./elasticsearch-plugin list | grep 'opendistro-performance-analyzer' - register: elasticsearch_performance - args: - chdir: /usr/share/elasticsearch/bin/ - name: Remove performance analyzer plugin from elasticsearch become: true command: ./elasticsearch-plugin remove opendistro-performance-analyzer - when: elasticsearch_performance == 'opendistro-performance-analyzer' ignore_errors: true args: chdir: /usr/share/elasticsearch/bin/ From d656c1d82fa62c7efd8858e403609c59030e3b4d Mon Sep 17 00:00:00 2001 From: Nicolas Lastra Date: Thu, 14 Oct 2021 12:23:31 -0300 Subject: [PATCH 3/3] routine optimization --- roles/opendistro/opendistro-elasticsearch/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml index 4ceb8805..98dd74ef 100644 --- a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml +++ b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml @@ -11,7 +11,6 @@ - import_tasks: Debian.yml when: ansible_os_family == 'Debian' - - name: Remove performance analyzer plugin from elasticsearch become: true command: ./elasticsearch-plugin remove opendistro-performance-analyzer