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 branch 'dev' into foxtrot

Browse Source
This commit is contained in:
William Wernert
2021-04-21 14:45:11 -04:00
parent b618207f51 df2420f6fe
commit d5717b7011
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/repo/client/files/centos/securityonioncache.repo
View File

@@ -67,12 +67,12 @@ gpgcheck=1
gpgkey=https://repo.securityonion.net/file/securityonion-repo/keys/GPG-KEY-WAZUH gpgkey=https://repo.securityonion.net/file/securityonion-repo/keys/GPG-KEY-WAZUH
enabled=1 enabled=1
name=Wazuh repository name=Wazuh repository
baseurl=https://repocache.securityonion.net/file/securityonion-repo/wazuh4_repo/ baseurl=http://repocache.securityonion.net/file/securityonion-repo/wazuh4_repo/
protect=1 protect=1
[securityonion] [securityonion]
name=Security Onion Repo name=Security Onion Repo
baseurl=https://repocache.securityonion.net/file/securityonion-repo/securityonion/ baseurl=http://repocache.securityonion.net/file/securityonion-repo/securityonion/
enabled=1 enabled=1
gpgcheck=1 gpgcheck=1
gpgkey=https://repo.securityonion.net/file/securityonion-repo/keys/securityonion.pub gpgkey=https://repo.securityonion.net/file/securityonion-repo/keys/securityonion.pub

30
salt/suricata/threading.map.jinja
View File

@@ -1,4 +1,18 @@
{% if salt['pillar.get']('sensor:suriprocs') %} {% if salt['pillar.get']('sensor:suripins') %}
{% load_yaml as cpu_affinity%}
cpu-affinity:
- management-cpu-set:
cpu: [ {{ salt['pillar.get']('sensor:suripins')|join(",") }} ] # include only these cpus in affinity settings
- receive-cpu-set:
cpu: [ {{ salt['pillar.get']('sensor:suripins')|join(",") }} ] # include only these cpus in affinity settings
- worker-cpu-set:
cpu: [ {{ salt['pillar.get']('sensor:suripins')|join(",") }} ]
mode: "exclusive"
threads: {{ salt['pillar.get']('sensor:suripins')|length }}
prio:
default: "high"
{% endload %}
{% elif salt['pillar.get']('sensor:suriprocs') %}
{% load_yaml as cpu_affinity%} {% load_yaml as cpu_affinity%}
cpu-affinity: cpu-affinity:
- management-cpu-set: - management-cpu-set:
@@ -15,18 +29,4 @@ cpu-affinity:
high: [ 3 ] high: [ 3 ]
default: "high" default: "high"
{% endload %} {% endload %}
{% elif salt['pillar.get']('sensor:suripins') %}
{% load_yaml as cpu_affinity%}
cpu-affinity:
- management-cpu-set:
cpu: [ {{ salt['pillar.get']('sensor:suripins')|join(",") }} ] # include only these cpus in affinity settings
- receive-cpu-set:
cpu: [ {{ salt['pillar.get']('sensor:suripins')|join(",") }} ] # include only these cpus in affinity settings
- worker-cpu-set:
cpu: [ {{ salt['pillar.get']('sensor:suripins')|join(",") }} ]
mode: "exclusive"
threads: {{ salt['pillar.get']('sensor:suripins')|length }}
prio:
default: "high"
{% endload %}
{% endif %} {% endif %}