Add necessary functions to allow upgrade using installation assistant

README.md

@@ -32,14 +32,14 @@ The following table shows the references for the versions of each component.
 
 ### Dashboard
 
-| Wazuh dashboard | Opensearch dashboards |
+| Wazuh dashboard | OpenSearch Dashboards |
 |-----------------|-----------------------|
 | 4.3.x           | 1.2.0                 |
 | 4.4.x           | 2.3.0                 |
 
 ### Indexer
 
-| Wazuh indexer   | Opensearch            |
+| Wazuh indexer   | OpenSearch            |
 |-----------------|-----------------------|
 | 4.3.x           | 1.2.4                 |
 | 4.4.x           | 2.3.0                 |

unattended_installer/builder.sh

@@ -70,7 +70,8 @@ function buildInstaller() {
         echo 'readonly repogpg="https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH"' >> "${output_script_path}"
         echo 'readonly repobaseurl="https://packages-dev.wazuh.com/'${devrepo}'"' >> "${output_script_path}"
         echo 'readonly reporelease="unstable"' >> "${output_script_path}"
-        echo 'readonly filebeat_wazuh_module="${repobaseurl}/filebeat/wazuh-filebeat-0.2.tar.gz"' >> "${output_script_path}"
+        echo 'readonly filebeat_wazuh_module_version="0.2"' >> "${output_script_path}"
+        echo 'readonly filebeat_wazuh_module="${repobaseurl}/filebeat/wazuh-filebeat-${filebeat_wazuh_module_version}.tar.gz"' >> "${output_script_path}"
         echo 'readonly bucket="packages-dev.wazuh.com"' >> "${output_script_path}"
         echo 'readonly repository="'"${devrepo}"'"' >> "${output_script_path}"
     else

unattended_installer/common_functions/common.sh

@@ -68,39 +68,39 @@ function common_checkInstalled() {
     dashboard_installed=""
 
     if [ "${sys_type}" == "yum" ]; then
-        wazuh_installed=$(yum list installed 2>/dev/null | grep wazuh-manager)
+        wazuh_installed=$(yum list installed 2>/dev/null | grep wazuh-manager | sed 's/  */ /g'| cut -d' ' -f2 | sed "s/-.*//g")
     elif [ "${sys_type}" == "apt-get" ]; then
-        wazuh_installed=$(apt list --installed  2>/dev/null | grep wazuh-manager)
+        wazuh_installed=$(apt list --installed  2>/dev/null | grep wazuh-manager | cut -d' ' -f2 | sed "s/-.*//")
     fi
 
     if [ -d "/var/ossec" ]; then
         wazuh_remaining_files=1
     fi
 
     if [ "${sys_type}" == "yum" ]; then
-        indexer_installed=$(yum list installed 2>/dev/null | grep wazuh-indexer)
+        indexer_installed=$(yum list installed 2>/dev/null | grep wazuh-indexer | sed 's/  */ /g'| cut -d' ' -f2 | sed "s/-.*//g")
     elif [ "${sys_type}" == "apt-get" ]; then
-        indexer_installed=$(apt list --installed 2>/dev/null | grep wazuh-indexer)
+        indexer_installed=$(apt list --installed 2>/dev/null | grep wazuh-indexer | cut -d' ' -f2 | sed "s/-.*//")
     fi
 
     if [ -d "/var/lib/wazuh-indexer/" ] || [ -d "/usr/share/wazuh-indexer" ] || [ -d "/etc/wazuh-indexer" ] || [ -f "${base_path}/search-guard-tlstool*" ]; then
         indexer_remaining_files=1
     fi
 
     if [ "${sys_type}" == "yum" ]; then
-        filebeat_installed=$(yum list installed 2>/dev/null | grep filebeat)
+        filebeat_installed=$(yum list installed 2>/dev/null | grep filebeat | sed 's/  */ /g'| cut -d' ' -f2 | sed "s/-.*//g")
     elif [ "${sys_type}" == "apt-get" ]; then
-        filebeat_installed=$(apt list --installed  2>/dev/null | grep filebeat)
+        filebeat_installed=$(apt list --installed  2>/dev/null | grep filebeat | cut -d' ' -f2 | sed "s/-.*//")
     fi
 
     if [ -d "/var/lib/filebeat/" ] || [ -d "/usr/share/filebeat" ] || [ -d "/etc/filebeat" ]; then
         filebeat_remaining_files=1
     fi
 
     if [ "${sys_type}" == "yum" ]; then
-        dashboard_installed=$(yum list installed 2>/dev/null | grep wazuh-dashboard)
+        dashboard_installed=$(yum list installed 2>/dev/null | grep wazuh-dashboard | sed 's/  */ /g'| cut -d' ' -f2 | sed "s/-.*//g")
     elif [ "${sys_type}" == "apt-get" ]; then
-        dashboard_installed=$(apt list --installed  2>/dev/null | grep wazuh-dashboard)
+        dashboard_installed=$(apt list --installed  2>/dev/null | grep wazuh-dashboard | cut -d' ' -f2 | sed "s/-.*//")
     fi
 
     if [ -d "/var/lib/wazuh-dashboard/" ] || [ -d "/usr/share/wazuh-dashboard" ] || [ -d "/etc/wazuh-dashboard" ] || [ -d "/run/wazuh-dashboard/" ]; then

unattended_installer/install_functions/checks.sh

@@ -154,8 +154,8 @@ function checks_arguments() {
 
     # -------------- Global -----------------------------------------
 
-    if [ -z "${AIO}" ] && [ -z "${indexer}" ] && [ -z "${dashboard}" ] && [ -z "${wazuh}" ] && [ -z "${start_indexer_cluster}" ] && [ -z "${configurations}" ] && [ -z "${uninstall}" ] && [ -z "${download}" ]; then
-        common_logger -e "At least one of these arguments is necessary -a|--all-in-one, -g|--generate-config-files, -wi|--wazuh-indexer, -wd|--wazuh-dashboard, -s|--start-cluster, -ws|--wazuh-server, -u|--uninstall, -dw|--download-wazuh."
+    if [ -z "${AIO}" ] && [ -z "${indexer}" ] && [ -z "${dashboard}" ] && [ -z "${wazuh}" ] && [ -z "${start_indexer_cluster}" ] && [ -z "${configurations}" ] && [ -z "${uninstall}" ] && [ -z "${download}" ] && [ -z "${upgrade}" ]; then
+        common_logger -e "At least one of these arguments is necessary -a|--all-in-one, -g|--generate-config-files, , -up|--upgrade, -wi|--wazuh-indexer, -wd|--wazuh-dashboard, -s|--start-cluster, -ws|--wazuh-server, -u|--uninstall, -dw|--download-wazuh."
         exit 1
     fi
 

unattended_installer/install_functions/dashboard.sh

@@ -191,7 +191,9 @@ function dashboard_install() {
     common_checkInstalled
     if [  "$install_result" != 0  ] || [ -z "${dashboard_installed}" ]; then
         common_logger -e "Wazuh dashboard installation failed."
-        installCommon_rollBack
+        if [ -z ${upgrade} ]; then
+            installCommon_rollBack
+        fi
         exit 1
     else
         common_logger "Wazuh dashboard installation finished."

unattended_installer/install_functions/indexer.sh

@@ -148,7 +148,9 @@ function indexer_install() {
     common_checkInstalled
     if [  "$install_result" != 0  ] || [ -z "${indexer_installed}" ]; then
         common_logger -e "Wazuh indexer installation failed."
-        installCommon_rollBack
+        if [ -z ${upgrade} ]; then
+            installCommon_rollBack
+        fi
         exit 1
     else
         common_logger "Wazuh indexer installation finished."

unattended_installer/install_functions/installMain.sh

@@ -49,6 +49,9 @@ function getHelp() {
     echo -e "        -u,  --uninstall"
     echo -e "                Uninstalls all Wazuh components. This will erase all the existing configuration and data."
     echo -e ""
+    echo -e "        -up,  --upgrade"
+    echo -e "                Upgrades installed Wazuh components."
+    echo -e ""
     echo -e "        -v,  --verbose"
     echo -e "                Shows the complete installation output."
     echo -e ""
@@ -129,6 +132,10 @@ function main() {
                 uninstall=1
                 shift 1
                 ;;
+            "-up"|"--upgrade")
+                upgrade=1
+                shift 1
+                ;;
             "-v"|"--verbose")
                 debugEnabled=1
                 debug="2>&1 | tee -a ${logfile}"
@@ -209,11 +216,21 @@ function main() {
     common_checkSystem
     common_checkInstalled
     checks_arguments
+# -------------- Uninstall case  ------------------------------------
+
     if [ -n "${uninstall}" ]; then
         installCommon_rollBack
         exit 0
     fi
 
+# -------------- Upgrade case  ------------------------------------
+
+    if [ -n "${upgrade}" ]; then
+        installCommon_addWazuhRepo
+        upgrade_upgradeInstalled
+        exit 0
+    fi
+
 # -------------- Preliminary checks  --------------------------------
 
     if [ -z "${configurations}" ] && [ -z "${AIO}" ] && [ -z "${download}" ]; then

unattended_installer/install_functions/manager.sh

@@ -54,7 +54,9 @@ function manager_install() {
     common_checkInstalled
     if [  "$install_result" != 0  ] || [ -z "${wazuh_installed}" ]; then
         common_logger -e "Wazuh installation failed."
-        installCommon_rollBack
+        if [ -z ${upgrade} ]; then
+            installCommon_rollBack 
+        fi
         exit 1
     else
         common_logger "Wazuh manager installation finished."

unattended_installer/install_functions/upgrade.sh

@@ -0,0 +1,106 @@
+# Wazuh installer - common.sh functions.
+# Copyright (C) 2015, Wazuh Inc.
+#
+# This program is a free software; you can redistribute it
+# and/or modify it under the terms of the GNU General Public
+# License (version 2) as published by the FSF - Free Software
+# Foundation.
+
+
+function upgrade_getUpgradable {
+
+  if [ -n "${wazuh_installed}" ]; then
+    if [ "${sys_type}" == "yum" ]; then
+        manager_upgradable=$(yum list wazuh-manager --show-duplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | tail -n +2 | grep ${wazuh_version})
+    elif [ "${sys_type}" == "apt-get" ]; then
+        manager_upgradable=$(apt-get install wazuh-manager=${wazuh_version}-* --dry-run |grep "The following packages will be upgraded:")
+    fi
+  fi
+
+  if [ -n "${filebeat_installed}" ]; then
+    if [ "${sys_type}" == "yum" ]; then
+        filebeat_upgradable=$(yum list filebeat --show-duplicates | tail -n +8 | grep -A 5000 ${filebeat_installed} | tail -n +2 | grep ${filebeat_version})
+    elif [ "${sys_type}" == "apt-get" ]; then
+        filebeat_upgradable=$(apt-get install filebeat=${filebeat_version} --dry-run |grep "The following packages will be upgraded:")
+    fi
+    installed_module_version=$(cat /usr/share/filebeat/module/wazuh/alerts/manifest.yml | grep "module_version" | cut -d" " -f2)
+    installed_module_version_major=$(echo ${installed_module_version} | cut -d"." -f1)
+    installed_module_version_minor=$(echo ${installed_module_version} | cut -d"." -f2)
+    filebeat_wazuh_module_major=$(echo ${filebeat_wazuh_module_version} | cut -d"." -f1)
+    filebeat_wazuh_module_minor=$(echo ${filebeat_wazuh_module_version} | cut -d"." -f2)
+    if [ "${installed_module_version_major}" -lt "${filebeat_wazuh_module_major}" ] || ([ "${installed_module_version_major}" -eq "${filebeat_wazuh_module_major}" ] && [ "${installed_module_version_minor}" -lt "${filebeat_wazuh_module_minor}" ]); then
+      module_upgradable="${filebeat_wazuh_module_version}"
+    fi
+  fi
+
+  if [ -n "${indexer_installed}" ]; then
+    if [ "${sys_type}" == "yum" ]; then
+        indexer_upgradable=$(yum list wazuh-indexer --show-duplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | tail -n +2 | grep ${wazuh_version})
+    elif [ "${sys_type}" == "apt-get" ]; then
+        indexer_upgradable=$(apt-get install wazuh-indexer=${wazuh_version}-* --dry-run |grep "The following packages will be upgraded:")
+    fi
+  fi
+
+  if [ -n "${dashboard_installed}" ]; then
+    if [ "${sys_type}" == "yum" ]; then
+        dashboard_upgradable=$(yum list wazuh-dashboard --show-duplicates | tail -n +8 | grep -A 5000 ${wazuh_installed} | tail -n +2 | grep ${wazuh_version})
+    elif [ "${sys_type}" == "apt-get" ]; then
+        dashboard_upgradable=$(apt-get install wazuh-dashboard=${wazuh_version}-* --dry-run |grep "The following packages will be upgraded:")
+    fi
+  fi
+
+}
+
+
+function upgrade_upgradeInstalled(){
+
+  common_logger "--- Upgrading existing Wazuh installation ---"
+
+  upgrade_getUpgradable
+
+  if [ -n "${wazuh_installed}" ]; then
+    if [ -n "${manager_upgradable}" ]; then
+      common_logger "Upgrading Wazuh Manager to ${wazuh_version}"
+      eval "manager_install ${debug}"
+      installCommon_startService "wazuh-manager"
+    else
+      common_logger -w "Wazuh manager is already installed and the version is equal or greater than ${wazuh_version}."
+    fi
+  fi
+
+  if [ -n "${filebeat_installed}" ]; then
+    if [ -n "${filebeat_upgradable}" ]; then
+      common_logger "Upgrading Filebeat to ${filebeat_version}"
+      eval "filebeat_install ${debug}"
+      installCommon_startService "filebeat"
+    else
+      common_logger -w "Filebeat is already installed and the version is equal or greater than ${filebeat_version}."
+    fi
+
+    if [ -n ${module_upgradable} ];then
+      common_logger "Upgrading Filebeat module to ${filebeat_wazuh_module_version}"
+      eval "curl -s ${filebeat_wazuh_module} --max-time 300 | tar -xvz -C /usr/share/filebeat/module ${debug}"
+    fi
+  fi
+
+  if [ -n "${indexer_installed}" ]; then
+    if [ -n "${indexer_upgradable}" ]; then
+      common_logger "Upgrading Wazuh Indexer to ${wazuh_version}"
+      eval "indexer_install ${debug}"
+      installCommon_startService "wazuh-indexer"
+    else
+      common_logger -w "Wazuh Indexer is already installed and the version is equal or greater than ${wazuh_version}."
+    fi
+  fi
+
+  if [ -n "${dashboard_installed}" ]; then
+    if [ -n "${dashboard_upgradable}" ]; then
+      common_logger "Upgrading Wazuh Dashboard to ${wazuh_version}"
+      eval "dashboard_install ${debug}"
+      installCommon_startService "wazuh-dashboard"
+    else
+      common_logger -w "Wazuh Dashboard is already installed and the version is equal or greater than ${wazuh_version}."
+    fi
+  fi
+
+}