diff --git a/ansible-playbook.yml b/ansible-playbook.yml index 0165ea7..a9c1098 100755 --- a/ansible-playbook.yml +++ b/ansible-playbook.yml @@ -58,7 +58,6 @@ value: '1' sysctl_set: true state: present - reload: true - name: Enable source valid mark on host ansible.posix.sysctl: @@ -236,6 +235,25 @@ mode: preserve force: true + - name: Check for stale Wazuh certificate residue + ansible.builtin.stat: + path: /opt/apps/wazuh/config/wazuh_indexer_ssl_certs/root-ca.pem + register: wazuh_cert_residue + + - name: Remove stale Wazuh certificate directories + ansible.builtin.file: + path: /opt/apps/wazuh/config/wazuh_indexer_ssl_certs + state: absent + when: wazuh_cert_residue.stat.exists and wazuh_cert_residue.stat.isdir + + - name: Recreate Wazuh certificates directory + ansible.builtin.file: + path: /opt/apps/wazuh/config/wazuh_indexer_ssl_certs + state: directory + mode: '0755' + owner: root + group: root + - name: Generate Wazuh certificates ansible.builtin.command: podman run --rm -e CERT_TOOL_VERSION=4.14 -v /opt/apps/wazuh/config/certs.yml:/config/certs.yml:z -v /opt/apps/wazuh/config/wazuh_indexer_ssl_certs/:/certificates:z docker.io/wazuh/wazuh-certs-generator:0.0.3 args: @@ -292,7 +310,7 @@ env: INDEXER_URL: "https://wazuh.indexer:9200" INDEXER_USERNAME: "admin" - INDEXER_PASSWORD: "SecretPassword" + INDEXER_PASSWORD: "*WD*oW9m6iKf4hDovy7BbMmhLxC9D?Tv" FILEBEAT_SSL_VERIFICATION_MODE: "full" SSL_CERTIFICATE_AUTHORITIES: "/etc/ssl/root-ca.pem" SSL_CERTIFICATE: "/etc/ssl/filebeat.pem" @@ -313,6 +331,8 @@ - "wazuh_logs:/var/ossec/logs" - "wazuh_queue:/var/ossec/queue" - "wazuh_var_multigroups:/var/ossec/var/multigroups" + - "wazuh_integrations:/var/ossec/integrations" + - "wazuh_agentless:/var/ossec/agentless" - "wazuh_active_response:/var/ossec/active-response/bin" - "wazuh_wodles:/var/ossec/wodles" - "filebeat_etc:/etc/filebeat" diff --git a/wazuh-docker/config/wazuh_cluster/wazuh_manager.conf b/wazuh-docker/config/wazuh_cluster/wazuh_manager.conf index 4f00c24..c5f16dd 100755 --- a/wazuh-docker/config/wazuh_cluster/wazuh_manager.conf +++ b/wazuh-docker/config/wazuh_cluster/wazuh_manager.conf @@ -1,10 +1,24 @@ - 15m + yes + yes + no + no + no + smtp.example.wazuh.com + wazuh@example.wazuh.com + recipient@example.wazuh.com + 12 + alerts.log + 10m 0 - yes + + 3 + 12 + + plain @@ -20,6 +34,8 @@ no + yes + yes yes yes yes @@ -29,12 +45,31 @@ 43200 - yes + etc/rootcheck/rootkit_files.txt + etc/rootcheck/rootkit_trojans.txt - /var/lib/containerd - /var/lib/docker/overlay2 + yes + + yes + 1800 + 1d + yes + + wodles/java + wodles/ciscat + + + + + yes + yes + /var/log/osquery/osqueryd.results.log + /etc/osquery/osquery.conf + yes + + no @@ -46,15 +81,9 @@ yes yes yes - yes - yes - yes - yes - yes - 5m 10 @@ -63,13 +92,7 @@ yes yes 12h - - - - yes - 5m - 10 - + yes @@ -99,6 +122,8 @@ 43200 + yes + yes @@ -138,12 +163,13 @@ 10 - 50 + 100 yes 5m + 1h 10 @@ -238,6 +264,13 @@ etc/rules + + yes + 1 + 64 + 15m + + no @@ -270,19 +303,9 @@ - - journald - journald - - - - audit - /var/log/audit/audit.log - - syslog /var/ossec/logs/active-responses.log - \ No newline at end of file + diff --git a/wazuh-docker/config/wazuh_dashboard/opensearch_dashboards.yml b/wazuh-docker/config/wazuh_dashboard/opensearch_dashboards.yml index 07c81ab..601f3bb 100755 --- a/wazuh-docker/config/wazuh_dashboard/opensearch_dashboards.yml +++ b/wazuh-docker/config/wazuh_dashboard/opensearch_dashboards.yml @@ -2,7 +2,7 @@ server.host: 0.0.0.0 server.port: 5601 opensearch.hosts: https://wazuh.indexer:9200 opensearch.ssl.verificationMode: certificate -opensearch.requestHeadersAllowlist: ["securitytenant","Authorization"] +opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"] opensearch_security.multitenancy.enabled: false opensearch_security.readonly_mode.roles: ["kibana_read_only"] server.ssl.enabled: true diff --git a/wazuh-docker/config/wazuh_indexer/internal_users.yml b/wazuh-docker/config/wazuh_indexer/internal_users.yml index d9f05b3..53165dd 100755 --- a/wazuh-docker/config/wazuh_indexer/internal_users.yml +++ b/wazuh-docker/config/wazuh_indexer/internal_users.yml @@ -11,7 +11,7 @@ _meta: ## Demo users admin: - hash: "$2y$12$K/SpwjtB.wOHJ/Nc6GVRDuc1h0rM1DfvziFRNPtk27P.c4yDr9njO" + hash: "$2y$12$xa.54OUnJ5V0F/MqXb0QleEgJ5lJSkrKwhpSbFkIRDljfOcPM41dq" reserved: true backend_roles: - "admin" diff --git a/wazuh-docker/config/wazuh_indexer/wazuh.indexer.yml b/wazuh-docker/config/wazuh_indexer/wazuh.indexer.yml index 3fc295a..44c0602 100755 --- a/wazuh-docker/config/wazuh_indexer/wazuh.indexer.yml +++ b/wazuh-docker/config/wazuh_indexer/wazuh.indexer.yml @@ -6,6 +6,7 @@ path.logs: /var/log/wazuh-indexer discovery.type: single-node http.port: 9200-9299 transport.tcp.port: 9300-9399 +compatibility.override_main_response_version: true plugins.security.ssl.http.pemcert_filepath: /usr/share/wazuh-indexer/config/certs/wazuh.indexer.pem plugins.security.ssl.http.pemkey_filepath: /usr/share/wazuh-indexer/config/certs/wazuh.indexer.key plugins.security.ssl.http.pemtrustedcas_filepath: /usr/share/wazuh-indexer/config/certs/root-ca.pem