From 5eca1acbeb22946e3b93b60badacbc843e0aa554 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Thu, 6 Jul 2023 13:24:45 -0400 Subject: [PATCH] incorporate features pillar --- pillar/top.sls | 4 ++++ salt/common/tools/sbin/so-common | 11 +++++++++++ salt/soc/enabled.sls | 5 ----- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pillar/top.sls b/pillar/top.sls index 75117e35f..4893c44f9 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -40,6 +40,7 @@ base: - logstash.adv_logstash - soc.soc_soc - soc.adv_soc + - soc.license - soctopus.soc_soctopus - soctopus.adv_soctopus - kibana.soc_kibana @@ -103,6 +104,7 @@ base: - idstools.adv_idstools - soc.soc_soc - soc.adv_soc + - soc.license - soctopus.soc_soctopus - soctopus.adv_soctopus - kibana.soc_kibana @@ -161,6 +163,7 @@ base: - manager.adv_manager - soc.soc_soc - soc.adv_soc + - soc.license - soctopus.soc_soctopus - soctopus.adv_soctopus - kibana.soc_kibana @@ -258,6 +261,7 @@ base: - manager.adv_manager - soc.soc_soc - soc.adv_soc + - soc.license - soctopus.soc_soctopus - soctopus.adv_soctopus - kibana.soc_kibana diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common index d41c8fc0c..fbe5648bf 100755 --- a/salt/common/tools/sbin/so-common +++ b/salt/common/tools/sbin/so-common @@ -301,6 +301,17 @@ lookup_role() { echo ${pieces[1]} } +is_feature_enabled() { + feature=$1 + enabled=$(lookup_salt_value features) + for cur in $enabled; do + if [[ "$feature" == "$cur" ]]; then + return 0 + fi + done + return 1 +} + require_manager() { if is_manager_node; then echo "This is a manager, so we can proceed." diff --git a/salt/soc/enabled.sls b/salt/soc/enabled.sls index ed2e37b82..9e588e5b1 100644 --- a/salt/soc/enabled.sls +++ b/salt/soc/enabled.sls @@ -33,11 +33,6 @@ so-soc: - /opt/so/conf/soc/soc_users_roles:/opt/sensoroni/rbac/users_roles:rw - /opt/so/conf/soc/queue:/opt/sensoroni/queue:rw - /opt/so/saltstack:/opt/so/saltstack:rw - {% if DOCKER.containers['so-soc'].custom_bind_mounts %} - {% for BIND in DOCKER.containers['so-soc'].custom_bind_mounts %} - - {{ BIND }} - {% endfor %} - {% endif %} - extra_hosts: {{ DOCKER_EXTRA_HOSTS }} {% if DOCKER.containers['so-soc'].extra_hosts %} {% for XTRAHOST in DOCKER.containers['so-soc'].extra_hosts %}