Commit Graph

5698 Commits

Author SHA1 Message Date
William Wernert
7458313d3d [fix] Also kill+start while trying to restart service initially 2020-12-03 15:42:15 -05:00
William Wernert
39dce13cf6 [fix] Move set_redirect out of sub-shell 2020-12-03 15:42:15 -05:00
William Wernert
916db4acec [fix] kill/start after if statement 2020-12-03 15:42:15 -05:00
William Wernert
2e516629f9 [fix] Kill + start salt-minion if it isn't responding 2020-12-03 15:42:15 -05:00
William Wernert
ddcf5dec5b [refactor] Run all changes inside whiptail progress, use grep -q 2020-12-03 13:59:25 -05:00
William Wernert
f410c451cd [fix] kill -> stop, add indent to service check, revert incorrect logic 2020-12-03 10:31:45 -05:00
William Wernert
786665d8cf [fix] Correct logic for service check + bash trap 2020-12-03 10:18:44 -05:00
William Wernert
9c919f3c92 [reafactor] systemctl stop -> kill 2020-12-02 17:07:49 -05:00
William Wernert
46d2342c8b Merge branch 'bugfix/reinstall' into experimental 2020-12-02 14:45:46 -05:00
William Wernert
fc7fe23590 [fix] Correct signal naming 2020-12-02 14:06:50 -05:00
William Wernert
cc5d54764a [fix] sed masks command return code, remove 2020-12-02 13:54:02 -05:00
William Wernert
8fe43d6d56 [fix] Print WARNING instead of ERROR if minion is not responding initially 2020-12-02 13:35:57 -05:00
William Wernert
467f9923b0 [refactor] Add trap to handle script exits, change what files are deleted in /etc/salt/ 2020-12-02 13:19:34 -05:00
William Wernert
2d4fe58299 [fix] Also kill currently running jobs 2020-12-01 21:43:38 -05:00
William Wernert
4b5b936abb [fix] echo -> return 2020-12-01 21:40:41 -05:00
William Wernert
2d6feea5c5 [fix] Syntax fixes 2020-12-01 21:21:32 -05:00
William Wernert
38028a543a [feat] Add timeout for salt services to stop during reinstall init 2020-12-01 21:18:24 -05:00
William Wernert
c2e7e42509 [fix] Don't SIGKILL salt services + disable highstate schedule 2020-12-01 15:36:05 -05:00
Josh Brower
c303cdff09 Merge pull request #2150 from Security-Onion-Solutions/bugfix/fleet-standalone
Fleet Fixes - mysql race condition
2020-11-30 18:06:30 -05:00
Josh Brower
e7a927188b Fleet Fixes - mysql race condition 2020-11-30 17:28:11 -05:00
Josh Brower
8e9458ca84 Merge pull request #2149 from Security-Onion-Solutions/bugfix/fleet-standalone
Fix Fleet setup errors
2020-11-30 12:06:36 -05:00
Josh Brower
5d2acf4011 Fix Fleet setup errors 2020-11-30 12:06:02 -05:00
William Wernert
8964444eeb [fix] Correct count print in mysql_conn 2020-11-30 11:32:43 -05:00
William Wernert
ec81e8565f [fix] Add safety logic to retry var in mysql_conn 2020-11-30 11:32:28 -05:00
William Wernert
040b435278 [refactor] Fail mysql_conn if the mainint has > 1 ip address 2020-11-30 11:10:50 -05:00
Josh Brower
704f024441 Merge pull request #2146 from Security-Onion-Solutions/bugfix/fleet-standalone
Fleet standalone - fix event
2020-11-30 10:33:05 -05:00
Josh Brower
65d8005629 Fleet standalone - fix event 2020-11-30 10:32:39 -05:00
Josh Brower
7fddf99648 Merge pull request #2128 from Security-Onion-Solutions/bugfix/fleet-standalone
Fix Fleet setup errors
2020-11-27 13:59:19 -05:00
Josh Brower
f52c30bff5 Fix Fleet setup errors 2020-11-27 13:58:41 -05:00
Josh Brower
19a33c5c2a Merge pull request #2126 from Security-Onion-Solutions/bugfix/fleet-standalone
Bugfix/fleet standalone
2020-11-27 11:45:25 -05:00
Josh Brower
19b36f0468 Fleet standalone redirect fix 2020-11-27 11:43:51 -05:00
Josh Brower
95a664e12a Merge pull request #2103 from Security-Onion-Solutions/bugfix/fleet-standalone
Fleet standalone fix
2020-11-25 14:09:27 -05:00
Josh Brower
38afd67108 Fleet standalone fix 2020-11-25 14:08:30 -05:00
Jason Ertel
979f171828 Add missing comma to sensoroni.json 2020-11-25 12:29:45 -05:00
Jason Ertel
8f9081618f Add role to sensoroni.json file 2020-11-25 11:11:46 -05:00
Jason Ertel
7fb264b4fe Use double quotes around agent key to ensure interpolation 2020-11-24 17:17:50 -05:00
Jason Ertel
d20560385f Remove /nsm/wazuh/etc subdir state since confirmed the Wazuh docker container itself 2020-11-24 16:50:46 -05:00
Jason Ertel
e1147398cc Ensure /nsm/wazuh is owned by ossec 2020-11-24 15:48:46 -05:00
Jason Ertel
8864428a00 Ensure setup output is redirected to logfile 2020-11-24 15:45:40 -05:00
Jason Ertel
ea9bbfd1aa Improve wazuh agent registration with retry logic to wait for manager to become ready 2020-11-24 13:53:20 -05:00
weslambert
0c4ee94472 Merge pull request #2077 from Security-Onion-Solutions/fix/thehive_upgrade_conf
Fix/thehive upgrade conf
2020-11-24 11:52:51 -05:00
weslambert
39bf60feb7 Add digit 2020-11-24 11:52:20 -05:00
weslambert
35653d2e66 Changes for ES7 2020-11-24 11:51:19 -05:00
weslambert
eb2364b926 Changes for ES7 2020-11-24 11:49:08 -05:00
Josh Patterson
9bb485cdc9 Merge pull request #2074 from Security-Onion-Solutions/issue/2040
Issue/2040
2020-11-24 11:45:08 -05:00
m0duspwnens
fe2662cab8 dont enable steno pillar on import node https://github.com/Security-Onion-Solutions/securityonion/issues/2040 2020-11-24 11:42:03 -05:00
m0duspwnens
995a377432 squigly comma if steno enabled https://github.com/Security-Onion-Solutions/securityonion/issues/2040 2020-11-24 11:31:41 -05:00
weslambert
e3a41c2a94 Changes for ES7 elasticsearch.yml 2020-11-24 11:20:09 -05:00
m0duspwnens
4dfd49ef39 add vars https://github.com/Security-Onion-Solutions/securityonion/issues/2040 2020-11-24 10:11:28 -05:00
m0duspwnens
65334d15ea https://github.com/Security-Onion-Solutions/securityonion/issues/2040 2020-11-24 09:33:38 -05:00