Commit Graph
100 Commits
Author SHA1 Message Date
Josh PattersonandGitHub 7420c31411 Merge pull request #9096 from Security-Onion-Solutions/salt3005.1_2.4
roll back to salt 3004.2
2022-11-08 15:47:00 -05:00
m0duspwnens 00cb0f5abb roll back to salt 3004.2 2022-11-08 15:45:18 -05:00
Josh PattersonandGitHub 4870b4b91f Merge pull request #9095 from Security-Onion-Solutions/salt3005.1_2.4
upgrade to salt 3005.1
2022-11-08 13:45:24 -05:00
m0duspwnens 1a678064dc upgrade to salt 3005.1 2022-11-08 13:42:24 -05:00
Josh PattersonandGitHub c6ebe5c8dd Merge pull request #9016 from Security-Onion-Solutions/patch2.4
Patch2.4
2022-10-27 13:07:54 -04:00
m0duspwnens 8af0334c3c Merge remote-tracking branch 'remotes/origin/2.4/dev' into patch2.4 2022-10-27 11:08:32 -04:00
m0duspwnens 6525e0f201 setup no longer add patch pillar to minion 2022-10-27 10:56:29 -04:00
m0duspwnens a95c2a690a add defaults and map for patch state 2022-10-27 10:54:29 -04:00
Josh PattersonandGitHub d148febc99 Merge pull request #8967 from Security-Onion-Solutions/curator2.4
add line space
2022-10-21 11:56:01 -04:00
m0duspwnens 8c5197c2ea add line space 2022-10-21 11:49:01 -04:00
Josh PattersonandGitHub 8197017b6c Merge pull request #8966 from Security-Onion-Solutions/curator2.4
Curator2.4
2022-10-21 11:26:51 -04:00
m0duspwnens 8b5c79fb39 add so-kratos and so-ossec to curator defaults 2022-10-21 11:21:03 -04:00
m0duspwnens 71eaa715b6 update jinja 2022-10-21 11:09:52 -04:00
m0duspwnens c880be8d45 use curator defaults.yaml merged with pillar for actions 2022-10-21 10:38:32 -04:00
Josh PattersonandGitHub 3af271a13c Merge pull request #8930 from Security-Onion-Solutions/statesglobals
Statesglobals
2022-10-17 16:06:42 -04:00
m0duspwnens 998870ac87 Merge remote-tracking branch 'remotes/origin/2.4/dev' into statesglobals 2022-10-17 15:58:44 -04:00
m0duspwnens b089a58243 use registry_host instead of manager 2022-10-17 15:53:29 -04:00
m0duspwnens 09b7af2998 fix typo 2022-10-17 15:50:48 -04:00
m0duspwnens deba743ef0 fix elasticsearch auth globals 2022-10-13 13:54:52 -04:00
m0duspwnens 04b4030eb6 only add elasticsearch.auth to elasticsearch global var if auth exists 2022-10-13 12:31:41 -04:00
m0duspwnens 78b496a689 fix mine_functions.conf 2022-10-12 16:03:44 -04:00
m0duspwnens 95f7cb6bcd change file_mode to mode 2022-10-12 14:21:55 -04:00
m0duspwnens eed3746ebc fix some globals 2022-10-12 13:39:37 -04:00
m0duspwnens 6a17f201a2 changes for backup state 2022-10-12 11:31:42 -04:00
m0duspwnens b526532ab6 use global vars in states 2022-10-11 11:57:15 -04:00
Josh PattersonandGitHub 004fa8167e Merge pull request #8821 from Security-Onion-Solutions/fix/soc2.4
Fix/soc2.4
2022-09-27 10:15:04 -04:00
m0duspwnens 6bd4860f19 fix path 2022-09-27 09:57:01 -04:00
m0duspwnens 42b03ca6df add missing soc things 2022-09-27 09:53:48 -04:00
Josh PattersonandGitHub 02f1d24ea6 remove minion hg 2022-09-23 08:40:25 -04:00
Josh PattersonandGitHub 975c7fabcc remove minion hg 2022-09-23 08:39:48 -04:00
Josh PattersonandGitHub 5e32e333c4 remove minion hg 2022-09-23 08:37:59 -04:00
Josh PattersonandGitHub 3100efc954 fix syntax 2022-09-22 16:03:12 -04:00
m0duspwnens abee5afd7b adjust standalone firewall assigned_hostgroups 2022-09-22 15:40:52 -04:00
m0duspwnens 06d3681cec 2.4/firewall 2022-09-22 13:39:10 -04:00
m0duspwnens c77fcc74c1 merge in 2.4./firewall changes 2022-09-22 10:55:39 -04:00
m0duspwnens 2995ae32bd 2.4 fw changes 2022-09-22 10:49:26 -04:00
Josh PattersonandGitHub f0ddfecd42 Merge pull request #8784 from Security-Onion-Solutions/2.4/zeek
2.4/zeek
2022-09-20 16:28:40 -04:00
m0duspwnens e1ea3c2031 soc for zeek 2022-09-20 16:22:54 -04:00
m0duspwnens 1685e0e6db few more 2022-09-20 15:25:50 -04:00
m0duspwnens 75aa121b2d fix some things 2022-09-20 13:19:15 -04:00
m0duspwnens 29285b8fb1 fix conflixt in zeek/init.sls 2022-09-20 11:12:44 -04:00
m0duspwnens d1ee3a7d04 zeek 2.4 2022-09-20 11:11:29 -04:00
Josh PattersonandGitHub 0367365225 Merge pull request #8773 from Security-Onion-Solutions/fix/soc2.4
fix some soc defaults
2022-09-19 15:54:25 -04:00
m0duspwnens 30afc88322 fix some soc defaults 2022-09-19 15:51:29 -04:00
m0duspwnens 79785fc053 zeek jinja 2022-09-19 15:26:32 -04:00
m0duspwnens 5a9b3f6821 fix diskfreepercantage 2022-09-15 15:39:31 -04:00
m0duspwnens 62f5ee04a4 fix source for steno config 2022-09-15 15:13:40 -04:00
m0duspwnens 52b58ad6ae jinja for steno/pcap 2022-09-15 15:12:40 -04:00
m0duspwnens 845d2e33bd remove dupe afpacket 2022-09-15 10:44:39 -04:00
m0duspwnens 4cb955fe8d jinja for the suricata outputs 2022-09-15 10:35:59 -04:00
Josh PattersonandGitHub c6421275f7 Merge pull request #8704 from Security-Onion-Solutions/influx/defaults
remove jinja from influxdb defaults.yaml
2022-09-09 15:42:46 -04:00
m0duspwnens 9a08decadb remove jinja from influxdb defaults.yaml 2022-09-09 15:41:20 -04:00
Josh PattersonandGitHub 54f7cefa28 Merge pull request #8702 from Security-Onion-Solutions/fix/soc2.4
add salt bind for soc
2022-09-09 14:45:31 -04:00
m0duspwnens b5fb7596b0 add salt bind for soc 2022-09-09 14:44:41 -04:00
Josh PattersonandGitHub 7dd65909f2 Merge pull request #8701 from Security-Onion-Solutions/fix/soc2.4
add saltPipe
2022-09-09 14:40:08 -04:00
m0duspwnens 0f2e9764ab add saltPipe 2022-09-09 14:39:20 -04:00
Josh PattersonandGitHub deaecad8fd Merge pull request #8700 from Security-Onion-Solutions/fix/soc2.4
Fix/soc2.4
2022-09-09 14:32:41 -04:00
m0duspwnens 5ccc103083 fix soc dashboards and things 2022-09-09 14:31:04 -04:00
m0duspwnens 5bb001281b soc defaults changes - client child of server 2022-09-08 15:57:18 -04:00
Josh PattersonandGitHub de456a402c Merge pull request #8676 from Security-Onion-Solutions/index_settings_False
Update so-functions
2022-09-07 09:40:12 -04:00
Josh PattersonandGitHub dfd505dfaa Update so-functions 2022-09-07 09:38:22 -04:00
Josh PattersonandGitHub dcb7b49dbe Merge pull request #8451 from Security-Onion-Solutions/issue/8441_3
manage salt-minion start delay with systemd drop-in file -
2022-08-02 16:39:45 -04:00
m0duspwnens a965301b2e manage salt-minion start delay with systemd drop-in file - https://github.com/Security-Onion-Solutions/securityonion/issues/8441 2022-08-02 16:37:27 -04:00
Josh PattersonandGitHub 37df49d4f3 Merge pull request #8296 from Security-Onion-Solutions/elastalert_esversion_check
use onlyif requisite instead
2022-07-13 15:22:40 -04:00
m0duspwnens 7d7cf42d9a use onlyif requisite instead 2022-07-13 15:21:34 -04:00
Josh PattersonandGitHub e79ca4bb9b Merge pull request #8291 from Security-Onion-Solutions/elastalert_esversion_check
do not start elastalert if elasticsearch is not v8
2022-07-13 11:24:12 -04:00
m0duspwnens 086cf3996d do not start elastalert if elasticsearch is not v8 2022-07-13 11:21:27 -04:00
Josh PattersonandGitHub 57b79421d8 Merge pull request #8280 from Security-Onion-Solutions/fix_filebeat
move port bindings back under port bindings
2022-07-12 16:12:49 -04:00
m0duspwnens ec451c19f8 move port bindings back under port bindings 2022-07-12 15:17:25 -04:00
Josh PattersonandGitHub fb365739ae Merge pull request #8225 from Security-Onion-Solutions/salltupdate
bootstrap-salt can now update to minor version with -r
2022-07-01 08:53:59 -04:00
m0duspwnens 5f898ae569 change to egrep 2022-07-01 08:47:46 -04:00
m0duspwnens f0ff0d51f7 allow bootstrap-salt to install specific verion even if -r is used 2022-06-30 16:59:54 -04:00
m0duspwnens 7524ea2c05 allow bootstrap-salt to install specific verion even if -r is used 2022-06-30 15:10:13 -04:00
Josh PattersonandGitHub 69ce3613ff Merge pull request #8217 from Security-Onion-Solutions/salltupdate
point to salt3004.2
2022-06-30 11:29:35 -04:00
m0duspwnens 0ebd957308 point to salt3004.2 2022-06-30 11:26:03 -04:00
Josh PattersonandGitHub c3979f5a32 Merge pull request #8207 from Security-Onion-Solutions/salltupdate
Saltupdate 3004.2
2022-06-28 11:20:53 -04:00
m0duspwnens 8fccd4598a update saltstack.list for 3004.2 2022-06-27 16:23:01 -04:00
Josh PattersonandGitHub fba5592f62 Update minion.defaults.yaml 2022-06-27 12:10:18 -04:00
Josh PattersonandGitHub 05e84699d1 Update master.defaults.yaml 2022-06-27 12:09:39 -04:00
Josh PattersonandGitHub e5c9b91529 Merge pull request #8054 from Security-Onion-Solutions/dmz_receiver
Dmz receiver
2022-06-01 15:31:42 -04:00
m0duspwnens e5b74bcb78 remove podman state 2022-06-01 15:26:25 -04:00
Josh PattersonandGitHub 76bb1fbbcc Merge pull request #8014 from Security-Onion-Solutions/issue/7918
manage suricata classifications.config
2022-05-26 13:13:03 -04:00
m0duspwnens 53d6e1d30d simplfy 2022-05-26 11:51:17 -04:00
m0duspwnens 1bfde852f5 manage suricata classifications.config https://github.com/Security-Onion-Solutions/securityonion/issues/7918 2022-05-26 11:43:31 -04:00
m0duspwnens 53883e4ade manage suricata classifications.config https://github.com/Security-Onion-Solutions/securityonion/issues/7918 2022-05-26 11:40:33 -04:00
m0duspwnens d8abc0a195 if in dmz_nodes dont add to filebeta 2022-05-11 11:51:18 -04:00
m0duspwnens a641346c02 prevent nodes with logstash:dmz:true from being added to logstash:nodes pillar 2022-05-10 17:28:19 -04:00
Josh PattersonandGitHub 8f5967911b Merge pull request #7847 from Security-Onion-Solutions/m0duspwnens-patch-1
add eval
2022-04-22 16:06:01 -04:00
Josh PattersonandGitHub 80eb31368a add eval 2022-04-22 16:04:29 -04:00
Josh PattersonandGitHub 40d9335573 Merge pull request #7822 from Security-Onion-Solutions/workstation_state
add securityonion-strelka-oneshot and securityonion-strelka-fileshot to workstation
2022-04-19 09:21:35 -04:00
m0duspwnens 807f6adf1e add securityonion-strelka-oneshot and securityonion-strelka-fileshot to workstation 2022-04-19 09:19:09 -04:00
Josh PattersonandGitHub ba61057433 Merge pull request #7796 from Security-Onion-Solutions/fix_analyst_setup
Fix analyst setup
2022-04-14 16:12:53 -04:00
m0duspwnens b8a80f76cf change words 2022-04-14 16:09:39 -04:00
Josh PattersonandGitHub be2573bb7d Merge pull request #7794 from Security-Onion-Solutions/soup_salt_influx
remove influxdb module patched state files when salt is upgraded
2022-04-14 16:08:10 -04:00
m0duspwnens 36aef87a3c remove cd before running so-setup analyst 2022-04-14 16:03:43 -04:00
m0duspwnens 02c19da3c4 remove influxdb module patched state files when salt is upgraded 2022-04-14 15:00:14 -04:00
Josh PattersonandGitHub 2d094a3bfc Merge pull request #7784 from Security-Onion-Solutions/workstation_script
modify so-analyst-install to work with new states and install on managers
2022-04-13 14:37:24 -04:00
m0duspwnens 371fda09db fix copy paste fail 2022-04-13 14:28:05 -04:00
m0duspwnens 149375115e warn about required reboot and prompt if reboot desired at completion of install 2022-04-13 14:26:14 -04:00
m0duspwnens 4728bea633 fix typo 2022-04-13 14:03:09 -04:00