Fix rollBack and uninstall improvement #1211

myu1d157h0u54nd · 2022-01-27T19:45:44Z

Related issue
Closes #1210

Description

The script needs to be able to run custom uninstallations:

-u all
- To uninstall all.
-u wazuh
- To uninstall just wazuh.
-u elasticsearch
- To uninstall only elasticsearch.
-u kibana
- To uninstall just Kibana.

verdx

LGTM

alberpilot

The function Rollback must call other functions with names uninstallWazuh, uninstallElasticsearch, and uninstallKibana. Those functions must be placed in their respective .sh file, not in common.sh. In common.sh will be only a functions rollBack with this appearance:

function rollBack() {
	component=$1
        if $1 != "all"; then 
        	eval "uninstall$component"
        else
                eval "uninstallWazuh" 
                eval "uninstallElasticsearch"
                eval "uninstallKibana"  
}

Delegating the uninstall component responsibility to their corresponding module (wazuh.sh, elasticsearch.sh, etc).

Please review the other comments

alberpilot · 2022-02-01T17:33:48Z

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>"


Suggested change

echo -e " -u, --uninstall <app-module-name>"

echo -e " -u, --uninstall <component-name>"

unattended_installer/wazuh_install.sh

…component

myu1d157h0u54nd · 2022-02-02T06:02:38Z

The function Rollback must call other functions with names uninstallWazuh, uninstallElasticsearch, and uninstallKibana. Those functions must be placed in their respective .sh file, not in common.sh. In common.sh will be only a functions rollBack with this appearance:
function rollBack() {
	component=$1
        if $1 != "all"; then 
        	eval "uninstall$component"
        else
                eval "uninstallWazuh" 
                eval "uninstallElasticsearch"
                eval "uninstallKibana"  
}
Delegating the uninstall component responsibility to their corresponding module (wazuh.sh, elasticsearch.sh, etc).

Please review the other comments

Done!

alberpilot

Please consider the uninstall_component_name and elasticsearchinstalled, wazuhinstaller, etc unification.

myu1d157h0u54nd · 2022-02-03T19:17:11Z

Improvement for parameter check in the case: --uninstall

wazuh_install.sh --local --development --ignore-health-check --disable-spinner -u all

03/02/2022 06:44:22 INFO: Starting Wazuh unattended installer. Wazuh version: 4.3.0. Wazuh installer version: 0.1
03/02/2022 06:44:22 WARNING: Health-check ignored.
03/02/2022 06:44:22 INFO: Wazuh manager components were not found on the system so it was not uninstalled.
03/02/2022 06:44:22 INFO: Filebeat components were not found on the system so it was not uninstalled.
03/02/2022 06:44:22 INFO: Elasticsearch components were not found on the system so it was not uninstalled.
03/02/2022 06:44:22 INFO: Kibana components were not found on the system so it was not uninstalled.
03/02/2022 06:44:23 INFO: ------------------------------------ Uninstall ------------------------------------
03/02/2022 06:44:23 INFO: Removing components and cleaning the installation.
03/02/2022 06:44:23 INFO: All packages and components will be uninstalled.
03/02/2022 06:44:23 INFO: Wazuh and Filebeat will be uninstalled.
03/02/2022 06:44:23 INFO: Elasticsearch will be uninstalled.
03/02/2022 06:44:23 INFO: Kibana will be uninstalled.
03/02/2022 06:44:23 INFO: Repositories were removed.
03/02/2022 06:44:23 INFO: All components removed.

wazuh_install.sh --local --development --ignore-health-check --disable-spinner -u alla


03/02/2022 06:46:04 INFO: Starting Wazuh unattended installer. Wazuh version: 4.3.0. Wazuh installer version: 0.1
03/02/2022 06:46:04 WARNING: Health-check ignored.
03/02/2022 06:46:04 ERROR: The argument -u|--uninstall only accepts the following parameters: all, manager, elasticsearch or kibana.

myu1d157h0u54nd · 2022-02-03T20:17:02Z

wazuh_install.sh --local --development --ignore-health-check --disable-spinner -u all

