Fix rollBack and uninstall improvement

tests/unattended/install/pytest.ini

@@ -7,4 +7,4 @@ markers =
     wazuh_worker: test for wazuh cluster worker nodes. It is meant to be executed on the worker nodes.
     indexer: tests to be executed on Wazuh Indexer hosts.
     indexer_cluster: tests to be executed on Wazuh Indexer hosts on distributed installations.
-    dashboards: tests to be executed on Wazuh Dashboards hosts.
+    dashboard: tests to be executed on Wazuh Dashboard hosts.

tests/unattended/install/test_unattended.py

@@ -73,13 +73,13 @@ def api_call_elasticsearch(host,query,address,api_protocol,api_user,api_pass,api
     response = resp.json()
     return response
 
-def get_dashboards_password():
-    stream = open("/etc/wazuh-dashboards/dashboards.yml", 'r')
+def get_dashboard_password():
+    stream = open("/etc/wazuh-dashboard/dashboard.yml", 'r')
     dictionary = yaml.safe_load(stream)
     return (dictionary.get('opensearch.password'))
 
-def get_dashboards_username():
-    stream = open("/etc/wazuh-dashboards/dashboards.yml", 'r')
+def get_dashboard_username():
+    stream = open("/etc/wazuh-dashboard/dashboard.yml", 'r')
     dictionary = yaml.safe_load(stream)
     return (dictionary.get('opensearch.username'))
 
@@ -91,11 +91,11 @@ def get_elasticsearch_cluster_status():
                         verify=False)
     return (resp.json()['status'])
 
-def get_dashboards_status():
+def get_dashboard_status():
     ip = get_indexer_ip()
     resp = requests.get('https://'+ip,
-                        auth=(get_dashboards_username(),
-                        get_dashboards_password()),
+                        auth=(get_dashboard_username(),
+                        get_dashboard_password()),
                         verify=False)
     return (resp.status_code)
 
@@ -174,9 +174,9 @@ def test_check_filebeat_process():
 def test_check_elasticsearch_process():
     assert check_call("ps -xa | grep \"/usr/share/wazuh-indexer/jdk/bin/java\" | grep -v grep | cut -d \" \" -f15", shell=True) != ""
 
-@pytest.mark.dashboards
-def test_check_dashboards_process():
-    assert check_call("ps -xa | grep \"/usr/share/wazuh-dashboards/bin/../node/bin/node\" | grep -v grep", shell=True) != ""
+@pytest.mark.dashboard
+def test_check_dashboard_process():
+    assert check_call("ps -xa | grep \"/usr/share/wazuh-dashboard/bin/../node/bin/node\" | grep -v grep", shell=True) != ""
 
 @pytest.mark.indexer
 def test_check_elasticsearch_cluster_status_not_red():
@@ -186,9 +186,9 @@ def test_check_elasticsearch_cluster_status_not_red():
 def test_check_elasticsearch_cluster_status_not_yellow():
     assert get_elasticsearch_cluster_status() != "yellow"
 
-@pytest.mark.dashboards
-def test_check_dashboards_status():
-    assert get_dashboards_status() == 200
+@pytest.mark.dashboard
+def test_check_dashboard_status():
+    assert get_dashboard_status() == 200
 
 @pytest.mark.wazuh
 def test_check_wazuh_api_status():

unattended_installer/config/certificate/config.yml

@@ -18,7 +18,7 @@ nodes:
     # ip: <wazuh-manager-ip>
     # node_type: worker
 
-  # Wazuh dashboards node
-  dashboards:
-    name: dashboards
-    ip: <dashboards-node-ip>
+  # Wazuh dashboard node
+  dashboard:
+    name: dashboard
+    ip: <dashboard-node-ip>

unattended_installer/config/certificate/config_aio.yml

@@ -5,6 +5,6 @@ nodes:
   wazuh_servers:
     name: filebeat
     ip: 127.0.0.1
-  dashboards:
-    name: dashboards
+  dashboard:
+    name: dashboard
     ip: 127.0.0.1

unattended_installer/config/dashboards/dashboards.yml → unattended_installer/config/dashboard/dashboard.yml

@@ -8,7 +8,7 @@ opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"]
 opensearch_security.multitenancy.enabled: true
 opensearch_security.readonly_mode.roles: ["kibana_read_only"]
 server.ssl.enabled: true
