yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity

Test CI

Browse Source
This commit is contained in:
vcerenu
2022-06-03 15:51:18 -03:00
parent d578dfbd39 fb66a358c8
commit 2fdb06d824
29 changed files with 70 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/.goss.yaml
+1 -1
View File
@@ -6,7 +6,7 @@ package:
wazuh-manager: wazuh-manager:
installed: true installed: true
versions: versions:
- 4.3.1-1 - 4.3.3
port: port:
tcp:1514: tcp:1514:
listening: true listening: true
CHANGELOG.md
+20
View File
@@ -1,6 +1,16 @@
# 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.3.3
### Added
- Update Wazuh to version [4.3.3](https://github.com/wazuh/wazuh/blob/v4.3.3/CHANGELOG.md#v433)
## Wazuh Docker v4.3.2
### Added
- Update Wazuh to version [4.3.2](https://github.com/wazuh/wazuh/blob/v4.3.2/CHANGELOG.md#v432)
## Wazuh Docker v4.3.1 ## Wazuh Docker v4.3.1
### Added ### Added
@@ -11,6 +21,16 @@ All notable changes to this project will be documented in this file.
- Update Wazuh to version [4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430) - Update Wazuh to version [4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430)
## Wazuh Docker v4.2.7
### Added
- Update Wazuh to version [4.2.7](https://github.com/wazuh/wazuh/blob/v4.2.7/CHANGELOG.md#v427)
## Wazuh Docker v4.2.6
### Added
- Update Wazuh to version [4.2.6](https://github.com/wazuh/wazuh/blob/v4.2.6/CHANGELOG.md#v426)
## Wazuh Docker v4.2.5 ## Wazuh Docker v4.2.5
### Added ### Added
LICENSE
+1 -1
View File
@@ -1,5 +1,5 @@
Portions Copyright (C) 2021 Wazuh, Inc. Portions Copyright (C) 2017, Wazuh Inc.
Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc. Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc.
This program is a free software; you can redistribute it and/or modify This program is a free software; you can redistribute it and/or modify
README.md
+5 -1
View File
@@ -193,8 +193,12 @@ WAZUH_MONITORING_REPLICAS=0 #
| Wazuh version | ODFE | XPACK | | Wazuh version | ODFE | XPACK |
|---------------|---------|--------| |---------------|---------|--------|
| v4.3.3 | | |
| v4.3.2 | | |
| v4.3.1 | | | | v4.3.1 | | |
| v4.3.0 | | | | v4.3.0 | | |
| v4.2.7 | 1.13.2 | 7.11.2 |
| v4.2.6 | 1.13.2 | 7.11.2 |
| v4.2.5 | 1.13.2 | 7.11.2 | | v4.2.5 | 1.13.2 | 7.11.2 |
| v4.2.4 | 1.13.2 | 7.11.2 | | v4.2.4 | 1.13.2 | 7.11.2 |
| v4.2.3 | 1.13.2 | 7.11.2 | | v4.2.3 | 1.13.2 | 7.11.2 |
@@ -224,7 +228,7 @@ We thank you them and everyone else who has contributed to this project.
## License and copyright ## License and copyright
Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
## Web references ## Web references
VERSION
+2 -2
View File
@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.3.1" WAZUH-DOCKER_VERSION="4.3.3"
REVISION="40311" REVISION="40315"
build-docker-images/build-images.sh
+1 -1
View File
@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.3.1 WAZUH_IMAGE_VERSION=4.3.3
WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g') WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
WAZUH_ACTUAL_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_ACTUAL_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')
build-docker-images/build-images.yml
+1 -1
View File
@@ -1,4 +1,4 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7' version: '3.7'
services: services:
build-docker-images/wazuh-dashboard/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal AS builder FROM ubuntu:focal AS builder
ARG WAZUH_VERSION ARG WAZUH_VERSION
build-docker-images/wazuh-dashboard/config/config.sh
+1 -1
View File
@@ -1,4 +1,4 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# This has to be exported to make some magic below work. # This has to be exported to make some magic below work.
export DH_OPTIONS export DH_OPTIONS
build-docker-images/wazuh-dashboard/config/entrypoint.sh
+11 -1
View File
@@ -1,5 +1,15 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
INSTALL_DIR=/usr/share/wazuh-dashboard
DASHBOARD_USERNAME="${DASHBOARD_USERNAME:-kibanaserver}"
DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}"
# Create and configure Wazuh dashboard keystore
$INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \
echo $DASHBOARD_USERNAME | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \
echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root
############################################################################## ##############################################################################
# Start Wazuh dashboard # Start Wazuh dashboard
build-docker-images/wazuh-dashboard/config/wazuh.yml
+1 -1
View File
@@ -1,7 +1,7 @@
--- ---
# #
# Wazuh app - App configuration file # Wazuh app - App configuration file
# Copyright (C) 2015-2021 Wazuh, Inc. # Copyright (C) 2017, Wazuh Inc.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
wazuh_url="${WAZUH_API_URL:-https://wazuh}" wazuh_url="${WAZUH_API_URL:-https://wazuh}"
wazuh_port="${API_PORT:-55000}" wazuh_port="${API_PORT:-55000}"
build-docker-images/wazuh-indexer/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal AS builder FROM ubuntu:focal AS builder
ARG WAZUH_VERSION ARG WAZUH_VERSION
build-docker-images/wazuh-indexer/config/config.sh
+1 -1
View File
@@ -1,4 +1,4 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# This has to be exported to make some magic below work. # This has to be exported to make some magic below work.
export DH_OPTIONS export DH_OPTIONS
build-docker-images/wazuh-indexer/config/entrypoint.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
set -e set -e
umask 0002 umask 0002
build-docker-images/wazuh-indexer/config/securityadmin.sh
+1 -1
View File
@@ -1,3 +1,3 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
sleep 30 sleep 30
bash /usr/share/wazuh-indexer/plugins/opensearch-security/tools/securityadmin.sh -cd /usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/ -nhnv -cacert $CACERT -cert $CERT -key $KEY -p 9300 -icl bash /usr/share/wazuh-indexer/plugins/opensearch-security/tools/securityadmin.sh -cd /usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/ -nhnv -cacert $CACERT -cert $CERT -key $KEY -p 9300 -icl
build-docker-images/wazuh-manager/Dockerfile
+2 -2
View File
@@ -1,4 +1,4 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal FROM ubuntu:focal
RUN rm /bin/sh && ln -s /bin/bash /bin/sh RUN rm /bin/sh && ln -s /bin/bash /bin/sh
@@ -7,7 +7,7 @@ ARG WAZUH_VERSION
ARG TEMPLATE_VERSION=4.3 ARG TEMPLATE_VERSION=4.3
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.1.tar.gz" ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"
RUN apt-get update && apt install curl apt-transport-https lsb-release gnupg -y RUN apt-get update && apt install curl apt-transport-https lsb-release gnupg -y
build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# Variables # Variables
source /permanent_data.env source /permanent_data.env
build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
set -e set -e
build-docker-images/wazuh-manager/config/permanent_data.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# Variables # Variables
source /permanent_data.env source /permanent_data.env
indexer-certs-creator/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal FROM ubuntu:focal
RUN apt-get update && apt-get install openssl curl -y RUN apt-get update && apt-get install openssl curl -y
indexer-certs-creator/config/entrypoint.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
############################################################################## ##############################################################################
# Downloading Cert Gen Tool # Downloading Cert Gen Tool
multi-node/config/wazuh_cluster/wazuh_manager.conf
-1
View File
@@ -222,7 +222,6 @@
<global> <global>
<white_list>127.0.0.1</white_list> <white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list> <white_list>^localhost.localdomain$</white_list>
<white_list>127.0.0.53</white_list>
</global> </global>
<command> <command>
multi-node/config/wazuh_cluster/wazuh_worker.conf
-1
View File
@@ -222,7 +222,6 @@
<global> <global>
<white_list>127.0.0.1</white_list> <white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list> <white_list>^localhost.localdomain$</white_list>
<white_list>127.0.0.53</white_list>
</global> </global>
<command> <command>
multi-node/docker-compose.yml
+7 -7
View File
@@ -1,9 +1,9 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7' version: '3.7'
services: services:
wazuh.master: wazuh.master:
image: wazuh/wazuh-manager:4.3.1 image: wazuh/wazuh-manager:4.3.3
hostname: wazuh.master hostname: wazuh.master
restart: always restart: always
ports: ports:
@@ -38,7 +38,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.3.1 image: wazuh/wazuh-manager:4.3.3
hostname: wazuh.worker hostname: wazuh.worker
restart: always restart: always
environment: environment:
@@ -67,7 +67,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.3.1 image: wazuh/wazuh-indexer:4.3.3
hostname: wazuh1.indexer hostname: wazuh1.indexer
restart: always restart: always
ports: ports:
@@ -93,7 +93,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh2.indexer: wazuh2.indexer:
image: wazuh/wazuh-indexer:4.3.1 image: wazuh/wazuh-indexer:4.3.3
hostname: wazuh2.indexer hostname: wazuh2.indexer
restart: always restart: always
environment: environment:
@@ -115,7 +115,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh3.indexer: wazuh3.indexer:
image: wazuh/wazuh-indexer:4.3.1 image: wazuh/wazuh-indexer:4.3.3
hostname: wazuh3.indexer hostname: wazuh3.indexer
restart: always restart: always
environment: environment:
@@ -137,7 +137,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh.dashboard: wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.3.1 image: wazuh/wazuh-dashboard:4.3.3
hostname: wazuh.dashboard hostname: wazuh.dashboard
restart: always restart: always
ports: ports:
multi-node/generate-indexer-certs.yml
+1 -1
View File
@@ -1,4 +1,4 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3' version: '3'
services: services:
single-node/config/wazuh_cluster/wazuh_manager.conf
-1
View File
@@ -222,7 +222,6 @@
<global> <global>
<white_list>127.0.0.1</white_list> <white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list> <white_list>^localhost.localdomain$</white_list>
<white_list>10.0.0.106</white_list>
</global> </global>
<command> <command>
single-node/docker-compose.yml
+4 -4
View File
@@ -1,9 +1,9 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7' version: '3.7'
services: services:
wazuh.manager: wazuh.manager:
image: wazuh/wazuh-manager:4.3.1 image: wazuh/wazuh-manager:4.3.3
hostname: wazuh.manager hostname: wazuh.manager
restart: always restart: always
ports: ports:
@@ -39,7 +39,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.3.1 image: wazuh/wazuh-indexer:4.3.3
hostname: wazuh.indexer hostname: wazuh.indexer
restart: always restart: always
ports: ports:
@@ -64,7 +64,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh.dashboard: wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.3.1 image: wazuh/wazuh-dashboard:4.3.3
hostname: wazuh.dashboard hostname: wazuh.dashboard
restart: always restart: always
ports: ports:
single-node/generate-indexer-certs.yml
+1 -1
View File
@@ -1,4 +1,4 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3' version: '3'
services: services: