Fix rollBack and uninstall improvement

unattended_installer/install_functions/opendistro/common.sh

@@ -273,10 +273,28 @@ function restoreWazuhrepo() {
 }
 
 function rollBack() {
-
-    if [ -z "${uninstall}" ]; then
+    if [ ! -z "${uninstall}" ] || [ ! -z "${uninstall_module_name}" ]; then
         logger "Cleaning the installation."
-    fi  
+
+        if [ "${uninstall_module_name}" == "wazuh" ]; then
+            logger "Cleaning the installation. Wazuh and Filebeat will be uninstalled."
+            rollBackWazuh
+        fi
+        if [ "${uninstall_module_name}" == "elasticsearch" ]; then
+            logger "Cleaning the installation. Elasticsearch will be uninstalled."
+            rollBackElasticsearch
+        fi
+        if [ "${uninstall_module_name}" == "kibana" ]; then
+            logger "Cleaning the installation. Kibana will be uninstalled."
+            rollBackKibana
+        fi
+        if [ "${uninstall_module_name}" == "all" ]; then
+            logger "Cleaning the installation. All packages and components will be uninstalled."
+            rollBackWazuh
+            rollBackElasticsearch
+            rollBackKibana
+        fi
+    fi
 
     if [ -f "/etc/yum.repos.d/wazuh.repo" ]; then
         eval "rm /etc/yum.repos.d/wazuh.repo"
@@ -286,6 +304,18 @@ function rollBack() {
         eval "rm /etc/apt/sources.list.d/wazuh.list"
     fi
 
+    if [ -z "${uninstall}" ]; then
+        if [ -n "${rollback_conf}" ] || [ -n "${overwrite}" ]; then
+            logger "Installation cleaned."
+        else
+            logger "Installation cleaned. Check the ${logfile} file to learn more about the issue."
+        fi
+    fi
+
+}
+
+function rollBackWazuh() {
+
     if [[ -n "${wazuhinstalled}" && ( -n "${wazuh}" || -n "${AIO}" || -n "${uninstall}" ) ]];then
         logger -w "Removing the Wazuh manager."
         if [ "${sys_type}" == "yum" ]; then
@@ -302,6 +332,34 @@ function rollBack() {
         eval "rm -rf /var/ossec/ ${debug}"
     fi
 
+    if [[ -n "${filebeatinstalled}" && ( -n "${wazuh}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then
+        logger -w "Removing Filebeat."
+        if [ "${sys_type}" == "yum" ]; then
+            eval "yum remove filebeat -y ${debug}"
+        elif [ "${sys_type}" == "zypper" ]; then
+            eval "zypper -n remove filebeat ${debug}"
+        elif [ "${sys_type}" == "apt-get" ]; then
+            eval "apt remove --purge filebeat -y ${debug}"
+        fi
+    fi
+
+    if [[ ( -n "${filebeat_remaining_files}" || -n "${filebeatinstalled}" ) && ( -n "${wazuh}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then
+        eval "rm -rf /var/lib/filebeat/ ${debug}"
+        eval "rm -rf /usr/share/filebeat/ ${debug}"
+        eval "rm -rf /etc/filebeat/ ${debug}"
+    fi
+
+    elements_to_remove=(    "/var/log/filebeat/"
+                            "/etc/systemd/system/multi-user.target.wants/wazuh-manager.service"
+                            "/etc/systemd/system/multi-user.target.wants/filebeat.service"
+                        )
+
+    eval "rm -rf ${elements_to_remove[*]}"
+
+}
+
+function rollBackElasticsearch() {
+
     if [[ -n "${elasticsearchinstalled}" && ( -n "${elasticsearch}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then
         logger -w "Removing Elasticsearch."
         if [ "${sys_type}" == "yum" ]; then
@@ -321,22 +379,20 @@ function rollBack() {
         eval "rm -rf /etc/elasticsearch/ ${debug}"
     fi
 
-    if [[ -n "${filebeatinstalled}" && ( -n "${wazuh}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then
-        logger -w "Removing Filebeat."
-        if [ "${sys_type}" == "yum" ]; then
-            eval "yum remove filebeat -y ${debug}"
-        elif [ "${sys_type}" == "zypper" ]; then
-            eval "zypper -n remove filebeat ${debug}"
-        elif [ "${sys_type}" == "apt-get" ]; then
-            eval "apt remove --purge filebeat -y ${debug}"
-        fi
-    fi
+    elements_to_remove=(    "/var/log/elasticsearch/"
+                            "/etc/systemd/system/elasticsearch.service.wants/"
+                            "/securityadmin_demo.sh"
+                            "/etc/systemd/system/multi-user.target.wants/elasticsearch.service"
+                            "/etc/systemd/system/multi-user.target.wants/kibana.service"
+                            "/etc/systemd/system/kibana.service"
+                            "/lib/firewalld/services/kibana.xml"
+                            "/lib/firewalld/services/elasticsearch.xml" )
 
-    if [[ ( -n "${filebeat_remaining_files}" || -n "${filebeatinstalled}" ) && ( -n "${wazuh}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then
-        eval "rm -rf /var/lib/filebeat/ ${debug}"
-        eval "rm -rf /usr/share/filebeat/ ${debug}"
-        eval "rm -rf /etc/filebeat/ ${debug}"
-    fi
+    eval "rm -rf ${elements_to_remove[*]}"
+
+}
+
+function rollBackKibana() {
 
     if [[ -n "${kibanainstalled}" && ( -n "${kibana}" || -n "${AIO}" || -n "${uninstall}" ) ]]; then
         logger -w "Removing Kibana."
@@ -355,28 +411,12 @@ function rollBack() {
         eval "rm -rf /etc/kibana/ ${debug}"
     fi
 
-    elements_to_remove=(    "/var/log/elasticsearch/"
-                            "/var/log/filebeat/"
-                            "/etc/systemd/system/elasticsearch.service.wants/"
-                            "/securityadmin_demo.sh"
-                            "/etc/systemd/system/multi-user.target.wants/wazuh-manager.service"
-                            "/etc/systemd/system/multi-user.target.wants/filebeat.service"
-                            "/etc/systemd/system/multi-user.target.wants/elasticsearch.service"
-                            "/etc/systemd/system/multi-user.target.wants/kibana.service"
+    elements_to_remove=(    "/etc/systemd/system/multi-user.target.wants/kibana.service"
                             "/etc/systemd/system/kibana.service"
-                            "/lib/firewalld/services/kibana.xml"
-                            "/lib/firewalld/services/elasticsearch.xml" )
+                            "/lib/firewalld/services/kibana.xml" )
 
     eval "rm -rf ${elements_to_remove[*]}"
 
-    if [ -z "${uninstall}" ]; then
-        if [ -n "${rollback_conf}" ] || [ -n "${overwrite}" ]; then
-            logger "Installation cleaned."
-        else
-            logger "Installation cleaned. Check the ${logfile} file to learn more about the issue."
-        fi
-    fi
-
 }
 
 function startService() {

unattended_installer/install_functions/opendistro/elasticsearch.sh

@@ -148,6 +148,7 @@ function initializeElasticsearch() {
 
 function installElasticsearch() {
 
+    uninstall_module_name="elasticsearch"
     logger "Starting Open Distro for Elasticsearch installation."
 
     if [ "${sys_type}" == "yum" ]; then

unattended_installer/install_functions/opendistro/filebeat.sh

@@ -54,6 +54,7 @@ function copyCertificatesFilebeat() {
 
 function installFilebeat() {
 
+    uninstall_module_name="filebeat"
     logger "Starting filebeat installation."
 
     if [ "${sys_type}" == "zypper" ]; then

unattended_installer/install_functions/opendistro/kibana.sh

@@ -159,6 +159,7 @@ function initializeKibanaAIO() {
 
 function installKibana() {
 
+    uninstall_module_name="kibana"
     logger "Starting Kibana installation."
     if [ "${sys_type}" == "zypper" ]; then
         eval "zypper -n install opendistroforelasticsearch-kibana=${opendistro_version} ${debug}"

unattended_installer/install_functions/opendistro/wazuh.sh

@@ -43,6 +43,7 @@ function configureWazuhCluster() {
 
 function installWazuh() {
 
+    uninstall_module_name="wazuh"
     logger "Starting the Wazuh manager installation."
     if [ "${sys_type}" == "zypper" ]; then
         eval "${sys_type} -n install wazuh-manager=${wazuh_version}-${wazuh_revision} ${debug}"

unattended_installer/wazuh_install.sh

@@ -111,7 +111,7 @@ function getHelp() {
     echo -e "        -t,  --tar <path-to-certs-tar>"
     echo -e "                Path to tar containing certificate files. By default: ${base_path}/configurations.tar"
     echo -e ""
-    echo -e "        -u,  --uninstall"
+    echo -e "        -u,  --uninstall <app-module-name>"
     echo -e "                Uninstalls all Wazuh components. NOTE: This will erase all the existing configuration and data."
     echo -e ""
     echo -e "        -v,  --verbose"
@@ -284,8 +284,14 @@ function main() {
                 shift 2
                 ;;
             "-u"|"--uninstall")
+                if [ -z "${2}" ]; then
+                    logger -e "Error on arguments. Probably missing <app-module-name> after -u|--uninstall."
+                    getHelp
+                    exit 1
+                fi
                 uninstall=1
-                shift 1
+                uninstall_module_name="${2}"
+                shift 2
                 ;;
             "-v"|"--verbose")
                 debugEnabled=1