Compare commits

...

30 Commits

Author SHA1 Message Date
Alberto Rodríguez
15205ada03 Merge pull request #742 from wazuh/bump-4-3-10
Bump 4.3 to 4.3.10
2022-11-11 16:20:58 +01:00
vcerenu
c1bfc450ba bump 4.3.10 version 2022-11-11 11:34:09 -03:00
Gonzalo Acuña
b08fd3e384 Merge pull request #726 from wazuh/bump-4-3-9
Bump 4.3 to 4.3.9
2022-10-11 09:47:12 -03:00
vcerenu
fd08279f32 bump 4.3.9 version 2022-10-06 14:25:56 -03:00
Gonzalo Acuña
f42b30b71d Merge pull request #720 from wazuh/bump-4-3-8
Bump 4.3 to 4.3.8
2022-09-14 12:15:09 -03:00
vcerenu
7555453d55 bump 4.3.8 version 2022-09-14 10:39:31 -03:00
vcerenu
22b77749fa bump 4.3.8 version 2022-09-12 15:37:47 -03:00
José Fernández Aguilera
28e21b0282 Merge pull request #717 from wazuh/714-modify-password
Add Double Quote on password
2022-09-09 08:52:18 +02:00
vcerenu
b83dcc087e doble quote for password 2022-09-08 12:17:45 -03:00
vcerenu
19c23456ec readme 2022-08-24 11:45:55 -03:00
José Fernández Aguilera
f99721e98b Merge pull request #708 from wazuh/bump-4-3-7
Bump 4.3 to 4.3.7
2022-08-17 08:23:32 +02:00
vcerenu
38271d7797 bump 4.3.7 version 2022-08-12 12:44:20 -03:00
vcerenu
c278f6a503 bump 4.3.7 version 2022-08-12 12:02:04 -03:00
vcerenu
d6ba8c3661 Merge pull request #707 from wazuh/695-change-indexer-username
Filebeat parameters
2022-08-12 10:39:19 -03:00
vcerenu
1db718ffc8 fix replace filebeat parameters 2022-08-10 16:15:17 -03:00
vcerenu
cf137c6703 Merge pull request #706 from wazuh/MigrationTo43-WazuhManagerNew
Fix permissions/ownership issue for Wazuh manager migration (4.2 -> 4.3)
2022-08-09 11:41:16 -03:00
Elwali karkoub
6f966cb01a Update 0-wazuh-init 2022-08-09 07:42:12 +02:00
José Fernández Aguilera
8bc11c48d9 Merge pull request #698 from wazuh/change-readme
Update Readme
2022-07-27 12:39:00 +02:00
vcerenu
be1bc64e0f update api and dashboard user 2022-07-26 09:27:01 -03:00
José Fernández Aguilera
80e8057f79 Merge pull request #694 from wazuh/bump-4-3-6
Bump 4.3 to 4.3.6
2022-07-19 12:49:07 +02:00
vcerenu
296de14886 bump 4.3.6 version 2022-07-18 10:25:01 -03:00
José Fernández Aguilera
0245a7e0d8 Merge pull request #692 from wazuh/fix-key-generator
Fix certificate generator
2022-07-08 09:06:54 +02:00
vcerenu
a9ea60b951 fix uid and gid for wazuh manager keys 2022-07-07 11:40:15 -03:00
José Fernández Aguilera
23cb7417bc Merge pull request #689 from wazuh/1665-Fix-filebeat-crash-due-to-glibc-to4.3
Add fix to avoid GLIBC crash
2022-07-07 08:59:47 +02:00
fcaffieri
adf95cd132 Add fix to avoid GLIBC crash, fix identation 2022-07-06 18:01:13 -03:00
fcaffieri
b6aa782730 Add fix to avoid GLIBC crash 2022-07-06 17:34:56 -03:00
José Fernández Aguilera
1d8d594a44 Merge pull request #685 from wazuh/1667-disable-filebeat-metrics-to4.3
Disable filebeat metrics
2022-07-04 15:59:55 +02:00
fcaffieri
265dfd39bf disable filebeat metrics 2022-07-04 09:16:57 -03:00
fcaffieri
28641accc2 disable filebeat metrics 2022-07-01 17:41:19 -03:00
Gonzalo Acuña
5774b93977 Merge pull request #684 from wazuh/fix-keystore-create
Add option to recreate keystore in entrypoint
2022-07-01 12:16:43 -03:00
14 changed files with 91 additions and 30 deletions

4
.env
View File

@@ -1,3 +1,3 @@
WAZUH_VERSION=4.3.5
WAZUH_IMAGE_VERSION=4.3.5
WAZUH_VERSION=4.3.10
WAZUH_IMAGE_VERSION=4.3.10
WAZUH_TAG_REVISION=1

2
.github/.goss.yaml vendored
View File

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

