Commit Graph

13957 Commits

Author SHA1 Message Date
Jason Ertel
d42b5ef901 remove unused url props to avoid kratos complaining about invalid urls when they're blank 2023-10-27 11:18:56 -04:00
m0duspwnens
2b511cef77 Merge branch 'upgrade/salt3006.3' into upgrade/salt3006.3v2 2023-10-27 10:58:09 -04:00
Josh Patterson
4bbcc5002a Revert "Revert "Upgrade/salt3006.3""
This reverts commit c41e19ad0b.
2023-10-27 10:56:45 -04:00
Mike Reeves
f1dbea6e2d Merge pull request #11623 from Security-Onion-Solutions/warmui
Warm Node UI Changes
2023-10-27 10:36:23 -04:00
Mike Reeves
25f1a0251f Annotation changes for warm node 2023-10-27 09:08:07 -04:00
Mike Reeves
87494f64c7 Annotation changes for warm node 2023-10-27 09:06:12 -04:00
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
Josh Brower
0d52efafa8 Merge pull request #11637 from Security-Onion-Solutions/2.4/kibanauser
2.4/kibanauser
2023-10-27 08:43:12 -04:00
defensivedepth
3b63ef149a Merge remote-tracking branch 'remotes/origin/2.4/dev' into 2.4/kibanauser 2023-10-27 07:50:58 -04:00
defensivedepth
cc3ee43192 Make dirs as needed 2023-10-27 07:49:34 -04:00
Mike Reeves
b37e38e3c3 Update defaults.yaml 2023-10-26 16:03:58 -04:00
Jorge Reyes
25982b79ab Merge pull request #11633 from Security-Onion-Solutions/reyesj2/influxdb_config
UPGRADE: Influxdb 2.7.1 & telegraf 1.28.2
2023-10-26 14:37:09 -04:00
Jason Ertel
cb9d72ebd7 switch back to kilo version 2023-10-26 14:19:59 -04:00
m0duspwnens
7e8f3b753f add minion name to log, update comment 2023-10-26 13:19:04 -04:00
reyesj2
47373adad2 Specify config.yaml in config_path. Otherwise when no influxd.bolt exists influxdb will fail to read the config file and won't create a new db.
Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>
2023-10-26 13:15:40 -04:00
m0duspwnens
6891a95254 remove wait_for_salt_minion from so-functions 2023-10-26 13:02:39 -04:00
Mike Reeves
2e0100fd35 Update defaults.yaml 2023-10-26 12:37:55 -04:00
Jason Ertel
a969c319f5 Merge pull request #11631 from Security-Onion-Solutions/kilo
oidc
2023-10-26 12:30:06 -04:00
Jason Ertel
4942f83d4f adjust version to match target branch 2023-10-26 11:45:39 -04:00
Josh Brower
6f4566c23e Merge pull request #11609 from Security-Onion-Solutions/2.4/kibanauser
Add kibana curl config
2023-10-26 10:42:32 -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
Jason Ertel
b20177b0ef Merge branch '2.4/dev' into kilo 2023-10-25 15:19:57 -04:00
defensivedepth
1e710a22ce Merge remote-tracking branch 'remotes/origin/2.4/dev' into 2.4/kibanauser 2023-10-25 11:33:38 -04:00
Josh Patterson
d562445686 Merge pull request #11619 from Security-Onion-Solutions/revert-11612-upgrade/salt3006.3
Revert "Upgrade/salt3006.3"
2023-10-25 11:28:14 -04:00
Josh Patterson
c41e19ad0b Revert "Upgrade/salt3006.3" 2023-10-25 11:01:13 -04:00
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