From 9bed0a8f5d38d4c065a5deebc0def20203a848ea Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Fri, 8 Nov 2019 13:23:53 +0100
Subject: [PATCH 01/17] Added nginx recipte in elastic cookbook - installing
 nginx

---
 cookbooks/wazuh_elastic/recipes/nginx.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 cookbooks/wazuh_elastic/recipes/nginx.rb

diff --git a/cookbooks/wazuh_elastic/recipes/nginx.rb b/cookbooks/wazuh_elastic/recipes/nginx.rb
new file mode 100644
index 00000000..1701538b
--- /dev/null
+++ b/cookbooks/wazuh_elastic/recipes/nginx.rb
@@ -0,0 +1,12 @@
+if platform_family?('debian', 'ubuntu')
+    apt_package 'nginx' do
+        action :install
+    end
+elsif platform_family?('rhel', 'redhat', 'centos', 'amazon')
+    yum_package 'nginx' do
+        action :install
+    end
+else
+    raise "Platform Family is not in {'debian', 'ubuntu', 'rhel', 'redhat', 'centos', 'amazon'} - Not Supported"
+end
+

From 1fa8b819b3c0d11edb517185b06b4370c1067f2f Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Fri, 8 Nov 2019 15:04:58 +0100
Subject: [PATCH 02/17] Added task to create the cer. and key folder

---
 cookbooks/wazuh_elastic/recipes/nginx.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/cookbooks/wazuh_elastic/recipes/nginx.rb b/cookbooks/wazuh_elastic/recipes/nginx.rb
index 1701538b..f66aa592 100644
--- a/cookbooks/wazuh_elastic/recipes/nginx.rb
+++ b/cookbooks/wazuh_elastic/recipes/nginx.rb
@@ -10,3 +10,17 @@
     raise "Platform Family is not in {'debian', 'ubuntu', 'rhel', 'redhat', 'centos', 'amazon'} - Not Supported"
 end
 
+
+directory '/etc/ssl/certs' do
+    mode '0755'
+    recursive true
+    action :create
+end
+
+directory '/etc/ssl/private' do
+    mode '0755'
+    recursive true
+    action :create
+end
+
+  
\ No newline at end of file

From b96b7618e860eeaeef710859ca43c9c447240a10 Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Fri, 8 Nov 2019 15:18:44 +0100
Subject: [PATCH 03/17] Added a task to generate a self-signed certificate and
 a key - nginx recipe

---
 cookbooks/wazuh_elastic/recipes/nginx.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cookbooks/wazuh_elastic/recipes/nginx.rb b/cookbooks/wazuh_elastic/recipes/nginx.rb
index f66aa592..24ea7cbe 100644
--- a/cookbooks/wazuh_elastic/recipes/nginx.rb
+++ b/cookbooks/wazuh_elastic/recipes/nginx.rb
@@ -23,4 +23,9 @@
     action :create
 end
 
+bash 'Generate a self-signed ceritificate and a key' do
+    code <<-EOH
+    openssl req -x509 -batch -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/kibana-access.key -out /etc/ssl/certs/kibana-access.pem
+    EOH
+end
   
\ No newline at end of file

From bb53a6af4e6803a9ea1a97eaf64fa8c96693aa31 Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Fri, 8 Nov 2019 15:37:18 +0100
Subject: [PATCH 04/17] added the task and  the corresponding template fileto
 replace nginx site-available template

---
 cookbooks/wazuh_elastic/recipes/nginx.rb      |  8 +++++++-
 .../wazuh_elastic/templates/default/nginx.erb | 20 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 cookbooks/wazuh_elastic/templates/default/nginx.erb

diff --git a/cookbooks/wazuh_elastic/recipes/nginx.rb b/cookbooks/wazuh_elastic/recipes/nginx.rb
index 24ea7cbe..1aaf6831 100644
--- a/cookbooks/wazuh_elastic/recipes/nginx.rb
+++ b/cookbooks/wazuh_elastic/recipes/nginx.rb
@@ -28,4 +28,10 @@
     openssl req -x509 -batch -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/kibana-access.key -out /etc/ssl/certs/kibana-access.pem
     EOH
 end
