CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-07 17:52:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,767 Commits 24 Branches 119 Tags
ed6473a34b7da12fa6cc1ac13a77dfcc07c39dc9
Commit Graph

13767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
m0duspwnens
a3e6b1ee1d change generate_ssl wait_for_salt_minion 2023-10-25 09:26:36 -04:00
Jason Ertel
a28cc274ba Merge branch '2.4/dev' into kilo 2023-10-25 09:04:36 -04:00
Jason Ertel
a66006c8a6 minor updates 2023-10-25 09:04:23 -04:00
defensivedepth
3ad480453a Rename to remove dupe 2023-10-25 07:20:07 -04:00
Josh Patterson
205748e992 Merge pull request #11613 from Security-Onion-Solutions/issue/11610 
fix issue/11610
 2023-10-24 18:16:44 -04:00
m0duspwnens
dfe707ab64 fix issue/11610 2023-10-24 17:26:39 -04:00
Josh Patterson
308e5ea505 Merge pull request #11612 from Security-Onion-Solutions/upgrade/salt3006.3 
Upgrade/salt3006.3
 2023-10-24 16:45:12 -04:00
m0duspwnens
3e343bff84 fix line to log properly 2023-10-24 16:40:51 -04:00
m0duspwnens
1d6e32fbab dont exit if salt isnt running 2023-10-24 15:08:50 -04:00
defensivedepth
310a6b4f27 Add kibana curl config 2023-10-24 14:21:01 -04:00
m0duspwnens
180ba3a958 if deb fam, stop salt-master and salt-minion after salt upgrade 2023-10-24 13:24:52 -04:00
m0duspwnens
6d3465626e if deb fam, stop salt-master and salt-minion after salt upgrade 2023-10-24 12:52:25 -04:00
m0duspwnens
fab91edd2d Merge remote-tracking branch 'origin/2.4/dev' into upgrade/salt3006.3 2023-10-24 09:41:23 -04:00
m0duspwnens
752390be2e merge with dev, fix confict 2023-10-24 09:40:09 -04:00
Mike Reeves
02639d3bc5 Merge pull request #11606 from Security-Onion-Solutions/TOoSmOotH-patch-2 
Enable http2 for Suricata
 2023-10-24 09:23:07 -04:00
Mike Reeves
4a3fc06a4d Enable http2 for Suricata 2023-10-24 09:18:10 -04:00
weslambert
0c2b3f3c62 Merge pull request #11600 from Security-Onion-Solutions/fix/suricata_pkt_src 
Parse pkt_src for Suricata logs
 2023-10-23 15:51:30 -04:00
weslambert
660020cc76 Parse pkt_src for Suricata logs 2023-10-23 15:45:41 -04:00
Jorge Reyes
b59a95b72f Merge pull request #11594 from Security-Onion-Solutions/fix/playbookrule 
FIX: Add -watch to soctopus saltstate for file SOCtopus.conf. Makes contai…
 2023-10-23 11:51:53 -04:00
reyesj2
030a667d26 Add -watch to soctopus saltstate for file SOCtopus.conf. Makes container restart @ highstate if file is updated. 
Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>
 2023-10-23 11:47:14 -04:00
Josh Patterson
a40760e601 Merge pull request #11592 from Security-Onion-Solutions/minechanges 
Minechanges
 2023-10-23 10:37:05 -04:00
m0duspwnens
dc3ca99c12 ask the minion if it can see itself in the mine 2023-10-20 17:16:33 -04:00
m0duspwnens
7e3aa11a73 check mine is populated with ip before telling node to highstate 2023-10-20 16:27:20 -04:00
m0duspwnens
c409339446 change post setup highstate cron to 5 minutes since accepting minion runs a highstate 2023-10-20 13:46:24 -04:00
m0duspwnens
c588bf4395 update mine and highstate minion when added 2023-10-20 13:43:12 -04:00
m0duspwnens
6d77b1e4c3 continue loop if minion not in mine 2023-10-20 13:41:53 -04:00
m0duspwnens
99662c999f log operation and minion target 2023-10-20 13:41:24 -04:00
m0duspwnens
ef2b89f5bf fix attempts logic 2023-10-20 13:40:40 -04:00
Josh Patterson
2878f82754 Merge pull request #11582 from Security-Onion-Solutions/minechanges 
handle a minion not being in the mine data return
 2023-10-20 10:07:44 -04:00
m0duspwnens
2e16250c93 handle a minion not being in the mine data return 2023-10-20 10:00:39 -04:00
m0duspwnens
f03bbdbc09 Merge remote-tracking branch 'origin/2.4/dev' into upgrade/salt3006.3 2023-10-19 17:01:12 -04:00
m0duspwnens
dbfccdfff8 fix logging when using wait_for_minion 2023-10-19 16:53:03 -04:00
m0duspwnens
dfcbbfd157 update call to wait_for_salt_minion with new options in so-functions 2023-10-19 15:58:50 -04:00
m0duspwnens
37e803917e have soup wait_for_salt_minion() before running any highstate 2023-10-19 15:58:10 -04:00
m0duspwnens
66ee074795 add wait_for_salt_minion to so-common 2023-10-19 15:57:24 -04:00
m0duspwnens
90bde94371 handle debian family salt upgrade for soup 2023-10-19 13:46:48 -04:00
m0duspwnens
84f8e1cc92 debian family upgrade salt without -r flag 2023-10-19 13:46:07 -04:00
m0duspwnens
e3830fa286 all more os to set_os in so-common 2023-10-19 13:43:03 -04:00
m0duspwnens
13a5c8baa7 remove extra || 2023-10-19 11:19:51 -04:00
m0duspwnens
c5610edd83 handle salt for r9 and c9 2023-10-19 11:12:20 -04:00
weslambert
5119e6c45a Merge pull request #11570 from Security-Onion-Solutions/feature/additional_integrations 
Additional integrations
 2023-10-19 09:30:40 -04:00
m0duspwnens
02e22c87e8 Merge remote-tracking branch 'origin/2.4/dev' into upgrade/salt3006.3 2023-10-19 09:15:31 -04:00
Mike Reeves
0772926992 Merge pull request #11573 from Security-Onion-Solutions/minechanges 2023-10-18 19:45:23 -04:00
m0duspwnens
b2bb92d413 remove extra space 2023-10-18 19:38:19 -04:00
Mike Reeves
19bebe44aa Merge pull request #11572 from Security-Onion-Solutions/minechanges 2023-10-18 19:37:34 -04:00
m0duspwnens
f30a652e19 add back redirects 2023-10-18 19:31:45 -04:00
m0duspwnens
ff18b1f074 remove redirect 2023-10-18 18:45:14 -04:00
m0duspwnens
9eb682bc40 generate_ca after salt-master and salt-minion states run 2023-10-18 18:37:35 -04:00
Wes
c135f886a9 Remove Carbon Black Cloud integration 2023-10-18 20:41:34 +00:00
Wes
28b7a24cc1 Add templates for integrations 2023-10-18 20:36:04 +00:00