03/02/2022 08:41:17 INFO: Starting Wazuh unattended installer. Wazuh version: 4.3.0. Wazuh installer version: 0.1
03/02/2022 08:41:17 WARNING: Health-check ignored.
03/02/2022 08:41:19 INFO: ------------------------------------ Uninstall ------------------------------------
03/02/2022 08:41:19 INFO: Removing components and cleaning the installation.
03/02/2022 08:41:19 INFO: All packages and components will be uninstalled.
03/02/2022 08:41:19 INFO: Wazuh and Filebeat will be uninstalled.
03/02/2022 08:41:19 WARNING: Removing Wazuh packages.
03/02/2022 08:41:25 WARNING: Removing Wazuh files.
03/02/2022 08:41:25 WARNING: Removing Filebeat packages.
03/02/2022 08:41:27 WARNING: Removing Filebeat files.
03/02/2022 08:41:27 INFO: Elasticsearch will be uninstalled.
03/02/2022 08:41:27 WARNING: Removing Elasticsearch packages.
03/02/2022 08:41:32 WARNING: Removing Elasticsearch files.
03/02/2022 08:41:32 INFO: Kibana will be uninstalled.
03/02/2022 08:41:32 WARNING: Removing Kibana packages.
03/02/2022 08:41:32 WARNING: Removing Kibana files.
03/02/2022 08:41:32 INFO: Repositories were removed.
03/02/2022 08:41:32 INFO: All components removed.

myu1d157h0u54nd · 2022-02-03T20:19:22Z

Please consider the uninstall_component_name and elasticsearchinstalled, wazuhinstaller, etc unification.

Done!

myu1d157h0u54nd · 2022-02-04T22:10:26Z

Let's see, the first and LEAST important thing that comes to my eyes is the there. We always talk about it, attention to detail. At least it's formatted.
Then, let's see, I have an INFO message that the unattended begins.
Then 4 messages that none of the 4 components were found.
Then Uninstall section. What for what? They have not been found.
Then it says Removing compobnent and cleaning the installation.
Then which packages and components will be uninstalled. But... if they didn't meet, he said at the beginning.
After all the components were removed...

I'm working on this!

myu1d157h0u54nd · 2022-02-07T15:30:17Z

Example of complete uninstall (all) in a scenario where nothing is installed.

bash unattended_installer/wazuh_install.sh --local --development --ignore-health-check --disable-spinner -u all

03/02/2022 21:07:51 INFO: ------------------------------------ Uninstall ------------------------------------
03/02/2022 21:07:51 INFO: Analyzing components to uninstall and clean.
03/02/2022 21:07:51 INFO: Wazuh manager components were not found on the system so it was not uninstalled.
03/02/2022 21:07:51 INFO: Elasticsearch components were not found on the system so it was not uninstalled.
03/02/2022 21:07:51 INFO: Kibana components were not found on the system so it was not uninstalled.
03/02/2022 21:07:53 INFO: The uninstall process is complete.

myu1d157h0u54nd · 2022-02-07T15:40:46Z

Example case where the host has all packages installed (AIO). And only one package (kibana) is uninstalled.
In this case, the deletion of the repository file is not performed.

bash unattended_installer/wazuh_install.sh --local --development --ignore-health-check --disable-spinner -u kibana

03/02/2022 21:24:00 INFO: ------------------------------------ Uninstall ------------------------------------
03/02/2022 21:24:00 INFO: Analyzing components to uninstall and clean.
03/02/2022 21:24:00 INFO: Kibana will be uninstalled.
03/02/2022 21:24:00 WARNING: Removing Kibana packages.
03/02/2022 21:24:05 WARNING: Removing Kibana files.
03/02/2022 21:24:06 WARNING: Some Wazuh components are still installed on this host.
03/02/2022 21:24:06 INFO: The uninstall process is complete.

Case with the example of removing only one component (kibana). When this component is no longer installed.

bash unattended_installer/wazuh_install.sh --local --development --ignore-health-check --disable-spinner -u kibana

03/02/2022 22:12:13 INFO: ------------------------------------ Uninstall ------------------------------------
03/02/2022 22:12:13 INFO: Analyzing components to uninstall and clean.
03/02/2022 22:12:13 INFO: Kibana components were not found on the system so it was not uninstalled.
03/02/2022 22:12:14 WARNING: Some Wazuh components are still installed on this host.
03/02/2022 22:12:14 INFO: The uninstall process is complete.

myu1d157h0u54nd · 2022-02-08T00:53:08Z

