Commit Graph

317 Commits

Author SHA1 Message Date
Mayte Ariza
5f2859d95e Entrypoint-scripts folder configured 2019-04-17 13:04:58 +02:00
Manuel J. Bernal
92b2814fb1 Merge pull request #140 from wazuh/3.8.2_6.5.4-s3_repository
New features for Elasticsearch image: S3 repository plugin and configure_s3.sh
2019-03-27 12:50:59 +01:00
Mayte Ariza
91e70da2b8 Configure_s3.sh: comments added 2019-03-27 12:48:12 +01:00
Manuel J. Bernal
260762968d Merge pull request #137 from wazuh/remove-build-time-alerts
Remove alerts created in build time
2019-03-27 11:29:55 +01:00
Manuel J. Bernal
beb9bee27b Merge pull request #141 from wazuh/dev-duplicate-alerts-fix
Fixing duplicate alerts with kubernetes
2019-03-27 11:28:49 +01:00
Manuel J. Bernal
49f6f673c6 Merge pull request #136 from wazuh/dev-nginx-credentials
Setting Nginx docker to support several user/passwords in Kibana
2019-03-27 11:26:02 +01:00
Mayte Ariza
1bc6ecca67 Elasticsearch major version checked and repository base path changed 2019-03-27 10:04:24 +01:00
l
ebca6b3696 Fixing duplicate alerts with kubernetes 2019-03-26 16:30:50 +01:00
Mayte Ariza
b15d61cda7 Added script configure_s3.sh to Elasticsearch Dockerfile 2019-03-26 14:20:38 +01:00
Mayte Ariza
7aeb6b2050 Merge branch '3.8.2_6.5.4' into 3.8.2_6.5.4-s3_repository 2019-03-26 14:08:08 +01:00
toniMR
11108631c0 Adding comments 2019-03-26 13:26:09 +01:00
AlfonsoRBJ
62af977067 Update CHANGELOG.md 2019-03-25 17:46:12 +01:00
AlfonsoRBJ
be9c278a18 Update CHANGELOG.md 2019-03-25 17:45:24 +01:00
AlfonsoRBJ
92d957730c remove alerts on build time 2019-03-25 17:36:27 +01:00
AlfonsoRBJ
8823405dd9 remove alerts content 2019-03-22 14:47:22 +01:00
Manuel J. Bernal
73e5b99983 Merge pull request #135 from wazuh/dev-logstash-entrypoint
New Logstash entrypoint added
2019-03-22 10:58:11 +01:00
Manuel J. Bernal
e563df4093 Merge branch '3.8.2_6.5.4' into dev-logstash-entrypoint 2019-03-22 10:57:15 +01:00
toniMR
f3674ff9d9 Changing comment 2019-03-22 09:57:02 +01:00
toniMR
12b40b48ee Adding NGINX_CREDENTIALS in docker-compose.yml 2019-03-22 09:54:32 +01:00
toniMR
715fb4fdec Adding NGINX_CREDENTIALS in nginx/config/entrypoint.sh 2019-03-22 09:52:37 +01:00
AlfonsoRBJ
fdca63f592 Update CHANGELOG.md 2019-03-21 19:38:54 +01:00
AlfonsoRBJ
6a82a36711 fix typo in elasticsearch url 2019-03-21 19:27:42 +01:00
Manuel J. Bernal
18e955090a Merge pull request #133 from wazuh/dev-welcome-screen
Welcome screen management
2019-03-21 19:20:58 +01:00
AlfonsoRBJ
fc97c3623b Update CHANGELOG.md 2019-03-21 19:18:17 +01:00
AlfonsoRBJ
283ca42d57 reduce sleep times after pass check 2019-03-21 19:13:22 +01:00
AlfonsoRBJ
c6793657e7 improve template check 2019-03-21 18:38:28 +01:00
AlfonsoRBJ
b3114e7293 add race condition for wazuh alerts template 2019-03-21 18:25:56 +01:00
AlfonsoRBJ
727858f74c remove run.sh exe 2019-03-21 16:56:52 +01:00
AlfonsoRBJ
48e0c75a26 remove run.sh execution 2019-03-21 16:56:22 +01:00
AlfonsoRBJ
580251104c add entrypoint to Dockerfile 2019-03-21 16:34:24 +01:00
AlfonsoRBJ
3fdba44bfa cond. race for logstash and improve it for kibana 2019-03-21 16:29:48 +01:00
AlfonsoRBJ
6ce25e00c9 merge run.sh in new entrypoint.sh 2019-03-21 16:13:53 +01:00
AlfonsoRBJ
699f2bb82e fix visible path 2019-03-20 16:30:44 +01:00
AlfonsoRBJ
b7537453e3 Hide undesired links 2019-03-20 15:47:14 +01:00
AlfonsoRBJ
9b0602766f fix typo 2019-03-19 17:43:14 +01:00
AlfonsoRBJ
e6062f28f3 removing optimize bundles 2019-03-19 17:07:01 +01:00
AlfonsoRBJ
e182e0d4f8 change redirect to wazuh app 2019-03-19 16:51:51 +01:00
AlfonsoRBJ
666708c47f kibana yml is in other path 2019-03-19 16:26:14 +01:00
AlfonsoRBJ
d0df9a06e1 fix typo 2019-03-19 14:50:12 +01:00
AlfonsoRBJ
c1a33b7185 kibana welcome 2019-03-19 14:35:44 +01:00
Manuel J. Bernal
7e2549a85a Merge pull request #121 from wazuh/3.8.2_6.5.4-refactor
Refactor of Wazuh Dockerfile
2019-03-15 15:44:47 +01:00
Manuel J. Bernal
f8dada12b1 Merge pull request #128 from wazuh/fix-copyright-year
Changing copyright year to 2019
2019-03-15 15:27:34 +01:00
l
532b691172 Changing copyright year to 2019 2019-03-15 15:11:49 +01:00
Manuel J. Bernal
3b7705e868 Merge pull request #126 from wazuh/3.8.2_6.5.4-refractor-fix
Fixing missing packets, env vars and config file of filebeat
2019-03-13 17:52:51 +01:00
l
3dce66e869 Fixing missing packets, env vars and config file of filebeat 2019-03-13 17:25:48 +01:00
Mayte Ariza
3ef08ccf66 Elasticsearch dockerfile: added repository-s3 plugin 2019-03-10 16:38:51 +01:00
Manuel J. Bernal
10ae694a92 Merge pull request #120 from wazuh/3.8.2_6.5.4-update-compose
Updating docker-compose file
2019-02-13 12:23:38 +01:00
manuasir
bc18ef46e6 Deleted unused file 2019-02-12 18:06:23 +01:00
migruiz4
d149327275 Resolved conflicts refactoring Dockerfile 2019-02-12 18:05:52 +01:00
manuasir
fdd2c9d2bf Updating docker-compose file 2019-02-12 17:38:49 +01:00