Commit Graph

7887 Commits

Author SHA1 Message Date
William Wernert
9bf1d3e0c6 Misc fixes 2021-07-16 14:59:44 -04:00
William Wernert
3a12d28d20 Merge branch 'dev' into feature/logscan 2021-07-16 14:13:19 -04:00
William Wernert
e8ba4bdc6c Add quotes to string 2021-07-16 14:07:23 -04:00
Jason Ertel
7f9d0b59b8 Merge pull request #4808 from Security-Onion-Solutions/kilo
Merge hotfix from master into dev; add `so-firewall apply` feature to dev
2021-07-14 15:49:12 -04:00
Jason Ertel
76c285158a Merge branch 'master' into kilo 2021-07-14 15:24:35 -04:00
Jason Ertel
08517e3732 Merge branch 'dev' into kilo 2021-07-14 15:24:29 -04:00
Mike Reeves
5d48fb41ba Merge pull request #4800 from Security-Onion-Solutions/hotfix/2.3.60 2.3.60FBPIPELINE 2021-07-14 14:54:00 -04:00
Mike Reeves
ebe5ef6535 Merge pull request #4799 from Security-Onion-Solutions/agsoupupdate
Update ISO info
2021-07-14 12:07:35 -04:00
weslambert
7e1be8a3a4 Merge pull request #4798 from Security-Onion-Solutions/fix/strelka_filepath_mapping
Replace staging with processed in Strelka file path mapping
2021-07-14 11:16:15 -04:00
Wes Lambert
05aad07bfc Replace staging path with processed path for analyzed files 2021-07-14 15:04:46 +00:00
Mike Reeves
92a80f9a58 Update ISO info 2021-07-14 10:30:10 -04:00
weslambert
42ba9888d7 Merge pull request #4797 from Security-Onion-Solutions/fix/wazuh_data_port
Change field name and mapping for Wazuh's data.port
2021-07-14 10:14:53 -04:00
William Wernert
818f912a90 [fix] Remove indent 2021-07-14 10:13:14 -04:00
Wes Lambert
723172bc1f Add path_unmatch for data.port so it is not mapped as integer 2021-07-14 13:45:09 +00:00
Wes Lambert
323b5d6694 Add dynamic mapping for wazuh 2021-07-14 13:43:34 +00:00
Wes Lambert
441cd3fc59 Move Wazuh-specific data to wazuh.data 2021-07-14 13:42:51 +00:00
Jason Ertel
1dd81b6d49 Merge pull request #4790 from Security-Onion-Solutions/agsoupupdate
Remove old airgap scripts
2021-07-13 15:45:45 -04:00
Mike Reeves
741e825ab9 Remove old airgap scripts 2021-07-13 15:44:26 -04:00
William Wernert
e41811fbd0 [fix] Typo 2021-07-13 15:14:13 -04:00
William Wernert
e7a6172d7e [fix] Add single quotes to strings 2021-07-13 14:07:27 -04:00
William Wernert
115e0a6fee [fix] Add missing comma 2021-07-13 12:04:10 -04:00
Mike Reeves
6eab390962 Merge pull request #4788 from Security-Onion-Solutions/fix/fbpipeline
Only route to FB module pipeline if filebeat in metadata
2021-07-13 11:40:58 -04:00
Mike Reeves
35388056d3 Merge pull request #4789 from Security-Onion-Solutions/TOoSmOotH-patch-1
Update HOTFIX
2021-07-13 11:40:44 -04:00
Mike Reeves
e2c5967191 Update HOTFIX 2021-07-13 11:38:20 -04:00
weslambert
7cdb967810 Only route to FB module pipeline if filebeat in metadata 2021-07-13 11:36:18 -04:00
William Wernert
e059c25ebc [fix][wip] Fix pipeline parsing errors 2021-07-13 11:05:05 -04:00
William Wernert
9ff95f66dd Merge branch 'dev' into feature/logscan 2021-07-13 10:02:58 -04:00
William Wernert
c1523c4936 Merge pull request #4782 from Security-Onion-Solutions/feature/check-local-mods
Add jinja raw tag
2021-07-13 08:58:25 -04:00
William Wernert
ca2b24f735 Add jinja raw tag 2021-07-13 08:46:57 -04:00
William Wernert
2b0bca8e55 Merge branch 'dev' into feature/logscan 2021-07-12 14:58:30 -04:00
Doug Burks
2ea3989497 Merge pull request #4775 from Security-Onion-Solutions/fix/suricata-dns-response-code
FIX: Suricata dns.response.code needs to be renamed to dns.response.code_name #4770
2021-07-12 13:40:14 -04:00
doug
e6f9592cde FIX: Suricata dns.response.code needs to be renamed to dns.response.code_name #4770 2021-07-12 13:24:21 -04:00
William Wernert
222d79bf53 Merge pull request #4774 from Security-Onion-Solutions/feature/check-local-mods
Compare local files to their defaults to check for potentially breaking changes
2021-07-12 12:00:18 -04:00
weslambert
c0f3c5b3db Merge pull request #4773 from Security-Onion-Solutions/feature/filebeat-logging-level
Allow setting Filebeat logging level in pillar
2021-07-12 10:55:43 -04:00
weslambert
a895270bc8 Allow setting Filebeat logging level in pillar 2021-07-12 10:27:43 -04:00
Jason Ertel
78c58e61ea Resolves #4765 2021-07-12 09:38:01 -04:00
William Wernert
f3ecdf21bf Revert "Add newline to local modifications warning"
This reverts commit ff656365d2.
2021-07-12 09:28:24 -04:00
William Wernert
ff656365d2 Add newline to local modifications warning 2021-07-12 09:22:22 -04:00
William Wernert
ea7c09bb00 Merge branch 'dev' into feature/check-local-mods 2021-07-12 09:20:10 -04:00
Jason Ertel
e23f7cd3e7 Merge pull request #4766 from Security-Onion-Solutions/kilo
Bump version to 2.3.70
2021-07-10 13:01:54 -04:00
Jason Ertel
c6bb32b862 Bump version to 2.3.70 2021-07-10 07:34:52 -04:00
William Wernert
90970f97e8 Add function to check if files copied to local have been changed in default 2021-07-09 15:44:27 -04:00
Jason Ertel
8c15fa1627 Merge pull request #4758 from Security-Onion-Solutions/kilo
Upgrade to ES 7.13.3; Use nginx reverse proxy for access to Playbook and Soctopus
2021-07-09 12:40:33 -04:00
William Wernert
bac7ef71d8 Add logscan.source.ips field 2021-07-09 10:55:11 -04:00
Jason Ertel
08ba4fdbee Update Kibana saved objects to 7.13.3 2021-07-08 16:34:16 -04:00
Jason Ertel
0c079edc1a Reverse proxy requests to playbook, soctopus, and nodered 2021-07-08 14:27:16 -04:00
William Wernert
80525ee736 [wip] Add logscan pipeline 2021-07-08 12:29:50 -04:00
Jason Ertel
a43bdd9aad Merge pull request #4723 from Security-Onion-Solutions/dev
HEAVYNODE_REDIS hotfix
2.3.60HEAVYNODE
2021-07-08 11:42:22 -04:00
Josh Patterson
70d7513f84 Merge pull request #4729 from Security-Onion-Solutions/fix/heavyfix
Fix/heavyfix
2021-07-07 14:49:38 -04:00
Josh Patterson
12b7fd3ab4 whitespace 2021-07-07 14:48:07 -04:00