CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #985 from Security-Onion-Solutions/quickfix/elasticpillar

Browse Source 
prevent elasticsearch pillar being added twice for managers and helix
This commit is contained in:
Josh Patterson
2020-07-13 09:48:44 -04:00
committed by GitHub
parent e62381e998 242e17b329
commit db80675609
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/so-functions
View File

@@ -1141,8 +1141,7 @@ elasticsearch_pillar() {
" log_size_limit: $log_size_limit"\ " log_size_limit: $log_size_limit"\
" node_route_type: hot"\ " node_route_type: hot"\
"" >> "$pillar_file" "" >> "$pillar_file"
if [ "$install_type" != 'EVAL' ] && [ "$install_type" != 'HELIXSENSOR' ] && [ "$install_type" != 'MANAGERSEARCH' ] && [ "$install_type" != 'STANDALONE' ]; then
printf '%s\n'\ printf '%s\n'\
"logstash_settings:"\ "logstash_settings:"\
" ls_pipeline_batch_size: $LSPIPELINEBATCH"\ " ls_pipeline_batch_size: $LSPIPELINEBATCH"\
@@ -1150,7 +1149,6 @@ elasticsearch_pillar() {
" ls_batch_count: $LSINPUTBATCHCOUNT"\ " ls_batch_count: $LSINPUTBATCHCOUNT"\
" lsheap: $NODE_LS_HEAP_SIZE"\ " lsheap: $NODE_LS_HEAP_SIZE"\
"" >> "$pillar_file" "" >> "$pillar_file"
fi
printf '%s\n' '----' >> "$setup_log" 2>&1 printf '%s\n' '----' >> "$setup_log" 2>&1
cat "$pillar_file" >> "$setup_log" 2>&1 cat "$pillar_file" >> "$setup_log" 2>&1

6
setup/so-setup
View File

@@ -440,8 +440,10 @@ fi
set_progress_str 18 'Setting node type' set_progress_str 18 'Setting node type'
set_node_type >> $setup_log 2>&1 set_node_type >> $setup_log 2>&1
set_progress_str 19 'Generating search node pillar' if ! [[ $is_manager || $is_helix ]]; then
elasticsearch_pillar >> $setup_log 2>&1 set_progress_str 19 'Generating search node pillar'
elasticsearch_pillar >> $setup_log 2>&1
fi
fi fi
if [[ $is_minion ]]; then if [[ $is_minion ]]; then