William Wernert
|
e656e5af45
|
[fix] so-functions and so-restart
|
2020-02-12 09:26:34 -05:00 |
|
William Wernert
|
fe2de8c9e4
|
Merge branch 'master' into dev
# Conflicts:
# setup/so-functions
|
2020-02-12 09:13:31 -05:00 |
|
weslambert
|
15533b7fac
|
Merge pull request #336 from Security-Onion-Solutions/hotfix/wazuh
Hotfix/wazuh
|
2020-02-11 22:45:43 -05:00 |
|
Wes Lambert
|
e76dc73ea6
|
change Wazuh install order
|
2020-02-12 03:44:20 +00:00 |
|
Wes Lambert
|
718dacf29a
|
update Wazuh order
|
2020-02-12 03:37:56 +00:00 |
|
Wes Lambert
|
0344ea7878
|
update Wazuh path
|
2020-02-12 03:34:12 +00:00 |
|
Mike Reeves
|
f7ab43e428
|
Update telegraf.conf
|
2020-02-11 19:30:17 -05:00 |
|
Josh Patterson
|
cb3977a6c2
|
Merge pull request #335 from Security-Onion-Solutions/feature/helixeps
changes to helixeps script for telegraf
|
2020-02-11 17:44:10 -05:00 |
|
m0duspwnens
|
73d5b637ad
|
changes to helixeps script for telegraf
|
2020-02-11 17:43:05 -05:00 |
|
weslambert
|
bb4a428dda
|
Merge pull request #334 from Security-Onion-Solutions/hotfix/wazuh_data_path
update Wazuh data paths
|
2020-02-11 17:18:06 -05:00 |
|
Wes Lambert
|
41db668af6
|
update Wazuh data paths
|
2020-02-11 22:16:25 +00:00 |
|
Josh Patterson
|
2df79ab909
|
Merge pull request #333 from Security-Onion-Solutions/feature/helixeps
fix pipeline name for helix eps telegraf script
|
2020-02-11 15:57:12 -05:00 |
|
m0duspwnens
|
c6a7543366
|
fix pipeline name for helix eps telegraf script
|
2020-02-11 15:53:19 -05:00 |
|
Josh Patterson
|
ae1ad31fc2
|
Merge pull request #332 from Security-Onion-Solutions/feature/helixeps
adding helix eps count for telegraf
|
2020-02-11 14:56:54 -05:00 |
|
Mike Reeves
|
0693034608
|
Merge pull request #331 from Security-Onion-Solutions/feature/wazuh
Stop wazzuh directory management
|
2020-02-11 14:56:27 -05:00 |
|
m0duspwnens
|
8b835284ef
|
adding helix eps count for telegraf
|
2020-02-11 14:55:44 -05:00 |
|
Mike Reeves
|
aa578bffba
|
Stop wazzuh directory management
|
2020-02-11 14:53:54 -05:00 |
|
Mike Reeves
|
99b1a15306
|
Helix Telegraf
|
2020-02-11 10:26:41 -05:00 |
|
weslambert
|
6a70511cc9
|
Merge pull request #330 from Security-Onion-Solutions/hotfix/wazuh_paths
update Wazuh paths
|
2020-02-11 08:54:12 -05:00 |
|
Wes Lambert
|
0994f598c7
|
update Wazuh paths
|
2020-02-11 13:45:28 +00:00 |
|
Mike Reeves
|
521de8f154
|
Update 9997_output_helix.conf
|
2020-02-10 22:47:11 -05:00 |
|
William Wernert
|
9e5c96ddfa
|
[fix] Remove containers from so-status for roles that don't use them
|
2020-02-10 17:05:48 -05:00 |
|
William Wernert
|
e07029bf6b
|
[fix] Remove containers from so-status for roles that don't use them
|
2020-02-10 16:59:06 -05:00 |
|
weslambert
|
776d5c3fcc
|
Merge pull request #328 from Security-Onion-Solutions/hotfix/wazuh_config
dont manage config
|
2020-02-10 16:23:18 -05:00 |
|
Wes Lambert
|
76305d42fc
|
dont manage config
|
2020-02-10 21:21:22 +00:00 |
|
weslambert
|
419493e52e
|
Merge pull request #327 from Security-Onion-Solutions/hotfix/wazuh_dir
change wazuh dir
|
2020-02-10 15:58:04 -05:00 |
|
Wes Lambert
|
fbeba98af8
|
change wazuh dir
|
2020-02-10 20:56:03 +00:00 |
|
Mike Reeves
|
34f6cec8e2
|
Set Unique ID in Pillar file
|
2020-02-10 14:32:36 -05:00 |
|
William Wernert
|
aa43cc4e01
|
Merge pull request #322 from Security-Onion-Solutions/hotfix/so-status
hotfix/so-status
|
2020-02-09 22:46:43 -05:00 |
|
William Wernert
|
301ff77501
|
[fix] Jinja2 templating comparisons
|
2020-02-09 22:30:39 -05:00 |
|
William Wernert
|
d29cd1caee
|
[fix] Elastalert typo
|
2020-02-09 22:30:37 -05:00 |
|
William Wernert
|
2804247f88
|
[fix] Syntax errors in so-status
|
2020-02-09 22:30:36 -05:00 |
|
William Wernert
|
95c394cae8
|
Merge pull request #321 from Security-Onion-Solutions/hotfix/checksum-offload-dir
hotfix/checksum-offload-dir
|
2020-02-08 18:46:28 -05:00 |
|
William Wernert
|
b341a7f0cd
|
[fix] Move checksum offload script dir to pre-up.d
|
2020-02-08 18:43:33 -05:00 |
|
William Wernert
|
319c22d740
|
Merge pull request #320 from Security-Onion-Solutions/hotfix/checksum-offload
hotfix/checksum-offload
|
2020-02-08 12:38:41 -05:00 |
|
William Wernert
|
9218121a23
|
[fix] checksum-offload-disable syntax errors
|
2020-02-08 12:35:52 -05:00 |
|
Mike Reeves
|
fe6990dfb3
|
Merge pull request #318 from Security-Onion-Solutions/bugfix/wazuhpath
Bugfix/wazuhpath
|
2020-02-07 16:49:11 -05:00 |
|
Mike Reeves
|
3dc73278a2
|
Fix Wazuh paths for logstash
|
2020-02-07 16:47:45 -05:00 |
|
Mike Reeves
|
9740b23b1d
|
Fix Wazuh paths for logstash
|
2020-02-07 16:42:16 -05:00 |
|
Mike Reeves
|
98a6a1d1d5
|
Merge pull request #317 from Security-Onion-Solutions/bugfix/wazuhpath
Fix Wazuh paths for logstash
|
2020-02-07 16:18:14 -05:00 |
|
Mike Reeves
|
e4a73d9773
|
Fix Wazuh paths for logstash
|
2020-02-07 16:16:28 -05:00 |
|
Mike Reeves
|
7fc0a09abf
|
Merge pull request #316 from Security-Onion-Solutions/bugfix/wazuhpath
Fix Wazuh paths for logstash/fb
|
2020-02-07 08:54:44 -05:00 |
|
Mike Reeves
|
bf6101fc30
|
Merge branch 'dev' into bugfix/wazuhpath
|
2020-02-07 08:54:32 -05:00 |
|
Mike Reeves
|
6ceb127c46
|
Fix Wazuh paths for logstash/fb
|
2020-02-07 08:52:09 -05:00 |
|
Mike Reeves
|
a77f44cf29
|
Merge pull request #315 from Security-Onion-Solutions/bugfix/wazuh
Fix Wazuh perms
|
2020-02-06 18:56:20 -05:00 |
|
Mike Reeves
|
3cfec72b40
|
Fix Wazuh perms
|
2020-02-06 18:55:23 -05:00 |
|
Josh Patterson
|
afdb2f93f0
|
Merge pull request #314 from Security-Onion-Solutions/quickfix/issue277
adjusting logstash heapsize for https://github.com/Security-Onion-Sol…
|
2020-02-06 16:19:42 -05:00 |
|
m0duspwnens
|
2f055d4c00
|
adjusting logstash heapsize for https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/277
|
2020-02-06 15:41:13 -05:00 |
|
Josh Brower
|
3b083970e6
|
Merge pull request #313 from Security-Onion-Solutions/fix/logstash-restart
Logstash restart script
|
2020-02-06 15:36:15 -05:00 |
|
Josh Brower
|
12d3ae92e7
|
Logstash restart script
|
2020-02-06 15:35:15 -05:00 |
|