CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-07 17:52:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,510 Commits 24 Branches 119 Tags
e22421ec99f39ea5babbfac76a3bb53c35d19f79
Commit Graph

7510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Ertel
36d13dd414 Merge branch 'dev' into kilo 2021-05-21 17:26:50 -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
William Wernert
ce9554281e Fix backwards logic 2021-05-17 16:08:34 -04:00
William Wernert
4e1fba5b38 Only echo error code if not using retry 2021-05-17 16:04:13 -04:00
William Wernert
3f238f7a4a Set flag so trap doesn't repeat info 2021-05-17 16:02:52 -04:00
William Wernert
b89091cc7d Try retrying in curl instead of shell function 2021-05-17 15:58:25 -04:00
Mike Reeves
d001597e52 Update README.md 2021-05-17 15:56:46 -04:00
Mike Reeves
4c7cee4ebc Update VERSION 2021-05-17 15:55:49 -04:00
Mike Reeves
6eed730209 Merge pull request #4213 from Security-Onion-Solutions/zeekhotfix 
Zeekhotfix
 2021-05-17 15:55:17 -04:00
William Wernert
992b76a0f0 Remove debug lines 2021-05-17 15:38:10 -04:00
William Wernert
2bcd51b21c Fix error message 2021-05-17 15:10:57 -04:00
William Wernert
3625453668 Don't unmount airgap directory if not airgap 2021-05-17 11:00:28 -04:00
William Wernert
5821a122cc Merge branch 'dev' into issue/3220 2021-05-17 10:58:06 -04:00
Josh Patterson
891e414cb6 Merge pull request #4202 from Security-Onion-Solutions/issue/3264 
Issue/3264
 2021-05-14 16:30:16 -04:00
m0duspwnens
54f9e3ff9d remove leading space on comment line 2021-05-14 16:24:16 -04:00
m0duspwnens
1c0cc15fdb Merge remote-tracking branch 'remotes/origin/dev' into issue/3264 2021-05-14 15:19:58 -04:00
m0duspwnens
231e07dbbd circumvent file.patch putting ERROR in log if patch doesnt need applied 2021-05-14 15:19:45 -04:00
m0duspwnens
3859f6464a dont be quiet on first grep 2021-05-14 08:56:42 -04:00
Josh Patterson
3668d1aadf Merge pull request #4188 from Security-Onion-Solutions/issue/3264 
install influxdb and grafana during setup prior to final highstate
 2021-05-13 11:46:57 -04:00
m0duspwnens
d3af06e7a4 handle exception if influxdb module doesnt exist 2021-05-13 11:00:42 -04:00
m0duspwnens
74f2a61b25 install influxdb and grafana during setup prior to final highstate 2021-05-13 09:06:47 -04:00
William Wernert
192b5db25a Add true to end of functions ending with shorthand comparison 
Functions ending with test using [[ <false> ]] && <cmd> will trip set -e, so adding true to the last line of the function will prevent the function from returning a nonzero code
 2021-05-12 15:26:39 -04:00
William Wernert
9ced391c11 Fix indent in main(), re-add trap, remove ERR_HANDLED variable 2021-05-12 13:20:59 -04:00
William Wernert
807b525c79 Temp remove exit on failure + bash trap 2021-05-12 11:19:33 -04:00
William Wernert
7bd04deae7 Unset exit on failure for pkill command 2021-05-12 10:45:03 -04:00
William Wernert
c379822bf0 Set variable to skip trap if error already handled 2021-05-11 12:59:49 -04:00
William Wernert
f793450d97 Return actual exit code from retry 2021-05-10 13:22:13 -04:00
William Wernert
fec868432f Try to fix bash trap 2021-05-10 11:59:22 -04:00
William Wernert
d3b08beb53 Only cat file if it exists 2021-05-10 11:11:54 -04:00