diff --git a/salt/kibana/config.map.jinja b/salt/kibana/config.map.jinja index 58f1fbf67..d595092de 100644 --- a/salt/kibana/config.map.jinja +++ b/salt/kibana/config.map.jinja @@ -1,4 +1,5 @@ {% import_yaml 'kibana/defaults.yaml' as KIBANACONFIG with context %} +{% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %} {% if salt['pillar.get']('elasticsearch:auth:enabled', False) %} {% do KIBANACONFIG.kibana.config.elasticsearch.update({'username': salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user'), 'password': salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass')}) %} @@ -12,4 +13,8 @@ {% do KIBANACONFIG.kibana.config.xpack.update({'reporting': {'encryptionKey': pillar['kibana']['secrets']['reporting']['encryptionKey']}}) %} {% endif %} +{% if HIGHLANDER %} + {% do KIBANACONFIG.kibana.config.xpack.ml.update({'enabled': true}) %} +{% endif %} + {% set KIBANACONFIG = salt['pillar.get']('kibana:config', default=KIBANACONFIG.kibana.config, merge=True) %}