CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10159 from Security-Onion-Solutions/ui/globals

Browse Source 
fix globals being changed via ui
This commit is contained in:
Josh Patterson
2023-04-19 12:22:42 -04:00
committed by GitHub
parent 499b889b56 d5ab8ff191
commit 9fed2ac616
4 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pillar/top.sls
View File

@@ -49,8 +49,8 @@ base:
- kibana.secrets - kibana.secrets
{% endif %} {% endif %}
- secrets - secrets
- soc_global - global.soc_global
- adv_global - global.adv_global
- manager.soc_manager - manager.soc_manager
- manager.adv_manager - manager.adv_manager
- idstools.soc_idstools - idstools.soc_idstools
@@ -74,8 +74,8 @@ base:
'*_sensor': '*_sensor':
- healthcheck.sensor - healthcheck.sensor
- soc_global - global.soc_global
- adv_global - global.adv_global
- minions.{{ grains.id }} - minions.{{ grains.id }}
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
@@ -89,7 +89,8 @@ base:
{% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/kibana/secrets.sls') %} {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/kibana/secrets.sls') %}
- kibana.secrets - kibana.secrets
{% endif %} {% endif %}
- soc_global - global.soc_global
- global.adv_global
- kratos.soc_kratos - kratos.soc_kratos
- elasticsearch.soc_elasticsearch - elasticsearch.soc_elasticsearch
- elasticsearch.adv_elasticsearch - elasticsearch.adv_elasticsearch
@@ -126,7 +127,8 @@ base:
{% endif %} {% endif %}
- secrets - secrets
- healthcheck.standalone - healthcheck.standalone
- soc_global - global.soc_global
- global.adv_global
- idstools.soc_idstools - idstools.soc_idstools
- idstools.adv_idstools - idstools.adv_idstools
- kratos.soc_kratos - kratos.soc_kratos
@@ -149,14 +151,15 @@ base:
'*_heavynode': '*_heavynode':
- elasticsearch.auth - elasticsearch.auth
- soc_global - global.soc_global
- global.adv_global
- redis.soc_redis - redis.soc_redis
- minions.{{ grains.id }} - minions.{{ grains.id }}
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
'*_idh': '*_idh':
- soc_global - global.soc_global
- adv_global - global.adv_global
- idh.soc_idh - idh.soc_idh
- idh.adv_idh - idh.adv_idh
- minions.{{ grains.id }} - minions.{{ grains.id }}
@@ -174,8 +177,8 @@ base:
- elasticsearch.auth - elasticsearch.auth
{% endif %} {% endif %}
- redis.soc_redis - redis.soc_redis
- soc_global - global.soc_global
- adv_global - global.adv_global
- minions.{{ grains.id }} - minions.{{ grains.id }}
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
@@ -189,8 +192,8 @@ base:
{% endif %} {% endif %}
- redis.soc_redis - redis.soc_redis
- redis.adv_redis - redis.adv_redis
- soc_global - global.soc_global
- adv_global - global.adv_global
- minions.{{ grains.id }} - minions.{{ grains.id }}
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
@@ -209,8 +212,8 @@ base:
- manager.soc_manager - manager.soc_manager
- manager.adv_manager - manager.adv_manager
- soc.soc_soc - soc.soc_soc
- soc_global - global.soc_global
- adv_global - global.adv_global
- backup.soc_backup - backup.soc_backup
- backup.adv_backup - backup.adv_backup
- kratos.soc_kratos - kratos.soc_kratos
@@ -225,8 +228,8 @@ base:
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
'*_fleet': '*_fleet':
- soc_global - global.soc_global
- adv_global - global.adv_global
- backup.soc_backup - backup.soc_backup
- backup.adv_backup - backup.adv_backup
- logstash - logstash

2
salt/common/tools/sbin/so-elastic-fleet-setup
View File

@@ -79,7 +79,7 @@ printf '%s\n'\
"" >> "$pillar_file" "" >> "$pillar_file"
#Store Grid Nodes Enrollment token in Global pillar #Store Grid Nodes Enrollment token in Global pillar
global_pillar_file=/opt/so/saltstack/local/pillar/soc_global.sls global_pillar_file=/opt/so/saltstack/local/pillar/global/soc_global.sls
printf '%s\n'\ printf '%s\n'\
" fleet_grid_enrollment_token: '$GRIDNODESENROLLMENTOKEN'"\ " fleet_grid_enrollment_token: '$GRIDNODESENROLLMENTOKEN'"\
"" >> "$global_pillar_file" "" >> "$global_pillar_file"

2
setup/so-functions
View File

@@ -1539,7 +1539,7 @@ make_some_dirs() {
mkdir -p $local_salt_dir/salt/firewall/portgroups mkdir -p $local_salt_dir/salt/firewall/portgroups
mkdir -p $local_salt_dir/salt/firewall/ports mkdir -p $local_salt_dir/salt/firewall/ports
for THEDIR in bpf pcap elasticsearch ntp firewall redis backup influxdb strelka sensoroni curator soc soctopus docker zeek suricata nginx telegraf logstash soc manager kratos idstools idh elastalert;do for THEDIR in bpf pcap elasticsearch ntp firewall redis backup influxdb strelka sensoroni curator soc soctopus docker zeek suricata nginx telegraf logstash soc manager kratos idstools idh elastalert global;do
mkdir -p $local_salt_dir/pillar/$THEDIR mkdir -p $local_salt_dir/pillar/$THEDIR
touch $local_salt_dir/pillar/$THEDIR/adv_$THEDIR.sls touch $local_salt_dir/pillar/$THEDIR/adv_$THEDIR.sls
touch $local_salt_dir/pillar/$THEDIR/soc_$THEDIR.sls touch $local_salt_dir/pillar/$THEDIR/soc_$THEDIR.sls

4
setup/so-variables
View File

@@ -76,10 +76,10 @@ export ntp_string
whiptail_title="Security Onion Setup - $SOVERSION" whiptail_title="Security Onion Setup - $SOVERSION"
export whiptail_title export whiptail_title
global_pillar_file="$local_salt_dir/pillar/soc_global.sls" global_pillar_file="$local_salt_dir/pillar/global/soc_global.sls"
export global_pillar_file export global_pillar_file
adv_global_pillar_file="$local_salt_dir/pillar/adv_global.sls" adv_global_pillar_file="$local_salt_dir/pillar/global/adv_global.sls"
export adv_global_pillar_file export adv_global_pillar_file
elasticsearch_pillar_file="$local_salt_dir/pillar/elasticsearch/soc_elasticsearch.sls" elasticsearch_pillar_file="$local_salt_dir/pillar/elasticsearch/soc_elasticsearch.sls"