CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-07-14 04:43:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,682 Commits 40 Branches 127 Tags
1b6f681ae1b45cda2e0da170e95372d705dd8820
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
William WernertandGitHub 49db2a016a Merge pull request #3341 from Security-Onion-Solutions/kilo 
Kilo
 2021-03-08 08:17:29 -05:00
William Wernert a18dd869c4 Merge branch 'dev' into feature/setup 2021-03-02 10:23:33 -05:00
William Wernert 61611b8de2 Fix Elasticsearch disk space prompt 
Resolves #3205
 2021-03-02 10:23:04 -05:00
William WernertandGitHub 3e1a31c0b0 Merge pull request #3201 from Security-Onion-Solutions/sigs 
Release 2.3.30 sig
 2021-03-01 10:49:55 -05:00
William Wernert be7dcdb442 Merge branch 'master' into release-merge-fix 
# Conflicts:
#	README.md
#	VERIFY_ISO.md
#	VERSION
#	salt/docker_clean/init.sls
#	salt/soc/files/soc/changes.json
 2021-03-01 10:45:51 -05:00
William Wernert def3637bf6 Revert "[refactor] Make default route message a warning" 
This reverts commit be1f641bf0.
 2021-03-01 09:46:28 -05:00
William Wernert cf9be3521d [fix] Don't validate LS/ES heap sizes 
* Also remove comments + fix indent
 2021-03-01 09:17:36 -05:00
William Wernert 6113bcc261 [fix] Increase max integer value 2021-03-01 09:16:51 -05:00
William Wernert 810ffbdaf5 Add max to MTU input validation to encompass default + jumbo frames 2021-03-01 08:41:19 -05:00
William Wernert fd877a2256 Fix logic for configure network option in setup 2021-02-26 15:40:20 -05:00
William WernertandGitHub 069f6eccbf Merge pull request #3157 from Security-Onion-Solutions/feature/default-route-warn 
[refactor] Make default route message a warning
 2021-02-26 10:29:43 -05:00
William Wernert be1f641bf0 [refactor] Make default route message a warning 
Don't force users to exit setup if the default route and management NIC's IP don't match,
just warn them
 2021-02-26 10:27:14 -05:00
William WernertandGitHub 8910b5c3a7 Merge pull request #3155 from Security-Onion-Solutions/bugfix/fleet-hostname-input 
[fix] Change logic for collecting fleet custom hostname
 2021-02-26 09:16:22 -05:00
William Wernert 333a7e6173 [fix] Change logic for collecting fleet custom hostname 2021-02-26 09:14:30 -05:00
William Wernert b024dae72e [fix] Don't call set_main_ip a second time 2021-02-25 15:19:28 -05:00
William Wernert 6a097beaff Show log_size_limit message at end of soup instead of during 2021-02-25 10:47:29 -05:00
William Wernert 4ae34f928c Merge branch 'dev' into kilo 
# Conflicts:
#	setup/so-functions
 2021-02-24 17:05:53 -05:00
William Wernert 4a6ad7c87e Set MAINIP to MNIC_IP when using a VPN 2021-02-24 16:31:45 -05:00
William Wernert f042312aac Merge branch 'dev' into kilo 
# Conflicts:
#	salt/common/tools/sbin/soup
 2021-02-24 15:42:10 -05:00
William Wernert 775f274962 Also check /nsm/elasticsearch in soup log_size_limit check 
Reflect changes from PR#3079
 2021-02-24 14:36:41 -05:00
William Wernert e500e24802 Only show log_size_limit warning on dist if heavynode pillars exist 2021-02-24 13:56:59 -05:00
William Wernert 298f7da90b Fix indent in set_default_log_size 2021-02-24 13:56:33 -05:00
William Wernert ece79379a5 Add file name/path to log_size_limit message 2021-02-24 12:54:14 -05:00
William Wernert ac6f1df86f [fix] Only check log_size_limit on .2X -> .30 
* Since we're showing a message in the middle of soup, wait for keypress if it's shown
 2021-02-24 12:35:17 -05:00
William Wernert 4507a89d95 tar arg fix (-x -> -z) 2021-02-24 12:24:54 -05:00
William Wernert 2be7ccac33 Add function to notify user that log_size_limit may be incorrect 2021-02-24 12:24:32 -05:00
William Wernert a361ca0e19 [fix] Add managersearch node type to so-rule pillar search 2021-02-23 14:15:17 -05:00
William Wernert 9cf15cdae5 [fix] Reword so-monitor-add help message 2021-02-23 13:55:18 -05:00
William Wernert d5477b4721 Add usage/help message to so-monitor-add 2021-02-23 13:48:54 -05:00
William Wernert 5a2fa26d72 Add ET OPEN/PRO URLs 2021-02-23 13:47:52 -05:00
William Wernert 61a23509a1 [fix] grep -q doesn't give output to parse, so remove the flag 2021-02-23 13:43:10 -05:00
William Wernert 25698dafe3 Add initial pre-flight check script 2021-02-23 13:25:54 -05:00
William WernertandGitHub fa9fe82046 Merge pull request #3082 from Security-Onion-Solutions/kilo 
Add so-rule script + soup pillar changes
 2021-02-23 08:56:49 -05:00
William Wernert fad87a8789 Fix function name (.20 -> .2X) 2021-02-23 08:51:44 -05:00
William Wernert 9287209750 Merge branch 'soup2.3.30' into feature/so-rules 
# Conflicts:
#	salt/common/tools/sbin/soup
 2021-02-22 16:07:15 -05:00
William Wernert 982967fdde Merge branch 'dev' into feature/so-rules 2021-02-22 16:01:48 -05:00
William Wernert fb3af255d9 Add more info to apply messaging 2021-02-22 15:50:07 -05:00
William Wernert 3e3c923ab9 Arrange missing pillar error message better 2021-02-22 15:44:29 -05:00
William Wernert b00cc88801 [fix] Unreverse apply prompt actions 2021-02-22 15:43:56 -05:00
William Wernert e9b85337ff [fix] Only prompt if entry doesn't exist, deep compare arrays 2021-02-22 15:41:09 -05:00
William Wernert fd33a6cebe Rename script, prompt user to apply if they didn't pass --apply 2021-02-22 15:32:18 -05:00
William Wernert cdf766eeae explicitely -> explicitly 2021-02-22 14:30:26 -05:00
William Wernert 8fc82fa3ef Fix minion pillar directory 2021-02-22 14:27:22 -05:00
William Wernert e65c9e5c7c Don't expect apply arg at beginning of command 2021-02-22 11:29:30 -05:00
William Wernert 4bcb7403a9 Add apply option to end of command 2021-02-22 11:27:03 -05:00
William Wernert bef3a6921c [fix] SID wildcards are not parsed by idstools, remove 2021-02-22 11:12:02 -05:00
William Wernert f7bef9200b [fix] Only look for manager-type pillars 
* SID disabling is only managed globally for now, so don't give the option to edit a different pillar
 2021-02-22 10:38:53 -05:00
William Wernert bb6f3107bc [fix] idstools can run on an import node as well 2021-02-22 10:29:40 -05:00
William Wernert f2a1e89633 Merge branch 'dev' into feature/so-rules 2021-02-22 10:03:14 -05:00
William Wernert abae673568 Update help text to reflect arg requirement changes 2021-02-22 10:00:29 -05:00
William Wernert c73970620d [fix] Correct indent 2021-02-19 14:38:43 -05:00
William Wernert 34174a3290 Print relevant help if no/partial command passed 2021-02-19 14:34:32 -05:00
William Wernert 4689e32ce4 Add sed for curly braces in minion pillars to soup 2021-02-19 10:18:06 -05:00
William Wernert 2184c6d59f [fix] Create dict value if it doesn't exist 2021-02-19 09:31:22 -05:00
William Wernert 9183c0a92c [feat] Initial so-rules script 
* Quote curly braces in minion pillar, need to add sed function in soup
 2021-02-19 09:24:12 -05:00
William WernertandGitHub cda36f178b Merge pull request #2979 from Security-Onion-Solutions/foxtrot 
Setup fixes/improvements
 2021-02-16 17:14:59 -05:00
William Wernert 0bd5ddf6a6 Grammar + misc fixes per PR review 
* Remove unnecessary `apt-get update` commands
* Change `if ! (command); then exit 1; fi` to `command || exit 1` to avoid subshell
 2021-02-16 14:17:41 -05:00
William Wernert 3323e900ef [fix] Fix indent (pt 2) 2021-02-16 11:17:36 -05:00
William Wernert 7a9f801eb1 [fix] Add more apt-get update commands 
Fixes #2962
 2021-02-16 10:24:58 -05:00
William Wernert 38a5b86813 Make apt-get syntax consistent 2021-02-16 10:24:07 -05:00
William Wernert 23221065eb Preset MANAGERUPDATES var for airgap since we don't prompt now 2021-02-16 09:43:54 -05:00
William Wernert 5e8d09be51 [fix] Fix indent 2021-02-16 09:42:35 -05:00
William Wernert 4affb20b27 Give context to metadata tool choice 2021-02-12 13:42:14 -05:00
William Wernert 724f5cad78 Warn user if using "securityonion" as hostname 2021-02-12 12:55:55 -05:00
William Wernert 8323f3f57a [fix] Fix logic to correctly hide prompt 2021-02-12 12:23:45 -05:00
William Wernert 1ffa7afefa eval-net answerfile corrections 
* HOSTNAME: standalone -> eval
* install_type: STANDALONE -> EVAL
 2021-02-11 16:20:29 -05:00
