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
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
Jason Ertel
fa6af06204
Avoid running highstate during setup when flipping auth flag
2021-06-02 17:13:59 -04:00
Jason Ertel
3a134cc706
fix merge conflicts
2021-06-02 09:16:28 -04:00
Jason Ertel
7aede4d058
Persist chown/chmod settings on users/roles files
2021-06-02 09:01:16 -04:00
Jason Ertel
2a2247e1da
Additional so-user sync adjustments
2021-06-01 14:45:01 -04:00
Jason Ertel
7a59bee315
Add so-elastic-auth script
2021-06-01 12:48:53 -04:00
Jason Ertel
ed8c85df2b
Only sync web users if teh sqlite db exists
2021-06-01 10:26:33 -04:00
Jason Ertel
b8a10f2e86
Support multiple elastic system users
2021-05-28 15:59:51 -04:00
m0duspwnens
0134ceef16
merge and resolve conflict in elasticsearch state
2021-05-27 11:33:44 -04:00
Jason Ertel
b43e6c5d6b
Salt will handle auto-sync
2021-05-26 13:51:24 -04:00
Jason Ertel
c531ef0773
Move user sync'd files to saltstack for grid propagation
2021-05-26 13:44:30 -04:00
Jason Ertel
a6a4c03029
Improve error scenarios for user sync; Ensure user sync runs before Elastic container starts
2021-05-26 12:08:10 -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
Jason Ertel
ec2f8fe6c8
Synchronize SOC passwords with Elastic
2021-05-25 17:16:05 -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
m0duspwnens
5a1e8d9fe9
update kibana scripts for elastic auth
2021-05-25 08:50:55 -04:00
William Wernert
3bc0def02a
Add failure message to salt-master check
2021-05-24 16:45:05 -04:00
Jason Ertel
8c6489a49a
Initial pass at synchronizing users file
2021-05-24 15:48:05 -04:00
William Wernert
ffd5bfc480
Force images from automated branches to a very high semver
2021-05-24 15:25:03 -04:00
m0duspwnens
a4226cc39a
use elastic map file
2021-05-24 15:14:05 -04:00
William Wernert
686c7c5a6c
Add exception handling for docker API error to so-docker-prune
2021-05-24 13:26:43 -04:00
Jason Ertel
409eea677d
Continue removal of argon hashing
2021-05-24 11:50:53 -04:00
William Wernert
99d41d1606
Add ending newline to soup
2021-05-24 11:29:40 -04:00
m0duspwnens
e2d5102a0e
changes for script to auth to elastic
2021-05-24 10:13:29 -04:00
Jason Ertel
0572ea4095
Fail curl command if a failing status code is returned by the remote server
2021-05-21 17:27:11 -04:00
William Wernert
946e369a44
Merge branch 'dev' into foxtrot
2021-05-21 15:26:24 -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
Jason Ertel
b440f73336
Truncate wait_for_web_response.log before each wait invocation
2021-05-19 18:37:08 -04:00
William Wernert
f445186f1e
Remove redundant error messages
2021-05-18 13:38:55 -04:00
William Wernert
bdd53ed5e3
Change retry delay + count
2021-05-18 12:23:40 -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
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
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