Commit Graph

3116 Commits

Author SHA1 Message Date
m0duspwnens
ae5bc297dd remove extra squigly https://github.com/Security-Onion-Solutions/securityonion/issues/1857 2020-11-09 17:06:32 -05:00
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
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
Wes Lambert
7e578d2ce0 Pull out additional fields from Exif info 2020-11-09 16:53:53 +00: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
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
weslambert
2911e37b70 Don't sleep if not registering agent 2020-11-05 14:03:08 -05:00
William Wernert
a5833f1f77 Merge branch 'dev' into feature/setup-idempotency
# Conflicts:
#	setup/so-functions
2020-11-05 13:48:05 -05:00
Josh Patterson
fea6e6f4f9 Merge branch 'dev' into patch_2.3.3 2020-11-05 09:58:43 -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
3ac9c43b7b Merge branch 'dev' into feature/setup-idempotency 2020-11-04 12:44:14 -05:00
Mike Reeves
e989fc7041 Update map.jinja 2020-11-04 10:58:52 -05:00
Mike Reeves
4592e2d4d7 add airgap option to upgradecommand 2020-11-04 10:08:01 -05:00
Mike Reeves
ec64314b70 Fix soup to clear yum cache for airgap 2020-11-04 10:00:44 -05:00
Mike Reeves
cf001875c2 Update soup 2020-11-03 20:14:15 -05:00
Mike Reeves
c7367eea38 Fix AGREPO Variable 2020-11-03 19:08:58 -05:00
Mike Reeves
8edb1529a9 Update soup 2020-11-03 17:36:53 -05:00
Mike Reeves
e8616e4d46 Update soup 2020-11-03 17:19:55 -05:00
William Wernert
6169758f4e [fix] 0 -> root so file owner is set correctly 2020-11-03 16:47:59 -05:00
William Wernert
57e7e61f21 [fix] Don't add proxy to yum.conf on manager nodes 2020-11-03 15:45:19 -05:00
Mike Reeves
887f412e48 Remove docker_clean from docker_update function 2020-11-03 13:54:00 -05:00
Jason Ertel
aa9aa59213 Correct cheatsheetUrl for airgap installs 2020-11-03 12:27:55 -05:00
m0duspwnens
a859aa4f48 upgrade from salt 3001.1 to salt 3002.1 - https://github.com/Security-Onion-Solutions/securityonion/issues/1807 2020-11-03 11:54:28 -05:00
Jason Ertel
82a7b7e02d Upgrade to Kratos 0.5.3-alpha1 2020-11-03 11:50:25 -05:00
Wes Lambert
7dca988c11 Remove Wazuh API creds after registering intial agent 2020-11-03 14:53:50 +00:00
Wes Lambert
05549a2362 Add Zeek intel.dat 2020-11-02 21:36:44 +00:00
Wes Lambert
24a54a326c Allow for muliple files for rules 2020-11-02 21:03:45 +00:00
Jason Ertel
184d163d65 Do not persist the Cortex PID file; This allows Cortex to recover from non-graceful container shutdowns, such as a power loss event on the host machine 2020-11-02 15:04:13 -05:00
Wes Lambert
3113d5fbdb Format scan.exiftool as text 2020-11-02 19:31:14 +00:00
Wes Lambert
6420ee0310 Update parsing for scan.exiftool 2020-11-02 19:28:12 +00:00
weslambert
71a260a000 Match max-pending-packets size 2020-11-02 08:38:45 -05:00
William Wernert
b489fee8b5 Merge pull request #1738 from Security-Onion-Solutions/bugfix/nginx-redirect
Bugfix/nginx redirect
2020-10-29 14:33:38 -04:00
William Wernert
91221c4332 [revert] Move proxy_pass back to ip 2020-10-29 10:23:12 -04:00
William Wernert
3abd1c9f16 [fix] Configure soctopus to use url_base 2020-10-28 16:08:19 -04:00