Example of uninstallation of the only package in the system (manager).

sudo bash /tmp/unattended_installer/wazuh_install.sh --local --development --ignore-health-check --disable-spinner --uninstall manager

04/02/2022 07:08:55 INFO: ------------------------------------ Uninstall ------------------------------------
04/02/2022 07:08:55 INFO: Analyzing components to uninstall and clean.
04/02/2022 07:08:55 INFO: Wazuh and Filebeat will be uninstalled.
04/02/2022 07:08:55 WARNING: Removing Wazuh packages.
04/02/2022 07:09:00 WARNING: Removing Filebeat packages.
04/02/2022 07:09:01 WARNING: Removing Wazuh files.
04/02/2022 07:09:01 WARNING: Removing Filebeat files.
04/02/2022 07:09:02 INFO: Repositories were removed.
04/02/2022 07:09:02 INFO: The uninstall process is complete.

Example of uninstallation of the only package in the system (elasticsearch).

sudo bash /tmp/unattended_installer/wazuh_install.sh --local --development --ignore-health-check --disable-spinner --uninstall elasticsearch

04/02/2022 07:18:39 INFO: ------------------------------------ Uninstall ------------------------------------
04/02/2022 07:18:39 INFO: Analyzing components to uninstall and clean.
04/02/2022 07:18:39 INFO: Elasticsearch will be uninstalled.
04/02/2022 07:18:39 WARNING: Removing Elasticsearch packages.
04/02/2022 07:18:41 WARNING: Removing Elasticsearch files.
04/02/2022 07:18:43 INFO: Repositories were removed.
04/02/2022 07:18:43 INFO: The uninstall process is complete.

Example of uninstallation of the only package in the system (kibana).

sudo bash /tmp/unattended_installer/wazuh_install.sh --local --development --ignore-health-check --disable-spinner --uninstall kibana

04/02/2022 07:34:03 INFO: ------------------------------------ Uninstall ------------------------------------
04/02/2022 07:34:03 INFO: Analyzing components to uninstall and clean.
04/02/2022 07:34:03 INFO: Kibana will be uninstalled.
04/02/2022 07:34:03 WARNING: Removing Kibana files.
04/02/2022 07:34:05 INFO: Repositories were removed.
04/02/2022 07:34:05 INFO: The uninstall process is complete.

…ollBack case)

new commmit

alberpilot

04/02/2022 07:08:55 INFO: ------------------------------------ Uninstall ------------------------------------
04/02/2022 07:08:55 INFO: Analyzing components to uninstall and clean.
04/02/2022 07:08:55 INFO: Wazuh and Filebeat will be uninstalled.
04/02/2022 07:08:55 WARNING: Removing Wazuh packages.
04/02/2022 07:09:00 WARNING: Removing Filebeat packages.
04/02/2022 07:09:01 WARNING: Removing Wazuh files.
04/02/2022 07:09:01 WARNING: Removing Filebeat files.
04/02/2022 07:09:02 INFO: Repositories were removed.
04/02/2022 07:09:02 INFO: The uninstall process is complete.

This output says: Wazuh and Filebeat will be uninstalled. Then, all components have a WARNING message for removal. Only Filebeat and Wazuh must appear.

The Elasticsearch and Kibana examples are good.
Please review the requested changes.

alberpilot · 2022-02-08T11:40:53Z

unattended_installer/install_functions/opendistro/common.sh

-        elif [ "${sys_type}" == "apt-get" ]; then
-            eval "apt remove --purge wazuh-manager -y ${debug}"
-        fi 
+    # Uninstall case!


Why the !?

Suggested change

# Uninstall case!

# Uninstall case

Done
c3fc835

alberpilot · 2022-02-08T11:41:55Z

unattended_installer/install_functions/opendistro/common.sh

-            eval "zypper -n remove filebeat ${debug}"
-        elif [ "${sys_type}" == "apt-get" ]; then
-            eval "apt remove --purge filebeat -y ${debug}"
+    # rollBack case!


Why the !?

Suggested change

# rollBack case!

# rollBack case

Done c3fc835

alberpilot · 2022-02-08T11:43:32Z

unattended_installer/install_functions/opendistro/common.sh

