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

Merge pull request #6254 from Security-Onion-Solutions/es_soup_ingest

Browse Source 
wrap common ingest in raw endraw since json and no jinja
This commit is contained in:
Josh Patterson
2021-11-16 16:47:53 -05:00
committed by GitHub
parent adaf3faf90 5448107310
commit 6288365a50
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
salt/common/tools/sbin/soup
View File

@@ -711,6 +711,9 @@ up_2.3.80_to_2.3.90() {
mkdir -vp /opt/so/saltstack/local/salt/elasticsearch/files/ingest-dynamic mkdir -vp /opt/so/saltstack/local/salt/elasticsearch/files/ingest-dynamic
if [[ -f "/opt/so/saltstack/local/salt/elasticsearch/files/ingest/common" ]]; then if [[ -f "/opt/so/saltstack/local/salt/elasticsearch/files/ingest/common" ]]; then
mv -v /opt/so/saltstack/local/salt/elasticsearch/files/ingest/common /opt/so/saltstack/local/salt/elasticsearch/files/ingest-dynamic/common mv -v /opt/so/saltstack/local/salt/elasticsearch/files/ingest/common /opt/so/saltstack/local/salt/elasticsearch/files/ingest-dynamic/common
# since json file, we need to wrap with raw
sed -i '1s/^/{% raw %}\n/' /opt/so/saltstack/local/salt/elasticsearch/files/ingest-dynamic/common
sed -i -e '$a{% endraw %}\n' /opt/so/saltstack/local/salt/elasticsearch/files/ingest-dynamic/common
fi fi
INSTALLEDVERSION=2.3.90 INSTALLEDVERSION=2.3.90