William Wernert fe3aec173f Merge branch 'master' into feature/merge-2.3.51 ...

# Conflicts:
#	VERSION
#	salt/influxdb/init.sls

2021-05-21 12:31:54 -04:00

..

engines

creating engine to watch the health of the salt mine

2020-09-08 16:49:38 -04:00

files

add support for shard_duration to influxdb module and influxdb_retention_policy state - https://github.com/Security-Onion-Solutions/securityonion/issues/3264

2021-03-25 08:50:32 -04:00

scripts

soup update salt on manager for centos - https://github.com/Security-Onion-Solutions/securityonion/issues/1091

2020-07-24 15:06:06 -04:00

service

remove extra lines at end

2021-04-14 11:11:13 -04:00

beacons.sls

monitoring zeek - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/90

2020-04-01 13:06:37 -04:00

helper-packages.sls

create salt.helper-packages state, use it to install the patch package

2021-04-21 18:22:44 -04:00

init.sls

remove /etc/yum.repos.d/salt-2019-2-5.repo if present https://github.com/Security-Onion-Solutions/securityonion/issues/2756

2021-02-12 12:04:08 -05:00

lasthighstate.sls

https://github.com/Security-Onion-Solutions/securityonion/issues/1764

2020-11-05 17:51:51 -05:00

map.jinja

change how version to be installed is defined to work with centos

2021-04-30 14:48:51 -04:00

master.defaults.yaml

remove references to 3003.1 change to 3003

2021-04-06 09:15:22 -04:00

master.sls

fix salt.master state

2021-04-16 13:09:01 -04:00

minion-check.sls

touch file at start of highstate, just kill salt dont systemctl stop it https://github.com/Security-Onion-Solutions/securityonion/issues/1831

2020-11-13 19:34:17 -05:00

minion-state-apply-test.sls

touch file at start of highstate, just kill salt dont systemctl stop it https://github.com/Security-Onion-Solutions/securityonion/issues/1831

2020-11-13 19:34:17 -05:00

minion.defaults.yaml

add delay to salt-minion service starting - https://github.com/Security-Onion-Solutions/securityonion/issues/3543

2021-04-14 10:22:06 -04:00

minion.sls

Merge branch 'master' into feature/merge-2.3.51

2021-05-21 12:31:54 -04:00

python3-influxdb.sls

remove leading space on comment line

2021-05-14 16:24:16 -04:00