Commit Graph

8465 Commits

Author SHA1 Message Date
Mike Reeves
ce1858fe05 Annotation changes for warm node 2023-10-27 09:02:39 -04:00
Mike Reeves
9fc3a73035 Annotation changes for warm node 2023-10-27 08:58:08 -04:00
Mike Reeves
b37e38e3c3 Update defaults.yaml 2023-10-26 16:03:58 -04:00
Mike Reeves
2e0100fd35 Update defaults.yaml 2023-10-26 12:37:55 -04:00
Wes
891ea997e7 Add lifecycle policies and warm settings 2023-10-26 12:25:37 +00:00
Mike Reeves
01810a782c Annotation changes for warm node 2023-10-25 16:46:30 -04:00
Mike Reeves
6d6292714f Annotation changes for warm node 2023-10-25 16:21:47 -04:00
Mike Reeves
88fb7d06e6 Annotation changes for warm node 2023-10-25 16:20:28 -04:00
Josh Patterson
39abe19cfd Update config.map.jinja 2023-10-25 16:17:06 -04:00
Josh Patterson
807b40019f Update soc_elasticsearch.yaml 2023-10-25 16:16:48 -04:00
Josh Patterson
5f168a33ed Update defaults.yaml 2023-10-25 16:16:01 -04:00
Mike Reeves
d1170cb69f Update soc_elasticsearch.yaml 2023-10-25 16:05:20 -04:00
m0duspwnens
19fdc9319b fix role update 2023-10-25 15:58:26 -04:00
Mike Reeves
dc53b49f15 Update soup 2023-10-25 15:53:39 -04:00
Josh Patterson
af4b34801f Update defaults.yaml 2023-10-25 15:48:27 -04:00
Josh Patterson
1ae8896a05 Update config.map.jinja 2023-10-25 15:47:40 -04:00
Mike Reeves
6fb0c5dbfe Annotation changes for warm node 2023-10-25 15:37:36 -04:00
Mike Reeves
58bf6d3eff Merge branch '2.4/dev' of github.com:Security-Onion-Solutions/securityonion into warmui 2023-10-25 15:37:14 -04:00
Mike Reeves
a887551dad Annotation changes for warm node 2023-10-25 15:22:47 -04:00
Josh Patterson
c41e19ad0b Revert "Upgrade/salt3006.3" 2023-10-25 11:01:13 -04:00
m0duspwnens
dfe707ab64 fix issue/11610 2023-10-24 17:26:39 -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
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
4a3fc06a4d Enable http2 for Suricata 2023-10-24 09:18:10 -04:00
weslambert
660020cc76 Parse pkt_src for Suricata logs 2023-10-23 15:45:41 -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
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
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
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