-  
\ No newline at end of file
+
+template '/etc/nginx/sites-available/default' do
+    source 'nginx.erb'
+    owner 'root'
+    group 'root'
+    mode '0644'
+end
\ No newline at end of file
diff --git a/cookbooks/wazuh_elastic/templates/default/nginx.erb b/cookbooks/wazuh_elastic/templates/default/nginx.erb
new file mode 100644
index 00000000..1f87b6db
--- /dev/null
+++ b/cookbooks/wazuh_elastic/templates/default/nginx.erb
@@ -0,0 +1,20 @@
+server {
+    listen 80;
+    listen [::]:80;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 default_server;
+    listen            [::]:443;
+    ssl on;
+    ssl_certificate /etc/ssl/certs/kibana-access.pem;
+    ssl_certificate_key /etc/ssl/private/kibana-access.key;
+    access_log            /var/log/nginx/nginx.access.log;
+    error_log            /var/log/nginx/nginx.error.log;
+    location / {
+        auth_basic "Restricted";
+        auth_basic_user_file /etc/nginx/conf.d/kibana.htpasswd;
+        proxy_pass http://localhost:5601/;
+    }
+}
\ No newline at end of file

From b5ff1829e33c96f9eedcdc81cabf97b0008b7eb8 Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Fri, 8 Nov 2019 15:49:00 +0100
Subject: [PATCH 05/17] Added task to install apache2-utils

---
 cookbooks/wazuh_elastic/recipes/nginx.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/cookbooks/wazuh_elastic/recipes/nginx.rb b/cookbooks/wazuh_elastic/recipes/nginx.rb
index 1aaf6831..85d20df3 100644
--- a/cookbooks/wazuh_elastic/recipes/nginx.rb
+++ b/cookbooks/wazuh_elastic/recipes/nginx.rb
@@ -34,4 +34,17 @@
     owner 'root'
     group 'root'
     mode '0644'
-end
\ No newline at end of file
+end
+
+if platform_family?('debian', 'ubuntu')
+    apt_package 'apache2-utils' do
+        action :install
+    end
+elsif platform_family?('rhel', 'redhat', 'centos', 'amazon')
+    yum_package 'apache2-utils' do
+        action :install
+    end
+else
+    raise "Platform Family is not in {'debian', 'ubuntu', 'rhel', 'redhat', 'centos', 'amazon'} - Not Supported"
+end
+

From 395168f0f611e66eb4f873dcbb74e744f06664c9 Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Fri, 8 Nov 2019 16:50:10 +0100
Subject: [PATCH 06/17] Added task to install dependency htpasswd and generate
 a user and password for kibana

---
 cookbooks/wazuh_elastic/Berksfile        | 3 ++-
 cookbooks/wazuh_elastic/metadata.rb      | 1 +
 cookbooks/wazuh_elastic/recipes/nginx.rb | 7 +++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/cookbooks/wazuh_elastic/Berksfile b/cookbooks/wazuh_elastic/Berksfile
index 2948cdf3..9d3506c2 100644
--- a/cookbooks/wazuh_elastic/Berksfile
+++ b/cookbooks/wazuh_elastic/Berksfile
@@ -3,4 +3,5 @@ source 'https://supermarket.getchef.com'
 
 metadata
 
-cookbook 'hostsfile' 
+cookbook 'hostsfile'
+cookbook 'htpasswd', '~> 0.3.0'
diff --git a/cookbooks/wazuh_elastic/metadata.rb b/cookbooks/wazuh_elastic/metadata.rb
index 890e1f95..7ac954a7 100644
--- a/cookbooks/wazuh_elastic/metadata.rb
+++ b/cookbooks/wazuh_elastic/metadata.rb
@@ -20,3 +20,4 @@
 depends 'poise-python'
 depends 'yum'
 depends 'hostsfile'
+depends 'htpasswd'
diff --git a/cookbooks/wazuh_elastic/recipes/nginx.rb b/cookbooks/wazuh_elastic/recipes/nginx.rb
index 85d20df3..7466f8da 100644
--- a/cookbooks/wazuh_elastic/recipes/nginx.rb
+++ b/cookbooks/wazuh_elastic/recipes/nginx.rb
@@ -48,3 +48,10 @@
     raise "Platform Family is not in {'debian', 'ubuntu', 'rhel', 'redhat', 'centos', 'amazon'} - Not Supported"
 end
 
+node.override['htpasswd']['install_method'] = 'ruby'
+include_recipe 'htpasswd::default'
+
+htpasswd "/etc/nginx/conf.d/kibana.htpasswd" do
+    user "user-1"
+    password "kibana01"
+end
\ No newline at end of file

