CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-07-23 01:05:40 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,110 Commits 47 Branches 127 Tags
cd766753eb0a09ce41fa892c0016632ddce7eb49
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
William Wernert 6c9c60b8dd Merge branch 'master' into dev 
# Conflicts:
#	VERSION
 2020-07-24 11:50:34 -04:00
William Wernert f3c24f1f01 [fix] Add check for $TESTING 2020-07-21 16:43:21 -04:00
William WernertandGitHub c70bb9e58f Merge pull request #1053 from Security-Onion-Solutions/feature/storage-calculation 
Feature/storage calculation
 2020-07-21 16:41:12 -04:00
William Wernert 752d1bceb4 [fix] Remove old storage space check 2020-07-21 16:36:37 -04:00
William Wernert ddf0a5055e [fix] Exit on NO 2020-07-21 16:34:08 -04:00
William Wernert 003271127a [feat] Only check storage during setup on a network install 2020-07-21 16:32:28 -04:00
William Wernert c531395452 Merge branch 'dev' into feature/storage-calculation 2020-07-21 16:24:28 -04:00
William Wernert e43829b22c [fix] Add then to if statement 2020-07-21 16:24:13 -04:00
William Wernert d6f7dcb630 [refactor] Changes to storage requirements 
See #1047
 2020-07-21 15:35:13 -04:00
William Wernert edcf834635 Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev 
# Conflicts:
#	salt/common/tools/sbin/so-elastic-clear
 2020-07-20 14:23:23 -04:00
William Wernert 9be4756a90 [fix] Resolve merge commits 2020-07-20 14:22:55 -04:00
William Wernert 3c855ed793 [fix] Set $percentage since it only exists in previous subshell 2020-07-17 15:38:14 -04:00
William Wernert 5570c778ad [feat] Add hostname formatting check for manager hostname 2020-07-17 13:30:08 -04:00
William Wernert 1309e0c7ad Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev 2020-07-17 13:09:21 -04:00
William Wernert 446817353d [refactor] | tee ... >> to > ... 2>> to show errors in log 2020-07-17 13:09:18 -04:00
William Wernert 1abf324654 [fix] Set py_ver_url_path for all install types 2020-07-17 12:59:17 -04:00
William Wernert d88e15ecb4 [fix] Use | tee instead of redirect when already redirecting to setup log 2020-07-17 12:33:25 -04:00
William Wernert 9cbc7ad8f5 [fix] guage -> gauge 2020-07-17 12:08:16 -04:00
William Wernert 1bd154760d Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev 2020-07-17 11:09:11 -04:00
William Wernert ede250d9e4 [feat] Merge access method dialogs together 2020-07-17 11:09:08 -04:00
William Wernert d97271cca3 [fix] Don't drop to shell while running so-allow 2020-07-17 11:08:31 -04:00
William Wernert 958d614bef [fix] Only show motd ip message on manager node 2020-07-17 09:21:47 -04:00
William Wernert 25dbcfaebe [refactor] Add check for "Result: False" in setup 2020-07-16 14:08:56 -04:00
William Wernert 8f62cd8f82 Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev 2020-07-16 11:33:20 -04:00
William Wernert a041be5c21 [fix] Don't force YARA Strelka rules during setup 2020-07-16 11:33:11 -04:00
William WernertandGitHub 5190e5d434 Update README.md 2020-07-16 09:20:20 -04:00
William WernertandGitHub 3df5904269 Merge pull request #979 from Security-Onion-Solutions/feature/setup 
Feature/setup
 2020-07-14 11:17:03 -04:00
William Wernert caf9e3f75a [fix] Redirect hive_init output to log 2020-07-14 11:13:50 -04:00
William Wernert ad3c4c4950 [fix] master -> manager 2020-07-14 11:09:12 -04:00
William Wernert 4ab90a9a30 [fix] Move redirect var to function after $MAINIP has been set 2020-07-14 10:12:51 -04:00
William Wernert 178ac79da8 [refactor] Set $REDIRECTIT outside of subshell 2020-07-14 09:05:09 -04:00
William Wernert aa4d435020 [fix] Don't run so-allow before setup complete menu 2020-07-13 15:21:05 -04:00
William Wernert 81c8185cb5 [refactor] Delete check for network install since we check /nsm now 2020-07-13 14:53:47 -04:00
William Wernert 1cf0732991 Merge branch 'dev' into feature/setup 
# Conflicts:
#	setup/so-setup
 2020-07-13 14:35:24 -04:00
