From a959b4b2cd413935dcbea6ae830a41799e018d6f Mon Sep 17 00:00:00 2001 From: William Wernert Date: Wed, 16 Dec 2020 11:00:48 -0500 Subject: [PATCH 1/5] [fix] Helix sensor needs so-soc and so-elasticsearch images downloaded --- salt/common/tools/sbin/so-image-common | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/common/tools/sbin/so-image-common b/salt/common/tools/sbin/so-image-common index 767f9d21c..ef53ce60f 100755 --- a/salt/common/tools/sbin/so-image-common +++ b/salt/common/tools/sbin/so-image-common @@ -84,11 +84,13 @@ container_list() { TRUSTED_CONTAINERS=( "so-filebeat" "so-idstools" + "so-elasticsearch" "so-logstash" "so-nginx" "so-redis" "so-steno" "so-suricata" + "so-soc" "so-telegraf" "so-zeek" ) From d670f96dc0b801b8be4d715ba96d858e07d4cbd2 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Wed, 16 Dec 2020 11:07:00 -0500 Subject: [PATCH 2/5] [fix] Exit on command failure in so-catrust --- salt/elasticsearch/files/scripts/so-catrust | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/salt/elasticsearch/files/scripts/so-catrust b/salt/elasticsearch/files/scripts/so-catrust index aee83a379..d49a29ce4 100644 --- a/salt/elasticsearch/files/scripts/so-catrust +++ b/salt/elasticsearch/files/scripts/so-catrust @@ -18,6 +18,10 @@ {%- set IMAGEREPO = salt['pillar.get']('global:imagerepo') %} {%- set MANAGER = salt['grains.get']('master') %} . /usr/sbin/so-common + +# Exit on errors, since all lines must succeed +set -e + # Check to see if we have extracted the ca cert. if [ ! -f /opt/so/saltstack/local/salt/common/cacerts ]; then docker run -v /etc/pki/ca.crt:/etc/pki/ca.crt --name so-elasticsearchca --user root --entrypoint jdk/bin/keytool {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-elasticsearch:{{ VERSION }} -keystore /etc/pki/ca-trust/extracted/java/cacerts -alias SOSCA -import -file /etc/pki/ca.crt -storepass changeit -noprompt From 6ba3c16c7569050aec7f04f58775083841639868 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Wed, 16 Dec 2020 11:10:57 -0500 Subject: [PATCH 3/5] [fix] Actually count containers when checking count --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 5f98e685e..144a75160 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1525,7 +1525,7 @@ reinstall_init() { if command -v docker &> /dev/null; then # Stop and remove all so-* containers so files can be changed with more safety - if [ $(docker ps -a -q --filter "name=so-") -gt 0 ]; then + if [ $(docker ps -a -q --filter "name=so-" | wc -l) -gt 0 ]; then docker stop $(docker ps -a -q --filter "name=so-") docker rm -f $(docker ps -a -q --filter "name=so-") fi From 9c8fc5e6ed560ce4b6e12af997c81fba79b7338a Mon Sep 17 00:00:00 2001 From: William Wernert Date: Wed, 16 Dec 2020 11:16:14 -0500 Subject: [PATCH 4/5] [fix] Make parent directories if needed --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 144a75160..0db2d5792 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -719,7 +719,7 @@ create_local_directories() { for d in $(find $PILLARSALTDIR/$i -type d); do suffixdir=${d//$PILLARSALTDIR/} if [ ! -d "$local_salt_dir/$suffixdir" ]; then - mkdir -v "$local_salt_dir$suffixdir" >> "$setup_log" 2>&1 + mkdir -pv "$local_salt_dir$suffixdir" >> "$setup_log" 2>&1 fi done chown -R socore:socore "$local_salt_dir/$i" From 09b5e6d227f501d2b2e052f6a779a2b4227726c5 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 16 Dec 2020 11:57:27 -0500 Subject: [PATCH 5/5] Fix SSL issue --- salt/telegraf/init.sls | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/salt/telegraf/init.sls b/salt/telegraf/init.sls index 8d400ca1e..1ff34ceae 100644 --- a/salt/telegraf/init.sls +++ b/salt/telegraf/init.sls @@ -48,6 +48,7 @@ so-telegraf: - HOST_ETC=/host/etc - HOST_SYS=/host/sys - HOST_MOUNT_PREFIX=/host + - GODEBUG=x509ignoreCN=0 - network_mode: host - binds: - /opt/so/log/telegraf:/var/log/telegraf:rw @@ -84,4 +85,4 @@ telegraf_state_not_allowed: test.fail_without_changes: - name: telegraf_state_not_allowed -{% endif %} \ No newline at end of file +{% endif %}