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 feature/setup-check-manager

Browse Source
This commit is contained in:
William Wernert
2021-04-12 13:14:51 -04:00
parent 73a1bdd885 03abf4d4ee
commit 8cb4a75eb1
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/influxdb/etc/influxdb.conf
View File

@@ -233,7 +233,7 @@
# enabled = true # enabled = true
# Determines whether the Flux query endpoint is enabled. # Determines whether the Flux query endpoint is enabled.
# flux-enabled = false flux-enabled = true
# The bind address used by the HTTP service. # The bind address used by the HTTP service.
# bind-address = ":8086" # bind-address = ":8086"

8
salt/sensoroni/files/sensoroni.json
View File

@@ -1,9 +1,6 @@
{%- set URLBASE = salt['pillar.get']('global:url_base') %} {%- set URLBASE = salt['pillar.get']('global:url_base') %}
{%- if salt['pillar.get']('sensoroni:node_description') %} {%- set DESCRIPTION = salt['pillar.get']('sensoroni:node_description', '') %}
{%- set DESCRIPTION = salt['pillar.get']('sensoroni:node_description') %} {%- set MODEL = salt['grains.get']('sosmodel', '') %}
{%- else %}
{%- set DESCRIPTION = salt['grains.get']('sosmodel', '') %}
{%- endif %}
{%- set ADDRESS = salt['pillar.get']('sensoroni:node_address') %} {%- set ADDRESS = salt['pillar.get']('sensoroni:node_address') %}
{%- set SENSORONIKEY = salt['pillar.get']('global:sensoronikey', '') %} {%- set SENSORONIKEY = salt['pillar.get']('global:sensoronikey', '') %}
{%- set CHECKININTERVALMS = salt['pillar.get']('sensoroni:node_checkin_interval_ms', 10000) %} {%- set CHECKININTERVALMS = salt['pillar.get']('sensoroni:node_checkin_interval_ms', 10000) %}
@@ -21,6 +18,7 @@
"role": "{{ grains.role }}", "role": "{{ grains.role }}",
"description": "{{ DESCRIPTION }}", "description": "{{ DESCRIPTION }}",
"address": "{{ ADDRESS }}", "address": "{{ ADDRESS }}",
"model": "{{ MODEL }}",
"pollIntervalMs": {{ CHECKININTERVALMS if CHECKININTERVALMS else 10000 }}, "pollIntervalMs": {{ CHECKININTERVALMS if CHECKININTERVALMS else 10000 }},
"serverUrl": "https://{{ URLBASE }}/sensoroniagents", "serverUrl": "https://{{ URLBASE }}/sensoroniagents",
"verifyCert": false, "verifyCert": false,

11
salt/soc/files/soc/soc.json
View File

@@ -53,6 +53,17 @@
"cacheMs": {{ ES_FIELDCAPS_CACHE }}, "cacheMs": {{ ES_FIELDCAPS_CACHE }},
"verifyCert": false "verifyCert": false
}, },
"influxdb": {
{%- if grains['role'] in ['so-import'] %}
"hostUrl": "",
{%- else %}
"hostUrl": "https://{{ MANAGERIP }}:8086",
{%- endif %}
"token": "",
"org": "",
"bucket": "telegraf",
"verifyCert": false
},
"sostatus": { "sostatus": {
"refreshIntervalMs": 30000, "refreshIntervalMs": 30000,
"offlineThresholdMs": 900000 "offlineThresholdMs": 900000

2
setup/so-functions
View File

@@ -2737,7 +2737,7 @@ update_sudoers() {
update_packages() { update_packages() {
if [ "$OS" = 'centos' ]; then if [ "$OS" = 'centos' ]; then
yum repolist >> /dev/null yum repolist >> /dev/null
yum -y update >> "$setup_log" yum -y update --exclude=salt* >> "$setup_log"
else else
retry 50 10 "apt-get -y update" >> "$setup_log" 2>&1 || exit 1 retry 50 10 "apt-get -y update" >> "$setup_log" 2>&1 || exit 1
retry 50 10 "apt-get -y upgrade" >> "$setup_log" 2>&1 || exit 1 retry 50 10 "apt-get -y upgrade" >> "$setup_log" 2>&1 || exit 1