Commit Graph

4838 Commits

Author SHA1 Message Date
Jesús Ángel
0318dcaa54 Merge remote-tracking branch 'origin/redesign-configuration' 2019-03-05 14:00:08 +01:00
Jesús Ángel
fb8d37e395 Merge remote-tracking branch 'origin/deamons-status' 2019-03-05 13:59:43 +01:00
Jesús Ángel
7a38fdce22 New design for Management > Configuration, Agent > Configuration 2019-03-05 13:56:04 +01:00
Jesús Ángel
989b3b3f5b Unescape back slash for JSON raw content 2019-03-05 13:38:08 +01:00
Jesús Ángel
8bdd9ec486
Merge pull request #1288 from wazuh/filter-by-name
Add name filter tag
2019-03-05 12:10:29 +01:00
JuanCarlos
b54b95cd26 Add name filter tag 2019-03-05 11:46:01 +01:00
Juanka Rodríguez
033efdb342
Update status.html 2019-03-04 17:37:12 +01:00
JuanCarlos
ea22c75a16 Fix typo 2019-03-04 17:31:58 +01:00
JuanCarlos
3dc48e9ea1 Deamons status design changed 2019-03-04 17:21:07 +01:00
Jesús Ángel
cf6de7c42d Merge branch '3.9-6.6' 2019-03-04 17:04:23 +01:00
Jesús Ángel
76ba1e6bc8 Fix typo 2019-03-04 17:04:06 +01:00
Jesús Ángel
06575fce92 Merge branch 'jobs' 2019-03-04 16:47:06 +01:00
Jesús Ángel
312e4c0e08 Yarn lint, yarn prettier 2019-03-04 16:43:19 +01:00
Jesús Ángel
7025a1e273 Add job to queue if "delay" parameter exists 2019-03-04 16:38:51 +01:00
Jesús Ángel
82fcfddfe7 Added job queue module 2019-03-04 16:38:33 +01:00
Jesús Ángel
010b72be18 Launch queue cron job 2019-03-04 16:38:07 +01:00
Jesús Ángel
bcd7c4671b Using new flag "delay" 2019-03-04 16:37:49 +01:00
Jesús Ángel
346a5b2e42 Fix typo 2019-03-04 15:21:23 +01:00
Jesús Ángel
b3adb0af62 Merge branch '3.9-6.6' 2019-03-04 14:14:19 +01:00
Jesús Ángel
a54c8816ef
Merge pull request #1282 from wazuh/delete-files
Delete and verify overwriting on rules/decoders/lists files
2019-03-04 14:11:56 +01:00
JuanCarlos
48cdeb9c63 Fix typo 2019-03-04 13:41:43 +01:00
JuanCarlos
751dbd1479 Merge 3.9 2019-03-04 13:32:35 +01:00
JuanCarlos
c8ea1bfa94 Rework overwrite files 2019-03-04 13:28:17 +01:00
Jesús Ángel
2ab8f4f8d4 Merge branch '3.9-6.6' 2019-03-04 13:19:35 +01:00
Jesús Ángel
12261a7786
Merge pull request #1281 from wazuh/custom-timeseries
Improved visualizations
2019-03-04 13:19:11 +01:00
Jesús Ángel
54034ac46b Merge branch '3.9-6.6' into custom-timeseries 2019-03-04 12:55:48 +01:00
Jesús Ángel
fdc2217d4e Force overwrite when sending ossec.conf updates 2019-03-04 12:55:26 +01:00
JuanCarlos
b41db7d315 Check adminMode 2019-03-04 12:33:29 +01:00
Jesús Ángel
315100fdcd Moved network tables to top of the view 2019-03-04 12:19:25 +01:00
Jesús Ángel
041d65ae07 Updated visualization titles 2019-03-04 12:19:07 +01:00
Jesús Ángel
83191bf514 Updated cloud visualizations 2019-03-04 12:18:53 +01:00
Jesús Ángel
d77b94df55 Added syscheck.tags 2019-03-04 12:18:34 +01:00
JuanCarlos
66b491547f Merge branch '3.9-6.6' of https://github.com/wazuh/wazuh-kibana-app into delete-files 2019-03-04 12:07:39 +01:00
JuanCarlos
d1deba9ebd Overwrite files 2019-03-04 12:07:36 +01:00
Jesús Ángel
85ac0a8f5e Merge branch 'custom-timeseries' 2019-03-04 11:12:46 +01:00
Jesús Ángel
75fd051510 Merge branch '3.9-6.6' into custom-timeseries 2019-03-04 11:09:41 +01:00
Jesús Ángel
eb068e7d0d Modified table behavior 2019-03-04 11:07:54 +01:00
Jesús Ángel
38630951a7 Updated SCA tab 2019-03-04 11:01:19 +01:00
Jesús Ángel
7cf9b6c8f9 Added "node_build" in package.json 2019-03-04 09:21:19 +01:00
Jesús Ángel
9552cd50ad Added "node_build" in package.json 2019-03-04 09:20:44 +01:00
Jesús Ángel
d403328213 Merge branch '3.9-6.6' 2019-03-01 19:56:27 +01:00
Jesús Ángel
f088098ffc
Merge pull request #1277 from wazuh/support-auth-ip-cron
Add support for Elasticsearch security
2019-03-01 19:56:03 +01:00
Jesús Ángel
b140400c7f Add support for Elasticsearch security 2019-03-01 19:54:36 +01:00
Jesús Ángel
72b593aeac Merge branch 'delete-files' 2019-03-01 18:14:24 +01:00
Jesús Ángel
0ae192b42d Merge branch 'custom-timeseries' 2019-03-01 18:14:17 +01:00
Jesús Ángel
72907555d2 Merge branch '3.9-6.6' 2019-03-01 18:14:10 +01:00
Jesús Ángel
ea745ed860 Yarn prettier 2019-03-01 18:13:50 +01:00
Jesús Ángel
017326c5b4 Fixed paths 2019-03-01 18:07:13 +01:00
Jesús Ángel
8a81fee1f7 Merge branch '3.9-6.6' into delete-files 2019-03-01 17:50:07 +01:00
Jesús Ángel
1a873df018
Merge pull request #1276 from wazuh/auto-known-fields
Merge dynamic known fields, added new cron task
2019-03-01 17:48:48 +01:00