William Wernert 00f178197c [fix] Evaluate $success early to avoid checking against other output 2020-07-13 14:34:11 -04:00
William Wernert c585713122 [style] Change SO_ERROR check to non-empty check 2020-07-13 13:28:54 -04:00
William Wernert 06aa63dd14 Merge branch 'dev' into feature/setup 2020-07-13 11:24:04 -04:00
William Wernert c31c24ccd8 [fix] Check /nsm instead of / for free space 2020-07-13 09:12:24 -04:00
William WernertandGitHub 99dc16d644 Merge pull request #981 from Security-Onion-Solutions/bugfix/disk-space-network-only 
[fix] Only check for disk space on a network install
 2020-07-10 18:52:48 -04:00
William Wernert 605daaf66b [fix] Only check for disk space on a network install 2020-07-10 18:45:34 -04:00
William Wernert 056b3a0629 Merge branch 'dev' into feature/setup 
# Conflicts:
#	setup/so-setup
 2020-07-10 18:41:24 -04:00
William Wernert f9c8f8cdca [fix] Set SKIP_REBOOT on any failure during setup 2020-07-10 18:40:39 -04:00
William Wernert aee304e5d5 [fix] master -> manager 2020-07-10 18:13:20 -04:00
William Wernert 4cfecae3b2 [ix] Remove grafanapassword pillar key 2020-07-10 17:59:51 -04:00
William Wernert ce7373501b [fix] Add fallback for hive + cortex users 2020-07-10 17:58:47 -04:00
William Wernert 571e97cdf7 Merge branch 'dev' into feature/setup 
# Conflicts:
#	salt/thehive/scripts/cortex_init
#	salt/thehive/scripts/hive_init
#	setup/so-functions
#	setup/so-whiptail
 2020-07-10 17:42:56 -04:00
William Wernert 547298fce0 [refactor] Hide output for cortex and thehive init scripts 2020-07-10 17:34:33 -04:00
William Wernert f56811e745 [feat] Use setup user+pass for TheHive, Cortex, and Fleet as well 2020-07-10 14:40:04 -04:00
William Wernert 67c8836cd6 [fix] Use 100GB min space for standalone also 2020-07-10 14:39:02 -04:00
William Wernert 72aa91b763 [feat] Add message in setup and motd on where to access SOC 2020-07-10 14:38:21 -04:00
William Wernert c5eff1d89e [feat][WIP] Add option to run so-allow -a <ip/cidr> during setup 2020-07-09 14:47:55 -04:00
William Wernert 4231fb1d1a Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev 2020-07-07 17:38:30 -04:00
William Wernert 72a98b33a7 [fix] Change test to check value of $SO_ERROR 2020-07-07 17:38:23 -04:00
William Wernert 640cfee3e1 Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev 2020-07-07 13:13:28 -04:00
William Wernert 3815f7e58e [refactor] Edit logic around setup failure/completion 
* Always run `install_cleanup` and `so-allow`
* Change if statement to check whether `$success != 0` or if `$SO_ERROR` was set
* Set `$IP` only for `so-allow` instead of exporting it
 2020-07-07 13:12:46 -04:00
William Wernert 1d47cec928 [refactor] Move install_cleanup outside of whiptail functions 2020-07-07 13:02:58 -04:00
William Wernert 0b995533ea [refactor] Only notify user of error found during setup 2020-07-07 13:01:29 -04:00
William Wernert e2c9184b29 [fix][refactor] Don't use relative path in so-setup-network 2020-07-07 08:45:28 -04:00
William Wernert 57bbb02c65 [refactor][fix] Move nmcli status list gen to a function 
nmcli is only assured to be installed after detect_os is run so move this command to a function so it can run after detect_os
 2020-07-02 17:18:56 -04:00
William Wernert 99d490bc06 [fix][refactor] Move detect_ec2 and add echo statement 2020-07-02 17:15:46 -04:00
William WernertandGitHub b9a176201f Merge pull request #913 from Security-Onion-Solutions/feature/setup-changes 
Feature/setup changes
 2020-07-02 14:01:46 -04:00
William Wernert d2ba25e784 Merge branch 'dev' into feature/setup-changes 
# Conflicts:
#	setup/so-setup
 2020-07-02 14:00:10 -04:00
