From ee44edfe754799296ce9de1b1a965178dd85e0b6 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 12 Jan 2022 13:18:44 -0500 Subject: [PATCH 1/2] Add additional highlander settings --- salt/elasticsearch/config.map.jinja | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/elasticsearch/config.map.jinja b/salt/elasticsearch/config.map.jinja index 914bda434..c3f2b2067 100644 --- a/salt/elasticsearch/config.map.jinja +++ b/salt/elasticsearch/config.map.jinja @@ -10,7 +10,7 @@ {% if salt['pillar.get']('nodestab', {}) %} {% do ESCONFIG.elasticsearch.config.node.update({'roles': ['master', 'data', 'remote_cluster_client']}) %} {% if HIGHLANDER %} - {% do ESCONFIG.elasticsearch.config.node.roles.append('ml') %} + {% do ESCONFIG.elasticsearch.config.node.roles.append('ml', 'transform') %} {% endif %} {% do ESCONFIG.elasticsearch.config.update({'discovery': {'seed_hosts': [grains.master]}}) %} {% for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %} @@ -23,7 +23,7 @@ {% else %} {% do ESCONFIG.elasticsearch.config.node.update({'roles': ['data', 'ingest']}) %} {% if HIGHLANDER %} - {% do ESCONFIG.elasticsearch.config.node.roles.extend(['ml', 'master']) %} + {% do ESCONFIG.elasticsearch.config.node.roles.extend(['ml', 'master', 'transform']) %} {% endif %} {% do ESCONFIG.elasticsearch.config.node.attr.update({'box_type': 'hot'}) %} {% do ESCONFIG.elasticsearch.config.update({'discovery': {'seed_hosts': [grains.master]}}) %} From c525bf310d9f0123795a01cd027035212ebcb489 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 12 Jan 2022 13:19:40 -0500 Subject: [PATCH 2/2] Add additional highlander settings --- salt/kibana/config.map.jinja | 5 +++++ 1 file changed, 5 insertions(+) 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) %}