CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-04-25 14:07:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,582 Commits 40 Branches 125 Tags
445f44d8471a9325cde21700751ac88054968e4b
Commit Graph

2582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Patterson 1735cc8252 Merge pull request #552 from Security-Onion-Solutions/issue/551 
change log_size_limit logic - https://github.com/Security-Onion-Solut…
 2020-04-10 16:17:56 -04:00
m0duspwnens 69031ab6b2 change log_size_limit logic - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/551 2020-04-10 16:15:43 -04:00
m0duspwnens 69d9507758 Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev 2020-04-10 14:50:58 -04:00
weslambert 6aafc4ef01 Merge pull request #550 from Security-Onion-Solutions/fix/zeek_clean 
Zeek: migrate Zeek clean script from Bro
 2020-04-10 08:51:54 -04:00
Wes Lambert 8d8bde36e8 migrate Zeek clean script from Bro 2020-04-10 12:46:28 +00:00
Jason Ertel 3bf7a5aab5 Merge pull request #549 from Security-Onion-Solutions/feature/auth 
Feature/auth
 2020-04-09 17:39:23 -04:00
Jason Ertel c130c8fbf4 Merge branch 'dev' into feature/auth 2020-04-09 17:37:09 -04:00
Jason Ertel bb470be4e6 support auto redirect on login 2020-04-09 17:37:03 -04:00
m0duspwnens d824b91c42 Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev 2020-04-09 15:08:52 -04:00
Mike Reeves c0739976c9 Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev 2020-04-09 13:58:25 -04:00
Mike Reeves b70d19781d Fix Filebeat Yaml 2020-04-09 13:58:19 -04:00
Josh Patterson be70de9623 Merge pull request #546 from Security-Onion-Solutions/issue/530 
move salt logs to /opt/so/logs - https://github.com/Security-Onion-So…
 2020-04-09 13:28:27 -04:00
m0duspwnens 57570fb740 move salt logs to /opt/so/logs - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/530 2020-04-09 13:27:32 -04:00
Mike Reeves 6625e17bf2 Have templates applied on the master only 2020-04-09 12:22:27 -04:00
m0duspwnens 2b05ae6c08 Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev 2020-04-09 11:59:25 -04:00
Mike Reeves 5a985736e5 Disable Strelka for all things 2020-04-09 11:49:38 -04:00
Mike Reeves 8ffeb0a33d Fix Wazuh and Strelka 2020-04-09 11:45:45 -04:00
Mike Reeves ac52c014d1 Remove ES watch 2020-04-09 11:30:24 -04:00
Mike Reeves 0b07d0f25f Fix ES Watch 2020-04-09 11:25:46 -04:00
Mike Reeves 69dca74afd Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev 2020-04-09 11:16:50 -04:00
Mike Reeves 5692f2a672 Make Kibana run faster on checkins 2020-04-09 11:16:36 -04:00
Josh Brower 422f4c928c Merge pull request #544 from Security-Onion-Solutions/bugfix/fleet-so-status 
so-status Fleet node
 2020-04-09 10:05:01 -04:00
Josh Brower 55ae5fa9f3 so-status Fleet node 2020-04-09 10:04:18 -04:00
m0duspwnens 48240498f9 Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev 2020-04-09 08:28:55 -04:00
Josh Patterson b10c424a7f Merge pull request #543 from Security-Onion-Solutions/quickfix/telegrafnsm 
fix missing telegraf data for /nsm
 2020-04-08 17:37:01 -04:00
m0duspwnens 7fe25f4c96 fix missing telegraf data for /nsm 2020-04-08 17:36:16 -04:00
m0duspwnens 3ec57eace8 Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev 2020-04-08 17:27:44 -04:00
William Wernert 40af9f871e [fix] NetworkManager dir should not be string 2020-04-08 17:02:33 -04:00
Josh Patterson 09de027d2c Merge pull request #542 from Security-Onion-Solutions/quickfix/telegrafmodule 
fix salt telegraf module
 2020-04-08 16:25:35 -04:00
m0duspwnens 86c13fc392 fix salt telegraf module 2020-04-08 16:24:15 -04:00
m0duspwnens 638bf7e50b merge 2020-04-08 16:22:49 -04:00
Josh Patterson 19c5ca5643 Merge pull request #541 from Security-Onion-Solutions/quickfix/searchnode 
removing path.config
 2020-04-08 15:31:56 -04:00
m0duspwnens 749935339b removing path.config 2020-04-08 15:31:11 -04:00
Josh Patterson 95f37ac357 Merge pull request #540 from Security-Onion-Solutions/quickfix/searchnode 
adding searchnode to salt/top
 2020-04-08 14:55:40 -04:00
weslambert 5ecbac9abd Merge pull request #538 from Security-Onion-Solutions/fix/kibana_config_load 
remark config load section for now
 2020-04-08 14:49:24 -04:00
m0duspwnens 8a186285a5 adding searchnode to salt/top 2020-04-08 14:49:09 -04:00
Wes Lambert f4c01eb313 move PL 2020-04-08 18:48:22 +00:00
Wes Lambert ead03f5147 remark config load section for now 2020-04-08 18:47:04 +00:00
Josh Patterson 494e1aff49 Merge pull request #537 from Security-Onion-Solutions/quickfix/searchnode 
adding searchnode to pillar/top
 2020-04-08 14:44:01 -04:00
William Wernert bc99903885 [fix] Networking fixes 2020-04-08 14:43:14 -04:00
m0duspwnens f28187099d adding searchnode to pillar/top 2020-04-08 14:43:06 -04:00
weslambert b293c3dd2c Merge pull request #536 from Security-Onion-Solutions/fix/kibana_config 
Fix/kibana config
 2020-04-08 14:26:40 -04:00
Wes Lambert a6c7765dd1 fix order 2020-04-08 18:25:47 +00:00
Wes Lambert ce3807a605 replace URL template with Label template 2020-04-08 18:16:09 +00:00
weslambert 3fab895435 Merge pull request #535 from Security-Onion-Solutions/fix/revert_kibana_config 
Revert "update Kibana config"
 2020-04-08 14:00:35 -04:00
Wes Lambert 433e571369 Revert "update Kibana config" 
This reverts commit 82bd14252c.
 2020-04-08 17:59:24 +00:00
Mike Reeves 394dfe654f Filter out KVM kits so cpu count is correct 2020-04-08 13:59:01 -04:00
Mike Reeves eeeec6f7b9 Fix so not executed in tmp 2020-04-08 13:28:07 -04:00
Jason Ertel 7a7fcce1e1 Added config changes needed for new admin pages in SOC 2020-04-08 12:39:37 -04:00
weslambert 313f332ac8 Merge pull request #533 from Security-Onion-Solutions/elastic_updates 
Elastic updates
 2020-04-08 12:28:14 -04:00