Pull in upstream changes

salt/common/tools/sbin/so-minion

@@ -131,13 +131,24 @@ function add_fleet_to_minion() {
 
     # Write out settings to minion file
     printf '%s\n'\
-		"logstash_settings:"\
-		"  lsheap: '500m'"\
 		"fleet-server:"\
 		"  ES-Token: '$ESTOKEN'"\
 		"  " >> $PILLARFILE
 }
 
+
+function add_logstash_to_minion() {
+	# Create the logstash advanced pillar
+	printf '%s\n'\
+		"logstash_settings:"\
+		"  ls_host: '$LSHOSTNAME'"\
+		"  ls_pipeline_batch_size: 125"\
+		"  ls_input_threads: 1"\
+		"  lsheap: $LSHEAP"\
+		"  ls_pipeline_workers: $CPUCORES"\
+		"  " >> $PILLARFILE
+}
+
 # Analyst Workstation
 function add_analyst_to_minion() {
     printf '%s\n'\
@@ -186,11 +197,13 @@ function add_sensor_to_minion() {
 
 function createEVAL() {
 	add_elastic_to_minion
+	add_logstash_to_minion
 	add_sensor_to_minion
 }
 
 function createFLEET() {
 	add_fleet_to_minion
+	add_logstash_to_minion
 }
 
 function createIDHNODE() {
@@ -199,20 +212,24 @@ function createIDHNODE() {
 
 function createIMPORT() {
 	add_elastic_to_minion
+	add_logstash_to_minion
 	add_sensor_to_minion
 }
 
 function createHEAVYNODE() {
 	add_elastic_to_minion
+	add_logstash_to_minion
 	add_sensor_to_minion
 }
 
-function createMASTER() {
+function createMANAGER() {
 	add_elastic_to_minion
+	add_logstash_to_minion
 }
 
-function createMASTERSEARCH() {
+function createMANAGERSEARCH() {
 	add_elastic_to_minion
+	add_logstash_to_minion
 }
 
 function createSENSOR() {
@@ -221,10 +238,12 @@ function createSENSOR() {
 
 function createSEARCHNODE() {
 	add_elastic_to_minion
+	add_logstash_to_minion
 }
 
 function createSTANDALONE() {
 	add_elastic_to_minion
+	add_logstash_to_minion
 	add_sensor_to_minion
 }