Merge branch 'dev' into feature/so-status

2025-12-26 02:43:11 +01:00 · 2020-01-30 12:41:41 -05:00
parent f839f38553 63d0a21a0c
commit 746bd99f99
47 changed files with 649 additions and 51 deletions
--- a/salt/common/tools/sbin/so-elastic-clear
+++ b/salt/common/tools/sbin/so-elastic-clear
@@ -14,6 +14,7 @@
 #
 # 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 MASTERIP = salt['pillar.get']('static:masterip', '') -%}
 . /usr/sbin/so-common

 SKIP=0
--- a/salt/common/tools/sbin/so-zeek-restart
+++ b/salt/common/tools/sbin/so-zeek-restart
@@ -17,4 +17,4 @@

 . /usr/sbin/so-common

-/usr/sbin/so-restart bro $1
+/usr/sbin/so-restart zeek $1
--- a/salt/common/tools/sbin/so-zeek-start
+++ b/salt/common/tools/sbin/so-zeek-start
@@ -17,4 +17,4 @@

 . /usr/sbin/so-common

-/usr/sbin/so-start bro $1
+/usr/sbin/so-start zeek $1
--- a/salt/common/tools/sbin/so-zeek-stop
+++ b/salt/common/tools/sbin/so-zeek-stop
@@ -17,4 +17,4 @@

 . /usr/sbin/so-common

-/usr/sbin/so-stop bro $1
+/usr/sbin/so-stop zeek $1