Compare commits

..
45 Commits
Author SHA1 Message Date
Gonzalo Acuña 1c69a38bd8 Merge pull request #813 from wazuh/807-docker-update-from-4310-to-440
Disable cluster option
2023-04-05 14:52:28 -03:00
vcerenu 615d6df29c disable cluster option 2023-04-05 13:55:24 -03:00
Gonzalo Acuña 949a465855 Merge pull request #811 from wazuh/revert-799-bump-4-4-1
Revert "Bump `4.4` to `4.4.1`"
2023-04-05 13:49:23 -03:00
Gonzalo Acuña f7bbac5a08 Revert "Bump 4.4 to 4.4.1" 2023-04-05 13:46:20 -03:00
Gonzalo Acuña 11820b01e9 Merge pull request #799 from wazuh/bump-4-4-1
Bump `4.4` to `4.4.1`
2023-03-31 11:02:25 -03:00
vcerenu a8de452002 bump 4.4.1 version 2023-03-31 10:27:58 -03:00
Victor Ereñú c76681b3b9 Merge pull request #794 from wazuh/modify-base-dashboard
Change dashboard and indexer base repository
2023-03-28 17:09:15 -03:00
vcerenu e25635cb25 change dashboard and indexer base repository 2023-03-28 16:59:49 -03:00
Gonzalo Acuña 304eedcb51 Merge pull request #793 from wazuh/bump_4-4
Change revision number
2023-03-28 10:03:41 -03:00
vcerenu 6123ab994c change revision number 2023-03-28 09:07:24 -03:00
Gonzalo Acuña 2f58da59de Merge pull request #776 from wazuh/change_password
Update indexer password
2023-02-01 10:59:11 -03:00
vcerenu 3279931813 update docs count 2023-02-01 10:33:26 -03:00
vcerenu b039567e1c update indexer password 2023-02-01 10:02:35 -03:00
Gonzalo Acuña 3190c4246e Merge pull request #766 from wazuh/765-change-wazuh-dashboard-and-indexer-base-path
Modify base path
2022-12-27 08:11:21 -03:00
vcerenu 271f421cd4 modify base path 2022-12-26 11:12:16 -03:00
Alberto Rodríguez 910e28956b Merge pull request #760 from wazuh/merge-4.4
Version check fix
2022-12-02 17:19:02 +01:00
vcerenu dcf8bb8060 fix index alerts test 2022-12-02 12:42:01 -03:00
vcerenu be9f3d1b90 fix index alerts test 2022-12-02 11:36:35 -03:00
vcerenu 91625f412c change indexer and manager configuration for 4.4 version 2022-12-01 19:35:35 -03:00
vcerenu 4c7dcb2ebf add revision into versions parameter 2022-12-01 13:32:43 -03:00
vcerenu 8febf33d58 add 4.4 version 2022-12-01 13:02:13 -03:00
Alberto Rodríguez 3d19774d7e Merge pull request #758 from wazuh/merge-4.4
Merge 4.3 in 4.4 branch
2022-12-01 16:23:05 +01:00
vcerenu e11e7a10b8 add 4.4 version 2022-12-01 11:58:21 -03:00
vcerenu 7f73635651 add 4.4 version 2022-11-30 15:35:16 -03:00
vcerenu e9a0be25ce resolving conflicts in 4.3 merge 2022-11-30 15:27:48 -03:00
José Fernández Aguilera 6c094d07a6 Merge pull request #719 from wazuh/4.4-add-double-quote
Add Double Quote on password
2022-09-12 17:04:35 +02:00
vcerenu b6959c8b15 doble quote for password 2022-09-09 15:29:07 -03:00
José Fernández Aguilera b98d32d4ca Merge pull request #691 from wazuh/1665-Fix-filebeat-crash-due-to-glibc-to4.4
Add fix to avoid GLIBC crash
2022-07-07 09:00:19 +02:00
fcaffieri 4c710e6c20 Add fix to avoid GLIBC crash, fix identation 2022-07-06 18:01:53 -03:00
fcaffieri f97a719304 Add fix to avoid GLIBC crash 2022-07-06 17:35:20 -03:00
José Fernández Aguilera bf534b4143 Merge pull request #687 from wazuh/1667-disable-filebeat-metrics-to4.4
Disable filebeat metrics
2022-07-04 16:02:24 +02:00
fcaffieri a82cc9ec39 disable filebeat metrics 2022-07-04 09:18:11 -03:00
fcaffieri 8d9ad6152a disable filebeat metrics 2022-07-01 17:45:23 -03:00
José Fernández Aguilera 5555c1dd06 Merge pull request #666 from wazuh/merge_4_4
Merge 4.3.3 into 4.4
2022-06-01 18:40:02 +02:00
vcerenu 0dd044de68 Merge 4.3.3 into 4.4 2022-06-01 12:29:05 -03:00
Alberto Rodríguez 5d88983066 Merge pull request #651 from wazuh/fix_whitelist_4_4
Fix whitelist in 4.4
2022-05-23 16:09:43 +02:00
vcerenu 95565df2f5 fix whitelist 2022-05-23 10:58:04 -03:00
Alberto Rodríguez ed5c5d70ba Merge pull request #649 from wazuh/master
Merge master into 4.4
2022-05-23 14:21:52 +02:00
Alberto Rodríguez 97f5a6bf04 Merge pull request #648 from wazuh/merge_master
Merge 4.3 into master
2022-05-23 14:15:22 +02:00
vcerenu b21c3769d3 Merge 4.3 into master 2022-05-20 15:57:34 -03:00
Alberto Rodríguez 9cd399c2df Merge pull request #598 from wazuh/4.2-merge_master
Merge 4.2 into master
2022-03-28 16:58:01 +02:00
Gonzalo Acuña 3e54eeb62f Merge branch 'master' into 4.2-merge_master 2022-03-28 11:34:55 -03:00
Alberto Rodríguez a4be008028 Merge pull request #596 from wazuh/595-bump_426
Bump to 4.2.6
2022-03-28 15:49:25 +02:00
Gonzalo Acuña 85e62cfd0e Bump to 4.2.6 2022-03-25 10:28:14 -03:00
Alberto R 84fe19e868 Bumped to 4.4.0 2021-11-24 17:01:09 +01:00
24 changed files with 95 additions and 89 deletions
+2 -2
View File
@@ -1,3 +1,3 @@
WAZUH_VERSION=4.3.11
WAZUH_IMAGE_VERSION=4.3.11
WAZUH_VERSION=4.4.0
WAZUH_IMAGE_VERSION=4.4.0
WAZUH_TAG_REVISION=1
+1 -1
View File
@@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.3.11-1
- 4.4.0-1
port:
tcp:1514:
listening: true
+3 -3
View File
@@ -126,7 +126,7 @@ jobs:
- name: Check documents into wazuh-alerts index
run: |
docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_doc/_search" -u admin:SecretPassword -k -s | jq -r ".hits.total.value"`"
docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`"
if [[ $docs -gt 100 ]]; then
echo "wazuh-alerts index documents: ${docs}"
else
@@ -250,8 +250,8 @@ jobs:
- name: Check documents into wazuh-alerts index
run: |
docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_doc/_search" -u admin:SecretPassword -k -s | jq -r ".hits.total.value"`"
if [[ $docs -gt 200 ]]; then
docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`"
if [[ $docs -gt 100 ]]; then
echo "wazuh-alerts index documents: ${docs}"
else
echo "wazuh-alerts index documents: ${docs}"
+2 -3
View File
@@ -1,11 +1,10 @@
# Change Log
All notable changes to this project will be documented in this file.
## Wazuh Docker v4.3.11
## Wazuh Docker v4.4.0
### Added
- Update Wazuh to version [4.3.11](https://github.com/wazuh/wazuh/blob/v4.3.11/CHANGELOG.md#v4311)
- Update Wazuh to version [4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440)
## Wazuh Docker v4.3.10
### Added
+2 -2
View File
@@ -42,7 +42,7 @@ API_PASSWORD="MyS3cr37P450r.*-" # Wazuh API password - Must
INDEXER_URL=https://wazuh.indexer:9200 # Wazuh indexer URL
INDEXER_USERNAME=admin # Wazuh indexer Username
INDEXER_PASSWORD=admin # Wazuh indexer Password
INDEXER_PASSWORD=SecretPassword # Wazuh indexer Password
FILEBEAT_SSL_VERIFICATION_MODE=full # Filebeat SSL Verification mode (full or none)
SSL_CERTIFICATE_AUTHORITIES="" # Path of Filebeat SSL CA
SSL_CERTIFICATE="" # Path of Filebeat SSL Certificate
@@ -195,7 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.3.11 | | |
| v4.4.0 | | |
| v4.3.10 | | |
| v4.3.9 | | |
| v4.3.8 | | |
+2 -2
View File
@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.3.11"
REVISION="40324"
WAZUH-DOCKER_VERSION="4.4.0"
REVISION="40405"
+1 -1
View File
@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.3.11
WAZUH_IMAGE_VERSION=4.4.0
WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
WAZUH_TAG_REVISION=1
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
@@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.3/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.3/
PACKAGES_URL=https://packages.wazuh.com/4.4/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
@@ -1,3 +1,4 @@
REPOSITORY="packages.wazuh.com/4.x"
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-)
MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1)
MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2)
@@ -7,23 +8,18 @@ MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2)
MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3)
## check version to use the correct repository
if [ "$MAJOR_BUILD" -ge "$MAJOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com"
if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
if [ "$MID_BUILD" -ge "$MID_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com"
if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then
if [ "$MINOR_BUILD" -ge "$MINOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com"
else
REPOSITORY="packages.wazuh.com"
if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com/pre-release"
fi
else
REPOSITORY="packages.wazuh.com"
fi
else
REPOSITORY="packages.wazuh.com"
fi
curl -o wazuh-dashboard-base.tar.xz https://${REPOSITORY}/stack/dashboard/base/wazuh-dashboard-base-${WAZUH_VERSION}-${WAZUH_TAG_REVISION}-linux-x64.tar.xz
tar -xf wazuh-dashboard-base.tar.xz --directory $INSTALL_DIR --strip-components=1
curl -o wazuh-dashboard-base.tar.xz https://${REPOSITORY}/stack/dashboard/wazuh-dashboard-base-${WAZUH_VERSION}-${WAZUH_TAG_REVISION}-linux-x64.tar.xz
tar -xf wazuh-dashboard-base.tar.xz --directory $INSTALL_DIR --strip-components=1
@@ -1,11 +1,24 @@
## Variables
WAZUH_IMAGE_VERSION=$(echo $WAZUH_VERSION | sed -e 's/\.//g')
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
## If wazuh manager exists in apt dev repository, change variables, if not exit 1
if [ "$WAZUH_IMAGE_VERSION" -le "$WAZUH_CURRENT_VERSION" ]; then
WAZUH_APP=https://packages.wazuh.com/4.x/ui/dashboard/wazuh-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
else
## variables
WAZUH_APP=https://packages.wazuh.com/4.x/ui/dashboard/wazuh-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-)
MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1)
MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2)
MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3)
MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1)
MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2)
MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3)
## check version to use the correct repository
if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then
WAZUH_APP=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then
WAZUH_APP=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then
if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then
WAZUH_APP=https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${WAZUH_VERSION}-${WAZUH_UI_REVISION}.zip
fi
fi
fi
# Install Wazuh App
+2 -3
View File
@@ -4,7 +4,7 @@ FROM ubuntu:focal AS builder
ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
RUN apt-get update -y && apt-get install curl openssl xz-utils wget -y
RUN apt-get update -y && apt-get install curl openssl xz-utils -y
COPY config/opensearch.yml /
@@ -67,8 +67,7 @@ RUN mkdir -p /var/lib/wazuh-indexer && chown 1000:1000 /var/lib/wazuh-indexer &&
mkdir -p /var/log/wazuh-indexer && chown 1000:1000 /var/log/wazuh-indexer && \
chmod 700 /usr/share/wazuh-indexer && \
chmod 600 /usr/share/wazuh-indexer/jvm.options && \
chmod 600 /usr/share/wazuh-indexer/opensearch.yml && \
chmod 0600 /usr/share/wazuh-indexer/plugins/opensearch-security/tools/securityadmin.sh
chmod 600 /usr/share/wazuh-indexer/opensearch.yml
USER wazuh-indexer
@@ -22,7 +22,7 @@ export REPO_DIR=/unattended_installer
rm -rf ${INSTALLATION_DIR}/
## variables
REPOSITORY="packages.wazuh.com"
REPOSITORY="packages.wazuh.com/4.x"
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-)
MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1)
MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2)
@@ -33,19 +33,19 @@ MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3)
## check version to use the correct repository
if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com"
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
if [ "$MID_BUILD" -gt "$MID_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com"
REPOSITORY="packages-dev.wazuh.com/pre-release"
elif [ "$MID_BUILD" -eq "$MID_CURRENT" ]; then
if [ "$MINOR_BUILD" -gt "$MINOR_CURRENT" ]; then
REPOSITORY="packages-dev.wazuh.com"
REPOSITORY="packages-dev.wazuh.com/pre-release"
fi
fi
fi
wget -O ${INDEXER_FILE} https://${REPOSITORY}/stack/indexer/base/${BASE_FILE}
curl -o ${INDEXER_FILE} https://${REPOSITORY}/stack/indexer/${BASE_FILE}
tar -xf ${INDEXER_FILE}
## TOOLS
@@ -53,8 +53,8 @@ tar -xf ${INDEXER_FILE}
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.3/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.3/
PACKAGES_URL=https://packages.wazuh.com/4.4/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
@@ -84,10 +84,10 @@ if [[ "$(id -u)" == "0" ]]; then
fi
if [[ "$DISCOVERY" == "single-node" ]] && [[ ! -f "/var/lib/wazuh-indexer/.flag" ]]; then
#if [[ "$DISCOVERY" == "single-node" ]] && [[ ! -f "/var/lib/wazuh-indexer/.flag" ]]; then
# run securityadmin.sh for single node with CACERT, CERT and KEY parameter
nohup /securityadmin.sh &
touch "/var/lib/wazuh-indexer/.flag"
fi
# nohup /securityadmin.sh &
# touch "/var/lib/wazuh-indexer/.flag"
#fi
run_as_other_user_if_needed /usr/share/wazuh-indexer/bin/opensearch <<<"$KEYSTORE_PASSWORD"
@@ -4,12 +4,12 @@ path.data: /var/lib/wazuh-indexer
path.logs: /var/log/wazuh-indexer
discovery.type: single-node
compatibility.override_main_response_version: true
plugins.security.ssl.http.pemcert_filepath: ${OPENSEARCH_PATH_CONF}/certs/indexer.pem
plugins.security.ssl.http.pemkey_filepath: ${OPENSEARCH_PATH_CONF}/certs/indexer-key.pem
plugins.security.ssl.http.pemtrustedcas_filepath: ${OPENSEARCH_PATH_CONF}/certs/root-ca.pem
plugins.security.ssl.transport.pemcert_filepath: ${OPENSEARCH_PATH_CONF}/certs/indexer.pem
plugins.security.ssl.transport.pemkey_filepath: ${OPENSEARCH_PATH_CONF}/certs/indexer-key.pem
plugins.security.ssl.transport.pemtrustedcas_filepath: ${OPENSEARCH_PATH_CONF}/certs/root-ca.pem
plugins.security.ssl.http.pemcert_filepath: /usr/share/wazuh-indexer/certs/indexer.pem
plugins.security.ssl.http.pemkey_filepath: /usr/share/wazuh-indexer/certs/indexer-key.pem
plugins.security.ssl.http.pemtrustedcas_filepath: /usr/share/wazuh-indexer/certs/root-ca.pem
plugins.security.ssl.transport.pemcert_filepath: /usr/share/wazuh-indexer/certs/indexer.pem
plugins.security.ssl.transport.pemkey_filepath: /usr/share/wazuh-indexer/certs/indexer-key.pem
plugins.security.ssl.transport.pemtrustedcas_filepath: /usr/share/wazuh-indexer/certs/root-ca.pem
plugins.security.ssl.http.enabled: true
plugins.security.ssl.transport.enforce_hostname_verification: false
plugins.security.ssl.transport.resolve_hostname: false
+2 -5
View File
@@ -5,7 +5,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh
ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
ARG TEMPLATE_VERSION=4.3
ARG TEMPLATE_VERSION=4.4
ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"
@@ -18,10 +18,7 @@ RUN chmod 775 /check_repository.sh
RUN source /check_repository.sh
RUN apt-get update && \
apt-get install wget && \
wget https://packages.wazuh.com/custom/4.3.11/deb/var/wazuh-manager_4.3.11-1_amd64.deb && \
apt-get install ./wazuh-manager_4.3.11-1_amd64.deb && \
rm -f wazuh-manager_4.3.11-1_amd64.deb
apt-get install wazuh-manager=${WAZUH_VERSION}-${WAZUH_TAG_REVISION}
RUN curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb &&\
dpkg -i ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && rm -f ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && \
+4 -4
View File
@@ -8,8 +8,8 @@
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.3/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.3/
PACKAGES_URL=https://packages.wazuh.com/4.4/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
@@ -54,8 +54,8 @@ cp /certificates/root-ca.key /certificates/root-ca-manager.key
chown 101:101 /certificates/root-ca-manager.pem
chown 101:101 /certificates/root-ca-manager.key
for i in ${node_names[@]};
do
for i in ${node_names[@]};
do
chown 101:101 "/certificates/${i}.pem"
chown 101:101 "/certificates/${i}-key.pem"
done
@@ -1,6 +1,6 @@
# Opendistro data migration to Wazuh indexer on docker.
This procedure explains how to migrate Opendistro data from Opendistro to Wazuh indexer in docker production deployments.
The example is migrating from v4.2 to v4.3.
The example is migrating from v4.2 to v4.4.
## Procedure
Assuming that you have a v4.2 production deployment, perform the following steps.
@@ -350,9 +350,9 @@ docker container run --rm -it \
alpine ash -c "cd /from ; cp -avp . /to"
```
**7. Start the 4.3 environment.**
**7. Start the 4.4 environment.**
```
git checkout 4.3
git checkout 4.4
cd multi-node
docker-compose -f generate-indexer-certs.yml run --rm generator
docker-compose up -d
+1 -1
View File
@@ -21,4 +21,4 @@ nodes:
# Wazuh dashboard node
dashboard:
- name: wazuh.dashboard
ip: wazuh.dashboard
ip: wazuh.dashboard
+6 -6
View File
@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.3.11-dev
image: wazuh/wazuh-manager:4.4.0
hostname: wazuh.master
restart: always
ports:
@@ -38,7 +38,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.worker:
image: wazuh/wazuh-manager:4.3.11-dev
image: wazuh/wazuh-manager:4.4.0
hostname: wazuh.worker
restart: always
environment:
@@ -67,7 +67,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
wazuh1.indexer:
image: wazuh/wazuh-indexer:4.3.11-dev
image: wazuh/wazuh-indexer:4.4.0
hostname: wazuh1.indexer
restart: always
ports:
@@ -93,7 +93,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh2.indexer:
image: wazuh/wazuh-indexer:4.3.11-dev
image: wazuh/wazuh-indexer:4.4.0
hostname: wazuh2.indexer
restart: always
environment:
@@ -115,7 +115,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh3.indexer:
image: wazuh/wazuh-indexer:4.3.11-dev
image: wazuh/wazuh-indexer:4.4.0
hostname: wazuh3.indexer
restart: always
environment:
@@ -137,7 +137,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.3.11-dev
image: wazuh/wazuh-dashboard:4.4.0
hostname: wazuh.dashboard
restart: always
ports:
+1 -1
View File
@@ -13,4 +13,4 @@ nodes:
# Wazuh dashboard node
dashboard:
- name: wazuh.dashboard
ip: wazuh.dashboard
ip: wazuh.dashboard
@@ -331,11 +331,11 @@
<name>wazuh</name>
<node_name>node01</node_name>
<node_type>master</node_type>
<key></key>
<key>aa093264ef885029653eea20dfcf51ae</key>
<port>1516</port>
<bind_addr>0.0.0.0</bind_addr>
<nodes>
<node>NODE_IP</node>
<node>wazuh.manager</node>
</nodes>
<hidden>no</hidden>
<disabled>yes</disabled>
@@ -3,13 +3,15 @@ node.name: "wazuh.indexer"
path.data: /var/lib/wazuh-indexer
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: ${OPENSEARCH_PATH_CONF}/certs/wazuh.indexer.pem
plugins.security.ssl.http.pemkey_filepath: ${OPENSEARCH_PATH_CONF}/certs/wazuh.indexer.key
plugins.security.ssl.http.pemtrustedcas_filepath: ${OPENSEARCH_PATH_CONF}/certs/root-ca.pem
plugins.security.ssl.transport.pemcert_filepath: ${OPENSEARCH_PATH_CONF}/certs/wazuh.indexer.pem
plugins.security.ssl.transport.pemkey_filepath: ${OPENSEARCH_PATH_CONF}/certs/wazuh.indexer.key
plugins.security.ssl.transport.pemtrustedcas_filepath: ${OPENSEARCH_PATH_CONF}/certs/root-ca.pem
plugins.security.ssl.http.pemcert_filepath: /usr/share/wazuh-indexer/certs/wazuh.indexer.pem
plugins.security.ssl.http.pemkey_filepath: /usr/share/wazuh-indexer/certs/wazuh.indexer.key
plugins.security.ssl.http.pemtrustedcas_filepath: /usr/share/wazuh-indexer/certs/root-ca.pem
plugins.security.ssl.transport.pemcert_filepath: /usr/share/wazuh-indexer/certs/wazuh.indexer.pem
plugins.security.ssl.transport.pemkey_filepath: /usr/share/wazuh-indexer/certs/wazuh.indexer.key
plugins.security.ssl.transport.pemtrustedcas_filepath: /usr/share/wazuh-indexer/certs/root-ca.pem
plugins.security.ssl.http.enabled: true
plugins.security.ssl.transport.enforce_hostname_verification: false
plugins.security.ssl.transport.resolve_hostname: false
+3 -3
View File
@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.3.11-dev
image: wazuh/wazuh-manager:4.4.0
hostname: wazuh.manager
restart: always
ports:
@@ -39,7 +39,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.indexer:
image: wazuh/wazuh-indexer:4.3.11-dev
image: wazuh/wazuh-indexer:4.4.0
hostname: wazuh.indexer
restart: always
ports:
@@ -64,7 +64,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.3.11-dev
image: wazuh/wazuh-dashboard:4.4.0
hostname: wazuh.dashboard
restart: always
ports:
+1 -1
View File
@@ -7,4 +7,4 @@ services:
hostname: wazuh-certs-generator
volumes:
- ./config/wazuh_indexer_ssl_certs/:/certificates/
- ./config/certs.yml:/config/certs.yml
- ./config/certs.yml:/config/certs.yml