William Wernert 188d844d27 Redirect stderr of minion grep to /dev/null 2021-02-11 13:49:39 -05:00
William Wernert d9b4c09cf0 [fix] Don't show irrelevant prompts during airgap setup 2021-02-11 10:52:18 -05:00
William Wernert ce8db8abdb [fix] Only run salt commands during reinstall if master is configured 2021-02-11 10:51:04 -05:00
William WernertandGitHub 8f0b0ac936 Merge pull request #2825 from Security-Onion-Solutions/foxtrot 
Setup: dpkg retry, whiptail changes, fix zeek state condition
 2021-02-02 14:41:48 -05:00
William Wernert 46581c0528 [fix] Don't use ZEEKVERSION var, check pillar value 2021-02-02 12:45:56 -05:00
William Wernert 2253603544 [fix] Don't try to inherit home net on standalone 2021-02-02 12:11:47 -05:00
William Wernert 8d01b87ab5 Merge branch 'dev' into foxtrot 2021-02-01 13:56:33 -05:00
William Wernert 8f476bbbdd [fix] Add back removed if statement 2021-02-01 13:11:51 -05:00
William Wernert daebe90b6e [fix] fix retry command handling 
* use eval "$cmd" to handle strings correctly
* add-apt-repo doesn't need dpkg lock so don't use retry for those lines
 2021-02-01 12:06:19 -05:00
William Wernert 44617fdddf [fix] Run command being retried within quotes 2021-02-01 11:28:28 -05:00
William Wernert 02f0ef989b [fix] <cmd> || <fail_reactor>; exit 1 will always exit, fix this 2021-02-01 11:11:01 -05:00
William Wernert 36ce389202 Remove wait_for_apt, use common retry function to run apt commands 2021-02-01 10:55:14 -05:00
William Wernert edfd985353 Merge branch 'bugfix/zeek-prompts' into foxtrot 2021-01-29 16:04:56 -05:00
William Wernert 7a3c7322fc [fix] Only check for ZEEKVERSION on manager installs 2021-01-29 15:36:50 -05:00
William Wernert f5c044e3e3 [fix] Log directory fixes 
* The playbook log dir is owned by the socore group, so we can use `su root socore`
* Addresses https://github.com/Security-Onion-Solutions/securityonion/pull/2681#issuecomment-767761670
---
* influxdb runs as root, so we can set the log directory permissions to 755 for this service
 2021-01-26 16:07:34 -05:00
William Wernert 1939fe85d7 [fix] Revert directory permission changes 2021-01-26 13:41:10 -05:00
William Wernert 7b2ec05dbf [fix] Add missing fi 2021-01-25 19:57:34 -05:00
William WernertandGitHub 2a4eac74c4 Merge pull request #2681 from Masaya-A/logrotate-fix 
Log Rotation Fix (common-rotate)
 2021-01-25 10:14:39 -05:00
William WernertandGitHub 59a4b148bc Merge branch 'dev' into logrotate-fix 2021-01-22 15:20:55 -05:00
William WernertandGitHub 2159914742 Merge pull request #2708 from Security-Onion-Solutions/bugfix/telegraf-zombie-procs 
Bugfix/telegraf zombie procs
 2021-01-22 15:20:09 -05:00
William Wernert 7273c8a066 [fix] Also rotate stenographer log as per #2681 2021-01-22 12:46:21 -05:00
William Wernert 4079f8a8e8 [fix] Telegraf doesn't clean up zombie processes, use init flag to fix this 2021-01-22 12:23:09 -05:00
William Wernert f1781b1fde [fix] Set timeout for scripts (15s, 3x default 5s) 2021-01-22 12:15:29 -05:00
William Wernert 8023e79020 [fix] Don't remove answer file when checking version on manager, file does not yet exist 2021-01-19 11:28:33 -05:00
William Wernert 650008e1e6 [fix] Replace leftover /root/install_opt strings with variable 2021-01-19 11:20:53 -05:00
William Wernert 32839f8a53 [feat] Various input validation changes + fixes 
* Keep invalid input in subsequent prompts
* Remove useless placeholder values
* Only set PROCS variable once
* Make input collection loops more consistent
 2021-01-15 18:05:29 -05:00
William Wernert 8cb836a17a [fix] Don't preset HOSTNAME var, interferes with automation 2021-01-15 16:22:07 -05:00
William Wernert 432d231a0e [fix] Don't use set -e since we depend on non-zero exit codes for this function 2021-01-15 13:52:10 -05:00
William Wernert 9726ff9ce6 [fix] Correct logic for verbose flag 2021-01-15 13:39:12 -05:00
William Wernert e440f6c44a [fix] Set variables used by sensor pillar before generating the pillar 2021-01-15 10:29:51 -05:00
William Wernert ed129bcf1f [fix] Add verbose flag so that so-monitor-add only sees necessary information 2021-01-15 09:25:04 -05:00
William Wernert f4de5e28bf [fix] Padding 3->4 spaces, don't use lookup_pillar before salt is installed 2021-01-15 08:57:14 -05:00
William Wernert 0f6805823e [fix] Add spacing to whiptail menu + preset err 2021-01-15 08:35:37 -05:00
William Wernert dbe22f901d [fix] Add jinja raw block to so-common 2021-01-14 14:54:37 -05:00