Commit Graph

3639 Commits

Author SHA1 Message Date
Mike Reeves
f05e366d49 Fix salt upgrade script 2020-07-06 15:56:55 -04:00
Mike Reeves
be3390a796 Fix Logstash state 2020-07-06 15:53:21 -04:00
Mike Reeves
623c37f1f5 Merge remote-tracking branch 'remotes/origin/dev' into issue/142 2020-07-06 14:35:46 -04:00
Mike Reeves
1016315196 Change Logic for logstash 2020-07-06 13:58:38 -04:00
Mike Reeves
087080d583 Add logix for logstash_settings 2020-07-06 13:16:40 -04:00
William Wernert
57bbb02c65 [refactor][fix] Move nmcli status list gen to a function
nmcli is only assured to be installed after detect_os is run so move this command to a function so it can run after detect_os
2020-07-02 17:18:56 -04:00
William Wernert
99d490bc06 [fix][refactor] Move detect_ec2 and add echo statement 2020-07-02 17:15:46 -04:00
bryant-treacle
cfeb95a718 Merge pull request #924 from Security-Onion-Solutions/feature/so-container-scripts
Additional so-container scripts Issue # 701
2020-07-02 14:42:49 -04:00
William Wernert
b9a176201f Merge pull request #913 from Security-Onion-Solutions/feature/setup-changes
Feature/setup changes
2020-07-02 14:01:46 -04:00
William Wernert
d2ba25e784 Merge branch 'dev' into feature/setup-changes
# Conflicts:
#	setup/so-setup
2020-07-02 14:00:10 -04:00
weslambert
0bfa3d486e Merge pull request #923 from Security-Onion-Solutions/fix/es-allow
Fix my typo
2020-07-02 13:32:45 -04:00
weslambert
bbc752b6d9 Fix my typo 2020-07-02 13:32:19 -04:00
Josh Brower
518c8db3de Merge pull request #922 from Security-Onion-Solutions/feature/low-level-alerts
Initial commit - Low Level Alerts
2020-07-02 12:18:03 -04:00
Josh Brower
69ace6fbfa Initial commit - Low Level Alerts 2020-07-02 12:16:56 -04:00
Jason Ertel
cf6a229f51 Import now requires execution on a sensor node due to the need for zeek and suricata; Automatically stop curator if curator is installed 2020-07-02 12:07:30 -04:00
William Wernert
c7a3cc9c17 [fix][revert] Change source in so-allow to correct path 2020-07-02 08:58:14 -04:00
Jason Ertel
4cedacf8fd Improve curator verbiage in so-import-pcap 2020-07-02 06:01:17 -04:00
Josh Brower
07d13b7ad0 Merge pull request #916 from Security-Onion-Solutions/defensivedepth-patch-1
Delete playbook_db_init.sql.backup
2020-07-02 05:32:45 -04:00
Josh Brower
7811ea5d4c Delete playbook_db_init.sql.backup 2020-07-02 05:32:35 -04:00
Josh Brower
0f915ec85e Merge pull request #915 from Security-Onion-Solutions/feature/playbook-updates
Feature/playbook updates
2020-07-02 05:31:30 -04:00
Josh Brower
3c93f9fd45 Playbook setup fix 2020-07-02 05:30:30 -04:00
bryant-treacle
0b10b775c5 Additional so-container scripts 2020-07-02 07:02:35 +00:00
Jason Ertel
ac01b8de4b Stop curator when directed on PCAP imports 2020-07-01 22:04:07 -04:00
Doug Burks
98cfba18e9 fix zeek.ftp description 2020-07-01 20:27:40 -04:00
Doug Burks
f6adf4ed56 fix zeek.smb_mapping description 2020-07-01 20:26:51 -04:00
Doug Burks
2cbd5ffe61 fix zeek.ssh description 2020-07-01 20:26:06 -04:00
Jason Ertel
e3126064e8 Improve usage instructions for so-import-pcap 2020-07-01 17:58:02 -04:00
William Wernert
aeda3fde74 [revert] Remove regex from setup log grep 2020-07-01 17:39:04 -04:00
William Wernert
408b5ee32d [ix] Fix if conditions 2020-07-01 17:25:26 -04:00
Jason Ertel
96e93b012d Adjust imports for filebeat configuration to ensure import data is placed into ES 2020-07-01 17:18:01 -04:00
Josh Brower
d893aa0032 Playbook Updates 2020-07-01 16:48:07 -04:00
William Wernert
b671f28562 [fix] Rename function whiptail_bond_nics to whiptail_sensor_nics 2020-07-01 16:32:33 -04:00
William Wernert
85a3f3c277 Merge branch 'dev' into feature/setup-changes 2020-07-01 16:24:55 -04:00
William Wernert
b4f9fe5f54 [fix] Remove quotes 2020-07-01 16:24:41 -04:00
William Wernert
b75cb36058 Merge branch 'feature/ec2_setup' into feature/setup-changes 2020-07-01 16:23:48 -04:00
William Wernert
54c3327240 [refactor] Simplify ec2 detection + handling 2020-07-01 16:23:38 -04:00
Jason Ertel
d6feafb12a Correct indentation in filebeat.yaml 2020-07-01 15:39:23 -04:00
Mike Reeves
ab42126d8e Add logstash_settings pillar 2020-07-01 15:25:35 -04:00
Mike Reeves
5580f05daf Add logstash pillar 2020-07-01 15:07:00 -04:00
Mike Reeves
f580da5d56 Update 9999_output_redis.conf.jinja 2020-07-01 14:45:54 -04:00
Mike Reeves
70e4ce3e98 Add batch to output 2020-07-01 14:38:51 -04:00
William Wernert
4b5571a8d6 [refactor][fix] Remove unnecessary variable 2020-07-01 13:56:15 -04:00
William Wernert
44890edc79 [refactor] Use regex in error check for setup log 2020-07-01 13:51:54 -04:00
Josh Patterson
549fd93cba Merge pull request #912 from Security-Onion-Solutions/issue/642
Issue/642
2020-07-01 13:44:49 -04:00
m0duspwnens
f98c497d79 change setup and whiptail back to bro 2020-07-01 13:43:37 -04:00
Wes Lambert
26b0daf2da Add other setup-related items for EC2 interface 2020-07-01 17:42:51 +00:00
m0duspwnens
fd939a06b9 whitespace cleanup 2020-07-01 13:40:40 -04:00
Wes Lambert
3cf79995a2 Modify Whiptail menu for EC2 NIC 2020-07-01 17:32:43 +00:00
m0duspwnens
38db512eda fix spacing 2020-07-01 13:29:19 -04:00
m0duspwnens
4e7e19af54 pillarize zeek node.cfg. change reference from bro to zeek. 2020-07-01 13:26:27 -04:00