diff --git a/salt/kibana/bin/so-kibana-config-load b/salt/kibana/bin/so-kibana-config-load index a642e9e55..73b83cece 100644 --- a/salt/kibana/bin/so-kibana-config-load +++ b/salt/kibana/bin/so-kibana-config-load @@ -5,7 +5,7 @@ # Elastic License 2.0. {%- set MANAGER = salt['pillar.get']('global:url_base', '') %} -{%- set ENDGAMEHOST = salt['pillar.get']('soc:endgamehost', 'ENDGAMEHOST') %} +{%- set ENDGAMEHOST = salt['pillar.get']('global:endgamehost', 'ENDGAMEHOST') %} . /usr/sbin/so-common check_file() { diff --git a/setup/so-functions b/setup/so-functions index 46833c081..ac7444cc8 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1455,15 +1455,7 @@ idstools_pillar() { soc_pillar() { touch $adv_soc_pillar_file - printf '%s\n'\ - "soc:"\ - " es_index_patterns: '*:so-*,*:endgame-*'"\ - "" > "$soc_pillar_file" - if [[ -n $ENDGAMEHOST ]]; then - printf '%s\n'\ - " endgamehost: '$ENDGAMEHOST'"\ - "" >> "$soc_pillar_file" - fi + touch $soc_pillar_file } manager_pillar() { @@ -1530,6 +1522,7 @@ create_global() { echo " pipeline: 'redis'" >> $global_pillar_file echo " repo_host: '$MAINIP'" >> $global_pillar_file echo " registry_host: '$MAINIP'" >> $global_pillar_file + echo " endgamehost: '$ENDGAMEHOST'" >> $global_pillar_file } create_sensoroni_pillar() {