CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-07 17:52:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,375 Commits 24 Branches 119 Tags
79cbc747ea49aae4bf6333d199f2eee28e6dea49
Commit Graph

5375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
weslambert
533a65205f Merge pull request #1885 from Security-Onion-Solutions/fix/syslog_application 
Add check for field
 2020-11-11 10:33:24 -05:00
weslambert
ea1f53b40c Add check for field 2020-11-11 10:29:58 -05:00
Josh Patterson
0f4f029e92 Merge pull request #1883 from Security-Onion-Solutions/issue/1857 
add top change for fleet getting mysql state back
 2020-11-11 09:18:06 -05:00
m0duspwnens
da9a915421 add top change for fleet getting mysql state back was reverted in https://github.com/Security-Onion-Solutions/securityonion/pull/1880/files 2020-11-11 09:15:50 -05:00
weslambert
280fc501f9 Merge pull request #1882 from Security-Onion-Solutions/fix/extra_top_var 
Fix duplicate vars
 2020-11-11 08:53:43 -05:00
weslambert
625307ac5f Fix duplicate vars 2020-11-11 08:52:39 -05:00
weslambert
44677ad521 Merge pull request #1880 from Security-Onion-Solutions/disable_elastic 
Allow for disabling Elastic stack via pillar
 2020-11-11 08:29:23 -05:00
Wes Lambert
1c326f561b Allow for disabling Elastic stack via pillar 2020-11-11 13:26:59 +00:00
Josh Patterson
7b64f93bce Merge pull request #1874 from Security-Onion-Solutions/issue/1681 
Issue/1681
 2020-11-10 17:57:48 -05:00
m0duspwnens
15f243f0ce change names of acng and docker registry containers https://github.com/Security-Onion-Solutions/securityonion/issues/1681 2020-11-10 17:51:00 -05:00
m0duspwnens
edb00c2058 remove redundant common from top, create so-status conf files on manager before registry state https://github.com/Security-Onion-Solutions/securityonion/issues/1681 2020-11-10 17:09:38 -05:00
m0duspwnens
9e612e98ed merge with dev 2020-11-10 15:43:40 -05:00
m0duspwnens
1fc94a8f59 change to so-acng for so-status https://github.com/Security-Onion-Solutions/securityonion/issues/1681 2020-11-10 15:37:03 -05:00
m0duspwnens
c58039ab47 rename state https://github.com/Security-Onion-Solutions/securityonion/issues/1681 2020-11-10 15:34:10 -05:00
m0duspwnens
1fca5e65df redo how containers get added to so-status https://github.com/Security-Onion-Solutions/securityonion/issues/1681 2020-11-10 15:31:47 -05:00
William Wernert
676b4f0777 [fix] Close connection in mysql_conn module 2020-11-10 11:42:40 -05:00
William Wernert
6557155a8a Merge pull request #1868 from Security-Onion-Solutions/feature/improve-mysql-dep 
Feature/improve mysql dep
 2020-11-10 11:04:23 -05:00
William Wernert
d3227bbcb1 [refactor] Code cleanup pt. 3 2020-11-10 11:03:43 -05:00
William Wernert
7f218e5297 [feat] Also run query against mysql to ensure queries can complete 2020-11-10 11:02:34 -05:00
William Wernert
b3c527e7a9 [refactor] Code cleanup pt. 2 2020-11-10 10:05:06 -05:00
William Wernert
54d732a060 [refactor] Code cleanup 2020-11-10 10:01:10 -05:00
William Wernert
22b7de819c [fix] Put mysql import in try,catch in case it hasn't been installed 2020-11-10 10:00:21 -05:00
William Wernert
dba30fb0ed [refactor] Split 15 min mysql startup between two wait states 2020-11-10 09:48:20 -05:00
Josh Patterson
95b24b1684 Merge pull request #1865 from Security-Onion-Solutions/issue/1864 
make so-status line color same as service state
 2020-11-09 18:17:05 -05:00
m0duspwnens
66cd91c0a7 make so-status line color same as service state https://github.com/Security-Onion-Solutions/securityonion/issues/1864 2020-11-09 18:16:02 -05:00
Josh Patterson
64199c81e1 Merge pull request #1863 from Security-Onion-Solutions/issue/1857 
Issue/1857
 2020-11-09 17:54:25 -05:00
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
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