From 9f5a38c26f28617e68b4bf4597b36431f20fac13 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 21 May 2020 09:19:24 -0400 Subject: [PATCH 1/2] add so-filebeat to so-status for eval - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/706 --- salt/common/maps/eval.map.jinja | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/common/maps/eval.map.jinja b/salt/common/maps/eval.map.jinja index 56f2116b9..f868474c5 100644 --- a/salt/common/maps/eval.map.jinja +++ b/salt/common/maps/eval.map.jinja @@ -1,5 +1,6 @@ {% set docker = { 'containers': [ + 'so-filebeat', 'so-nginx', 'so-telegraf', 'so-dockerregistry', From 0a6f0efdc55a438250c75856b72c9a80db59a59a Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 21 May 2020 09:21:28 -0400 Subject: [PATCH 2/2] Sort so-status output alphabetically - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/747 --- salt/common/tools/sbin/so-status | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/so-status b/salt/common/tools/sbin/so-status index 29c029623..7a7d6c783 100755 --- a/salt/common/tools/sbin/so-status +++ b/salt/common/tools/sbin/so-status @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . {%- from 'common/maps/so-status.map.jinja' import docker with context %} -{%- set container_list = docker['containers'] %} +{%- set container_list = docker['containers'] | sort %} if ! [ "$(id -u)" = 0 ]; then echo "This command must be run as root"