Merge commit '0921095dd35c19c699f5042226ebb13566689bc4' into enhancem…

…ent/1449-fix-pr-checks
wazuh · Nov 13, 2024 · 4bc0921 · 4bc0921
2 parents c925857 + 0921095
commit 4bc0921
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 30 deletions.
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-ANSIBLE_VERSION="v5.0.0"
-REVISION="50000"
+WAZUH-ANSIBLE_VERSION="v4.9.0"
+REVISION="40907"
diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 filebeat_version: 7.10.2
 
-wazuh_template_branch: v5.0.0
+wazuh_template_branch: v4.9.0
 
 filebeat_node_name: node-1
 
@@ -23,7 +23,7 @@ local_certs_path: "{{ playbook_dir }}/indexer/certificates"
 
 filebeatrepo:
   keyring_path: '/usr/share/keyrings/wazuh.gpg'
-  apt: "deb [signed-by=/usr/share/keyrings/wazuh.gpg] https://packages.wazuh.com/5.x/apt/ stable main"
-  yum: 'https://packages.wazuh.com/5.x/yum/'
+  apt: "deb [signed-by=/usr/share/keyrings/wazuh.gpg] https://packages.wazuh.com/4.x/apt/ stable main"
+  yum: 'https://packages.wazuh.com/4.x/yum/'
   gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH'
   path: '/tmp/WAZUH-GPG-KEY'
diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-wazuh_agent_version: 5.0.0
+wazuh_agent_version: 4.9.0
 
 # Custom packages installation
 
@@ -65,7 +65,7 @@ wazuh_managers:
     retry_interval: 5
     register: yes
 
-## Authentication Method: Enrollment section (5.x)
+## Authentication Method: Enrollment section (4.x)
 
 # For more information see:
 # * https://documentation.wazuh.com/current/user-manual/reference/ossec-conf/client.html#enrollment

diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-wazuh_manager_version: 5.0.0
+wazuh_manager_version: 4.9.0
 
 wazuh_manager_fqdn: "wazuh-server"
 wazuh_manager_package_state: present

diff --git a/roles/wazuh/check-packages/defaults/main.yml b/roles/wazuh/check-packages/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-wazuh_version: 5.0.0
+wazuh_version: 4.9.0
diff --git a/roles/wazuh/check-packages/files/packages_uri.txt b/roles/wazuh/check-packages/files/packages_uri.txt
@@ -1,6 +1,6 @@
 yum/wazuh-manager-VERSION-1.x86_64.rpm
 apt/pool/main/w/wazuh-manager/wazuh-manager_VERSION-1_amd64.deb
-yum/wazuh-dashboard-VERSION-1.x86_64.rpm
+yum/wazuh-dashboard-VERSION-2.x86_64.rpm
 yum/wazuh-indexer-VERSION-1.x86_64.rpm
 apt/pool/main/w/wazuh-agent/wazuh-agent_VERSION-1_amd64.deb
 yum/wazuh-agent-VERSION-1.x86_64.rpm
