Merge pull request #57 from wazuh/release-wazuh_3.12.3_7.6.2

Release Wazuh 3.12.3_7.6.2
wazuh · Apr 30, 2020 · a644b85 · a644b85
2 parents 515982d + 7ec2517
commit a644b85
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 37 deletions.
diff --git a/demo/README.md b/demo/README.md
@@ -90,7 +90,7 @@ A parent domain (e.g. mycompany.com) and subdomain (e.g. wazuh) can be specified
 
 An example of the installation of a new agent, on a Windows system (automatically registered and configured) using an MSI package would be:
 
-    wazuh-agent-3.12.2-1.msi /q ADDRESS=“wazuh.mycompany.com” AUTHD_SERVER=“registration.wazuh.mycompany.com” PASSWORD=“mypassword” AGENT_NAME=“myhostname” PROTOCOL=“TCP”
+    wazuh-agent-3.12.3-1.msi /q ADDRESS=“wazuh.mycompany.com” AUTHD_SERVER=“registration.wazuh.mycompany.com” PASSWORD=“mypassword” AGENT_NAME=“myhostname” PROTOCOL=“TCP”
 
 An example of the registration of a new agent on a Linux system would be:
 

diff --git a/demo/elastic/wazuh_cf_bootstrap_elastic.sh b/demo/elastic/wazuh_cf_bootstrap_elastic.sh
@@ -18,7 +18,7 @@ master_ip=$(cat /tmp/wazuh_cf_settings | grep '^MasterIp:' | cut -d' ' -f2)
 worker_ip=$(cat /tmp/wazuh_cf_settings | grep '^WorkerIp:' | cut -d' ' -f2)
 kibana_ip=$(cat /tmp/wazuh_cf_settings | grep '^KibanaIp:' | cut -d' ' -f2)
 
-TAG="v3.12.2"
+TAG="v3.12.3"
 echo "Added env vars." >> /tmp/deploy.log
 echo "eth0_ip: $eth0_ip" >> /tmp/deploy.log
 
@@ -253,4 +253,4 @@ main(){
     disable_elk_repos
 }
 
