CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-06-22 02:08:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev

Browse Source
This commit is contained in:
Mike Reeves
2020-04-09 11:16:50 -04:00
parent 5692f2a672 422f4c928c
commit 69dca74afd
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pillar/docker/config.sls
+15 -6
View File
@@ -1,4 +1,5 @@
{% set OSQUERY = salt['pillar.get']('master:osquery', '0') %} {%- set FLEETMASTER = salt['pillar.get']('static:fleet_master', False) -%}
{%- set FLEETNODE = salt['pillar.get']('static:fleet_node', False) -%}
{% set WAZUH = salt['pillar.get']('master:wazuh', '0') %} {% set WAZUH = salt['pillar.get']('master:wazuh', '0') %}
{% set THEHIVE = salt['pillar.get']('master:thehive', '0') %} {% set THEHIVE = salt['pillar.get']('master:thehive', '0') %}
{% set PLAYBOOK = salt['pillar.get']('master:playbook', '0') %} {% set PLAYBOOK = salt['pillar.get']('master:playbook', '0') %}
@@ -7,7 +8,6 @@
{% set BROVER = salt['pillar.get']('static:broversion', 'COMMUNITY') %} {% set BROVER = salt['pillar.get']('static:broversion', 'COMMUNITY') %}
{% set GRAFANA = salt['pillar.get']('master:grafana', '0') %} {% set GRAFANA = salt['pillar.get']('master:grafana', '0') %}
eval: eval:
containers: containers:
- so-core - so-core
@@ -20,7 +20,7 @@ eval:
- so-soc - so-soc
- so-kratos - so-kratos
- so-idstools - so-idstools
{% if OSQUERY != '0' %} {% if FLEETMASTER %}
- so-mysql - so-mysql
- so-fleet - so-fleet
- so-redis - so-redis
@@ -100,7 +100,7 @@ master_search:
- so-elastalert - so-elastalert
- so-filebeat - so-filebeat
- so-soctopus - so-soctopus
{% if OSQUERY != '0' %} {% if FLEETMASTER %}
- so-mysql - so-mysql
- so-fleet - so-fleet
- so-redis - so-redis
@@ -143,7 +143,7 @@ master:
- so-kibana - so-kibana
- so-elastalert - so-elastalert
- so-filebeat - so-filebeat
{% if OSQUERY != '0' %} {% if FLEETMASTER %}
- so-mysql - so-mysql
- so-fleet - so-fleet
- so-redis - so-redis
@@ -199,4 +199,13 @@ warm_node:
- so-core - so-core
- so-telegraf - so-telegraf
- so-elasticsearch - so-elasticsearch
fleet:
containers:
{% if FLEETNODE %}
- so-mysql
- so-fleet
- so-redis
- so-filebeat
- so-core
- so-telegraf
{% endif %}
salt/_modules/telegraf.py
+1 -1
View File
@@ -6,7 +6,7 @@ import socket
def send(data): def send(data):
mainint = __salt__['pillar.get']('node:mainint') mainint = __salt__['pillar.get']('sensor:mainint', __salt__['pillar.get']('master:mainint'))
mainip = __salt__['grains.get']('ip_interfaces').get(mainint)[0] mainip = __salt__['grains.get']('ip_interfaces').get(mainint)[0]
dstport = 8094 dstport = 8094
salt/common/telegraf/etc/telegraf.conf
+1 -1
View File
@@ -498,7 +498,7 @@
[[inputs.disk]] [[inputs.disk]]
## By default stats will be gathered for all mount points. ## By default stats will be gathered for all mount points.
## Set mount_points will restrict the stats to only the specified mount points. ## Set mount_points will restrict the stats to only the specified mount points.
mount_points = ["/","/nsm"] mount_points = ["/", "/host/nsm"]
## Ignore mount points by filesystem type. ## Ignore mount points by filesystem type.
#ignore_fs = ["tmpfs", "devtmpfs", "devfs", "overlay", "aufs", "squashfs"] #ignore_fs = ["tmpfs", "devtmpfs", "devfs", "overlay", "aufs", "squashfs"]
setup/so-functions
+1 -1
View File
@@ -947,7 +947,7 @@ network_setup() {
fi fi
echo "... Copying 99-so-checksum-offload-disable"; echo "... Copying 99-so-checksum-offload-disable";
cp "$SCRIPTDIR/install_scripts/99-so-checksum-offload-disable" /etc/NetworkManager/dispatcher.d/pre-up.d/99-so-checksum-offload-disable ; cp "$SCRIPTDIR"/install_scripts/99-so-checksum-offload-disable /etc/NetworkManager/dispatcher.d/pre-up.d/99-so-checksum-offload-disable ;
echo "... Modifying 99-so-checksum-offload-disable"; echo "... Modifying 99-so-checksum-offload-disable";
sed -i "s/\$MAININT/${MAININT}/g" /etc/NetworkManager/dispatcher.d/pre-up.d/99-so-checksum-offload-disable; sed -i "s/\$MAININT/${MAININT}/g" /etc/NetworkManager/dispatcher.d/pre-up.d/99-so-checksum-offload-disable;