Commit Graph

320 Commits

Author SHA1 Message Date
AlfonsoRBJ
28d6ecae5d
Merge branch '3.7' into Issue-77_conflict_configurations 2018-11-16 12:30:00 +01:00
AlfonsoRBJ
95b19c14ab
Bump version 2018-11-16 12:24:48 +01:00
AlfonsoRBJ
5609c23607
Update CHANGELOG.md 2018-11-16 12:24:15 +01:00
AlfonsoRBJ
ccca02bea1
Update CHANGELOG.md 2018-11-16 12:23:36 +01:00
AlfonsoRBJ
7da5812365
Merge pull request #87 from wazuh/Issue-34_local_internal_options
include template local_internal_options.conf
2018-11-16 12:21:58 +01:00
AlfonsoRBJ
1369b3df41
Merge branch '3.7' into Issue-34_local_internal_options 2018-11-16 12:20:42 +01:00
AlfonsoRBJ
96054c4899
Bump version 2018-11-16 11:42:57 +01:00
AlfonsoRBJ
0b15204812
Update CHANGELOG.md 2018-11-16 11:40:24 +01:00
AlfonsoRBJ
b4471a2f03
Merge pull request #89 from wazuh/Issue-88_version_windows_installer
Changed windows agent version
2018-11-16 11:39:47 +01:00
AlfonsoRBJ
99a6a3d6b0
Merge branch '3.7' into Issue-88_version_windows_installer 2018-11-16 11:38:34 +01:00
cadoming
bdf913453e Added windows task 2018-11-16 10:34:41 +00:00
Carlos Dominguez
e4ed2b3f2b
Update CHANGELOG.md 2018-11-16 11:10:18 +01:00
AlfonsoRBJ
b89093a1a8
Bump version 2018-11-16 11:07:30 +01:00
Carlos Dominguez
0c8afb81aa
Update CHANGELOG.md 2018-11-16 11:07:15 +01:00
Carlos Dominguez
c396bf0c64
Update CHANGELOG.md 2018-11-16 11:05:15 +01:00
AlfonsoRBJ
e05bcfbbe8
Merge pull request #86 from wazuh/Issue-57_clean_code
clean old code for windows agent
2018-11-16 11:04:54 +01:00
AlfonsoRBJ
b19b9dcfae
Update CHANGELOG.md 2018-11-16 11:00:26 +01:00
cadoming
f2b3ac68bb agent configuration and monitoring 2018-11-15 12:16:05 +00:00
cadoming
6fe87697f1 Changed windows agent version 2018-11-15 10:40:57 +00:00
cadoming
8ef5e65eb7 include template local_internal_options.conf 2018-11-14 12:13:58 +00:00
cadoming
5c1f2ed783 clean old code for windows agent 2018-11-14 10:39:25 +00:00
Jesus Linares
aa1dfcdb60 Bump version: 3702 2018-11-13 06:56:07 -05:00
SitoRBJ
f4f770e435 Merge branch '3.7' 2018-11-13 12:12:26 +01:00
SitoRBJ
0a43bf038b Bump version 2018-11-13 12:08:52 +01:00
SitoRBJ
b502fcef44 Merge branch '3.7' 2018-11-13 12:01:52 +01:00
AlfonsoRBJ
546f9e0301
Update CHANGELOG.md 2018-11-13 11:50:12 +01:00
AlfonsoRBJ
14d2e1509f
Update CHANGELOG.md 2018-11-13 11:48:56 +01:00
AlfonsoRBJ
338512d61f
Update CHANGELOG.md 2018-11-13 11:13:44 +01:00
SitoRBJ
03b9462413 Merge branch '3.7' 2018-11-12 17:42:06 +01:00
AlfonsoRBJ
62938ff894
Merge pull request #71 from wazuh/Amazon-Linux-support
Support for Amazon Linux added
2018-11-12 16:41:29 +01:00
AlfonsoRBJ
d36fdb8f4f
Merge pull request #84 from wazuh/ISSUE_83
include logall_json label
2018-11-12 16:11:24 +01:00
AlfonsoRBJ
fcf7bf4b00
Merge pull request #79 from wazuh/PR-54_new_structure
client.keys registration triggers
2018-11-12 14:13:04 +01:00
root
4f2a080eb3 include logall_json label 2018-11-12 11:05:49 +00:00
AlfonsoRBJ
2b3a20b1cf
Merge pull request #82 from wazuh/3.7
New version 3.7
2018-11-12 09:00:57 +01:00
AlfonsoRBJ
cf11aea81a
Merge pull request #81 from wazuh/PR-62_add_local_rules
adding custom rules/decoders files
2018-11-09 16:29:03 +01:00
AlfonsoRBJ
f1ae819bd0
Merge pull request #80 from wazuh/PR-68_API_configuration
API configuration
2018-11-09 15:47:11 +01:00
root
87cd7c214f adding custom rules/decoders files 2018-11-09 10:35:52 +00:00
root
1007255e4a change syntax erros 2018-11-07 12:17:28 +00:00
root
ea7b685633 new changes 2018-11-07 12:11:44 +00:00
root
5c3b767f34 API configuration 2018-11-07 11:34:02 +00:00
root
5298084a62 client.keys registration triggers 2018-11-06 10:48:02 +00:00
AlfonsoRBJ
5e8380934e
Adding Wazuh License 2018-11-06 09:05:11 +01:00
AlfonsoRBJ
52084d66d5
Merge pull request #76 from wazuh/PR-55_new_structure
validate agent.conf in manager
2018-11-02 17:42:19 +01:00
AlfonsoRBJ
3d4e3ff67b
Merge pull request #75 from wazuh/PR-52_new_structure
active_response_disable configuration
2018-11-02 17:19:49 +01:00
AlfonsoRBJ
3bed9cb6b7
Merge pull request #74 from wazuh/PR-47_new_structure
agent and manager grouping task
2018-11-02 16:45:10 +01:00
AlfonsoRBJ
c9251be2b6
Merge pull request #73 from wazuh/Java-Repository-3.7-PR
Improve of the Java repository
2018-11-02 11:44:13 +01:00
root
539f94d9c1 validate agent.conf in manager 2018-11-02 10:31:00 +00:00
root
33e9150dcd active_response_disable configuration 2018-10-31 11:50:37 +00:00
root
dcd7b1a6fd agent and manager grouping task 2018-10-31 10:49:45 +00:00
root
9f4781cd9b test 2018-10-30 11:35:38 +00:00