mirror of
https://github.com/wazuh/wazuh-docker.git
synced 2025-11-03 13:33:17 +00:00
Compare commits
9 Commits
v4.6.0-bet
...
v4.5.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3a3218f0d4 | ||
|
|
dd86d1b707 | ||
|
|
8aad8651d7 | ||
|
|
3c073ab5ea | ||
|
|
5106715b0c | ||
|
|
ded91b2f0a | ||
|
|
d7e051af19 | ||
|
|
93c53a712d | ||
|
|
5f3a0481ba |
4
.env
4
.env
@@ -1,3 +1,3 @@
|
|||||||
WAZUH_VERSION=4.6.0
|
WAZUH_VERSION=4.5.4
|
||||||
WAZUH_IMAGE_VERSION=4.6.0
|
WAZUH_IMAGE_VERSION=4.5.4
|
||||||
WAZUH_TAG_REVISION=1
|
WAZUH_TAG_REVISION=1
|
||||||
|
|||||||
2
.github/.goss.yaml
vendored
2
.github/.goss.yaml
vendored
@@ -56,7 +56,7 @@ package:
|
|||||||
wazuh-manager:
|
wazuh-manager:
|
||||||
installed: true
|
installed: true
|
||||||
versions:
|
versions:
|
||||||
- 4.6.0-1
|
- 4.5.4-1
|
||||||
port:
|
port:
|
||||||
tcp:1514:
|
tcp:1514:
|
||||||
listening: true
|
listening: true
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
# Change Log
|
# Change Log
|
||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
## Wazuh Docker v4.6.0
|
## Wazuh Docker v4.5.4
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Update Wazuh to version [4.6.0](https://github.com/wazuh/wazuh/blob/v4.6.0/CHANGELOG.md#v460)
|
- Update Wazuh to version [4.5.4](https://github.com/wazuh/wazuh/blob/v4.5.4/CHANGELOG.md#v454)
|
||||||
|
|
||||||
## Wazuh Docker v4.5.3
|
## Wazuh Docker v4.5.3
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -195,7 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
|
|||||||
|
|
||||||
| Wazuh version | ODFE | XPACK |
|
| Wazuh version | ODFE | XPACK |
|
||||||
|---------------|---------|--------|
|
|---------------|---------|--------|
|
||||||
| v4.6.0 | | |
|
| v4.5.4 | | |
|
||||||
| v4.5.3 | | |
|
| v4.5.3 | | |
|
||||||
| v4.5.2 | | |
|
| v4.5.2 | | |
|
||||||
| v4.5.1 | | |
|
| v4.5.1 | | |
|
||||||
|
|||||||
4
VERSION
4
VERSION
@@ -1,2 +1,2 @@
|
|||||||
WAZUH-DOCKER_VERSION="4.6.0"
|
WAZUH-DOCKER_VERSION="4.5.4"
|
||||||
REVISION="40601"
|
REVISION="40510"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
WAZUH_IMAGE_VERSION=4.6.0
|
WAZUH_IMAGE_VERSION=4.5.4
|
||||||
WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
|
WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
|
||||||
WAZUH_TAG_REVISION=1
|
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')
|
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')
|
||||||
|
|||||||
@@ -66,8 +66,6 @@ ENV PATTERN="" \
|
|||||||
EXTENSIONS_CISCAT="" \
|
EXTENSIONS_CISCAT="" \
|
||||||
EXTENSIONS_AWS="" \
|
EXTENSIONS_AWS="" \
|
||||||
EXTENSIONS_GCP="" \
|
EXTENSIONS_GCP="" \
|
||||||
EXTENSIONS_GITHUB=""\
|
|
||||||
EXTENSIONS_OFFICE=""\
|
|
||||||
EXTENSIONS_VIRUSTOTAL="" \
|
EXTENSIONS_VIRUSTOTAL="" \
|
||||||
EXTENSIONS_OSQUERY="" \
|
EXTENSIONS_OSQUERY="" \
|
||||||
EXTENSIONS_DOCKER="" \
|
EXTENSIONS_DOCKER="" \
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config
|
|||||||
|
|
||||||
## Variables
|
## Variables
|
||||||
CERT_TOOL=wazuh-certs-tool.sh
|
CERT_TOOL=wazuh-certs-tool.sh
|
||||||
PACKAGES_URL=https://packages.wazuh.com/4.6/
|
PACKAGES_URL=https://packages.wazuh.com/4.5/
|
||||||
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.6/
|
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/
|
||||||
|
|
||||||
## Check if the cert tool exists in S3 buckets
|
## 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}')
|
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
|
||||||
|
|||||||
@@ -25,8 +25,6 @@ declare -A CONFIG_MAP=(
|
|||||||
[extensions.ciscat]=$EXTENSIONS_CISCAT
|
[extensions.ciscat]=$EXTENSIONS_CISCAT
|
||||||
[extensions.aws]=$EXTENSIONS_AWS
|
[extensions.aws]=$EXTENSIONS_AWS
|
||||||
[extensions.gcp]=$EXTENSIONS_GCP
|
[extensions.gcp]=$EXTENSIONS_GCP
|
||||||
[extensions.github]=$EXTENSIONS_GITHUB
|
|
||||||
[extensions.office]=$EXTENSIONS_OFFICE
|
|
||||||
[extensions.virustotal]=$EXTENSIONS_VIRUSTOTAL
|
[extensions.virustotal]=$EXTENSIONS_VIRUSTOTAL
|
||||||
[extensions.osquery]=$EXTENSIONS_OSQUERY
|
[extensions.osquery]=$EXTENSIONS_OSQUERY
|
||||||
[extensions.docker]=$EXTENSIONS_DOCKER
|
[extensions.docker]=$EXTENSIONS_DOCKER
|
||||||
|
|||||||
@@ -53,8 +53,8 @@ tar -xf ${INDEXER_FILE}
|
|||||||
## Variables
|
## Variables
|
||||||
CERT_TOOL=wazuh-certs-tool.sh
|
CERT_TOOL=wazuh-certs-tool.sh
|
||||||
PASSWORD_TOOL=wazuh-passwords-tool.sh
|
PASSWORD_TOOL=wazuh-passwords-tool.sh
|
||||||
PACKAGES_URL=https://packages.wazuh.com/4.6/
|
PACKAGES_URL=https://packages.wazuh.com/4.5/
|
||||||
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.6/
|
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/
|
||||||
|
|
||||||
## Check if the cert tool exists in S3 buckets
|
## 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}')
|
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
|||||||
|
|
||||||
ARG WAZUH_VERSION
|
ARG WAZUH_VERSION
|
||||||
ARG WAZUH_TAG_REVISION
|
ARG WAZUH_TAG_REVISION
|
||||||
ARG TEMPLATE_VERSION=v4.6.0
|
ARG TEMPLATE_VERSION=4.5
|
||||||
ARG FILEBEAT_CHANNEL=filebeat-oss
|
ARG FILEBEAT_CHANNEL=filebeat-oss
|
||||||
ARG FILEBEAT_VERSION=7.10.2
|
ARG FILEBEAT_VERSION=7.10.2
|
||||||
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"
|
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ SPECIAL_CHARS = "@$!%*?&-_"
|
|||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from wazuh.rbac.orm import check_database_integrity
|
from wazuh.rbac.orm import create_rbac_db
|
||||||
from wazuh.security import (
|
from wazuh.security import (
|
||||||
create_user,
|
create_user,
|
||||||
get_users,
|
get_users,
|
||||||
@@ -69,7 +69,7 @@ if __name__ == "__main__":
|
|||||||
username, password = read_user_file()
|
username, password = read_user_file()
|
||||||
|
|
||||||
# create RBAC database
|
# create RBAC database
|
||||||
check_database_integrity()
|
create_rbac_db()
|
||||||
|
|
||||||
initial_users = db_users()
|
initial_users = db_users()
|
||||||
if username not in initial_users:
|
if username not in initial_users:
|
||||||
|
|||||||
@@ -8,8 +8,8 @@
|
|||||||
## Variables
|
## Variables
|
||||||
CERT_TOOL=wazuh-certs-tool.sh
|
CERT_TOOL=wazuh-certs-tool.sh
|
||||||
PASSWORD_TOOL=wazuh-passwords-tool.sh
|
PASSWORD_TOOL=wazuh-passwords-tool.sh
|
||||||
PACKAGES_URL=https://packages.wazuh.com/4.6/
|
PACKAGES_URL=https://packages.wazuh.com/4.5/
|
||||||
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.6/
|
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/
|
||||||
|
|
||||||
## Check if the cert tool exists in S3 buckets
|
## 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}')
|
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
|
||||||
|
|||||||
@@ -117,7 +117,6 @@
|
|||||||
<enabled>no</enabled>
|
<enabled>no</enabled>
|
||||||
<os>buster</os>
|
<os>buster</os>
|
||||||
<os>bullseye</os>
|
<os>bullseye</os>
|
||||||
<os>bookworm</os>
|
|
||||||
<update_interval>1h</update_interval>
|
<update_interval>1h</update_interval>
|
||||||
</provider>
|
</provider>
|
||||||
|
|
||||||
@@ -164,14 +163,6 @@
|
|||||||
<update_interval>1h</update_interval>
|
<update_interval>1h</update_interval>
|
||||||
</provider>
|
</provider>
|
||||||
|
|
||||||
<!-- Alma Linux OS vulnerabilities -->
|
|
||||||
<provider name="almalinux">
|
|
||||||
<enabled>no</enabled>
|
|
||||||
<os>8</os>
|
|
||||||
<os>9</os>
|
|
||||||
<update_interval>1h</update_interval>
|
|
||||||
</provider>
|
|
||||||
|
|
||||||
<!-- Aggregate vulnerabilities -->
|
<!-- Aggregate vulnerabilities -->
|
||||||
<provider name="nvd">
|
<provider name="nvd">
|
||||||
<enabled>yes</enabled>
|
<enabled>yes</enabled>
|
||||||
|
|||||||
@@ -117,7 +117,6 @@
|
|||||||
<enabled>no</enabled>
|
<enabled>no</enabled>
|
||||||
<os>buster</os>
|
<os>buster</os>
|
||||||
<os>bullseye</os>
|
<os>bullseye</os>
|
||||||
<os>bookworm</os>
|
|
||||||
<update_interval>1h</update_interval>
|
<update_interval>1h</update_interval>
|
||||||
</provider>
|
</provider>
|
||||||
|
|
||||||
@@ -158,14 +157,6 @@
|
|||||||
<update_interval>1h</update_interval>
|
<update_interval>1h</update_interval>
|
||||||
</provider>
|
</provider>
|
||||||
|
|
||||||
<!-- Alma Linux OS vulnerabilities -->
|
|
||||||
<provider name="almalinux">
|
|
||||||
<enabled>no</enabled>
|
|
||||||
<os>8</os>
|
|
||||||
<os>9</os>
|
|
||||||
<update_interval>1h</update_interval>
|
|
||||||
</provider>
|
|
||||||
|
|
||||||
<!-- Windows OS vulnerabilities -->
|
<!-- Windows OS vulnerabilities -->
|
||||||
<provider name="msu">
|
<provider name="msu">
|
||||||
<enabled>yes</enabled>
|
<enabled>yes</enabled>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ version: '3.7'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
wazuh.master:
|
wazuh.master:
|
||||||
image: wazuh/wazuh-manager:4.6.0
|
image: wazuh/wazuh-manager:4.5.4
|
||||||
hostname: wazuh.master
|
hostname: wazuh.master
|
||||||
restart: always
|
restart: always
|
||||||
ulimits:
|
ulimits:
|
||||||
@@ -45,7 +45,7 @@ services:
|
|||||||
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
|
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
|
||||||
|
|
||||||
wazuh.worker:
|
wazuh.worker:
|
||||||
image: wazuh/wazuh-manager:4.6.0
|
image: wazuh/wazuh-manager:4.5.4
|
||||||
hostname: wazuh.worker
|
hostname: wazuh.worker
|
||||||
restart: always
|
restart: always
|
||||||
ulimits:
|
ulimits:
|
||||||
@@ -81,7 +81,7 @@ services:
|
|||||||
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
|
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
|
||||||
|
|
||||||
wazuh1.indexer:
|
wazuh1.indexer:
|
||||||
image: wazuh/wazuh-indexer:4.6.0
|
image: wazuh/wazuh-indexer:4.5.4
|
||||||
hostname: wazuh1.indexer
|
hostname: wazuh1.indexer
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
@@ -107,7 +107,7 @@ services:
|
|||||||
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
|
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
|
||||||
|
|
||||||
wazuh2.indexer:
|
wazuh2.indexer:
|
||||||
image: wazuh/wazuh-indexer:4.6.0
|
image: wazuh/wazuh-indexer:4.5.4
|
||||||
hostname: wazuh2.indexer
|
hostname: wazuh2.indexer
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
@@ -129,7 +129,7 @@ services:
|
|||||||
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
|
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
|
||||||
|
|
||||||
wazuh3.indexer:
|
wazuh3.indexer:
|
||||||
image: wazuh/wazuh-indexer:4.6.0
|
image: wazuh/wazuh-indexer:4.5.4
|
||||||
hostname: wazuh3.indexer
|
hostname: wazuh3.indexer
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
@@ -151,7 +151,7 @@ services:
|
|||||||
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
|
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
|
||||||
|
|
||||||
wazuh.dashboard:
|
wazuh.dashboard:
|
||||||
image: wazuh/wazuh-dashboard:4.6.0
|
image: wazuh/wazuh-dashboard:4.5.4
|
||||||
hostname: wazuh.dashboard
|
hostname: wazuh.dashboard
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
@@ -117,7 +117,6 @@
|
|||||||
<enabled>no</enabled>
|
<enabled>no</enabled>
|
||||||
<os>buster</os>
|
<os>buster</os>
|
||||||
<os>bullseye</os>
|
<os>bullseye</os>
|
||||||
<os>bookworm</os>
|
|
||||||
<update_interval>1h</update_interval>
|
<update_interval>1h</update_interval>
|
||||||
</provider>
|
</provider>
|
||||||
|
|
||||||
@@ -158,14 +157,6 @@
|
|||||||
<update_interval>1h</update_interval>
|
<update_interval>1h</update_interval>
|
||||||
</provider>
|
</provider>
|
||||||
|
|
||||||
<!-- Alma Linux OS vulnerabilities -->
|
|
||||||
<provider name="almalinux">
|
|
||||||
<enabled>no</enabled>
|
|
||||||
<os>8</os>
|
|
||||||
<os>9</os>
|
|
||||||
<update_interval>1h</update_interval>
|
|
||||||
</provider>
|
|
||||||
|
|
||||||
<!-- Windows OS vulnerabilities -->
|
<!-- Windows OS vulnerabilities -->
|
||||||
<provider name="msu">
|
<provider name="msu">
|
||||||
<enabled>yes</enabled>
|
<enabled>yes</enabled>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ version: '3.7'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
wazuh.manager:
|
wazuh.manager:
|
||||||
image: wazuh/wazuh-manager:4.6.0
|
image: wazuh/wazuh-manager:4.5.4
|
||||||
hostname: wazuh.manager
|
hostname: wazuh.manager
|
||||||
restart: always
|
restart: always
|
||||||
ulimits:
|
ulimits:
|
||||||
@@ -46,7 +46,7 @@ services:
|
|||||||
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
|
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
|
||||||
|
|
||||||
wazuh.indexer:
|
wazuh.indexer:
|
||||||
image: wazuh/wazuh-indexer:4.6.0
|
image: wazuh/wazuh-indexer:4.5.4
|
||||||
hostname: wazuh.indexer
|
hostname: wazuh.indexer
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
@@ -71,7 +71,7 @@ services:
|
|||||||
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
|
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
|
||||||
|
|
||||||
wazuh.dashboard:
|
wazuh.dashboard:
|
||||||
image: wazuh/wazuh-dashboard:4.6.0
|
image: wazuh/wazuh-dashboard:4.5.4
|
||||||
hostname: wazuh.dashboard
|
hostname: wazuh.dashboard
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
Reference in New Issue
Block a user