From abc2ce576fba11e8ccc3b3021215536d4cd36255 Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Fri, 8 Nov 2019 17:53:13 +0100
Subject: [PATCH 07/17] Added task for nginx service restart

---
 cookbooks/wazuh_elastic/recipes/nginx.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cookbooks/wazuh_elastic/recipes/nginx.rb b/cookbooks/wazuh_elastic/recipes/nginx.rb
index 7466f8da..00b020f3 100644
--- a/cookbooks/wazuh_elastic/recipes/nginx.rb
+++ b/cookbooks/wazuh_elastic/recipes/nginx.rb
@@ -54,4 +54,9 @@
 htpasswd "/etc/nginx/conf.d/kibana.htpasswd" do
     user "user-1"
     password "kibana01"
+end
+
+service "nginx" do
+    supports :start => true, :stop => true, :restart => true, :reload => true
+    action [:restart]
 end
\ No newline at end of file

From 79fecec898a1dcd01ce828135f276e4cef43055b Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Mon, 11 Nov 2019 11:30:29 +0100
Subject: [PATCH 08/17] Added nginx recipe to default.rb

---
 cookbooks/wazuh_elastic/recipes/default.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cookbooks/wazuh_elastic/recipes/default.rb b/cookbooks/wazuh_elastic/recipes/default.rb
index 48730ecd..15ce3b54 100644
--- a/cookbooks/wazuh_elastic/recipes/default.rb
+++ b/cookbooks/wazuh_elastic/recipes/default.rb
@@ -8,5 +8,6 @@
 include_recipe 'chef-sugar::default'
 
 include_recipe 'wazuh_elastic::repository'
+include_recipe 'wazuh_elastic::nginx'
 include_recipe 'wazuh_elastic::elasticsearch'
 include_recipe 'wazuh_elastic::kibana'

From edd8fad287bc50c724b7f803949bcb662912bba7 Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Tue, 12 Nov 2019 11:13:57 +0100
Subject: [PATCH 09/17] added centos missing packages installation

---
 cookbooks/wazuh_elastic/recipes/nginx.rb | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/cookbooks/wazuh_elastic/recipes/nginx.rb b/cookbooks/wazuh_elastic/recipes/nginx.rb
index 00b020f3..931224ab 100644
--- a/cookbooks/wazuh_elastic/recipes/nginx.rb
+++ b/cookbooks/wazuh_elastic/recipes/nginx.rb
@@ -1,3 +1,9 @@
+if platform_family?('rhel', 'redhat', 'centos', 'amazon')
+    yum_package 'epl-release' do
+        action :install
+end
+
+
 if platform_family?('debian', 'ubuntu')
     apt_package 'nginx' do
         action :install
@@ -41,13 +47,21 @@
         action :install
     end
 elsif platform_family?('rhel', 'redhat', 'centos', 'amazon')
-    yum_package 'apache2-utils' do
+    yum_package 'httpd' do
         action :install
     end
 else
     raise "Platform Family is not in {'debian', 'ubuntu', 'rhel', 'redhat', 'centos', 'amazon'} - Not Supported"
 end
 
+if platform_family?('rhel', 'redhat', 'centos', 'amazon')
+    service "httpd" do
+        supports :start => true, :stop => true, :restart => true, :reload => true
+        action [:restart]
+    end
+end
+
+
 node.override['htpasswd']['install_method'] = 'ruby'
 include_recipe 'htpasswd::default'
 

From 28a2a7897e272d33c197d49e3698faa5225e6c6f Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Tue, 12 Nov 2019 12:20:37 +0100
Subject: [PATCH 10/17] Added ipv6only for nginx template to avoid a possible
 conflict on port 80

---
 cookbooks/wazuh_elastic/templates/default/nginx.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cookbooks/wazuh_elastic/templates/default/nginx.erb b/cookbooks/wazuh_elastic/templates/default/nginx.erb
index 1f87b6db..6aeeee7a 100644
--- a/cookbooks/wazuh_elastic/templates/default/nginx.erb
+++ b/cookbooks/wazuh_elastic/templates/default/nginx.erb
@@ -1,6 +1,6 @@
 server {
     listen 80;
-    listen [::]:80;
+    listen [::]:80 ipv6only=on;
     return 301 https://$host$request_uri;
 }
 

From d820dc9f76a3fbfb73d1e4ad1c11ae7bdd89b5b1 Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Tue, 12 Nov 2019 12:21:06 +0100
Subject: [PATCH 11/17] Added nginx attributes user:password

