Merge remote-tracking branch 'remotes/origin/dev' into feature/suripillar

This commit is contained in:
m0duspwnens
2020-06-22 09:13:29 -04:00
2 changed files with 36 additions and 14 deletions

View File

@@ -12,6 +12,7 @@
"apiKey": "{{ SENSORONIKEY }}" "apiKey": "{{ SENSORONIKEY }}"
}, },
"stenoquery": { "stenoquery": {
"executablePath": "/opt/sensoroni/scripts/stenoquery.sh",
"pcapInputPath": "/nsm/pcap", "pcapInputPath": "/nsm/pcap",
"pcapOutputPath": "/nsm/pcapout" "pcapOutputPath": "/nsm/pcapout"
} }

View File

@@ -20,13 +20,11 @@
# PCAP Section # PCAP Section
# Create the logstash group
stenographergroup: stenographergroup:
group.present: group.present:
- name: stenographer - name: stenographer
- gid: 941 - gid: 941
# Add the logstash user for the jog4j settings
stenographer: stenographer:
user.present: user.present:
- uid: 941 - uid: 941
@@ -40,6 +38,13 @@ stenoconfdir:
- group: 939 - group: 939
- makedirs: True - makedirs: True
sensoroniconfdir:
file.directory:
- name: /opt/so/conf/sensoroni
- user: 939
- group: 939
- makedirs: True
{% if BPF_STENO %} {% if BPF_STENO %}
{% set BPF_CALC = salt['cmd.script']('/usr/sbin/so-bpf-compile', INTERFACE + ' ' + BPF_STENO|join(" "),cwd='/root') %} {% 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'] == "" %}
@@ -58,8 +63,8 @@ stenoconf:
file.managed: file.managed:
- name: /opt/so/conf/steno/config - name: /opt/so/conf/steno/config
- source: salt://pcap/files/config - source: salt://pcap/files/config
- user: root - user: stenographer
- group: root - group: stenographer
- mode: 644 - mode: 644
- template: jinja - template: jinja
- defaults: - defaults:
@@ -67,10 +72,10 @@ stenoconf:
sensoroniagentconf: sensoroniagentconf:
file.managed: file.managed:
- name: /opt/so/conf/steno/sensoroni.json - name: /opt/so/conf/sensoroni/sensoroni.json
- source: salt://pcap/files/sensoroni.json - source: salt://pcap/files/sensoroni.json
- user: stenographer - user: 939
- group: stenographer - group: 939
- mode: 600 - mode: 600
- template: jinja - template: jinja
@@ -78,7 +83,7 @@ stenoca:
file.directory: file.directory:
- name: /opt/so/conf/steno/certs - name: /opt/so/conf/steno/certs
- user: 941 - user: 941
- group: 941 - group: 939
pcapdir: pcapdir:
file.directory: file.directory:
@@ -97,8 +102,8 @@ pcaptmpdir:
pcapoutdir: pcapoutdir:
file.directory: file.directory:
- name: /nsm/pcapout - name: /nsm/pcapout
- user: 941 - user: 939
- group: 941 - group: 939
- makedirs: True - makedirs: True
pcapindexdir: pcapindexdir:
@@ -115,6 +120,13 @@ stenolog:
- group: 941 - group: 941
- makedirs: True - makedirs: True
sensoronilog:
file.directory:
- name: /opt/so/log/sensoroni
- user: 939
- group: 939
- makedirs: True
so-steno: so-steno:
docker_container.running: docker_container.running:
- image: {{ MASTER }}:5000/soshybridhunter/so-steno:{{ VERSION }} - image: {{ MASTER }}:5000/soshybridhunter/so-steno:{{ VERSION }}
@@ -128,10 +140,19 @@ so-steno:
- /nsm/pcap:/nsm/pcap:rw - /nsm/pcap:/nsm/pcap:rw
- /nsm/pcapindex:/nsm/pcapindex:rw - /nsm/pcapindex:/nsm/pcapindex:rw
- /nsm/pcaptmp:/tmp:rw - /nsm/pcaptmp:/tmp:rw
- /nsm/pcapout:/nsm/pcapout:rw
- /opt/so/log/stenographer:/var/log/stenographer:rw - /opt/so/log/stenographer:/var/log/stenographer:rw
- /opt/so/conf/steno/sensoroni.json:/opt/sensoroni/sensoroni.json:ro
- /opt/so/log/stenographer:/opt/sensoroni/logs:rw
- watch: - watch:
- file: /opt/so/conf/steno/config - file: /opt/so/conf/steno/config
- file: /opt/so/conf/steno/sensoroni.json
so-sensoroni:
docker_container.running:
- image: {{ MASTER }}:5000/soshybridhunter/so-soc:{{ VERSION }}
- network_mode: host
- binds:
- /opt/so/conf/steno/certs:/etc/stenographer/certs:rw
- /nsm/pcap:/nsm/pcap:rw
- /nsm/pcapout:/nsm/pcapout:rw
- /opt/so/conf/sensoroni/sensoroni.json:/opt/sensoroni/sensoroni.json:ro
- /opt/so/log/sensoroni:/opt/sensoroni/logs:rw
- watch:
- file: /opt/so/conf/sensoroni/sensoroni.json