Merge remote-tracking branch 'origin/reyesj2/kafka' into kaffytaffy

salt/manager/tools/sbin/so-firewall-minion

@@ -79,6 +79,9 @@ fi
 		'RECEIVER')
 			so-firewall includehost receiver "$IP" --apply
 			;;
+		'KAFKANODE')
+			so-firewall includehost kafkanode "$IP" --apply
+			;;
 		'DESKTOP')
 			so-firewall includehost desktop "$IP" --apply
 			;;

salt/manager/tools/sbin/so-kafka-clusterid

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
+# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
+# https://securityonion.net/license; you may not use this file except in compliance with the
+# Elastic License 2.0.
+
+local_salt_dir=/opt/so/saltstack/local
+
+if [[ -f /usr/sbin/so-common ]]; then
+  source /usr/sbin/so-common
+else
+  source $(dirname $0)/../../../common/tools/sbin/so-common
+fi
+
+if ! grep -q "^  kafka_cluster_id:" $local_salt_dir/pillar/secrets.sls; then
+    kafka_cluster_id=$(get_random_value 22)
+    echo '  kafka_cluster_id: '$kafka_cluster_id >> $local_salt_dir/pillar/secrets.sls
+else
+    echo 'kafka_cluster_id exists'
+    salt-call pillar.get secrets
+fi

salt/manager/tools/sbin/so-minion

@@ -565,6 +565,11 @@ function createRECEIVER() {
 	add_telegraf_to_minion
 }
 
+function createKAFKANODE() {
+	add_logstash_to_minion
+	# add_telegraf_to_minion
+}
+
 function createDESKTOP() {
 	add_desktop_to_minion
 	add_telegraf_to_minion