---
 cookbooks/wazuh_elastic/attributes/nginx.rb | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 cookbooks/wazuh_elastic/attributes/nginx.rb

diff --git a/cookbooks/wazuh_elastic/attributes/nginx.rb b/cookbooks/wazuh_elastic/attributes/nginx.rb
new file mode 100644
index 00000000..cee9b563
--- /dev/null
+++ b/cookbooks/wazuh_elastic/attributes/nginx.rb
@@ -0,0 +1,2 @@
+default['mginx']['user'] = 'user1'
+default['mginx']['password'] = 'nginx1'
\ No newline at end of file

From a0c1b4a3ad3a1b79a8d638c6d22717ab938399f0 Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Tue, 12 Nov 2019 12:21:35 +0100
Subject: [PATCH 12/17] removed unecessary tasks and added new ones for nginx
 folders creation

---
 cookbooks/wazuh_elastic/recipes/nginx.rb | 30 +++++++++++++-----------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/cookbooks/wazuh_elastic/recipes/nginx.rb b/cookbooks/wazuh_elastic/recipes/nginx.rb
index 931224ab..e402a50f 100644
--- a/cookbooks/wazuh_elastic/recipes/nginx.rb
+++ b/cookbooks/wazuh_elastic/recipes/nginx.rb
@@ -1,6 +1,7 @@
 if platform_family?('rhel', 'redhat', 'centos', 'amazon')
-    yum_package 'epl-release' do
+    yum_package 'epel-release' do
         action :install
+    end
 end
 
 
@@ -17,6 +18,18 @@
 end
 
 
+directory '/etc/nginx/sites-available' do
+    mode '0755'
+    recursive true
+    action :create
+end
+
+directory '/etc/nginx/sites-enabled' do
+    mode '0755'
+    recursive true
+    action :create
+end
+
 directory '/etc/ssl/certs' do
     mode '0755'
     recursive true
@@ -46,28 +59,17 @@
     apt_package 'apache2-utils' do
         action :install
     end
-elsif platform_family?('rhel', 'redhat', 'centos', 'amazon')
-    yum_package 'httpd' do
-        action :install
-    end
 else
     raise "Platform Family is not in {'debian', 'ubuntu', 'rhel', 'redhat', 'centos', 'amazon'} - Not Supported"
 end
 
-if platform_family?('rhel', 'redhat', 'centos', 'amazon')
-    service "httpd" do
-        supports :start => true, :stop => true, :restart => true, :reload => true
-        action [:restart]
-    end
-end
-
 
 node.override['htpasswd']['install_method'] = 'ruby'
 include_recipe 'htpasswd::default'
 
 htpasswd "/etc/nginx/conf.d/kibana.htpasswd" do
-    user "user-1"
-    password "kibana01"
+    user "#{node['mginx']['user']}"
+    password "#{node['mginx']['password']}"
 end
 
 service "nginx" do

From 2a2182fd61edb65844c91a03b6692fe3637df6a7 Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Wed, 13 Nov 2019 16:52:43 +0100
Subject: [PATCH 13/17] fixed template file path issue

---
 cookbooks/wazuh_elastic/recipes/nginx.rb            | 4 +---
 cookbooks/wazuh_elastic/templates/default/nginx.erb | 6 ------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/cookbooks/wazuh_elastic/recipes/nginx.rb b/cookbooks/wazuh_elastic/recipes/nginx.rb
index e402a50f..98de90c4 100644
--- a/cookbooks/wazuh_elastic/recipes/nginx.rb
+++ b/cookbooks/wazuh_elastic/recipes/nginx.rb
@@ -48,7 +48,7 @@
     EOH
 end
 
-template '/etc/nginx/sites-available/default' do
+template '/etc/nginx/conf.d/kibana.conf' do
     source 'nginx.erb'
     owner 'root'
     group 'root'
@@ -59,8 +59,6 @@
     apt_package 'apache2-utils' do
         action :install
     end
-else
-    raise "Platform Family is not in {'debian', 'ubuntu', 'rhel', 'redhat', 'centos', 'amazon'} - Not Supported"
 end
 
 