-        eval "rm -rf /usr/share/filebeat/ ${debug}"
-        eval "rm -rf /etc/filebeat/ ${debug}"
+    if [ -n "${wazuhinstalled}" ] || [ -n "${wazuh_remaining_files}" ] || [ -n "${filebeatinstalled}" ] || [ -n "${filebeat_remaining_files}" ] || [ -n "${elasticsearchinstalled}" ] || [ -n "${elastic_remaining_files}" ] || [ -n "${kibanainstalled}" ] || [ -n "${kibana_remaining_files}" ]; then
+        logger -w "Some Wazuh components are still installed on this host."


When could this casuistic happen?

When the process of uninstalling a component is done. And there are others installed.

Consider if when uninstalling a component. And there is still another one installed that should:

be notified, hence the -w

And also, the repository configuration will not be deleted. This should be uninstalled only when it is verified that there are no components left installed.

alberpilot · 2022-02-08T11:44:29Z

unattended_installer/install_functions/opendistro/elasticsearch.sh

@@ -169,6 +170,43 @@ function installElasticsearch() {

 }

+function uninstallelasticsearch() {
+    logger "Elasticsearch will be uninstalled."


Use a blank line separator from the first function line to function definition

Done c3fc835

alberpilot · 2022-02-08T11:44:46Z

unattended_installer/install_functions/opendistro/kibana.sh

        kibanainstalled="1"
        logger "Kibana installation finished."
    fi

 }