William Wernert c7a3cc9c17 [fix][revert] Change source in so-allow to correct path 2020-07-02 08:58:14 -04:00
William Wernert aeda3fde74 [revert] Remove regex from setup log grep 2020-07-01 17:39:04 -04:00
William Wernert 408b5ee32d [ix] Fix if conditions 2020-07-01 17:25:26 -04:00
William Wernert b671f28562 [fix] Rename function whiptail_bond_nics to whiptail_sensor_nics 2020-07-01 16:32:33 -04:00
William Wernert 85a3f3c277 Merge branch 'dev' into feature/setup-changes 2020-07-01 16:24:55 -04:00
William Wernert b4f9fe5f54 [fix] Remove quotes 2020-07-01 16:24:41 -04:00
William Wernert b75cb36058 Merge branch 'feature/ec2_setup' into feature/setup-changes 2020-07-01 16:23:48 -04:00
William Wernert 54c3327240 [refactor] Simplify ec2 detection + handling 2020-07-01 16:23:38 -04:00
William Wernert 4b5571a8d6 [refactor][fix] Remove unnecessary variable 2020-07-01 13:56:15 -04:00
William Wernert 44890edc79 [refactor] Use regex in error check for setup log 2020-07-01 13:51:54 -04:00
William Wernert db764902c7 [fix] Change if condition when checking nmcli status 2020-07-01 13:05:11 -04:00
William Wernert 19b997ece0 Merge branch 'dev' into feature/setup-changes 2020-07-01 12:56:57 -04:00
William Wernert 7bb97f2b2d [fix] Remove "Panel Title" from Kibana CPU graph 
Resolves #874
 2020-07-01 11:12:21 -04:00
William Wernert 90f4b8e043 [feat] Add welcome/instruction wording to initial menu 2020-07-01 11:03:18 -04:00
William Wernert c97798b57d [feat] Add check to see if bond nics are managed by Network Manager 2020-07-01 09:43:39 -04:00
William Wernert 3a9d252af3 [fix] Correct indent in create_local_directories() 2020-07-01 09:42:07 -04:00
William WernertandGitHub de620c88a1 Merge pull request #910 from Security-Onion-Solutions/version-correction 
Remove HH prefix to ensure compatibility with updated build system
 2020-06-30 15:57:30 -04:00
William Wernert 8dedd60da8 Merge branch 'feature/fast-fail' into feature/setup-changes 2020-06-30 14:27:04 -04:00
William Wernert ce8a59243c [feat] Add grep for "Error" to fail if nmcli fails 2020-06-30 14:26:48 -04:00
William Wernert 8d624e6ade [fix] Move navigatordefaultlayer file.managed state to nginx sls 2020-06-30 10:53:10 -04:00
William Wernert cab232ae9f [feat] Add check for disk space during setup 2020-06-30 10:11:02 -04:00
William Wernert 1022bf5b99 [fix] Apply regex filter to hostname input 2020-06-30 09:08:55 -04:00
William Wernert 9f39875192 [fix] Apply regex filter to hostname input 2020-06-30 09:01:19 -04:00
William Wernert fdaab8da9f Merge branch 'dev' into feature/setup-changes 2020-06-29 15:54:36 -04:00
William Wernert 23c0363899 [fix] Reference correct directory in nginx sls and remove navigator sls 2020-06-29 15:54:17 -04:00
William Wernert b97ecd2d7a Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev 2020-06-29 15:53:29 -04:00
William Wernert 0a97328acc [fix] Apply regex filter to hostname input 2020-06-29 15:53:21 -04:00
William Wernert 53c3b1579b [feat] Reformat install type menu 2020-06-29 15:20:17 -04:00
William Wernert 8e15f858dd Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev 
# Conflicts:
#	salt/common/tools/sbin/so-allow
 2020-06-29 15:14:12 -04:00
William Wernert 8cbccb656d [fix] Apply shellcheck fixes 2020-06-29 11:32:25 -04:00
William Wernert b01bdf35f9 [fix] Remove port binding from telegraf docker state 2020-06-29 11:31:44 -04:00
William WernertandGitHub 22eb81128a Merge pull request #891 from Security-Onion-Solutions/feature/navigator-to-nginx 
Feature/navigator to nginx
 2020-06-26 15:48:46 -04:00
William Wernert cf7e5f1b6f [fix] Change permissions on so-yara-update + fix indents 2020-06-26 09:59:44 -04:00
William Wernert a45fbb6f5c Revert "[fix] discovery.zen.minimum_master_nodes is deprecated, update the key" 
This reverts commit 8bd6c067aa.
 2020-06-25 10:53:26 -04:00
William Wernert 8bd6c067aa [fix] discovery.zen.minimum_master_nodes is deprecated, update the key 2020-06-24 13:10:18 -04:00
William Wernert bd36749959 [feat] Remove navigator container references 2020-06-24 12:38:32 -04:00
William Wernert 4404a4f312 Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev 2020-06-23 17:57:19 -04:00
William Wernert 0a0fe5914a [fix][feat] Move navigator entries to static files + fix indent 2020-06-23 17:57:14 -04:00