diff --git a/cookbooks/wazuh_elastic/templates/default/nginx.erb b/cookbooks/wazuh_elastic/templates/default/nginx.erb
index 6aeeee7a..6b65f9e9 100644
--- a/cookbooks/wazuh_elastic/templates/default/nginx.erb
+++ b/cookbooks/wazuh_elastic/templates/default/nginx.erb
@@ -1,9 +1,3 @@
-server {
-    listen 80;
-    listen [::]:80 ipv6only=on;
-    return 301 https://$host$request_uri;
-}
-
 server {
     listen 443 default_server;
     listen            [::]:443;

From 4104bc863535f6fecb33af25b2b92233b44bf62e Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Tue, 19 Nov 2019 15:22:00 +0100
Subject: [PATCH 14/17] adapted elasticsearch ip

---
 cookbooks/wazuh_elastic/attributes/elasticsearch.rb | 2 +-
 cookbooks/wazuh_filebeat/attributes/default.rb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cookbooks/wazuh_elastic/attributes/elasticsearch.rb b/cookbooks/wazuh_elastic/attributes/elasticsearch.rb
index 569abf1c..b41cb7b0 100644
--- a/cookbooks/wazuh_elastic/attributes/elasticsearch.rb
+++ b/cookbooks/wazuh_elastic/attributes/elasticsearch.rb
@@ -17,7 +17,7 @@
 default['wazuh-elastic']['elasticsearch_path_data'] = "/var/lib/elasticsearch"
 default['wazuh-elastic']['elasticsearch_path_logs'] = "/var/log/elasticsearch"
 default['wazuh-elastic']['elasticsearch_port'] = 9200
-default['wazuh-elastic']['elasticsearch_ip'] = '172.19.0.211'
+default['wazuh-elastic']['elasticsearch_ip'] = '0.0.0.0'
 default['wazuh-elastic']['elasticsearch_discovery_option'] = 'discovery.type: single-node'
 default['wazuh-elastic']['elasticsearch_cluster_initial_master_nodes'] = "#cluster.initial_master_nodes: ['es-node-01']"
 
diff --git a/cookbooks/wazuh_filebeat/attributes/default.rb b/cookbooks/wazuh_filebeat/attributes/default.rb
index 51f50ace..c6684d70 100644
--- a/cookbooks/wazuh_filebeat/attributes/default.rb
+++ b/cookbooks/wazuh_filebeat/attributes/default.rb
@@ -7,7 +7,7 @@
 #
 default['filebeat']['package_name'] = 'filebeat'
 default['filebeat']['service_name'] = 'filebeat'
-default['filebeat']['elasticsearch_server_ip'] = "172.19.0.211"
+default['filebeat']['elasticsearch_server_ip'] = "localhost"
 default['filebeat']['timeout'] = 15
 default['filebeat']['config_path'] = '/etc/filebeat/filebeat.yml'
 

From c6e3fa265590fa46f8c5137b59f237004664f128 Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Tue, 19 Nov 2019 16:32:12 +0100
Subject: [PATCH 15/17] parameterize filebeat template

---
 cookbooks/wazuh_filebeat/recipes/filebeat.rb                | 2 +-
 cookbooks/wazuh_filebeat/templates/default/filebeat.yml.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cookbooks/wazuh_filebeat/recipes/filebeat.rb b/cookbooks/wazuh_filebeat/recipes/filebeat.rb
index 650d10f7..34183250 100644
--- a/cookbooks/wazuh_filebeat/recipes/filebeat.rb
+++ b/cookbooks/wazuh_filebeat/recipes/filebeat.rb
@@ -48,7 +48,7 @@
   owner 'root'
   group 'root'
   mode '0640'
-  variables(elasticsearch_server_ip: "  hosts: ['#{node['filebeat']['elasticsearch_server_ip']}:9200']")
+  variables(output_server_host: "output.elasticsearch.hosts: ['#{node['filebeat']['elasticsearch_server_ip']}:9200']")
 end
 
 service node['filebeat']['service_name'] do
diff --git a/cookbooks/wazuh_filebeat/templates/default/filebeat.yml.erb b/cookbooks/wazuh_filebeat/templates/default/filebeat.yml.erb
index c2cc2666..aa03109e 100644
--- a/cookbooks/wazuh_filebeat/templates/default/filebeat.yml.erb
+++ b/cookbooks/wazuh_filebeat/templates/default/filebeat.yml.erb
@@ -12,4 +12,4 @@ setup.template.json.name: 'wazuh'
 setup.template.overwrite: true
 setup.ilm.enabled: false
 
-output.elasticsearch.hosts: ['http://YOUR_ELASTIC_SERVER_IP:9200']
\ No newline at end of file
+<%= @output_server_host %>
\ No newline at end of file

From 18c2e0b1367cbaf066c6194cbbba51b55b764aa0 Mon Sep 17 00:00:00 2001
From: Jose M <jm.garcia@wazuh.com>
Date: Thu, 26 Dec 2019 15:26:11 +0100
Subject: [PATCH 16/17] Bump version to 3.11.0_7.5.1

---
 cookbooks/wazuh_agent/attributes/version.rb     | 2 +-
 cookbooks/wazuh_elastic/attributes/versions.rb  | 6 +++---
 cookbooks/wazuh_filebeat/attributes/versions.rb | 6 +++---
 cookbooks/wazuh_manager/attributes/versions.rb  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cookbooks/wazuh_agent/attributes/version.rb b/cookbooks/wazuh_agent/attributes/version.rb
index 2104fd6e..5dc35423 100644
--- a/cookbooks/wazuh_agent/attributes/version.rb
+++ b/cookbooks/wazuh_agent/attributes/version.rb
@@ -1 +1 @@
-default['wazuh-agent']['version'] = "3.10.2"
\ No newline at end of file
+default['wazuh-agent']['version'] = "3.11.0"
\ No newline at end of file
diff --git a/cookbooks/wazuh_elastic/attributes/versions.rb b/cookbooks/wazuh_elastic/attributes/versions.rb
index 946eab84..3f85845e 100644
--- a/cookbooks/wazuh_elastic/attributes/versions.rb
+++ b/cookbooks/wazuh_elastic/attributes/versions.rb
@@ -1,3 +1,3 @@
-default['wazuh-elastic']['elastic_stack_version'] = '7.3.2'
-default['wazuh-elastic']['wazuh_app_version'] = "3.10.2_7.3.2"
-default['wazuh-elastic']['extensions_version'] = "v3.10.2"
\ No newline at end of file
+default['wazuh-elastic']['elastic_stack_version'] = '7.5.1'
+default['wazuh-elastic']['wazuh_app_version'] = "3.11.0_7.5.1"
+default['wazuh-elastic']['extensions_version'] = "v3.11.0"
\ No newline at end of file
diff --git a/cookbooks/wazuh_filebeat/attributes/versions.rb b/cookbooks/wazuh_filebeat/attributes/versions.rb
index 08376f23..c9f31b0c 100644
--- a/cookbooks/wazuh_filebeat/attributes/versions.rb
+++ b/cookbooks/wazuh_filebeat/attributes/versions.rb
@@ -1,4 +1,4 @@
-default['filebeat']['elastic_stack_version'] = '7.3.2'
-default['filebeat']['wazuh_app_version'] = "3.10.2_7.3.2"
-default['filebeat']['extensions_version'] = "v3.10.2"
+default['filebeat']['elastic_stack_version'] = '7.5.1'
+default['filebeat']['wazuh_app_version'] = "3.11.0_7.5.1"
+default['filebeat']['extensions_version'] = "v3.11.0"
 default['filebeat']['wazuh_filebeat_module'] = "wazuh-filebeat-0.1.tar.gz"
diff --git a/cookbooks/wazuh_manager/attributes/versions.rb b/cookbooks/wazuh_manager/attributes/versions.rb
index 138c3a47..dbfb7352 100644
--- a/cookbooks/wazuh_manager/attributes/versions.rb
+++ b/cookbooks/wazuh_manager/attributes/versions.rb
@@ -1 +1 @@
-default['wazuh-manager']['version'] = "3.10.2"
\ No newline at end of file
+default['wazuh-manager']['version'] = "3.11.0"
\ No newline at end of file

From 33d67de42df3ac583988ebe92eb4e1dfe583c7ab Mon Sep 17 00:00:00 2001
From: Jose M <jm.garcia@wazuh.com>
Date: Thu, 26 Dec 2019 15:43:51 +0100
Subject: [PATCH 17/17] Update CHANGELOG.md

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d42f587..ebfb5bb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Wazuh Chef v3.11.0_7.5.1
+
+### Added
+
+- Update to Wazuh version 3.11.0_7.5.1
+
+- Add Nginx SSL authentication for Kibana ([rshad](https://github.com/rshad)) [PR#69](https://github.com/wazuh/wazuh-chef/pull/69)
+
+
 ## Wazuh Chef v3.10.2_7.3.2
 
 ### Added