Commit Graph

2519 Commits

Author SHA1 Message Date
m0duspwnens
22127a3d58 Merge remote-tracking branch 'remotes/origin/dev' into issue/90 2020-03-26 11:01:10 -04:00
m0duspwnens
cfdaedb89c changes to healthcheck. specify mount points for telegraf 2020-03-26 11:00:46 -04:00
William Wernert
83c2edb0d9 [fix] Set all indents to tabs 2020-03-25 15:59:04 -04:00
William Wernert
ecbd78c6a1 [feature] Add options to soctopus.conf
Resolves #420
2020-03-25 15:38:42 -04:00
William Wernert
693e3e69de [fix] Manage soctopus.conf separately
Resolves #419
2020-03-25 15:37:35 -04:00
Josh Brower
e5ecf0f4cb Fleet dedicated node - various fixes 2020-03-25 13:03:40 -04:00
m0duspwnens
e6f91264fb send proper format data to telegraf module from healtheck module - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/90 2020-03-25 12:48:47 -04:00
m0duspwnens
566a26e3b7 fix dashboards to use right node name 2020-03-25 12:47:01 -04:00
Josh Brower
05690691f5 Merge pull request #459 from Security-Onion-Solutions/feature/communityid-suricata
Suricata - enable community id
2020-03-25 09:28:02 -04:00
Josh Brower
51b9af7ac4 Suricata - enable community id 2020-03-25 09:24:45 -04:00
m0duspwnens
77a48b1d66 Merge remote-tracking branch 'remotes/origin/dev' into issue/90 2020-03-25 09:03:16 -04:00
Josh Brower
9bcba41882 Feature/Fleet-Standalone 2020-03-24 20:57:24 -04:00
m0duspwnens
b96579f6d3 Merge remote-tracking branch 'remotes/origin/dev' into issue/90 2020-03-24 17:28:46 -04:00
m0duspwnens
7e6c70aff2 add modules to be used in monitoring - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/90 2020-03-24 17:27:55 -04:00
Josh Brower
e4e598f0be Merge pull request #458 from Security-Onion-Solutions/bugfix/so-functions
so-functions --- conditional-fix
2020-03-24 16:01:12 -04:00
Josh Brower
166a21c1d1 conditional-fix 2020-03-24 15:59:50 -04:00
weslambert
b59fc5b77e Merge pull request #457 from Security-Onion-Solutions/fix/more_ossec_fields
fix ossec fields
2020-03-24 11:44:45 -04:00
Wes Lambert
ef808875f4 fix ossec fields 2020-03-24 15:42:31 +00:00
weslambert
239e0a0cb6 Merge pull request #456 from Security-Onion-Solutions/kibana_disable_telem
Disable telemetry
2020-03-24 10:20:51 -04:00
weslambert
fef0185e90 Disable telemetry 2020-03-24 10:18:39 -04:00
weslambert
81a481022c Merge pull request #455 from Security-Onion-Solutions/fix/zeek_weird_ingest
add some more fields
2020-03-23 23:44:47 -04:00
Wes Lambert
083c588a87 add some more fields 2020-03-24 03:43:31 +00:00
weslambert
a01b0e44e1 Merge pull request #454 from Security-Onion-Solutions/es_template_fix
Add message field
2020-03-23 23:39:44 -04:00
weslambert
ece7e139f2 Add message 2020-03-23 23:39:15 -04:00
weslambert
126913e41b Merge pull request #453 from Security-Onion-Solutions/fix/kibana_config_load
Fix/kibana config load
2020-03-23 23:24:09 -04:00
weslambert
f5e932ab58 Re-enable load script 2020-03-23 23:23:32 -04:00
weslambert
1a44b744f7 Update so-kibana-config-load 2020-03-23 23:23:04 -04:00
weslambert
1c153b9081 Fix path 2020-03-23 23:09:00 -04:00
Mike Reeves
d3ecfe543f Update so-functions 2020-03-23 18:08:27 -04:00
weslambert
5207ca71c9 Merge pull request #452 from Security-Onion-Solutions/fix/remove_dupe
Update init.sls
2020-03-23 17:07:50 -04:00
weslambert
951a087c20 Update init.sls 2020-03-23 17:07:18 -04:00
weslambert
2ae3ff7490 Merge pull request #451 from Security-Onion-Solutions/fix/saved_objects_config
Fix/saved objects config
2020-03-23 15:58:20 -04:00
Wes Lambert
0b6ff18a0d change default route 2020-03-23 19:57:41 +00:00
Josh Patterson
6c39f93569 Merge pull request #450 from Security-Onion-Solutions/issue/90
adding zeekctl module to be used for monitoring zeek
2020-03-23 15:57:12 -04:00
m0duspwnens
bc76739f6e adding zeekctl module to be used for monitoring zeek - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/90 2020-03-23 15:55:45 -04:00
Wes Lambert
fe0ab0965a move saved_objects 2020-03-23 19:55:07 +00:00
weslambert
79feee1dd1 Merge pull request #449 from Security-Onion-Solutions/fix/kibana_master
Fix master and remark config load
2020-03-23 15:36:38 -04:00
weslambert
8edecfceb9 Fix master and remark config load 2020-03-23 15:36:12 -04:00
Mike Reeves
c88a356a73 Merge pull request #448 from Security-Onion-Solutions/feature/updates
Feature/updates
2020-03-23 15:20:46 -04:00
Mike Reeves
a48ecfbbb1 Merge branch 'dev' into feature/updates 2020-03-23 15:20:36 -04:00
weslambert
c8345753ac Merge pull request #447 from Security-Onion-Solutions/fix/kibana_state
Fix/kibana state
2020-03-23 15:17:04 -04:00
weslambert
8e9cffad4a Update init.sls 2020-03-23 15:15:05 -04:00
weslambert
2a5ab3492d Update init.sls 2020-03-23 15:14:42 -04:00
Mike Reeves
98caae8ec9 Update Stuff round 3 2020-03-23 15:12:36 -04:00
weslambert
9c29f39cc1 Merge pull request #446 from Security-Onion-Solutions/fix/kibana_docker_image
Update init.sls
2020-03-23 14:50:54 -04:00
weslambert
8d0659c200 Update init.sls 2020-03-23 14:50:34 -04:00
weslambert
c1e3a00d22 Merge pull request #445 from Security-Onion-Solutions/fix/kibana_config
more Kibana config
2020-03-23 14:12:11 -04:00
Wes Lambert
a43154e0eb more Kibana config 2020-03-23 18:07:12 +00:00
Mike Reeves
b48612dd3b Update Stuff Round 2 2020-03-19 13:46:19 -04:00
William Wernert
d21df50689 Merge pull request #439 from Security-Onion-Solutions/bugfix/html-formatting
[fix] HTML formatting and css changes
2020-03-19 10:09:12 -04:00