View File

@@ -1,6 +1,33 @@
# Change Log
All notable changes to this project will be documented in this file.
## Wazuh Docker v4.3.10
### Added
- Update Wazuh to version [4.3.10](https://github.com/wazuh/wazuh/blob/v4.3.10/CHANGELOG.md#v4310)
## Wazuh Docker v4.3.9
### Added
- Update Wazuh to version [4.3.9](https://github.com/wazuh/wazuh/blob/v4.3.9/CHANGELOG.md#v439)
## Wazuh Docker v4.3.8
### Added
- Update Wazuh to version [4.3.8](https://github.com/wazuh/wazuh/blob/v4.3.8/CHANGELOG.md#v438)
## Wazuh Docker v4.3.7
### Added
- Update Wazuh to version [4.3.7](https://github.com/wazuh/wazuh/blob/v4.3.7/CHANGELOG.md#v437)
## Wazuh Docker v4.3.6
### Added
- Update Wazuh to version [4.3.6](https://github.com/wazuh/wazuh/blob/v4.3.6/CHANGELOG.md#v436)
## Wazuh Docker v4.3.5
### Added

View File

@@ -36,8 +36,8 @@ Default values are included when available.
### Wazuh
```
API_USERNAME="wazuh" # Wazuh API username
API_PASSWORD="wazuh" # Wazuh API password - Must comply with requirements
API_USERNAME="wazuh-wui" # Wazuh API username
API_PASSWORD="MyS3cr37P450r.*-" # Wazuh API password - Must comply with requirements
# (8+ length, uppercase, lowercase, specials chars)
INDEXER_URL=https://wazuh.indexer:9200 # Wazuh indexer URL
@@ -78,10 +78,12 @@ API_SELECTOR=true Defines if the user is allowed to change the sel
IP_SELECTOR=true # Defines if the user is allowed to change the selected index pattern directly from the Wazuh app top menu
IP_IGNORE="[]" # List of index patterns to be ignored
DASHBOARD_USERNAME=kibanaserver # Custom user saved in the dashboard keystore
DASHBOARD_PASSWORD=kibanaserver # Custom password saved in the dashboard keystore
WAZUH_MONITORING_ENABLED=true # Custom settings to enable/disable wazuh-monitoring indices
WAZUH_MONITORING_FREQUENCY=900 # Custom setting to set the frequency for wazuh-monitoring indices cron task
WAZUH_MONITORING_SHARDS=2 # Configure wazuh-monitoring-* indices shards and replicas
WAZUH_MONITORING_REPLICAS=0 #
WAZUH_MONITORING_REPLICAS=0 ##
```
## Directory structure
@@ -193,6 +195,11 @@ WAZUH_MONITORING_REPLICAS=0 #
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.3.10 | | |
| v4.3.9 | | |
| v4.3.8 | | |
| v4.3.7 | | |
| v4.3.6 | | |
| v4.3.5 | | |
| v4.3.4 | | |
| v4.3.3 | | |

View File

@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.3.5"
REVISION="40317"
WAZUH-DOCKER_VERSION="4.3.10"
REVISION="40323"

View File

@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.3.5
WAZUH_IMAGE_VERSION=4.3.10
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

@@ -179,6 +179,15 @@ set_rids_owner() {
chown -R wazuh:wazuh /var/ossec/queue/rids
}
##############################################################################
# Change any ossec user/group to wazuh user/group
##############################################################################
set_correct_permOwner() {
find / -group 997 -exec chown :101 {} +;
find / -user 999 -exec chown 101 {} +;
}
##############################################################################
# Main function
##############################################################################
@@ -189,6 +198,9 @@ main() {
# Restore files stored in permanent data that are not permanent (i.e. internal_options.conf)
apply_exclusion_data
# Apply correct permission and ownership
set_correct_permOwner
# Rename files stored in permanent data (i.e. queue/ossec)
move_data_files

View File

@@ -12,32 +12,38 @@ fi
if [ "$INDEXER_USERNAME" != "" ]; then
>&2 echo "Configuring username."
sed -i "s|#username:.*|username: '$INDEXER_USERNAME'|g" /etc/filebeat/filebeat.yml
sed -i "s|#username:.*|username:|g" /etc/filebeat/filebeat.yml
sed -i "s|username:.*|username: '$INDEXER_USERNAME'|g" /etc/filebeat/filebeat.yml
fi
if [ "$INDEXER_PASSWORD" != "" ]; then
>&2 echo "Configuring password."
sed -i "s|#password:.*|password: '$INDEXER_PASSWORD'|g" /etc/filebeat/filebeat.yml
sed -i "s|#password:.*|password:|g" /etc/filebeat/filebeat.yml
sed -i "s|password:.*|password: '$INDEXER_PASSWORD'|g" /etc/filebeat/filebeat.yml
fi
if [ "$FILEBEAT_SSL_VERIFICATION_MODE" != "" ]; then
>&2 echo "Configuring SSL verification mode."
sed -i "s|#ssl.verification_mode:.*|ssl.verification_mode: $FILEBEAT_SSL_VERIFICATION_MODE|g" /etc/filebeat/filebeat.yml
sed -i "s|#ssl.verification_mode:.*|ssl.verification_mode:|g" /etc/filebeat/filebeat.yml
sed -i "s|ssl.verification_mode:.*|ssl.verification_mode: '$FILEBEAT_SSL_VERIFICATION_MODE'|g" /etc/filebeat/filebeat.yml
fi
if [ "$SSL_CERTIFICATE_AUTHORITIES" != "" ]; then
>&2 echo "Configuring Certificate Authorities."
sed -i "s|#ssl.certificate_authorities:.*|ssl.certificate_authorities: ['$SSL_CERTIFICATE_AUTHORITIES']|g" /etc/filebeat/filebeat.yml
sed -i "s|#ssl.certificate_authorities:.*|ssl.certificate_authorities:|g" /etc/filebeat/filebeat.yml
sed -i "s|ssl.certificate_authorities:.*|ssl.certificate_authorities: ['$SSL_CERTIFICATE_AUTHORITIES']|g" /etc/filebeat/filebeat.yml
fi
if [ "$SSL_CERTIFICATE" != "" ]; then
>&2 echo "Configuring SSL Certificate."
sed -i "s|#ssl.certificate:.*|ssl.certificate: '$SSL_CERTIFICATE'|g" /etc/filebeat/filebeat.yml
sed -i "s|#ssl.certificate:.*|ssl.certificate:|g" /etc/filebeat/filebeat.yml
sed -i "s|ssl.certificate:.*|ssl.certificate: '$SSL_CERTIFICATE'|g" /etc/filebeat/filebeat.yml
fi
if [ "$SSL_KEY" != "" ]; then
>&2 echo "Configuring SSL Key."
sed -i "s|#ssl.key:.*|ssl.key: '$SSL_KEY'|g" /etc/filebeat/filebeat.yml
sed -i "s|#ssl.key:.*|ssl.key:|g" /etc/filebeat/filebeat.yml
sed -i "s|ssl.key:.*|ssl.key: '$SSL_KEY'|g" /etc/filebeat/filebeat.yml
fi

View File

@@ -20,3 +20,12 @@ output.elasticsearch:
#ssl.certificate_authorities:
#ssl.certificate:
#ssl.key:
logging.metrics.enabled: false
seccomp:
default_action: allow
syscalls:
- action: allow
names:
- rseq

View File

@@ -51,11 +51,11 @@ chown 1000:1000 /certificates/*
echo "Setting UID for wazuh manager and worker"
cp /certificates/root-ca.pem /certificates/root-ca-manager.pem
cp /certificates/root-ca.key /certificates/root-ca-manager.key
chown 999:997 /certificates/root-ca-manager.pem
chown 999:997 /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
chown 999:997 "/certificates/${i}.pem"
chown 999:997 "/certificates/${i}-key.pem"
chown 101:101 "/certificates/${i}.pem"
chown 101:101 "/certificates/${i}-key.pem"
done

View File

@@ -3,5 +3,5 @@ hosts:
url: "https://wazuh.master"
port: 55000
username: wazuh-wui
password: MyS3cr37P450r.*-
password: "MyS3cr37P450r.*-"
run_as: false

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.3.5
image: wazuh/wazuh-manager:4.3.10
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.5
image: wazuh/wazuh-manager:4.3.10
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.5
image: wazuh/wazuh-indexer:4.3.10
hostname: wazuh1.indexer
restart: always
ports:
@@ -93,7 +93,7 @@ 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.5
image: wazuh/wazuh-indexer:4.3.10
hostname: wazuh2.indexer
restart: always
environment:
@@ -115,7 +115,7 @@ 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.5
image: wazuh/wazuh-indexer:4.3.10
hostname: wazuh3.indexer
restart: always
environment:
@@ -137,7 +137,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.5
image: wazuh/wazuh-dashboard:4.3.10
hostname: wazuh.dashboard
restart: always
ports:

View File

@@ -3,5 +3,5 @@ hosts:
url: "https://wazuh.manager"
port: 55000
username: wazuh-wui
password: MyS3cr37P450r.*-
password: "MyS3cr37P450r.*-"
run_as: false

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.3.5
image: wazuh/wazuh-manager:4.3.10
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.5
image: wazuh/wazuh-indexer:4.3.10
hostname: wazuh.indexer
restart: always
ports:
@@ -64,7 +64,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.5
image: wazuh/wazuh-dashboard:4.3.10
hostname: wazuh.dashboard
restart: always
ports: