Commit Graph

7852 Commits

Author SHA1 Message Date
Jason Ertel a323aeb8fa Allow so-elastic-auth to run before common even though the script has dependency on a common-provided script (benign error). This is needed first since common will need to know if auth is enabled 2021-06-16 14:23:58 -04:00
Mike Reeves 8d6b0e23ce Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion into dev 2021-06-16 13:23:44 -04:00
Jason Ertel edac99e5a9 Merge pull request #4546 from Security-Onion-Solutions/kilo
Accept either 200 or 401 instead of wasting 3 minutes waiting for thi…
2021-06-16 11:41:23 -04:00
Jason Ertel dd14235e31 Accept either 200 or 401 instead of wasting 3 minutes waiting for this to timeout 2021-06-16 11:39:21 -04:00
Jason Ertel 15eadd4f89 Merge pull request #4545 from Security-Onion-Solutions/kilo
Merge kilo to dev for additional ES Auth changes
2021-06-16 11:04:39 -04:00
Jason Ertel 09fbb045a1 If ES auth disabled ensure user/pass are blank 2021-06-16 09:59:57 -04:00
Josh Patterson 7bdd0d3bf1 Merge pull request #4543 from Security-Onion-Solutions/issue/2977
Issue/2977
2021-06-16 08:16:36 -04:00
m0duspwnens ebea9a7198 remove space 2021-06-16 08:07:28 -04:00
m0duspwnens ad9441bb60 prevent suricata state from running on manager and managersearch https://github.com/Security-Onion-Solutions/securityonion/issues/2977 2021-06-16 08:06:26 -04:00
Jason Ertel 989f9dce42 Ensure sqlite.db exists before querying it; Execute so-elastic-auth after common state has been applied and redirect output to setup log 2021-06-15 16:57:13 -04:00
Jason Ertel b95437347e Upgrade ES to 7.13.2 2021-06-15 12:50:57 -04:00
Jason Ertel 2d27e0d9a9 Merge pull request #4530 from Security-Onion-Solutions/kilo
Elastic auth
2021-06-15 11:15:19 -04:00
Jason Ertel c3c078e5be Merge pull request #4522 from Security-Onion-Solutions/feature/contributing-md
Add CONTRIBUTING.md
2021-06-15 10:25:07 -04:00
Jason Ertel dd8eb29a18 Continue merge of ECS into Elastic Auth 2021-06-15 09:11:58 -04:00
William Wernert 2d5591a87f Remove draft label 2021-06-14 16:33:52 -04:00
William Wernert 71b079eb54 Add bullet detailing linking pull request to issue 2021-06-14 16:04:22 -04:00
William Wernert ca6f3807fc Don't use idioms, and remove TBD lines 2021-06-14 15:58:21 -04:00
Doug Burks c2f6a6983d Merge pull request #4521 from Security-Onion-Solutions/feature/security-md
Create SECURITY.md
2021-06-14 15:51:55 -04:00
Jason Ertel 3891ca2929 Use correct mode param to file.recurse 2021-06-14 15:46:25 -04:00
Doug Burks 20437ef2c7 Create SECURITY.md 2021-06-14 15:42:18 -04:00
William Wernert 7de02d541f Increase width of verified commit screenshot 2021-06-14 15:28:44 -04:00
William Wernert 68e4c5e469 Add CONTRIBUTING.md draft, move markdown images to assets/images 2021-06-14 15:21:46 -04:00
Jason Ertel 62187807f0 Specify elastic creds for playbook alert templates 2021-06-14 14:08:14 -04:00
Jason Ertel 37f4caf536 Make new ECS changes Elastic-auth compatible 2021-06-14 12:13:50 -04:00
Jason Ertel fca1c6e957 Merge branch 'dev' into kilo 2021-06-14 10:40:04 -04:00
Josh Patterson 0de7e71fa0 Merge pull request #4517 from Security-Onion-Solutions/fix/filebeat
update roles that include es state
2021-06-14 10:02:50 -04:00
m0duspwnens fd5d540c78 update roles that include es state 2021-06-14 10:00:19 -04:00
m0duspwnens d2069dc5f2 update roles that include es state 2021-06-14 09:58:50 -04:00
Mike Reeves 2ac832678f Merge pull request #4513 from Security-Onion-Solutions/fix/filebeat
fix two bugs
2021-06-14 08:53:13 -04:00
m0duspwnens 5941332d49 fix two bugs 2021-06-14 08:51:29 -04:00
Josh Patterson 45732bd87a Merge pull request #4494 from Security-Onion-Solutions/fix_module_config_jinja
dont loop if modules arent defined for the node
2021-06-11 13:54:15 -04:00
m0duspwnens f7600af89b dont loop if modules arent defined for the node 2021-06-11 13:52:33 -04:00
Josh Patterson 5108121b59 Merge pull request #4489 from Security-Onion-Solutions/hotfix/soup_salt
Hotfix/soup salt
2021-06-10 16:04:27 -04:00
Josh Patterson c2339c84e7 Merge branch 'dev' into hotfix/soup_salt 2021-06-10 15:48:00 -04:00
Jason Ertel 7205c5cb7b Provide timestamp as arg to SOC PCAP pivots 2021-06-10 15:21:03 -04:00
m0duspwnens ff807c9a6f empty hotfix file for merge into dev 2021-06-10 14:06:24 -04:00
Mike Reeves 0341eb5d8f Merge pull request #4479 from Security-Onion-Solutions/hotfix/soup_salt
Hotfix/soup salt
2021-06-10 13:44:10 -04:00
Mike Reeves a2e1b1de3a Merge pull request #4484 from Security-Onion-Solutions/pipeline
Pipeline
2021-06-10 13:41:14 -04:00
m0duspwnens e64059bd7b remove unneeded function 2021-06-10 09:31:10 -04:00
m0duspwnens 46b1de97f5 change function name 2021-06-10 09:30:03 -04:00
Mike Reeves ca7d2c6d64 Merge branch 'pipeline' of https://github.com/Security-Onion-Solutions/securityonion into pipeline 2021-06-10 09:20:38 -04:00
Mike Reeves 12d4d4a4f7 Dynamix Pipelines take 2 2021-06-10 09:19:15 -04:00
m0duspwnens 7c92054f13 soup hotfix to updating repos for earlier versions of SO so salt will isntall 2021-06-10 09:13:15 -04:00
weslambert 1bef1d5652 Update to apply to any so-prefixed index 2021-06-10 08:16:00 -04:00
Jason Ertel 89a02383b8 Correct cronjob path issue for sysctl; suppress diff outputs from users/roles files; suppress salt state output during user sync 2021-06-09 16:31:32 -04:00
Mike Reeves 7fba904f75 Dynamix Pipelines take 1 2021-06-09 15:32:39 -04:00
Mike Reeves 1c7741fdbe Add templates for SO logs 2021-06-09 12:38:19 -04:00
Mike Reeves 4c90a0ed7e Add templates for SO logs 2021-06-09 12:04:32 -04:00
m0duspwnens a82b174826 perform the repo changes for any upgrade 2021-06-09 11:53:10 -04:00
Mike Reeves 579ff8c0b4 Add verbosity to checkin 2021-06-09 11:40:17 -04:00