-main
+main
diff --git a/demo/splunk/wazuh_cf_splunk.sh b/demo/splunk/wazuh_cf_splunk.sh
@@ -11,8 +11,8 @@ eth0_ip=$(/sbin/ifconfig eth0 | grep 'inet addr:' | cut -d: -f2  | cut -d' ' -f1
 wazuh_api_user=$(cat /tmp/wazuh_cf_settings | grep '^WazuhApiAdminUsername:' | cut -d' ' -f2)
 wazuh_api_password=$(cat /tmp/wazuh_cf_settings | grep '^WazuhApiAdminPassword:' | cut -d' ' -f2)
 wazuh_api_port=$(cat /tmp/wazuh_cf_settings | grep '^WazuhApiPort:' | cut -d' ' -f2)
-TAG="v3.12.2"
-APP_TAG="v3.12.2-7.3.4"
+TAG="v3.12.3"
+APP_TAG="v3.12.3-7.3.4"
 # Creating SSH user
 adduser ${ssh_username}
 echo "${ssh_username} ALL=(ALL)NOPASSWD:ALL" >> /etc/sudoers
@@ -47,4 +47,4 @@ cp -R ./wazuh-splunk/SplunkAppForWazuh/ /opt/splunk/etc/apps/
 # restart splunk
 /opt/splunk/bin/splunk start --accept-license --answer-yes --no-prompt &> /dev/null
 
-# curl -XPOST http://${eth0_ip}:${splunk_port}/custom/SplunkAppForWazuh/manager/add_api?url=${wazuh_master_ip}&portapi=${wazuh_api_port}&userapi=${wazuh_api_user}&passapi=${wazuh_api_password}
+# curl -XPOST http://${eth0_ip}:${splunk_port}/custom/SplunkAppForWazuh/manager/add_api?url=${wazuh_master_ip}&portapi=${wazuh_api_port}&userapi=${wazuh_api_user}&passapi=${wazuh_api_password}
diff --git a/demo/wazuh/cluster/wazuh_cf_master.sh b/demo/wazuh/cluster/wazuh_cf_master.sh
@@ -26,7 +26,7 @@ AwsSecretKey=$(cat /tmp/wazuh_cf_settings | grep '^AwsSecretKey:' | cut -d' ' -f
 AwsAccessKey=$(cat /tmp/wazuh_cf_settings | grep '^AwsAccessKey:' | cut -d' ' -f2)
 SlackHook=$(cat /tmp/wazuh_cf_settings | grep '^SlackHook:' | cut -d' ' -f2)
 EnvironmentType=$(cat /tmp/wazuh_cf_settings | grep '^EnvironmentType:' | cut -d' ' -f2)
-TAG='v3.12.2'
+TAG='v3.12.3'
 
 echo "Added env vars." >> /tmp/deploy.log
 
@@ -769,4 +769,4 @@ windows_id=`/var/ossec/bin/manage_agents -l | grep Win | cut -d':' -f2 | cut -d
 /var/ossec/bin/agent_groups -a -g redhat -i ${rhel_id} -q
 /var/ossec/bin/agent_groups -a -g mysql -i ${rhel_id} -q
 /var/ossec/bin/agent_groups -a -g apache -i ${rhel_id} -q
-/var/ossec/bin/agent_groups -a -g windows -i ${windows_id} -q
+/var/ossec/bin/agent_groups -a -g windows -i ${windows_id} -q
diff --git a/demo/wazuh/cluster/wazuh_cf_worker.sh b/demo/wazuh/cluster/wazuh_cf_worker.sh
@@ -19,7 +19,7 @@ SlackHook=$(cat /tmp/wazuh_cf_settings | grep '^SlackHook:' | cut -d' ' -f2)
 EnvironmentType=$(cat /tmp/wazuh_cf_settings | grep '^EnvironmentType:' | cut -d' ' -f2)
 splunk_username=$(cat /tmp/wazuh_cf_settings | grep '^SplunkUsername:' | cut -d' ' -f2)
 splunk_password=$(cat /tmp/wazuh_cf_settings | grep '^SplunkPassword:' | cut -d' ' -f2)
-TAG='v3.12.2'
+TAG='v3.12.3'
 
 # Check if running as root
 if [[ $EUID -ne 0 ]]; then
@@ -384,4 +384,4 @@ systemctl enable filebeat
 echo "Enabled Filebeat" >> /tmp/log
 systemctl restart filebeat
 echo "Started Filebeat" >> /tmp/log
-echo "Done" >> /tmp/log
+echo "Done" >> /tmp/log
diff --git a/demo/wazuh_template.yml b/demo/wazuh_template.yml
@@ -240,8 +240,9 @@ Parameters:
       - 7.6.1_3.11.4
       - 7.6.1_3.12.0
       - 7.6.2_3.12.2
+      - 7.6.2_3.12.3
     ConstraintDescription: Format is ElasticVersion_WazuhVersion
-    Default: 7.6.2_3.12.2
+    Default: 7.6.2_3.12.3
     Description: Elastic and Wazuh versions to be installed
     Type: String
   WazuhInstanceType:
@@ -726,7 +727,7 @@ Resources:
               group: root
             /tmp/wazuh_cf_bootstrap_elastic.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/demo/elastic/wazuh_cf_bootstrap_elastic.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/demo/elastic/wazuh_cf_bootstrap_elastic.sh
               mode: '000700'
               owner: root
               group: root
@@ -805,7 +806,7 @@ Resources:
               group: root
             /tmp/wazuh_cf_elastic.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/demo/elastic/wazuh_cf_elastic.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/demo/elastic/wazuh_cf_elastic.sh
               mode: '000700'
               owner: root
               group: root
@@ -884,7 +885,7 @@ Resources:
               group: root
             /tmp/wazuh_cf_elastic.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/demo/elastic/wazuh_cf_elastic.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/demo/elastic/wazuh_cf_elastic.sh
               mode: '000700'
               owner: root
               group: root
@@ -1111,7 +1112,7 @@ Resources:
               group: root
             /tmp/wazuh_cf_kibana.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/demo/elastic/wazuh_cf_kibana.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/demo/elastic/wazuh_cf_kibana.sh
               mode: '000700'
               owner: root
               group: root
@@ -1188,7 +1189,7 @@ Resources:
               group: root
             /tmp/wazuh_cf_splunk.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/demo/splunk/wazuh_cf_splunk.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/demo/splunk/wazuh_cf_splunk.sh
               mode: '000700'
               owner: root
               group: root
@@ -1282,7 +1283,7 @@ Resources:
               group: root
             /tmp/wazuh_cf_master.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/demo/wazuh/cluster/wazuh_cf_master.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/demo/wazuh/cluster/wazuh_cf_master.sh
               mode: '000700'
               owner: root
               group: root
@@ -1371,7 +1372,7 @@ Resources:
               group: root
             /tmp/wazuh_cf_worker.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/demo/wazuh/cluster/wazuh_cf_worker.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/demo/wazuh/cluster/wazuh_cf_worker.sh
               mode: '000700'
               owner: root
               group: root
@@ -1452,7 +1453,7 @@ Resources:
               group: root
             /tmp/wazuh_agent_amazon.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/demo/wazuh/agents/wazuh_agent_amazon.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/demo/wazuh/agents/wazuh_agent_amazon.sh
               mode: '000700'
               owner: root
               group: root
@@ -1533,7 +1534,7 @@ Resources:
               group: root
             /tmp/wazuh_agent_centos.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/demo/wazuh/agents/wazuh_agent_centos.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/demo/wazuh/agents/wazuh_agent_centos.sh
               mode: '000700'
               owner: root
               group: root
@@ -1627,7 +1628,7 @@ Resources:
           Add-LocalGroupMember -Group "Remote Desktop Users" -Member "wazuh"
           net user Administrator ${SshPassword}
           $master_ip=${WazuhNetworkLoadBalancer.DNSName}
-          $url = "https://packages.wazuh.com/3.x/windows/wazuh-agent-3.12.2-1.msi"
+          $url = "https://packages.wazuh.com/3.x/windows/wazuh-agent-3.12.3-1.msi"
           $path = "C:\\Users\\Administrator\\Desktop\\wazuh-agent.msi"
           $url_osquery = "https://pkg.osquery.io/windows/osquery-3.3.2.msi"
           $path_osquery = "C:\\Users\\Administrator\\Desktop\\osquery.msi"
@@ -1707,7 +1708,7 @@ Resources:
               group: root
             /tmp/wazuh_agent_debian.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/demo/wazuh/agents/wazuh_cf_agent_debian.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/demo/wazuh/agents/wazuh_cf_agent_debian.sh
               mode: '000700'
               owner: root
               group: root
@@ -1795,7 +1796,7 @@ Resources:
               group: root
             /tmp/wazuh_agent_ubuntu.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/demo/wazuh/agents/wazuh_cf_agent_ubuntu.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/demo/wazuh/agents/wazuh_cf_agent_ubuntu.sh
               mode: '000700'
               owner: root
               group: root
@@ -1883,7 +1884,7 @@ Resources:
               group: root
             /tmp/wazuh_agent_rhel.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/demo/wazuh/agents/wazuh_agent_rhel.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/demo/wazuh/agents/wazuh_agent_rhel.sh
               mode: '000700'
               owner: root
               group: root
@@ -2005,4 +2006,4 @@ Outputs:
     Description: Elastic Stack and Wazuh versions
     Value: !GetAtt
       - RHEL7
-      - PublicIp
+      - PublicIp
diff --git a/production/elastic/wazuh_cf_bootstrap_elastic.sh b/production/elastic/wazuh_cf_bootstrap_elastic.sh
@@ -18,7 +18,7 @@ master_ip=$(cat /tmp/wazuh_cf_settings | grep '^MasterIp:' | cut -d' ' -f2)
 worker_ip=$(cat /tmp/wazuh_cf_settings | grep '^WorkerIp:' | cut -d' ' -f2)
 kibana_ip=$(cat /tmp/wazuh_cf_settings | grep '^KibanaIp:' | cut -d' ' -f2)
 
-TAG="v3.12.2"
+TAG="v3.12.3"
 echo "Added env vars." >> /tmp/deploy.log
 echo "eth0_ip: $eth0_ip" >> /tmp/deploy.log
 
@@ -253,4 +253,4 @@ main(){
     disable_elk_repos
 }
 
-main
+main
diff --git a/production/wazuh/cluster/wazuh_cf_master.sh b/production/wazuh/cluster/wazuh_cf_master.sh
@@ -18,7 +18,7 @@ wazuh_cluster_key=$(cat /tmp/wazuh_cf_settings | grep '^WazuhClusterKey:' | cut
 elb_elastic=$(cat /tmp/wazuh_cf_settings | grep '^ElbElasticDNS:' | cut -d' ' -f2)
 eth0_ip=$(/sbin/ifconfig eth0 | grep 'inet' | head -1 | sed -e 's/^[[:space:]]*//' | cut -d' ' -f2)
 InstallType=$(cat /tmp/wazuh_cf_settings | grep '^InstallType:' | cut -d' ' -f2)
-TAG='v3.12.2'
+TAG='v3.12.3'
 
 echo "Added env vars." >> /tmp/deploy.log
 

diff --git a/production/wazuh/cluster/wazuh_cf_worker.sh b/production/wazuh/cluster/wazuh_cf_worker.sh
@@ -13,7 +13,7 @@ wazuh_cluster_key=$(cat /tmp/wazuh_cf_settings | grep '^WazuhClusterKey:' | cut
 wazuh_master_ip=$(cat /tmp/wazuh_cf_settings | grep '^WazuhMasterIP:' | cut -d' ' -f2)
 elb_elasticsearch=$(cat /tmp/wazuh_cf_settings | grep '^ElbElasticDNS:' | cut -d' ' -f2)
 InstallType=$(cat /tmp/wazuh_cf_settings | grep '^InstallType:' | cut -d' ' -f2)
-TAG='v3.12.2'
+TAG='v3.12.3'
 
 # Check if running as root
 if [[ $EUID -ne 0 ]]; then
@@ -191,4 +191,4 @@ systemctl enable filebeat
 echo "Enabled Filebeat" >> /tmp/log
 systemctl restart filebeat
 echo "Started Filebeat" >> /tmp/log
-echo "Done" >> /tmp/log
+echo "Done" >> /tmp/log
diff --git a/production/wazuh_template.yml b/production/wazuh_template.yml
@@ -163,8 +163,9 @@ Parameters:
       - 7.6.1_3.11.4
       - 7.6.1_3.12.0
       - 7.6.2_3.12.2
+      - 7.6.2_3.12.3
     ConstraintDescription: Format is ElasticVersion_WazuhVersion
-    Default: 7.6.2_3.12.2
+    Default: 7.6.2_3.12.3
     Description: Elastic and Wazuh versions to be installed
     Type: String
   WazuhInstanceType:
@@ -497,7 +498,7 @@ Resources:
               group: root
             /tmp/wazuh_cf_bootstrap_elastic.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/production/elastic/wazuh_cf_bootstrap_elastic.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/production/elastic/wazuh_cf_bootstrap_elastic.sh
               mode: '000700'
               owner: root
               group: root
@@ -576,7 +577,7 @@ Resources:
               group: root
             /tmp/wazuh_cf_elastic.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/production/elastic/wazuh_cf_elastic.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/production/elastic/wazuh_cf_elastic.sh
               mode: '000700'
               owner: root
               group: root
@@ -655,7 +656,7 @@ Resources:
               group: root
             /tmp/wazuh_cf_elastic.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/production/elastic/wazuh_cf_elastic.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/production/elastic/wazuh_cf_elastic.sh
               mode: '000700'
               owner: root
               group: root
@@ -955,7 +956,7 @@ Resources:
               group: root
             /tmp/wazuh_cf_kibana.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/production/elastic/wazuh_cf_kibana.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/production/elastic/wazuh_cf_kibana.sh
               mode: '000700'
               owner: root
               group: root
@@ -1036,7 +1037,7 @@ Resources:
               group: root
             /tmp/wazuh_cf_master.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/production/wazuh/cluster/wazuh_cf_master.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/production/wazuh/cluster/wazuh_cf_master.sh
               mode: '000700'
               owner: root
               group: root
@@ -1118,7 +1119,7 @@ Resources:
               group: root
             /tmp/wazuh_cf_worker.sh:
               source: !Sub >-
-                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.2_7.6.2/production/wazuh/cluster/wazuh_cf_worker.sh
+                https://raw.githubusercontent.com/wazuh/wazuh-cloudformation/v3.12.3_7.6.2/production/wazuh/cluster/wazuh_cf_worker.sh
               mode: '000700'
               owner: root
               group: root