Commit Graph

5448 Commits

Author SHA1 Message Date
m0duspwnens
f5a1bd4074 only try to get enrollsecret if fleet is already enabled https://github.com/Security-Onion-Solutions/securityonion/issues/1857 2020-11-09 16:25:28 -05:00
m0duspwnens
407a655717 merge with dev 2020-11-09 15:29:19 -05:00
m0duspwnens
0e19594c97 enable fleet in global pillars before running fleet state during setup https://github.com/Security-Onion-Solutions/securityonion/issues/1857 2020-11-09 15:25:11 -05:00
William Wernert
ff4d7a6cb6 [fix] Sync modules so states can use our modules during setup 2020-11-09 14:01:19 -05:00
William Wernert
f647a06239 [fix] Correct percentage steps 2020-11-09 13:37:42 -05:00
Josh Patterson
d122ca1ba3 Merge pull request #1861 from Security-Onion-Solutions/issue/1857
fix top logic for mysql for fleet/playbook
2020-11-09 13:16:28 -05:00
m0duspwnens
5616aa6beb fix top logic for mysql - https://github.com/Security-Onion-Solutions/securityonion/issues/1857 2020-11-09 13:12:45 -05:00
William Wernert
394fa727cb [fix] Don't overwrite mysql module 2020-11-09 13:05:29 -05:00
William Wernert
9960cf0592 [feat] Add salt module to check if mysql is accepting db connections 2020-11-09 12:05:37 -05:00
weslambert
059c4e03e1 Merge pull request #1860 from Security-Onion-Solutions/strelka-parsing
Pull out additional fields from Exif info
2020-11-09 11:54:55 -05:00
Wes Lambert
7e578d2ce0 Pull out additional fields from Exif info 2020-11-09 16:53:53 +00:00
William Wernert
12125deecb [feat] Show link state in whiptail menus 2020-11-09 11:06:08 -05:00
William Wernert
51256983da [fix] Make sure pip is installed on Ubuntu 2020-11-06 08:53:30 -05:00
William Wernert
0718dbbd4d Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion into dev 2020-11-06 08:52:42 -05:00
William Wernert
6b2ab67c58 [fix] Bump version of navigator json to 3.0 + fix booleans 2020-11-06 08:52:36 -05:00
Josh Patterson
64fd27fd78 Merge pull request #1843 from Security-Onion-Solutions/issue/1536
increase so-status padding by 1
2020-11-05 19:10:06 -05:00
m0duspwnens
7eb0dab6c7 increase padding by 1 - https://github.com/Security-Onion-Solutions/securityonion/issues/1536 2020-11-05 19:08:19 -05:00
Josh Patterson
0caf054da0 Merge pull request #1842 from Security-Onion-Solutions/issue/1764
show if disabled regardless of highstate status
2020-11-05 18:50:09 -05:00
m0duspwnens
21b284fb10 show if disabled regardless of highstate status - https://github.com/Security-Onion-Solutions/securityonion/issues/1764 2020-11-05 18:46:11 -05:00
Josh Patterson
3d1412a138 Merge pull request #1841 from Security-Onion-Solutions/issue/1764
Issue/1764
2020-11-05 18:24:51 -05:00
m0duspwnens
c7b4a5351c fix logic - https://github.com/Security-Onion-Solutions/securityonion/issues/1764 2020-11-05 18:17:11 -05:00
m0duspwnens
a95129b8c2 add color - https://github.com/Security-Onion-Solutions/securityonion/issues/1764 2020-11-05 18:03:42 -05:00
m0duspwnens
695bace3e8 https://github.com/Security-Onion-Solutions/securityonion/issues/1764 2020-11-05 17:54:10 -05:00
m0duspwnens
47cac59adb https://github.com/Security-Onion-Solutions/securityonion/issues/1764 2020-11-05 17:52:28 -05:00
m0duspwnens
1a75ebdca3 https://github.com/Security-Onion-Solutions/securityonion/issues/1764 2020-11-05 17:51:51 -05:00
m0duspwnens
8da070d511 https://github.com/Security-Onion-Solutions/securityonion/issues/1764 2020-11-05 17:46:23 -05:00
William Wernert
d2ea197ce0 [fix] Remove old entry for manager from known_hosts
Resolves #1839
2020-11-05 14:40:00 -05:00
William Wernert
b528fe1a03 [fix] Only show analyst on network installs
Closes #1682
2020-11-05 14:39:04 -05:00
weslambert
3abe8cb397 Merge pull request #1836 from Security-Onion-Solutions/fix/wazuh_agent_register
Don't sleep if not registering agent
2020-11-05 14:03:32 -05:00
weslambert
2911e37b70 Don't sleep if not registering agent 2020-11-05 14:03:08 -05:00
William Wernert
4fed5c2518 Merge pull request #1822 from Security-Onion-Solutions/feature/setup-idempotency
Feature/setup idempotency
2020-11-05 13:48:18 -05:00
William Wernert
a5833f1f77 Merge branch 'dev' into feature/setup-idempotency
# Conflicts:
#	setup/so-functions
2020-11-05 13:48:05 -05:00
William Wernert
b27b2e358b [fix] Set MSRVIP variable before hosts file is overwritten 2020-11-05 13:38:08 -05:00
William Wernert
915aaf58f2 [fix] Always set MSRVIP because /etc/hosts is wiped 2020-11-05 13:28:21 -05:00
William Wernert
f058fb460d [fix] Don't modify hosts file during whiptail menus 2020-11-05 13:25:02 -05:00
William Wernert
f7394559d4 [fix] Only add entry to /etc/hosts if unable to resolve hostname 2020-11-05 13:16:52 -05:00
Josh Patterson
ec3f35c360 Merge pull request #1832 from Security-Onion-Solutions/patch_2.3.3
Patch 2.3.3
2020-11-05 10:00:43 -05:00
Josh Patterson
fea6e6f4f9 Merge branch 'dev' into patch_2.3.3 2020-11-05 09:58:43 -05:00
William Wernert
cb75b2df65 [revert] Remove wazuh-agent package as well 2020-11-04 16:23:51 -05:00
William Wernert
4369b8d0f6 [fix] Remove wazuh-agent package as well 2020-11-04 16:14:58 -05:00
William Wernert
5cb8d0beda [fix] Add -q flag to grep 2020-11-04 14:23:24 -05:00
William Wernert
b4446cba9a [refactor][wip] Also backup directories in /nsm 2020-11-04 14:20:51 -05:00
William Wernert
1e41b9ba31 [fix] Add conditions for commands so they're less likely to fail 2020-11-04 14:20:26 -05:00
William Wernert
b2759c4c7c [fix] Uninstall launcher if installed 2020-11-04 14:19:25 -05:00
Mike Reeves
6b144903fc Update VERIFY_ISO.md 2020-11-04 13:47:37 -05:00
Mike Reeves
3825becd1b Update changes.json 2020-11-04 13:44:52 -05:00
Mike Reeves
2aa21512e5 Update soup 2020-11-04 13:40:45 -05:00
William Wernert
3150367b1d [fix] Add epoch string to /opt/so folder name 2020-11-04 12:52:37 -05:00
William Wernert
3ac9c43b7b Merge branch 'dev' into feature/setup-idempotency 2020-11-04 12:44:14 -05:00
William Wernert
b643363e82 [fix] Directories need -r flag 2020-11-04 12:07:34 -05:00