CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-01-10 02:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,453 Commits 22 Branches 120 Tags
9f2adfb67af8aef2eaf0da1f3badb4b91af6e13a
Commit Graph

7453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Wernert
9f2adfb67a Merge branch 'master' into merge_2.3.52 
# Conflicts:
#	VERSION
 2021-06-07 14:08:17 -04:00
Mike Reeves
6e92e7283d Merge pull request #4411 from Security-Onion-Solutions/hotfix-0528 
2.3.52
2.3.52 		2021-06-07 13:55:51 -04:00
Mike Reeves
e3c16147ce 2.3.52 2021-06-07 09:34:22 -04:00
William Wernert
fd5fcfeaae Merge pull request #4402 from Security-Onion-Solutions/foxtrot 
Use variable for whiptail title and make sure all menus in setup have the same title
 2021-06-04 11:10:01 -04:00
Mike Reeves
75ff268ecc 2.3.52 2021-06-04 11:03:08 -04:00
Mike Reeves
9f98b8ad2f 2.3.52 2021-06-04 10:59:18 -04:00
William Wernert
d1d09d4aab Remove useless variable assignment 2021-06-03 14:20:52 -04:00
Mike Reeves
31365b266a Update so-zeek-stats 2021-06-03 13:53:11 -04:00
Mike Reeves
2f34e7eeed Update HOTFIX 2021-06-03 11:04:10 -04:00
William Wernert
3aff3ac7e4 Change logic to check for unmanaged nics 
Resolves issue mentioned in #4327
 2021-06-03 11:00:20 -04:00
William Wernert
d1a185aaae Further standardize whiptail titles 2021-06-03 10:59:14 -04:00
Mike Reeves
ff10432124 Update VERSION 2021-06-03 10:57:20 -04:00
William Wernert
bb5b805983 Merge branch 'fix/missing-version-string' into foxtrot 2021-06-03 10:45:02 -04:00
William Wernert
d55e007032 Merge pull request #4386 from Security-Onion-Solutions/foxtrot 
Update wording for iso location prompt in soup
 2021-06-03 09:55:15 -04:00
Mike Reeves
9ec7cbef8e Merge pull request #4391 from Security-Onion-Solutions/es-7.13.1 
Es 7.13.1 saved objects update
 2021-06-02 20:23:40 -04:00
Jason Ertel
719d841353 Update saved objects 2021-06-02 20:15:03 -04:00
William Wernert
b3f2c60065 Whiptail title fixes 
- Use a variable for the title
- Fix cases where the whiptail title wasn't changed previously
 2021-06-02 12:38:32 -04:00
William Wernert
afbf7de9e3 Remove empty lines in iso location prompt 2021-06-02 11:05:43 -04:00
Jason Ertel
dd7388e577 Merge pull request #4382 from Security-Onion-Solutions/jertel/timeouts 
Increase SOC API timeouts and ES timeout from 2m to 5m
 2021-06-02 10:28:36 -04:00
Jason Ertel
c757d21360 Increase default SOC API and ES timeouts from 2m to 5m 2021-06-02 09:38:59 -04:00
William Wernert
91c8a7c65b Use correct syntax for tar to drop directory structure 2021-06-01 12:16:56 -04:00
William Wernert
e800d62df4 Merge branch 'dev' into fix/update-iso-soup-wording 2021-06-01 11:12:17 -04:00
William Wernert
a94c598d00 Merge pull request #4333 from Security-Onion-Solutions/feature/show-version-in-setup 
Show version in setup
 2021-05-28 15:15:43 -04:00
Mike Reeves
eac5c604bd Update packetloss.sh 2021-05-28 12:57:35 -04:00
Mike Reeves
e7d8df499c Update HOTFIX 2021-05-28 12:55:57 -04:00
William Wernert
d55a9e6274 Add version to all whiptail titles 2021-05-28 10:20:19 -04:00
William Wernert
ba011581ef Add version to ending summary 2021-05-28 10:14:58 -04:00
Jason Ertel
1788ceccea Merge pull request #4329 from Security-Onion-Solutions/fix/kibana_7.13.0 
bump Kibana version to 7.13.0
 2021-05-28 09:14:18 -04:00
doug
ada8255af0 bump version to 7.13.0 2021-05-28 08:59:40 -04:00
Doug Burks
cf3dda6869 Merge pull request #4300 from j-bernal/patch-1 
Update so-whiptail
 2021-05-27 07:58:16 -04:00
Jason Ertel
d9c5976ed0 Merge pull request #4304 from Security-Onion-Solutions/feature/1596 
add menu.actions.json and update soc.json
 2021-05-26 16:41:30 -04:00
doug
aeea5701e4 completely disable both alerts.actions.json and hunt.actions.json 2021-05-26 16:34:05 -04:00
doug
ee675546ac add menu.actions.json and update soc.json 2021-05-26 14:09:00 -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
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
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
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
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