Compare commits

..

9 Commits

Author SHA1 Message Date
David Correa Rodríguez
3a3218f0d4 Merge pull request #1061 from wazuh/bump-revision-40510
Bump revision to 40510
2023-10-19 12:00:04 +02:00
David Correa Rodríguez
dd86d1b707 Bump revision to 40510 2023-10-19 11:46:24 +02:00
Gonzalo Acuña
8aad8651d7 Merge pull request #1058 from wazuh/bump-version-4.5.4
Bump 4.5.4 version
2023-10-17 09:03:27 -03:00
vcerenu
3c073ab5ea bump 4.5.4 version 2023-10-17 09:01:18 -03:00
vcerenu
5106715b0c bump 4.5.4 version 2023-10-17 05:55:15 -03:00
Gonzalo Acuña
ded91b2f0a Merge pull request #1029 from wazuh/bump-4.5.3-revision
Bump 4.5.3 revision
2023-10-05 11:48:22 -03:00
Gonzalo Acuña
d7e051af19 Bump 4.5.3 revision 2023-10-05 11:44:40 -03:00
Gonzalo Acuña
93c53a712d Merge pull request #1021 from wazuh/change/1020-bump-revision-4.5.3-rc2
Bump revision to 40507
2023-09-28 08:24:43 -03:00
David Correa Rodríguez
5f3a0481ba Bump revision to 40507 2023-09-28 12:14:34 +02:00
18 changed files with 30 additions and 61 deletions

4
.env
View File

@@ -1,3 +1,3 @@
WAZUH_VERSION=4.6.0
WAZUH_IMAGE_VERSION=4.6.0
WAZUH_VERSION=4.5.4
WAZUH_IMAGE_VERSION=4.5.4
WAZUH_TAG_REVISION=1

2
.github/.goss.yaml vendored
View File

@@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.6.0-1
- 4.5.4-1
port:
tcp:1514:
listening: true

View File

@@ -1,10 +1,10 @@
# Change Log
All notable changes to this project will be documented in this file.
## Wazuh Docker v4.6.0
## Wazuh Docker v4.5.4
### 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
### Added

View File

@@ -195,7 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.6.0 | | |
| v4.5.4 | | |
| v4.5.3 | | |
| v4.5.2 | | |
| v4.5.1 | | |

View File

@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.6.0"
REVISION="40601"
WAZUH-DOCKER_VERSION="4.5.4"
REVISION="40510"

View File

@@ -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_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')

View File

@@ -66,8 +66,6 @@ ENV PATTERN="" \
EXTENSIONS_CISCAT="" \
EXTENSIONS_AWS="" \
EXTENSIONS_GCP="" \
EXTENSIONS_GITHUB=""\
EXTENSIONS_OFFICE=""\
EXTENSIONS_VIRUSTOTAL="" \
EXTENSIONS_OSQUERY="" \
EXTENSIONS_DOCKER="" \

View File

@@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.6/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.6/
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}')

View File

@@ -25,8 +25,6 @@ declare -A CONFIG_MAP=(
[extensions.ciscat]=$EXTENSIONS_CISCAT
[extensions.aws]=$EXTENSIONS_AWS
[extensions.gcp]=$EXTENSIONS_GCP
[extensions.github]=$EXTENSIONS_GITHUB
[extensions.office]=$EXTENSIONS_OFFICE
[extensions.virustotal]=$EXTENSIONS_VIRUSTOTAL
[extensions.osquery]=$EXTENSIONS_OSQUERY
[extensions.docker]=$EXTENSIONS_DOCKER

View File

@@ -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.6/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.6/
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}')

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=v4.6.0
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"
@@ -52,4 +52,4 @@ RUN chmod 755 /permanent_data.sh && \
# Services ports
EXPOSE 55000/tcp 1514/tcp 1515/tcp 514/udp 1516/tcp
ENTRYPOINT [ "/init" ]
ENTRYPOINT [ "/init" ]

View File

@@ -13,7 +13,7 @@ SPECIAL_CHARS = "@$!%*?&-_"
try:
from wazuh.rbac.orm import check_database_integrity
from wazuh.rbac.orm import create_rbac_db
from wazuh.security import (
create_user,
get_users,
@@ -69,7 +69,7 @@ if __name__ == "__main__":
username, password = read_user_file()
# create RBAC database
check_database_integrity()
create_rbac_db()
initial_users = db_users()
if username not in initial_users:

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.6/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.6/
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}')

View File

@@ -117,7 +117,6 @@
<enabled>no</enabled>
<os>buster</os>
<os>bullseye</os>
<os>bookworm</os>
<update_interval>1h</update_interval>
</provider>
@@ -164,14 +163,6 @@
<update_interval>1h</update_interval>
</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 -->
<provider name="nvd">
<enabled>yes</enabled>
@@ -375,4 +366,4 @@
<location>/var/log/dpkg.log</location>
</localfile>
</ossec_config>
</ossec_config>

View File

@@ -117,7 +117,6 @@
<enabled>no</enabled>
<os>buster</os>
<os>bullseye</os>
<os>bookworm</os>
<update_interval>1h</update_interval>
</provider>
@@ -158,14 +157,6 @@
<update_interval>1h</update_interval>
</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 -->
<provider name="msu">
<enabled>yes</enabled>
@@ -375,4 +366,4 @@
<location>/var/log/dpkg.log</location>
</localfile>
</ossec_config>
</ossec_config>

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.6.0
image: wazuh/wazuh-manager:4.5.4
hostname: wazuh.master
restart: always
ulimits:
@@ -45,7 +45,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.worker:
image: wazuh/wazuh-manager:4.6.0
image: wazuh/wazuh-manager:4.5.4
hostname: wazuh.worker
restart: always
ulimits:
@@ -81,7 +81,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
wazuh1.indexer:
image: wazuh/wazuh-indexer:4.6.0
image: wazuh/wazuh-indexer:4.5.4
hostname: wazuh1.indexer
restart: always
ports:
@@ -107,7 +107,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh2.indexer:
image: wazuh/wazuh-indexer:4.6.0
image: wazuh/wazuh-indexer:4.5.4
hostname: wazuh2.indexer
restart: always
environment:
@@ -129,7 +129,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh3.indexer:
image: wazuh/wazuh-indexer:4.6.0
image: wazuh/wazuh-indexer:4.5.4
hostname: wazuh3.indexer
restart: always
environment:
@@ -151,7 +151,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.6.0
image: wazuh/wazuh-dashboard:4.5.4
hostname: wazuh.dashboard
restart: always
ports:

View File

@@ -117,7 +117,6 @@
<enabled>no</enabled>
<os>buster</os>
<os>bullseye</os>
<os>bookworm</os>
<update_interval>1h</update_interval>
</provider>
@@ -158,14 +157,6 @@
<update_interval>1h</update_interval>
</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 -->
<provider name="msu">
<enabled>yes</enabled>

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.6.0
image: wazuh/wazuh-manager:4.5.4
hostname: wazuh.manager
restart: always
ulimits:
@@ -46,7 +46,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.indexer:
image: wazuh/wazuh-indexer:4.6.0
image: wazuh/wazuh-indexer:4.5.4
hostname: wazuh.indexer
restart: always
ports:
@@ -71,7 +71,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.6.0
image: wazuh/wazuh-dashboard:4.5.4
hostname: wazuh.dashboard
restart: always
ports: