Commit Graph

7771 Commits

Author SHA1 Message Date
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 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
Mike Reeves 264080546c Add log path 2021-06-09 11:37:27 -04:00
Jason Ertel a0c65e2333 Ensure elastic minions also update their auth files 2021-06-09 09:38:50 -04:00
Jason Ertel dd73ad544c Rename PATH var to avoid collision with OS PATH var; wrapped password var in quotes to support spaces in Fleet/TheHive passwords 2021-06-09 09:06:29 -04:00
Mike Reeves 33db9023eb Revert to SO taxonomy for zeek and suricata 2021-06-08 13:50:39 -04:00
Mike Reeves 88eea03f97 Revert to SO taxonomy for zeek and suricata 2021-06-08 13:36:50 -04:00
Mike Reeves a959ec1eb1 Revert to SO taxonomy for zeek and suricata 2021-06-08 13:23:31 -04:00
Mike Reeves 3e138cbc6d Revert to SO taxonomy for zeek and suricata 2021-06-08 13:14:46 -04:00
Jason Ertel 9b61723194 Merge branch 'dev' into kilo 2021-06-08 11:04:09 -04:00
Jason Ertel d2381b0209 Ensure empty/aborted users/roles files do not get copied onto final filenames 2021-06-08 11:03:56 -04:00
Mike Reeves 4972f69dd6 Merge remote-tracking branch 'remotes/origin/dev' into pipeline 2021-06-08 11:03:14 -04:00
Mike Reeves 56eb220ed6 Revert to SO taxonomy for zeek and suricata 2021-06-08 09:52:05 -04:00
Jason Ertel 343c47d67a Add so-elasticsearch-query tool 2021-06-07 17:26:07 -04:00
Jason Ertel e53f2217ec Add so-elasticsearch-query tool 2021-06-07 17:24:22 -04:00
Mike Reeves 016a5a5914 Merge pull request #4432 from Security-Onion-Solutions/merge_2.3.52
Merge 2.3.52
2021-06-07 14:10:16 -04:00
William Wernert 9f2adfb67a Merge branch 'master' into merge_2.3.52
# Conflicts:
#	VERSION
2021-06-07 14:08:17 -04:00
Mike Reeves 6e92e7283d Merge pull request #4411 from Security-Onion-Solutions/hotfix-0528
2.3.52
2.3.52
2021-06-07 13:55:51 -04:00
Mike Reeves e3c16147ce 2.3.52 2021-06-07 09:34:22 -04:00
Jason Ertel 14aa9805b4 Stop failing an install because salt is already running when a highstate is applied at 95% 2021-06-06 18:20:57 -04:00
Jason Ertel fdab17a3b9 Due to dir ownership restrictions need to run crossthestreams and eval as root 2021-06-06 16:36:35 -04:00
Jason Ertel bebba7d280 Switch ownership of curl config to socore 2021-06-06 07:43:53 -04:00
Jason Ertel 11b2b2a893 Switch ownership of curl config to socore 2021-06-06 05:42:34 -04:00
Jason Ertel 84141082ab Avoid applying state when adding web user 2021-06-05 08:41:48 -04:00
Jason Ertel ba29b5e036 Do not apply salt state if already applying a state 2021-06-04 21:56:41 -04:00