From 93056e802f07dfc56370674c2efcac35ab2c817e Mon Sep 17 00:00:00 2001 From: Doug Burks Date: Fri, 16 Dec 2022 13:17:27 -0500 Subject: [PATCH 1/3] remove old comment --- setup/so-setup | 1 - 1 file changed, 1 deletion(-) diff --git a/setup/so-setup b/setup/so-setup index 784aa0ca4..35502f759 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -332,7 +332,6 @@ if ! [[ -f $install_opt_file ]]; then get_redirect collect_so_allow whiptail_end_settings - # Start the install elif [[ $is_standalone ]]; then waitforstate=true monints=true From b9e51fc7cf7bb92930408fcb2275364d34a0fdf6 Mon Sep 17 00:00:00 2001 From: doug Date: Fri, 16 Dec 2022 13:24:02 -0500 Subject: [PATCH 2/3] first round of fixes for eval mode --- pillar/top.sls | 5 +++-- .../tools/sbin/so-elastic-agent-gen-installers | 0 .../tools/sbin/so-elastic-auth-password-reset | 0 salt/common/tools/sbin/so-elastic-fleet-setup | 0 salt/common/tools/sbin/so-firewall-minion | 0 salt/common/tools/sbin/so-idh-restart | 0 salt/common/tools/sbin/so-idh-start | 0 salt/common/tools/sbin/so-idh-stop | 0 salt/common/tools/sbin/so-status | 0 salt/vars/eval.map.jinja | 13 +++++++++++++ 10 files changed, 16 insertions(+), 2 deletions(-) mode change 100644 => 100755 salt/common/tools/sbin/so-elastic-agent-gen-installers mode change 100644 => 100755 salt/common/tools/sbin/so-elastic-auth-password-reset mode change 100644 => 100755 salt/common/tools/sbin/so-elastic-fleet-setup mode change 100644 => 100755 salt/common/tools/sbin/so-firewall-minion mode change 100644 => 100755 salt/common/tools/sbin/so-idh-restart mode change 100644 => 100755 salt/common/tools/sbin/so-idh-start mode change 100644 => 100755 salt/common/tools/sbin/so-idh-stop mode change 100644 => 100755 salt/common/tools/sbin/so-status create mode 100644 salt/vars/eval.map.jinja diff --git a/pillar/top.sls b/pillar/top.sls index 550433f21..0d713d64d 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -64,10 +64,11 @@ base: {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/elasticsearch/auth.sls') %} - elasticsearch.auth {% endif %} - - kibana.secrets {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/kibana/secrets.sls') %} - - soc_global + - kibana.secrets {% endif %} + - soc_global + - kratos.soc_kratos - elasticsearch.soc_elasticsearch - manager.soc_manager - soc.soc_soc diff --git a/salt/common/tools/sbin/so-elastic-agent-gen-installers b/salt/common/tools/sbin/so-elastic-agent-gen-installers old mode 100644 new mode 100755 diff --git a/salt/common/tools/sbin/so-elastic-auth-password-reset b/salt/common/tools/sbin/so-elastic-auth-password-reset old mode 100644 new mode 100755 diff --git a/salt/common/tools/sbin/so-elastic-fleet-setup b/salt/common/tools/sbin/so-elastic-fleet-setup old mode 100644 new mode 100755 diff --git a/salt/common/tools/sbin/so-firewall-minion b/salt/common/tools/sbin/so-firewall-minion old mode 100644 new mode 100755 diff --git a/salt/common/tools/sbin/so-idh-restart b/salt/common/tools/sbin/so-idh-restart old mode 100644 new mode 100755 diff --git a/salt/common/tools/sbin/so-idh-start b/salt/common/tools/sbin/so-idh-start old mode 100644 new mode 100755 diff --git a/salt/common/tools/sbin/so-idh-stop b/salt/common/tools/sbin/so-idh-stop old mode 100644 new mode 100755 diff --git a/salt/common/tools/sbin/so-status b/salt/common/tools/sbin/so-status old mode 100644 new mode 100755 diff --git a/salt/vars/eval.map.jinja b/salt/vars/eval.map.jinja new file mode 100644 index 000000000..9a47fc42f --- /dev/null +++ b/salt/vars/eval.map.jinja @@ -0,0 +1,13 @@ +{% from 'vars/elasticsearch.map.jinja' import ELASTICSEARCH_GLOBALS %} + +{% set ROLE_GLOBALS = {} %} + +{% set EVAL_GLOBALS = + [ + ELASTICSEARCH_GLOBALS + ] +%} + +{% for sg in EVAL_GLOBALS %} +{% do salt['defaults.merge'](ROLE_GLOBALS, sg, merge_lists=False, in_place=True) %} +{% endfor %} From 0fa6ca388080c2b21825afccd8a797383eddc680 Mon Sep 17 00:00:00 2001 From: Doug Burks Date: Fri, 16 Dec 2022 15:59:17 -0500 Subject: [PATCH 3/3] init.sls needs to import GLOBALS --- salt/utility/init.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/utility/init.sls b/salt/utility/init.sls index 43b780b4a..49bb2cb0c 100644 --- a/salt/utility/init.sls +++ b/salt/utility/init.sls @@ -1,4 +1,5 @@ {% from 'allowed_states.map.jinja' import allowed_states %} +{% from 'vars/globals.map.jinja' import GLOBALS %} {% if sls in allowed_states %} {% if grains['role'] in ['so-eval', 'so-import'] %}