-server.ssl.key: "/etc/wazuh-dashboards/certs/kibana-key.pem"
-server.ssl.certificate: "/etc/wazuh-dashboards/certs/kibana.pem"
-opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboards/certs/root-ca.pem"]
+server.ssl.key: "/etc/wazuh-dashboard/certs/kibana-key.pem"
+server.ssl.certificate: "/etc/wazuh-dashboard/certs/kibana.pem"
+opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboard/certs/root-ca.pem"]
 server.defaultRoute: /app/wazuh?security_tenant=global

unattended_installer/config/dashboards/dashboards_all_in_one.yml → unattended_installer/config/dashboard/dashboard_all_in_one.yml

@@ -8,8 +8,8 @@ opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"]
 opensearch_security.multitenancy.enabled: true
 opensearch_security.readonly_mode.roles: ["kibana_read_only"]
 server.ssl.enabled: true
-server.ssl.key: "/etc/wazuh-dashboards/certs/kibana-key.pem"
-server.ssl.certificate: "/etc/wazuh-dashboards/certs/kibana.pem"
-opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboards/certs/root-ca.pem"]
+server.ssl.key: "/etc/wazuh-dashboard/certs/kibana-key.pem"
+server.ssl.certificate: "/etc/wazuh-dashboard/certs/kibana.pem"
+opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboard/certs/root-ca.pem"]
 uiSettings.overrides.defaultRoute: /app/wazuh?security_tenant=global
-logging.dest: "/var/log/wazuh-dashboards/wazuh-dashboards.log"
+logging.dest: "/var/log/wazuh-dashboard/wazuh-dashboard.log"

unattended_installer/config/dashboards/dashboards_unattended.yml → unattended_installer/config/dashboard/dashboard_unattended.yml

@@ -8,8 +8,8 @@ opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"]
 opensearch_security.multitenancy.enabled: true
 opensearch_security.readonly_mode.roles: ["kibana_read_only"]
 server.ssl.enabled: true
-server.ssl.key: "/etc/wazuh-dashboards/certs/dashboards-key.pem"
-server.ssl.certificate: "/etc/wazuh-dashboards/certs/dashboards.pem"
-opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboards/certs/root-ca.pem"]
+server.ssl.key: "/etc/wazuh-dashboard/certs/dashboard-key.pem"
+server.ssl.certificate: "/etc/wazuh-dashboard/certs/dashboard.pem"
+opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboard/certs/root-ca.pem"]
 uiSettings.overrides.defaultRoute: /app/wazuh?security_tenant=global
-logging.dest: "/var/log/wazuh-dashboards/wazuh-dashboards.log"
+logging.dest: "/var/log/wazuh-dashboard/wazuh-dashboard.log"

unattended_installer/config/dashboards/dashboards_unattended_distributed.yml → unattended_installer/config/dashboard/dashboard_unattended_distributed.yml

@@ -6,9 +6,9 @@ opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"]
 opensearch_security.multitenancy.enabled: true
 opensearch_security.readonly_mode.roles: ["kibana_read_only"]
 server.ssl.enabled: true
-server.ssl.key: "/etc/wazuh-dashboards/certs/dashboards-key.pem"
-server.ssl.certificate: "/etc/wazuh-dashboards/certs/dashboards.pem"
-opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboards/certs/root-ca.pem"]
+server.ssl.key: "/etc/wazuh-dashboard/certs/dashboard-key.pem"
+server.ssl.certificate: "/etc/wazuh-dashboard/certs/dashboard.pem"
+opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboard/certs/root-ca.pem"]
 uiSettings.overrides.defaultRoute: /app/wazuh?security_tenant=global
-logging.dest: "/var/log/wazuh-dashboards/wazuh-dashboards.log"
+logging.dest: "/var/log/wazuh-dashboard/wazuh-dashboard.log"
 

unattended_installer/config/indexer/roles/roles.yml

@@ -2,7 +2,7 @@ _meta:
   type: "roles"
   config_version: 2
 
-# Restrict users so they can only view visualization and dashboards on kibana
+# Restrict users so they can only view visualization and dashboard on kibana
 kibana_read_only:
   reserved: true
 
@@ -142,7 +142,7 @@ wazuh_ui_user:
     allowed_actions:
     - "read"
   tenant_permissions: []
-  static: false        
+  static: false
 
 wazuh_ui_admin:
   reserved: true
@@ -160,4 +160,4 @@ wazuh_ui_admin:
     - "manage"
     - "index"
   tenant_permissions: []
-  static: false  
+  static: false