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 |
|
Jason Ertel
|
14aa9805b4
|
Stop failing an install because salt is already running when a highstate is applied at 95%
|
2021-06-06 18:20:57 -04:00 |
|
Jason Ertel
|
fdab17a3b9
|
Due to dir ownership restrictions need to run crossthestreams and eval as root
|
2021-06-06 16:36:35 -04:00 |
|
Jason Ertel
|
bebba7d280
|
Switch ownership of curl config to socore
|
2021-06-06 07:43:53 -04:00 |
|
Jason Ertel
|
11b2b2a893
|
Switch ownership of curl config to socore
|
2021-06-06 05:42:34 -04:00 |
|
Jason Ertel
|
84141082ab
|
Avoid applying state when adding web user
|
2021-06-05 08:41:48 -04:00 |
|
Jason Ertel
|
ba29b5e036
|
Do not apply salt state if already applying a state
|
2021-06-04 21:56:41 -04:00 |
|
Jason Ertel
|
e22421ec99
|
Refactor users/roles management via salt due to Salt's clobbering of the inode which breaks Docker mounts
|
2021-06-04 20:01:30 -04:00 |
|
Jason Ertel
|
416b38fc71
|
Use cronjob to ensure user synchronization
|
2021-06-04 11:24:58 -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 |
|
Jason Ertel
|
316035910f
|
Remove inotify beacon due to it not functioning as documented; Add back so-user changes to sync upon so-user changes
|
2021-06-03 15:15:35 -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 |
|
Jason Ertel
|
58ae3479dc
|
Fix mispelled db filename; ensure ELASTICCURL is used for loading config objects
|
2021-06-03 10:11:10 -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 |
|
Jason Ertel
|
2af43d62eb
|
Wrap curl param in quotes for function call
|
2021-06-03 08:53:59 -04:00 |
|
Jason Ertel
|
5c527b2c48
|
Rename username param to user since logstash is 'unique'
|
2021-06-03 07:51:43 -04:00 |
|
Jason Ertel
|
e6165f0046
|
Update kibana config load for auth changes
|
2021-06-03 07:47:32 -04:00 |
|
Jason Ertel
|
70427bc676
|
Merge branch 'dev' into kilo
|
2021-06-03 07:41:35 -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 |
|
Jason Ertel
|
fa6af06204
|
Avoid running highstate during setup when flipping auth flag
|
2021-06-02 17:13:59 -04:00 |
|
weslambert
|
cba719b3a0
|
Remove extra comma
|
2021-06-02 16:42:09 -04:00 |
|
weslambert
|
4241bb08b8
|
Add suricata/zeek until we migrate templates
|
2021-06-02 16:37:43 -04:00 |
|
Jason Ertel
|
901242f7e9
|
remove extra parenthesis
|
2021-06-02 16:23:45 -04:00 |
|
weslambert
|
4c74e7f308
|
Add event.kind and set name to module[dot]dataset
|
2021-06-02 15:35:26 -04:00 |
|
weslambert
|
db48c15f1d
|
Create event.kind field and rename dataset to be module[dot]dataset
|
2021-06-02 15:33:18 -04:00 |
|
weslambert
|
a1b34e7a88
|
Fix Suricata index name
|
2021-06-02 15:30:14 -04:00 |
|
Jason Ertel
|
fc6b3726a4
|
Fix missing colon for mode
|
2021-06-02 15:23:16 -04:00 |
|
Mike Reeves
|
9c9bcac61b
|
Update DNS queries
|
2021-06-02 15:01:14 -04:00 |
|
Jason Ertel
|
588da4d7dc
|
Resolve salt pillar/state/jinja race condition
|
2021-06-02 14:34:21 -04:00 |
|
Mike Reeves
|
e42db3cd2d
|
Fix some hunt queries
|
2021-06-02 14:05:02 -04:00 |
|
Mike Reeves
|
e8cc88174f
|
Fix some hunt queries
|
2021-06-02 13:55:05 -04:00 |
|
Mike Reeves
|
7b7111e12c
|
Fix some hunt queries
|
2021-06-02 13:53:39 -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 |
|
Jason Ertel
|
20e896cacf
|
Update all configs to pass user/pass to ES
|
2021-06-02 12:17:15 -04:00 |
|
William Wernert
|
afbf7de9e3
|
Remove empty lines in iso location prompt
|
2021-06-02 11:05:43 -04:00 |
|
Jason Ertel
|
4ff85ab0c4
|
Merge branch 'dev' into kilo
|
2021-06-02 10:39:51 -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 |
|
Mike Reeves
|
77f13961ad
|
Merge remote-tracking branch 'remotes/origin/dev' into pipeline
|
2021-06-02 10:12:17 -04:00 |
|
Mike Reeves
|
e00fe0a732
|
Enable for all modes
|
2021-06-02 10:02:11 -04:00 |
|