Commit Graph

7495 Commits

Author SHA1 Message Date
Mike Reeves 34d4eedf67 Remove old modules 2021-05-26 10:11:47 -04:00
Josh Brower 4a109d6af1 Merge pull request #4299 from Security-Onion-Solutions/feature/so-pcap-pull
Feature/so-pcap-export
2021-05-26 09:59:45 -04:00
John Bernal cb40a76247 Update so-whiptail
Updated Zeek capitalization when prompting for the number of processes.
2021-05-26 09:55:14 -04:00
Josh Brower ed249600d3 Merge remote-tracking branch 'remotes/origin/dev' into feature/so-pcap-pull 2021-05-26 09:52:58 -04:00
Josh Brower 0187c9d6df Adds so-pcap-export 2021-05-26 09:51:37 -04:00
William Wernert 6da37966d9 Update wording for iso location prompt in soup 2021-05-26 09:32:25 -04:00
m0duspwnens 525d4325c7 define ZEEKLOGLOOKUP in the yaml 2021-05-25 17:18:58 -04:00
m0duspwnens ecf7e25a51 fix merge conflict 2021-05-25 17:16:44 -04:00
m0duspwnens dfaf40f583 add zeekloglookup to translate zeeklogs to filebeat filesets 2021-05-25 17:14:26 -04:00
Mike Reeves 543154f037 Remove old modules 2021-05-25 16:58:18 -04:00
Mike Reeves cd3e355f84 Fix zeek depth 2021-05-25 16:54:20 -04:00
m0duspwnens 2eee6b45bc Merge branch 'pipeline' of https://github.com/Security-Onion-Solutions/securityonion into pipeline 2021-05-25 16:52:08 -04:00
m0duspwnens 0de5c6f204 fix sodefault modules 2021-05-25 16:52:02 -04:00
Mike Reeves 9363fc153c Fix pillar for module 2021-05-25 16:44:13 -04:00
m0duspwnens 2aacd5b9b6 so defaults filebeat modules 2021-05-25 16:40:50 -04:00
William Wernert 67828a86c1 Merge pull request #4289 from Security-Onion-Solutions/foxtrot
Soup error handling, reorder sensoroni state
2021-05-25 12:42:01 -04:00
William Wernert 94af55a951 Fix typo 2021-05-25 11:25:37 -04:00
William Wernert 192cec1825 Change how version with dashes are handled by so-docker-prune 2021-05-25 11:25:12 -04:00
Mike Reeves 1e564c2140 Fix zeek jinja 2021-05-25 10:22:36 -04:00
William Wernert 7e008378ba Replace string with variable, remove unnecessary text 2021-05-25 09:23:44 -04:00
William Wernert dbc4ffd69a Fix typo 2021-05-25 09:20:45 -04:00
Mike Reeves 5e5d30a377 Fix 3rd party modules 2021-05-25 08:26:25 -04:00
William Wernert 3bc0def02a Add failure message to salt-master check 2021-05-24 16:45:05 -04:00
William Wernert ffd5bfc480 Force images from automated branches to a very high semver 2021-05-24 15:25:03 -04:00
William Wernert dcb89b704a Move sensoroni state out of the * block of top.sls
Resolves #3559
2021-05-24 13:45:12 -04:00
William Wernert 686c7c5a6c Add exception handling for docker API error to so-docker-prune 2021-05-24 13:26:43 -04:00
William Wernert 99d41d1606 Add ending newline to soup 2021-05-24 11:29:40 -04:00
Mike Reeves e5a41b60ef Merge remote-tracking branch 'remotes/origin/dev' into pipeline 2021-05-24 09:14:03 -04:00
William Wernert 946e369a44 Merge branch 'dev' into foxtrot 2021-05-21 15:26:24 -04:00
Mike Reeves 18922ed6f5 Merge pull request #4263 from Security-Onion-Solutions/feature/merge-2.3.51
Merge 2.3.51 into dev
2021-05-21 12:47:15 -04:00
William Wernert c1dd4dafe4 Fix influx state 2021-05-21 12:41:10 -04:00
William Wernert fe3aec173f Merge branch 'master' into feature/merge-2.3.51
# Conflicts:
#	VERSION
#	salt/influxdb/init.sls
2021-05-21 12:31:54 -04:00
Mike Reeves c5d0286e24 Merge pull request #4254 from Security-Onion-Solutions/2.3.51
2.3.51
2.3.51
2021-05-21 12:15:04 -04:00
Mike Reeves 7aed01658f Sig file for 2.3.51 2021-05-20 22:10:36 -04:00
Mike Reeves de4fde4ee3 Merge pull request #4248 from Masaya-A/MAC-Address
Showing Mac Address to select suitable NICs (Discussions #4214)
2021-05-19 21:18:15 -04:00
Masaya-A 3450219bc7 Drop error to /dev/null 2021-05-20 09:33:14 +09:00
Jason Ertel b440f73336 Truncate wait_for_web_response.log before each wait invocation 2021-05-19 18:37:08 -04:00
Masaya-A 6af126b872 Fix array 2021-05-19 10:02:19 +09:00
Masaya-A ac42cba50b Adding MAC Address for NIC List 2021-05-19 09:06:02 +09:00
Masaya-A 5d263f63cb Merge pull request #10 from Security-Onion-Solutions/dev
Dev Sync
2021-05-19 08:59:49 +09:00
William Wernert f445186f1e Remove redundant error messages 2021-05-18 13:38:55 -04:00
Jason Ertel 25e2edc6d2 Reset HOTFIX with new release 2021-05-18 12:31:33 -04:00
William Wernert bdd53ed5e3 Change retry delay + count 2021-05-18 12:23:40 -04:00
Jason Ertel c207504657 Merge branch '2.3.51' of ssh://github.com/security-onion-solutions/securityonion into 2.3.51 2021-05-18 09:52:07 -04:00
Jason Ertel fe155222c2 Introduce mixed-case sensor into distributed test 2021-05-18 09:51:54 -04:00
Josh Patterson 9b4325662b Merge pull request #4218 from Security-Onion-Solutions/issue/4207
Issue/4207
2021-05-18 09:04:26 -04:00
m0duspwnens 0de1c9a669 removing unreference pillar file docker/config.sls 2021-05-18 07:57:00 -04:00
m0duspwnens ef32bff302 fix up soc.json 2021-05-17 18:29:27 -04:00
m0duspwnens e50002e0ca influx and grafana default for manager nodes - https://github.com/Security-Onion-Solutions/securityonion/issues/4207 2021-05-17 16:26:12 -04:00
William Wernert dbd5ef70c9 Change retry delay + count 2021-05-17 16:19:31 -04:00