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

resolve conflicts

Browse Source
This commit is contained in:
m0duspwnens
2020-02-20 17:00:15 -05:00
parent 2b34bdece9
commit e2ccebd2fa
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/logstash/files/dynamic/9002_output_import.conf
View File

@@ -19,7 +19,7 @@ output {
elasticsearch { elasticsearch {
hosts => "{{ ES }}" hosts => "{{ ES }}"
index => "logstash-import-%{+YYYY.MM.dd}" index => "logstash-import-%{+YYYY.MM.dd}"
template_name => "logstash-*" template_name => "logstash"
template => "/logstash-template.json" template => "/logstash-template.json"
template_overwrite => true template_overwrite => true
} }

2
salt/logstash/pipelines/config/9002_output_import.conf.jinja
View File

@@ -19,7 +19,7 @@ output {
elasticsearch { elasticsearch {
hosts => "{{ ES }}" hosts => "{{ ES }}"
index => "logstash-import-%{+YYYY.MM.dd}" index => "logstash-import-%{+YYYY.MM.dd}"
template_name => "logstash-*" template_name => "logstash"
template => "/logstash-template.json" template => "/logstash-template.json"
template_overwrite => true template_overwrite => true
} }

2
salt/pcap/init.sls
View File

@@ -41,7 +41,7 @@ stenoconfdir:
- makedirs: True - makedirs: True
{% if BPF_STENO %} {% if BPF_STENO %}
{% set BPF_CALC = salt['cmd.script']('/usr/sbin/so-bpf-compile', INTERFACE + ' ' + BPF_STENO|join(" ") ) %} {% set BPF_CALC = salt['cmd.script']('/usr/sbin/so-bpf-compile', INTERFACE + ' ' + BPF_STENO|join(" "),cwd='/root') %}
{% if BPF_CALC['stderr'] == "" %} {% if BPF_CALC['stderr'] == "" %}
{% set BPF_COMPILED = ",\\\"--filter=" + BPF_CALC['stdout'] + "\\\"" %} {% set BPF_COMPILED = ",\\\"--filter=" + BPF_CALC['stdout'] + "\\\"" %}
{% else %} {% else %}

2
salt/suricata/init.sls
View File

@@ -84,7 +84,7 @@ surithresholding:
# BPF compilation and configuration # BPF compilation and configuration
{% if BPF_NIDS %} {% if BPF_NIDS %}
{% set BPF_CALC = salt['cmd.script']('/usr/sbin/so-bpf-compile', interface + ' ' + BPF_NIDS|join(" ") ) %} {% set BPF_CALC = salt['cmd.script']('/usr/sbin/so-bpf-compile', interface + ' ' + BPF_NIDS|join(" "),cwd='/root') %}
{% if BPF_CALC['stderr'] == "" %} {% if BPF_CALC['stderr'] == "" %}
{% set BPF_STATUS = 1 %} {% set BPF_STATUS = 1 %}
{% else %} {% else %}

2
salt/zeek/init.sls
View File

@@ -95,7 +95,7 @@ plcronscript:
# BPF compilation and configuration # BPF compilation and configuration
{% if BPF_ZEEK %} {% if BPF_ZEEK %}
{% set BPF_CALC = salt['cmd.script']('/usr/sbin/so-bpf-compile', INTERFACE + ' ' + BPF_ZEEK|join(" ") ) %} {% set BPF_CALC = salt['cmd.script']('/usr/sbin/so-bpf-compile', INTERFACE + ' ' + BPF_ZEEK|join(" "),cwd='/root') %}
{% if BPF_CALC['stderr'] == "" %} {% if BPF_CALC['stderr'] == "" %}
{% set BPF_STATUS = 1 %} {% set BPF_STATUS = 1 %}
{% else %} {% else %}