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
William Wernert
a75d4841d0
Add debug lines
2021-05-10 11:05:24 -04:00
William Wernert
8b3730748b
Add debug line and remove exit command on retry failure
2021-05-10 10:58:29 -04:00
William Wernert
de5552c91a
Merge branch 'dev' into issue/3220
2021-05-10 10:33:52 -04:00
Josh Patterson
26335a9b42
Merge pull request #4140 from Security-Onion-Solutions/issue/3264
...
https://github.com/Security-Onion-Solutions/securityonion/issues/3264
2021-05-10 08:14:12 -04:00
William Wernert
f8dd6890b2
Unset/set exit on command fail for retries
2021-05-07 16:50:59 -04:00
m0duspwnens
e3ce683970
Merge remote-tracking branch 'remotes/origin/dev' into issue/3264
2021-05-07 14:48:16 -04:00
m0duspwnens
9eb63b17f9
exit if retry fails
2021-05-07 14:48:02 -04:00
Jason Ertel
407ad51244
Merge pull request #4139 from Security-Onion-Solutions/issue/4081
...
FEATURE: Pivot from Alerts/Hunt to CyberChef #4081
2021-05-07 13:31:21 -04:00
Doug Burks
293fb0a76d
FEATURE: Pivot from Alerts/Hunt to CyberChef #4081
2021-05-07 13:23:46 -04:00
Doug Burks
2e228c8355
FEATURE: Pivot from Alerts/Hunt to CyberChef #4081
2021-05-07 13:22:03 -04:00
m0duspwnens
009f7617c1
check salt-master is responding
2021-05-07 12:47:22 -04:00
William Wernert
7b29c6427b
Add preliminary error handling in soup
2021-05-07 10:55:17 -04:00
m0duspwnens
d0e084b8ea
change command to test if salt-master is accepting connections
2021-05-07 10:20:04 -04:00
m0duspwnens
46223e0b30
add quotes around minionid
2021-05-07 08:59:47 -04:00
m0duspwnens
5d3b147b42
change retry command
2021-05-06 20:32:26 -04:00
m0duspwnens
6474c296e1
dont need to specify dest rp
2021-05-06 20:26:13 -04:00
m0duspwnens
b8ad80ae35
update comment
2021-05-06 17:49:40 -04:00
m0duspwnens
78240b4b52
change retry command
2021-05-06 17:49:02 -04:00
m0duspwnens
e7c716ede4
merge with dev, use retry to check if manager up instead of sleep in soup
2021-05-06 16:44:34 -04:00
m0duspwnens
fb986b5cff
set both log levels to error
2021-05-06 14:55:14 -04:00
m0duspwnens
a49f2e2d98
change log_level_logfile to error for /opt/so/log/salt/minion
2021-05-06 13:38:16 -04:00
Mike Reeves
90b3462ead
No recurse for you
2021-05-06 13:29:15 -04:00
m0duspwnens
da528e802f
ensure migration script doesnt migrate the current days data and fix downsample cq to move from so_short_term rp
2021-05-06 12:52:47 -04:00
Josh Brower
23b4327c28
Merge pull request #4072 from petiepooo/fix-sleep
...
fix 5-second sleep
2021-05-06 12:48:34 -04:00
Mike Reeves
1de768c182
Update HOTFIX
2021-05-06 12:02:05 -04:00
William Wernert
9f6dfa4d2e
Merge pull request #4112 from Security-Onion-Solutions/master
...
Bring hotfix changes into dev
2021-05-06 10:44:25 -04:00
Mike Reeves
96c20ea3cf
Merge pull request #4080 from Security-Onion-Solutions/hotfix2
...
GRIDFIX Hotfix
2021-05-06 10:34:17 -04:00
m0duspwnens
9dbb9f519b
create so_short_term rp as default so that autogen can just be dropped once data is downsampled
2021-05-06 09:14:49 -04:00
m0duspwnens
20188549f7
add the logic for so-influxdb-migrate
2021-05-05 19:28:16 -04:00
m0duspwnens
925be17d51
clean some commas in so-influxdb-clean
2021-05-05 15:59:18 -04:00
m0duspwnens
0ea4c99102
remove support for months as it isnt supported in InfluxQL
2021-05-05 15:32:53 -04:00
m0duspwnens
db98b7ed27
verify with user before proceedig to clean
2021-05-05 15:08:11 -04:00
