From 5215a429ae6f07df1e0e6be43fc26ddfefdade94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez?= <pylott@gmail.com>
Date: Wed, 23 Jun 2021 11:10:25 +0200
Subject: [PATCH] Fix multi-tenant and performance analyzer

---
 roles/elastic-stack/ansible-kibana/templates/kibana.yml.j2    | 4 +++-
 roles/opendistro/opendistro-elasticsearch/tasks/main.yml      | 3 +++
 .../opendistro-kibana/templates/opendistro_kibana.yml.j2      | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/roles/elastic-stack/ansible-kibana/templates/kibana.yml.j2 b/roles/elastic-stack/ansible-kibana/templates/kibana.yml.j2
index 62f6e9eb..2de3d3e9 100644
--- a/roles/elastic-stack/ansible-kibana/templates/kibana.yml.j2
+++ b/roles/elastic-stack/ansible-kibana/templates/kibana.yml.j2
@@ -116,4 +116,6 @@ elasticsearch.ssl.certificateAuthorities: ["{{ node_certs_destination }}/ca.crt"
 {% elif generate_CA == false %}
 elasticsearch.ssl.certificateAuthorities: ["{{ node_certs_destination }}/{{ca_cert_name}}"]
 {% endif %}
-{% endif %}
\ No newline at end of file
+{% endif %}
+
+server.defaultRoute: /app/wazuh
\ No newline at end of file
diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
index e451cdaa..0470e477 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
@@ -11,6 +11,9 @@
     - import_tasks: Debian.yml
       when: ansible_os_family == 'Debian'
 
+    - name: Remove Performance analyzer plugin
+      command: "/usr/share/elasticsearch/bin/elasticsearch-plugin remove opendistro-performance-analyzer"
+
     - name: Remove elasticsearch configuration file
       file:
         path: "{{ opendistro_conf_path }}/elasticsearch.yml"
diff --git a/roles/opendistro/opendistro-kibana/templates/opendistro_kibana.yml.j2 b/roles/opendistro/opendistro-kibana/templates/opendistro_kibana.yml.j2
index bc166988..e624f2a3 100644
--- a/roles/opendistro/opendistro-kibana/templates/opendistro_kibana.yml.j2
+++ b/roles/opendistro/opendistro-kibana/templates/opendistro_kibana.yml.j2
@@ -25,7 +25,7 @@ elasticsearch.hosts: "http://{{ elasticsearch_network_host }}:{{ elasticsearch_h
 {% endif %}
 
 elasticsearch.requestHeadersWhitelist: ["securitytenant","Authorization"]
-opendistro_security.multitenancy.enabled: false # FIXME: should be enabled starting with Wazuh App v3.13
+opendistro_security.multitenancy.enabled: true
 opendistro_security.multitenancy.tenants.preferred: ["Private", "Global"]
 opendistro_security.readonly_mode.roles: ["kibana_read_only"]
 
@@ -33,4 +33,4 @@ newsfeed.enabled: {{ kibana_newsfeed_enabled }}
 telemetry.optIn: {{ kibana_telemetry_optin }}
 telemetry.enabled: {{ kibana_telemetry_enabled }}
 
-
+server.defaultRoute: /app/wazuh?security_tenant=global
\ No newline at end of file