diff --git a/roles/wazuh/check-packages/scripts/check_packages.sh b/roles/wazuh/check-packages/scripts/check_packages.sh
@@ -9,7 +9,7 @@ checkPackages(){
     ## Set S3 Bucket URL
     if [ $1 == "production" ]; then
         echo "production"
-        PACKAGES_URL=https://packages.wazuh.com/5.x/
+        PACKAGES_URL=https://packages.wazuh.com/4.x/
     elif [ $1 == "pre-release" ]; then
         echo "pre-release"
         PACKAGES_URL=https://packages-dev.wazuh.com/pre-release/
@@ -44,7 +44,8 @@ checkPackages(){
         ## If it does not exist set EXISTS to 1 (false)
         if [ "$PACKAGE" != "200" ]; then
             EXISTS=1
-            #echo $PACKAGES_URL$URI "does not exist"
+            # echo $PACKAGES_URL$URI "does not exist"
+            echo "The package: " $PACKAGES_URL$URI " was not found in the repository"
             return $EXISTS
         fi
     done < ../files/packages_uri_new.txt

diff --git a/roles/wazuh/vars/repo.yml b/roles/wazuh/vars/repo.yml
@@ -1,20 +1,20 @@
 wazuh_repo:
   keyring_path: '/usr/share/keyrings/wazuh.gpg'
-  apt: 'deb [signed-by=/usr/share/keyrings/wazuh.gpg] https://packages.wazuh.com/5.x/apt/ stable main'
-  yum: 'https://packages.wazuh.com/5.x/yum/'
+  apt: 'deb [signed-by=/usr/share/keyrings/wazuh.gpg] https://packages.wazuh.com/4.x/apt/ stable main'
+  yum: 'https://packages.wazuh.com/4.x/yum/'
   gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH'
   path: '/tmp/WAZUH-GPG-KEY'
-wazuh_winagent_config_url: "https://packages.wazuh.com/5.x/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi"
+wazuh_winagent_config_url: "https://packages.wazuh.com/4.x/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi"
 wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi"
-wazuh_winagent_sha512_url: "https://packages.wazuh.com/5.x/checksums/wazuh/{{ wazuh_agent_version }}/wazuh-agent-{{ wazuh_agent_version }}-1.msi.sha512"
-filebeat_module_package_url: https://packages.wazuh.com/5.x/filebeat
+wazuh_winagent_sha512_url: "https://packages.wazuh.com/4.x/checksums/wazuh/{{ wazuh_agent_version }}/wazuh-agent-{{ wazuh_agent_version }}-1.msi.sha512"
+filebeat_module_package_url: https://packages.wazuh.com/4.x/filebeat
 
 wazuh_macos_intel_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.intel64.pkg"
 wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg"
-wazuh_macos_intel_package_url: "https://packages.wazuh.com/5.x/macos/{{ wazuh_macos_intel_package_name }}"
-wazuh_macos_arm_package_url: "https://packages.wazuh.com/5.x/macos/{{ wazuh_macos_arm_package_name }}"
+wazuh_macos_intel_package_url: "https://packages.wazuh.com/4.x/macos/{{ wazuh_macos_intel_package_name }}"
+wazuh_macos_arm_package_url: "https://packages.wazuh.com/4.x/macos/{{ wazuh_macos_arm_package_name }}"
 
-certs_gen_tool_version: "5.0"
+certs_gen_tool_version: "4.9"
 
 # Url of certificates generator tool
 certs_gen_tool_url: "https://packages.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh"
diff --git a/roles/wazuh/vars/repo_pre-release.yml b/roles/wazuh/vars/repo_pre-release.yml
@@ -14,7 +14,7 @@ wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg
 wazuh_macos_intel_package_url: "https://packages-dev.wazuh.com/pre-release/{{ wazuh_macos_intel_package_name }}"
 wazuh_macos_arm_package_url: "https://packages-dev.wazuh.com/pre-release/macos/{{ wazuh_macos_arm_package_name }}"
 
-certs_gen_tool_version: "5.0"
+certs_gen_tool_version: "4.9"
 
 # Url of certificates generator tool
 certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh"
diff --git a/roles/wazuh/vars/repo_staging.yml b/roles/wazuh/vars/repo_staging.yml
@@ -15,7 +15,7 @@ wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg
 wazuh_macos_intel_package_url: "https://packages-dev.wazuh.com/staging/macos/{{ wazuh_macos_intel_package_name }}"
 wazuh_macos_arm_package_url: "https://packages-dev.wazuh.com/staging/macos/{{ wazuh_macos_arm_package_name }}"
 
-certs_gen_tool_version: "5.0"
+certs_gen_tool_version: "4.9"
 
 # Url of certificates generator tool
 certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh"
diff --git a/roles/wazuh/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml
@@ -8,12 +8,12 @@ dashboard_node_name: node-1
 dashboard_server_host: "0.0.0.0"
 dashboard_server_port: "443"
 dashboard_server_name: "dashboard"
-wazuh_version: 5.0.0
+wazuh_version: 4.9.0
 indexer_cluster_nodes:
   - 127.0.0.1
 
 # The Wazuh dashboard package repository
-dashboard_version: "5.0.0"
+dashboard_version: "4.9.0"
 
 # API credentials
 wazuh_api_credentials:

diff --git a/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 b/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2
@@ -21,7 +21,7 @@
 # ------------------------------- Index patterns -------------------------------
 #
 # Default index pattern to use.
-#pattern: wazuh-alerts-5.x-*
+#pattern: wazuh-alerts-4.x-*
 #
 # ----------------------------------- Checks -----------------------------------
 #
@@ -92,17 +92,17 @@
 # Default: 900 (s)
 #wazuh.monitoring.frequency: 900
 #
-# Configure wazuh-monitoring-5.x-* indices shards and replicas.
+# Configure wazuh-monitoring-4.x-* indices shards and replicas.
 #wazuh.monitoring.shards: 2
 #wazuh.monitoring.replicas: 0
 #
-# Configure wazuh-monitoring-5.x-* indices custom creation interval.
+# Configure wazuh-monitoring-4.x-* indices custom creation interval.
 # Values: h (hourly), d (daily), w (weekly), m (monthly)
 # Default: d
 #wazuh.monitoring.creation: d
 #
 # Default index pattern to use for Wazuh monitoring
-#wazuh.monitoring.pattern: wazuh-monitoring-5.x-*
+#wazuh.monitoring.pattern: wazuh-monitoring-4.x-*
 #
 #
 # ------------------------------- App privileges --------------------------------

diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml
@@ -1,2 +1,2 @@
 ---
-dashboard_version: 5.0.0
+dashboard_version: 4.9.0
diff --git a/roles/wazuh/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 # Cluster Settings
-indexer_version: 5.0.0
+indexer_version: 4.9.0
 
 single_node: false
 indexer_node_name: node-1