Merge branch 'dev' into foxtrot

This commit is contained in:
William Wernert
2021-03-10 09:33:42 -05:00
3 changed files with 7 additions and 2 deletions

View File

@@ -261,6 +261,7 @@ output.{{ type }}:
output.elasticsearch: output.elasticsearch:
enabled: true enabled: true
hosts: ["https://{{ MANAGER }}:9200"] hosts: ["https://{{ MANAGER }}:9200"]
ssl.certificate_authorities: ["/usr/share/filebeat/intraca.crt"]
pipelines: pipelines:
- pipeline: "%{[module]}.%{[dataset]}" - pipeline: "%{[module]}.%{[dataset]}"
indices: indices:

View File

@@ -50,7 +50,7 @@ MNIC=eth0
# MSEARCH= # MSEARCH=
MSRV=distributed-manager MSRV=distributed-manager
MSRVIP=10.66.166.42 MSRVIP=10.66.166.42
# MTU= MTU=1500
# NIDS=Suricata # NIDS=Suricata
# NODE_ES_HEAP_SIZE= # NODE_ES_HEAP_SIZE=
# NODE_LS_HEAP_SIZE= # NODE_LS_HEAP_SIZE=
@@ -71,8 +71,10 @@ PATCHSCHEDULENAME=auto
SOREMOTEPASS1=onionuser SOREMOTEPASS1=onionuser
SOREMOTEPASS2=onionuser SOREMOTEPASS2=onionuser
# STRELKA=1 # STRELKA=1
SURIPINS=(2 3)
# THEHIVE=1 # THEHIVE=1
# WAZUH=1 # WAZUH=1
# WEBUSER=onionuser@somewhere.invalid # WEBUSER=onionuser@somewhere.invalid
# WEBPASSWD1=0n10nus3r # WEBPASSWD1=0n10nus3r
# WEBPASSWD2=0n10nus3r # WEBPASSWD2=0n10nus3r
ZEEKPINS=(0 1)

View File

@@ -50,7 +50,7 @@ MNIC=ens18
# MSEARCH= # MSEARCH=
MSRV=distributed-manager MSRV=distributed-manager
MSRVIP=10.66.166.66 MSRVIP=10.66.166.66
# MTU= MTU=1500
# NIDS=Suricata # NIDS=Suricata
# NODE_ES_HEAP_SIZE= # NODE_ES_HEAP_SIZE=
# NODE_LS_HEAP_SIZE= # NODE_LS_HEAP_SIZE=
@@ -71,8 +71,10 @@ PATCHSCHEDULENAME=auto
SOREMOTEPASS1=onionuser SOREMOTEPASS1=onionuser
SOREMOTEPASS2=onionuser SOREMOTEPASS2=onionuser
# STRELKA=1 # STRELKA=1
SURIPINS=(2 3)
# THEHIVE=1 # THEHIVE=1
# WAZUH=1 # WAZUH=1
# WEBUSER=onionuser@somewhere.invalid # WEBUSER=onionuser@somewhere.invalid
# WEBPASSWD1=0n10nus3r # WEBPASSWD1=0n10nus3r
# WEBPASSWD2=0n10nus3r # WEBPASSWD2=0n10nus3r
ZEEKPINS=(0 1)