+function uninstallkibana() {
+    logger "Kibana will be uninstalled."


Done c3fc835

alberpilot · 2022-02-08T11:45:17Z

unattended_installer/install_functions/opendistro/wazuh.sh

+
+    logger "Wazuh and Filebeat will be uninstalled."
+
+    # remove packages


Suggested change

# remove packages

# Remove packages

Done c3fc835

alberpilot · 2022-02-08T11:45:36Z

unattended_installer/install_functions/opendistro/wazuh.sh

+        fi
+    fi
+
+    # remove files


Suggested change

# remove files

# Remove files

Done c3fc835

alberpilot · 2022-02-08T11:46:14Z

unattended_installer/install_functions/opendistro/wazuh.sh

+
+    # remove packages
+    if [[ -n "${wazuhinstalled}" ]];then
+        logger -w "Removing Wazuh packages."


Why packages? It's only one.

Suggested change

logger -w "Removing Wazuh packages."

logger -w "Removing Wazuh manager."

Done c3fc835

alberpilot · 2022-02-08T11:46:32Z

unattended_installer/install_functions/opendistro/wazuh.sh

+    fi
+
+    if [[ -n "${filebeatinstalled}" ]]; then
+        logger -w "Removing Filebeat packages."


Why packages?

Suggested change

logger -w "Removing Filebeat packages."

logger -w "Removing Filebeat."

Done c3fc835

…m:wazuh/wazuh-packages into unify-unatteded-uninstall-chose-component

myu1d157h0u54nd · 2022-02-08T18:46:24Z

This output says: Wazuh and Filebeat will be uninstalled. Then, all components have a WARNING message for removal. Only Filebeat and Wazuh must appear.

The Elasticsearch and Kibana examples are good. Please review the requested changes.

Done d29d1ad

…component

myu1d157h0u54nd · 2022-02-09T05:19:04Z

Merge branch 'unify-unattended' into unify-unatteded-uninstall-chose-component

It is pending testing. This merge was really hard, I want to be able to do a full install test again.

…shboard.

…tteded-uninstall-chose-component

Fix rollBack and uninstall improvement

fa9939f

myu1d157h0u54nd requested review from alberpilot, DFolchA and verdx January 27, 2022 19:45

myu1d157h0u54nd self-assigned this Jan 27, 2022

verdx previously approved these changes Jan 31, 2022

View reviewed changes

alberpilot suggested changes Feb 1, 2022

View reviewed changes

myu1d157h0u54nd added 3 commits February 2, 2022 02:04

Change app-module-name for component-name

039d2df

Merge branch 'unify-unattended' into unify-unatteded-uninstall-chose-…

f6f3406

…component

Fix rollBack and uninstall

064cb16

myu1d157h0u54nd requested review from alberpilot and verdx February 2, 2022 06:03

alberpilot added 2 commits February 2, 2022 15:46

Removed trims and help output rework

6d224d3

Style minor change

a0c00c0

alberpilot suggested changes Feb 2, 2022

View reviewed changes

Fix rollBack (rework)

5387d9b

myu1d157h0u54nd added 3 commits February 3, 2022 16:31

Fix checkArguments.

76e3e1b

Fix function uninstallelasticsearch, uninstallkibana, uninstallmanager.

4c1261b

Fix function rollBack.

5c15e06

Fix work flow in wazuh-install for uninstall case.

9e78493

myu1d157h0u54nd requested a review from alberpilot February 3, 2022 20:18

myu1d157h0u54nd added 2 commits February 3, 2022 17:46

Fix rollBack for overwrite case.

98253de

Fix function uninstallelasticsearch, uninstallkibana, uninstallmanager.

a72f607

myu1d157h0u54nd added 3 commits February 7, 2022 22:47

Fix function uninstall*

51af2ab

Fix logger and call to rollBack from wazuh_install*

fb60732

Big rework in function rollBack (uninstall case, overwrite case and r…

5d1267f

…ollBack case)

Improved array definition

b819306

alberpilot suggested changes Feb 8, 2022

View reviewed changes

myu1d157h0u54nd added 3 commits February 8, 2022 15:34

Minor change fix.

c3fc835

Merge branch 'unify-unatteded-uninstall-chose-component' of github.co…

6654ab1

…m:wazuh/wazuh-packages into unify-unatteded-uninstall-chose-component

Fix logger for uninstallmanager case.

d29d1ad

myu1d157h0u54nd requested a review from alberpilot February 8, 2022 18:46

Merge branch 'unify-unattended' into unify-unatteded-uninstall-chose-…

641d6aa

…component

myu1d157h0u54nd and others added 13 commits February 9, 2022 12:57

Fix merge, change elasticsearch>wazuh-indexer, change kibana>wazuh-da…

7b5b465

…shboard.

Fix merge, call to functions.

c777d90

Fix checks_arguments

1338351

Fix common_rollBack

4a0eebe

Fix call to common_rollBack, for installation failed

5a57fb7

Fix functions import, Uninstall and Overwrite

ea3e3ad

Fix wazuh-dashboards to wazuh-dashboard

ba07f87

Fix wazuh-dashboards renames

999ffa3

Fix wazuh-dashboards to wazuh-dashboard in yml files

17f67c7

Fix logger

5c362fe

Changed dashboards for dashboard in unattended pytest

8d5ed5f

Merge remote-tracking branch 'origin/unify-unattended' into unify-una…

524b366

…tteded-uninstall-chose-component

Removed accidentally added file

7af196b

	echo -e " -u, --uninstall <app-module-name>"
	echo -e " -u, --uninstall <component-name>"


		logger "Wazuh and Filebeat will be uninstalled."

		# remove packages

	logger -w "Removing Wazuh packages."
	logger -w "Removing Wazuh manager."

	logger -w "Removing Filebeat packages."
	logger -w "Removing Filebeat."

Fix rollBack and uninstall improvement #1211

Are you sure you want to change the base?

Fix rollBack and uninstall improvement #1211

Conversation

myu1d157h0u54nd commented Jan 27, 2022

Description

verdx left a comment

Choose a reason for hiding this comment

alberpilot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

myu1d157h0u54nd commented Feb 2, 2022

alberpilot left a comment

Choose a reason for hiding this comment

myu1d157h0u54nd commented Feb 3, 2022

myu1d157h0u54nd commented Feb 3, 2022 • edited Loading

myu1d157h0u54nd commented Feb 3, 2022

myu1d157h0u54nd commented Feb 4, 2022

myu1d157h0u54nd commented Feb 7, 2022

myu1d157h0u54nd commented Feb 7, 2022 • edited Loading

myu1d157h0u54nd commented Feb 8, 2022 • edited Loading

alberpilot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

myu1d157h0u54nd Feb 8, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

myu1d157h0u54nd commented Feb 8, 2022

myu1d157h0u54nd commented Feb 9, 2022

myu1d157h0u54nd commented Feb 3, 2022 •

edited

Loading

myu1d157h0u54nd commented Feb 7, 2022 •

edited

Loading

myu1d157h0u54nd commented Feb 8, 2022 •

edited

Loading

myu1d157h0u54nd Feb 8, 2022 •

edited

Loading