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

Merge pull request #1343 from Security-Onion-Solutions/rc3upgrade

Browse Source 
Upgrade Fun
This commit is contained in:
Mike Reeves
2020-09-14 14:54:37 -04:00
committed by GitHub
parent 38266f7db8 0a0e00866c
commit e2ecfca4c1
8 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pillar/docker/config.sls
View File

@@ -5,7 +5,7 @@
{% set PLAYBOOK = salt['pillar.get']('manager:playbook', '0') %} {% set PLAYBOOK = salt['pillar.get']('manager:playbook', '0') %}
{% set FREQSERVER = salt['pillar.get']('manager:freq', '0') %} {% set FREQSERVER = salt['pillar.get']('manager:freq', '0') %}
{% set DOMAINSTATS = salt['pillar.get']('manager:domainstats', '0') %} {% set DOMAINSTATS = salt['pillar.get']('manager:domainstats', '0') %}
{% set ZEEKVER = salt['pillar.get']('global:zeekversion', 'COMMUNITY') %} {% set ZEEKVER = salt['pillar.get']('global:mdengine', 'COMMUNITY') %}
{% set GRAFANA = salt['pillar.get']('manager:grafana', '0') %} {% set GRAFANA = salt['pillar.get']('manager:grafana', '0') %}
eval: eval:

4
salt/common/maps/so-status.map.jinja
View File

@@ -36,7 +36,7 @@
{% endif %} {% endif %}
{% if role in ['heavynode', 'standalone'] %} {% if role in ['heavynode', 'standalone'] %}
{{ append_containers('global', 'zeekversion', 'SURICATA') }} {{ append_containers('global', 'mdengine', 'SURICATA') }}
{% endif %} {% endif %}
{% if role == 'searchnode' %} {% if role == 'searchnode' %}
@@ -44,5 +44,5 @@
{% endif %} {% endif %}
{% if role == 'sensor' %} {% if role == 'sensor' %}
{{ append_containers('global', 'zeekversion', 'SURICATA') }} {{ append_containers('global', 'mdengine', 'SURICATA') }}
{% endif %} {% endif %}

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

@@ -178,7 +178,10 @@ rc2_to_rc3() {
rm -rf /opt/so/saltstack/local/salt/idstools/localrules rm -rf /opt/so/saltstack/local/salt/idstools/localrules
rm -rf /opt/so/saltstack/default/salt/idstools/localrules rm -rf /opt/so/saltstack/default/salt/idstools/localrules
# Rename ZEEKVERSION to MDENGINE # Rename mdengine to MDENGINE
sed -i "s/ mdengine/ mdengine/g" /opt/so/saltstack/local/pillar/global.sls
# Enable Strelka Rules
sed -i "/ rules:/c\ rules: 1" /opt/so/saltstack/local/pillar/global.sls
} }

2
salt/filebeat/etc/filebeat.yml
View File

@@ -6,7 +6,7 @@
{%- set HOSTNAME = salt['grains.get']('host', '') %} {%- set HOSTNAME = salt['grains.get']('host', '') %}
{%- set ZEEKVER = salt['pillar.get']('global:zeekversion', 'COMMUNITY') %} {%- set ZEEKVER = salt['pillar.get']('global:mdengine', 'COMMUNITY') %}
{%- set WAZUHENABLED = salt['pillar.get']('global:wazuh', '0') %} {%- set WAZUHENABLED = salt['pillar.get']('global:wazuh', '0') %}
{%- set STRELKAENABLED = salt['pillar.get']('strelka:enabled', '0') %} {%- set STRELKAENABLED = salt['pillar.get']('strelka:enabled', '0') %}
{%- set FLEETMANAGER = salt['pillar.get']('global:fleet_manager', False) -%} {%- set FLEETMANAGER = salt['pillar.get']('global:fleet_manager', False) -%}

2
salt/suricata/init.sls
View File

@@ -18,7 +18,7 @@
{% if 'suricata' in top_states %} {% if 'suricata' in top_states %}
{% set interface = salt['pillar.get']('sensor:interface', 'bond0') %} {% set interface = salt['pillar.get']('sensor:interface', 'bond0') %}
{% set ZEEKVER = salt['pillar.get']('global:zeekversion', '') %} {% set ZEEKVER = salt['pillar.get']('global:mdengine', '') %}
{% set VERSION = salt['pillar.get']('global:soversion', 'HH1.2.2') %} {% set VERSION = salt['pillar.get']('global:soversion', 'HH1.2.2') %}
{% set IMAGEREPO = salt['pillar.get']('global:imagerepo') %} {% set IMAGEREPO = salt['pillar.get']('global:imagerepo') %}
{% set MANAGER = salt['grains.get']('master') %} {% set MANAGER = salt['grains.get']('master') %}

2
salt/suricata/suricata_config.map.jinja
View File

@@ -44,7 +44,7 @@ HOME_NET: "[{{salt['pillar.get']('global:hnmanager', '')}}]"
{% endfor %} {% endfor %}
{% set surimeta_evelog_index = surimeta_evelog_index[0] %} {% set surimeta_evelog_index = surimeta_evelog_index[0] %}
{% if salt['pillar.get']('global:zeekversion', 'ZEEK') == 'SURICATA' %} {% if salt['pillar.get']('global:mdengine', 'ZEEK') == 'SURICATA' %}
{% do suricata_defaults.suricata.config.outputs[default_evelog_index]['eve-log'].types.extend(suricata_meta.suricata.config.outputs[surimeta_evelog_index]['eve-log'].types) %} {% do suricata_defaults.suricata.config.outputs[default_evelog_index]['eve-log'].types.extend(suricata_meta.suricata.config.outputs[surimeta_evelog_index]['eve-log'].types) %}
{% endif %} {% endif %}

2
salt/top.sls
View File

@@ -1,4 +1,4 @@
{% set ZEEKVER = salt['pillar.get']('global:zeekversion', '') %} {% set ZEEKVER = salt['pillar.get']('global:mdengine', '') %}
{% set WAZUH = salt['pillar.get']('global:wazuh', '0') %} {% set WAZUH = salt['pillar.get']('global:wazuh', '0') %}
{% set THEHIVE = salt['pillar.get']('manager:thehive', '0') %} {% set THEHIVE = salt['pillar.get']('manager:thehive', '0') %}
{% set PLAYBOOK = salt['pillar.get']('manager:playbook', '0') %} {% set PLAYBOOK = salt['pillar.get']('manager:playbook', '0') %}

2
setup/so-functions
View File

@@ -1117,7 +1117,7 @@ manager_global() {
" hnmanager: $HNMANAGER"\ " hnmanager: $HNMANAGER"\
" ntpserver: $NTPSERVER"\ " ntpserver: $NTPSERVER"\
" proxy: $PROXY"\ " proxy: $PROXY"\
" zeekversion: $ZEEKVERSION"\ " mdengine: $ZEEKVERSION"\
" ids: $NIDS"\ " ids: $NIDS"\
" url_base: $REDIRECTIT"\ " url_base: $REDIRECTIT"\
" managerip: $MAINIP" > "$global_pillar" " managerip: $MAINIP" > "$global_pillar"