Merge pull request #606 from wazuh/fix-tenant

Fixed multi tenant and performance analyzer
This commit is contained in:
Alberto Rodríguez 2021-06-24 08:41:39 +02:00 committed by GitHub
commit 78698c2e4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions

View File

@ -116,4 +116,6 @@ elasticsearch.ssl.certificateAuthorities: ["{{ node_certs_destination }}/ca.crt"
{% elif generate_CA == false %} {% elif generate_CA == false %}
elasticsearch.ssl.certificateAuthorities: ["{{ node_certs_destination }}/{{ca_cert_name}}"] elasticsearch.ssl.certificateAuthorities: ["{{ node_certs_destination }}/{{ca_cert_name}}"]
{% endif %} {% endif %}
{% endif %} {% endif %}
server.defaultRoute: /app/wazuh

View File

@ -11,6 +11,9 @@
- import_tasks: Debian.yml - import_tasks: Debian.yml
when: ansible_os_family == 'Debian' 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 - name: Remove elasticsearch configuration file
file: file:
path: "{{ opendistro_conf_path }}/elasticsearch.yml" path: "{{ opendistro_conf_path }}/elasticsearch.yml"

View File

@ -25,7 +25,7 @@ elasticsearch.hosts: "http://{{ elasticsearch_network_host }}:{{ elasticsearch_h
{% endif %} {% endif %}
elasticsearch.requestHeadersWhitelist: ["securitytenant","Authorization"] 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.multitenancy.tenants.preferred: ["Private", "Global"]
opendistro_security.readonly_mode.roles: ["kibana_read_only"] opendistro_security.readonly_mode.roles: ["kibana_read_only"]
@ -33,4 +33,6 @@ newsfeed.enabled: {{ kibana_newsfeed_enabled }}
telemetry.optIn: {{ kibana_telemetry_optin }} telemetry.optIn: {{ kibana_telemetry_optin }}
telemetry.enabled: {{ kibana_telemetry_enabled }} telemetry.enabled: {{ kibana_telemetry_enabled }}
server.defaultRoute: /app/wazuh?security_tenant=global