Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add JAVA_HOME to indexer for securityadmin.sh commands #705

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
84fe19e
Bumped to 4.4.0
alberpilot Nov 24, 2021
85e62cf
Bump to 4.2.6
teddytpc1 Mar 25, 2022
a4be008
Merge pull request #596 from wazuh/595-bump_426
alberpilot Mar 28, 2022
3e54eeb
Merge branch 'master' into 4.2-merge_master
teddytpc1 Mar 28, 2022
9cd399c
Merge pull request #598 from wazuh/4.2-merge_master
alberpilot Mar 28, 2022
b21c376
Merge 4.3 into master
vcerenu May 20, 2022
97f5a6b
Merge pull request #648 from wazuh/merge_master
alberpilot May 23, 2022
01d2e4a
bump release 4.5.0
vcerenu May 23, 2022
41aba4a
bump release 4.5.0
vcerenu May 23, 2022
1077ea7
bump release 4.5.0
vcerenu May 23, 2022
9099671
Merge pull request #650 from wazuh/bump_4_5
alberpilot May 23, 2022
e538188
Merge 4.3.3 into master
vcerenu Jun 1, 2022
b1c05d8
Merge 4.3.3 into master
vcerenu Jun 1, 2022
89a0def
Merge pull request #665 from wazuh/merge_master
okynos Jun 1, 2022
d5bd975
Allow other Exceptions to bubble up a stack trace instead of silently…
daxxog Feb 10, 2022
f5afd6b
Merge pull request #576 from daxxog/master
alberpilot Jun 8, 2022
5c06d22
disable filebeat metrics
fcaffieri Jul 1, 2022
907f752
disable filebeat metrics
fcaffieri Jul 4, 2022
db6ef42
Merge pull request #686 from wazuh/1667-disable-filebeat-metrics-toma…
okynos Jul 4, 2022
16aec13
Add fix to avoid GLIBC crash
fcaffieri Jul 6, 2022
6e5d746
Add fix to avoid GLIBC crash, fix identation
fcaffieri Jul 6, 2022
69d3490
Merge pull request #690 from wazuh/1665-Fix-filebeat-crash-due-to-gli…
okynos Jul 7, 2022
d227048
bump 4.3 into master
vcerenu Jul 22, 2022
9d65678
bump 4.3 into master
vcerenu Jul 22, 2022
2c52963
Merge pull request #696 from wazuh/merge-43-master
okynos Jul 25, 2022
c77ff03
add JAVA_HOME to indexer for securityadmin.sh commands
morph027 Aug 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/.goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.3.6-1
- 4.5.0-1
port:
tcp:1514:
listening: true
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
# Change Log
All notable changes to this project will be documented in this file.

## Wazuh Docker v4.5.0
### Added

- Update Wazuh to version [4.5.0](https://github.com/wazuh/wazuh/blob/v4.5.0/CHANGELOG.md#v450)

## Wazuh Docker v4.4.0
### Added

- Update Wazuh to version [4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440)

## Wazuh Docker v4.3.6
### Added

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ WAZUH_MONITORING_REPLICAS=0 #

| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.5.0 | | |
| v4.4.0 | | |
| v4.3.6 | | |
| v4.3.5 | | |
| v4.3.4 | | |
Expand Down
4 changes: 2 additions & 2 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.3.6"
REVISION="40318"
WAZUH-DOCKER_VERSION="4.5.0"
REVISION="40500"
2 changes: 1 addition & 1 deletion build-docker-images/build-images.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.3.6
WAZUH_IMAGE_VERSION=4.5.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')
Expand Down
4 changes: 2 additions & 2 deletions build-docker-images/wazuh-dashboard/config/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.5/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/

## 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}')
Expand Down
4 changes: 2 additions & 2 deletions build-docker-images/wazuh-indexer/config/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,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.5/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/

## 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}')
Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-manager/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.5
ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"
Expand Down
8 changes: 4 additions & 4 deletions indexer-certs-creator/config/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.5/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/

## 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}')
Expand Down Expand Up @@ -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
15 changes: 9 additions & 6 deletions multi-node/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3.7'

services:
wazuh.master:
image: wazuh/wazuh-manager:4.3.6
image: wazuh/wazuh-manager:4.5.0
hostname: wazuh.master
restart: always
ports:
Expand Down Expand Up @@ -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.6
image: wazuh/wazuh-manager:4.5.0
hostname: wazuh.worker
restart: always
environment:
Expand Down Expand Up @@ -67,14 +67,15 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf

wazuh1.indexer:
image: wazuh/wazuh-indexer:4.3.6
image: wazuh/wazuh-indexer:4.5.0
hostname: wazuh1.indexer
restart: always
ports:
- "9200:9200"
environment:
- "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
- "bootstrap.memory_lock=true"
- "JAVA_HOME=/usr/share/wazuh-indexer/jdk"
ulimits:
memlock:
soft: -1
Expand All @@ -93,12 +94,13 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml

wazuh2.indexer:
image: wazuh/wazuh-indexer:4.3.6
image: wazuh/wazuh-indexer:4.5.0
hostname: wazuh2.indexer
restart: always
environment:
- "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
- "bootstrap.memory_lock=true"
- "JAVA_HOME=/usr/share/wazuh-indexer/jdk"
ulimits:
memlock:
soft: -1
Expand All @@ -115,12 +117,13 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml

wazuh3.indexer:
image: wazuh/wazuh-indexer:4.3.6
image: wazuh/wazuh-indexer:4.5.0
hostname: wazuh3.indexer
restart: always
environment:
- "OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g"
- "bootstrap.memory_lock=true"
- "JAVA_HOME=/usr/share/wazuh-indexer/jdk"
ulimits:
memlock:
soft: -1
Expand All @@ -137,7 +140,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml

wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.3.6
image: wazuh/wazuh-dashboard:4.5.0
hostname: wazuh.dashboard
restart: always
ports:
Expand Down
7 changes: 4 additions & 3 deletions single-node/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3.7'

services:
wazuh.manager:
image: wazuh/wazuh-manager:4.3.6
image: wazuh/wazuh-manager:4.5.0
hostname: wazuh.manager
restart: always
ports:
Expand Down Expand Up @@ -39,13 +39,14 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf

wazuh.indexer:
image: wazuh/wazuh-indexer:4.3.6
image: wazuh/wazuh-indexer:4.5.0
hostname: wazuh.indexer
restart: always
ports:
- "9200:9200"
environment:
- "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m"
- "JAVA_HOME=/usr/share/wazuh-indexer/jdk"
ulimits:
memlock:
soft: -1
Expand All @@ -64,7 +65,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml

wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.3.6
image: wazuh/wazuh-dashboard:4.5.0
hostname: wazuh.dashboard
restart: always
ports:
Expand Down