Merge branch 'dev' into feature/setup-refactor

# Conflicts:
#	README.md
#	VERSION
#	pillar/top.sls
#	salt/common/grafana/grafana_dashboards/eval/eval.json
#	salt/common/init.sls
#	salt/common/tools/sbin/so-status
#	salt/curator/init.sls
#	salt/elastalert/init.sls
#	salt/elasticsearch/init.sls
#	salt/filebeat/init.sls
#	salt/fleet/files/scripts/so-fleet-setup
#	salt/fleet/init.sls
#	salt/grafana/dashboards/sensor_nodes/sensor.json
#	salt/hive/init.sls
#	salt/idstools/init.sls
#	salt/kibana/bin/so-kibana-config-load
#	salt/logstash/init.sls
#	salt/master/init.sls
#	salt/mysql/init.sls
#	salt/nginx/etc/index.html
#	salt/pcap/init.sls
#	salt/playbook/init.sls
#	salt/reactor/fleet.sls
#	salt/redis/init.sls
#	salt/sensoroni/init.sls
#	salt/soctopus/init.sls
#	salt/strelka/init.sls
#	salt/suricata/init.sls
#	salt/tcpreplay/init.sls
#	salt/wazuh/init.sls
#	salt/zeek/init.sls
#	setup/so-functions
#	setup/so-setup
#	setup/so-whiptail

salt/common/tools/sbin/so-elastic-download

@@ -2,7 +2,7 @@
 MASTER=MASTER
 VERSION="HH1.1.4"
 TRUSTED_CONTAINERS=( \
-"so-core:$VERSION" \
+"so-nginx:$VERSION" \
 "so-thehive-cortex:$VERSION" \
 "so-curator:$VERSION" \
 "so-domainstats:$VERSION" \

salt/common/tools/sbin/so-status

@@ -14,35 +14,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# {%- set pillar_suffix = ':containers' -%}
-# {%- if (salt['grains.get']('role') == 'so-mastersearch') -%}
-#     {%- set pillar_val = 'master_search' -%}
-# {%- elif (salt['grains.get']('role') == 'so-master') -%}
-#     {%- set pillar_val = 'master' -%}
-# {%- elif (salt['grains.get']('role') == 'so-heavynode') -%}
-#     {%- set pillar_val = 'heavy_node' -%}
-# {%- elif (salt['grains.get']('role') == 'so-sensor') -%}
-#     {%- set pillar_val = 'sensor' -%}
-# {%- elif (salt['grains.get']('role') == 'so-eval') -%}
-#     {%- set pillar_val = 'eval' -%}
-# {%- elif (salt['grains.get']('role') == 'so-fleet') -%}
-#     {%- set pillar_val = 'fleet' -%}
-# {%- elif (salt['grains.get']('role') == 'so-helix') -%}
-#     {%- set pillar_val = 'helix' -%}
-# {%- elif (salt['grains.get']('role') == 'so-node') -%}
-#     {%- if (salt['pillar.get']('node:node_type') == 'parser') -%}
-#         {%- set pillar_val = 'parser_node' -%}
-#     {%- elif (salt['pillar.get']('node:node_type') == 'hot') -%}
-#         {%- set pillar_val = 'hot_node' -%}
-#     {%- elif (salt['pillar.get']('node:node_type') == 'warm') -%}
-#         {%- set pillar_val = 'warm_node' -%}
-#     {%- elif (salt['pillar.get']('node:node_type') == 'search') -%}
-#         {%- set pillar_val = 'search_node' -%}
-#     {%- endif -%}
-# {%- endif -%}
-# {%- set pillar_name = pillar_val ~ pillar_suffix -%}
-# {%- set container_list = salt['pillar.get'](pillar_name) %}
+{%- from 'common/maps/so-status.map.jinja' import docker with context %}
+{%- set container_list = docker['containers'] %}
 
 if ! [ "$(id -u)" = 0 ]; then
    echo "This command must be run as root"
@@ -98,14 +71,15 @@ compare_lists() {
 # {% endraw %}
 
 create_expected_container_list() {
-    # {% for item in container_list%}
+    {% for item in container_list%}
         expected_container_list+=("{{ item }}")
-    # {% endfor %}
+    {% endfor %}
 }
 
 populate_container_lists() {
+    systemctl is-active --quiet docker
 
-    if systemctl is-active --quiet docker; then
+    if [[ $? = 0 ]]; then
         mapfile -t docker_raw_list < <(curl -s --unix-socket /var/run/docker.sock http:/v1.40/containers/json?all=1 \
             | jq -c '.[] | { Name: .Names[0], State: .State }' \
             | tr -d '/{"}')