-
Notifications
You must be signed in to change notification settings - Fork 416
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #442 from wazuh/release-wazuh_4.1.0
Release wazuh 4.1.0
- Loading branch information
Showing
23 changed files
with
963 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| WAZUH-DOCKER_VERSION="4.0.4_1.11.0" | ||
| REVISION="40400" | ||
| WAZUH-DOCKER_VERSION="4.1.0" | ||
| REVISION="41000" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| version: '2.2' | ||
|
|
||
| services: | ||
| generator: | ||
| container_name: generator | ||
| image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2 | ||
| command: > | ||
| bash -c ' | ||
| if [[ ! -f config/certificates/bundle.zip ]]; then | ||
| bin/elasticsearch-certutil cert --silent --pem --in config/certificates/instances.yml -out config/certificates/bundle.zip; | ||
| unzip config/certificates/bundle.zip -d config/certificates/; | ||
| fi; | ||
| chown -R 1000:0 /certs | ||
| ' | ||
| user: "0" | ||
| working_dir: /usr/share/elasticsearch | ||
| volumes: ['./xpack:/usr/share/elasticsearch/config/certificates'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| # Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) | ||
| FROM docker.elastic.co/kibana/kibana:7.10.2 | ||
| USER kibana | ||
| ARG ELASTIC_VERSION=7.10.2 | ||
| ARG WAZUH_VERSION=4.1.0 | ||
| ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" | ||
|
|
||
| WORKDIR /usr/share/kibana | ||
| RUN ./bin/kibana-plugin install https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana-${WAZUH_APP_VERSION}-1.zip | ||
|
|
||
| ENV PATTERN="" \ | ||
| CHECKS_PATTERN="" \ | ||
| CHECKS_TEMPLATE="" \ | ||
| CHECKS_API="" \ | ||
| CHECKS_SETUP="" \ | ||
| EXTENSIONS_PCI="" \ | ||
| EXTENSIONS_GDPR="" \ | ||
| EXTENSIONS_HIPAA="" \ | ||
| EXTENSIONS_NIST="" \ | ||
| EXTENSIONS_TSC="" \ | ||
| EXTENSIONS_AUDIT="" \ | ||
| EXTENSIONS_OSCAP="" \ | ||
| EXTENSIONS_CISCAT="" \ | ||
| EXTENSIONS_AWS="" \ | ||
| EXTENSIONS_GCP="" \ | ||
| EXTENSIONS_VIRUSTOTAL="" \ | ||
| EXTENSIONS_OSQUERY="" \ | ||
| EXTENSIONS_DOCKER="" \ | ||
| APP_TIMEOUT="" \ | ||
| API_SELECTOR="" \ | ||
| IP_SELECTOR="" \ | ||
| IP_IGNORE="" \ | ||
| WAZUH_MONITORING_ENABLED="" \ | ||
| WAZUH_MONITORING_FREQUENCY="" \ | ||
| WAZUH_MONITORING_SHARDS="" \ | ||
| WAZUH_MONITORING_REPLICAS="" \ | ||
| ADMIN_PRIVILEGES="" \ | ||
| XPACK_CANVAS="true" \ | ||
| XPACK_LOGS="true" \ | ||
| XPACK_INFRA="true" \ | ||
| XPACK_ML="true" \ | ||
| XPACK_DEVTOOLS="true" \ | ||
| XPACK_MONITORING="true" \ | ||
| XPACK_APM="true" | ||
|
|
||
| WORKDIR / | ||
| USER kibana | ||
|
|
||
| COPY --chown=kibana:kibana config/entrypoint.sh ./entrypoint.sh | ||
| RUN chmod 755 ./entrypoint.sh | ||
|
|
||
| RUN printf "\nserver.defaultRoute: /app/wazuh\n" >> /usr/share/kibana/config/kibana.yml | ||
|
|
||
| COPY --chown=kibana:kibana ./config/wazuh.yml /usr/share/kibana/data/wazuh/config/wazuh.yml | ||
| COPY --chown=kibana:kibana ./config/wazuh_app_config.sh ./ | ||
| RUN chmod +x ./wazuh_app_config.sh | ||
|
|
||
| COPY --chown=kibana:kibana ./config/kibana_settings.sh ./ | ||
| RUN chmod +x ./kibana_settings.sh | ||
|
|
||
| COPY --chown=kibana:kibana ./config/xpack_config.sh ./ | ||
| RUN chmod +x ./xpack_config.sh | ||
|
|
||
| ENTRYPOINT ./entrypoint.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| #!/bin/bash | ||
| # Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) | ||
|
|
||
| set -e | ||
|
|
||
| ############################################################################## | ||
| # Waiting for elasticsearch | ||
| ############################################################################## | ||
|
|
||
| if [ "x${ELASTICSEARCH_URL}" = "x" ]; then | ||
| export el_url="http://elasticsearch:9200" | ||
| else | ||
| export el_url="${ELASTICSEARCH_URL}" | ||
| fi | ||
|
|
||
| if [[ ${ENABLED_SECURITY} == "false" || "x${ELASTICSEARCH_USERNAME}" = "x" || "x${ELASTICSEARCH_PASSWORD}" = "x" ]]; then | ||
| export auth="" | ||
| else | ||
| export auth="--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} -k" | ||
| fi | ||
|
|
||
| until curl -XGET $el_url ${auth}; do | ||
| >&2 echo "Elastic is unavailable - sleeping" | ||
| sleep 5 | ||
| done | ||
|
|
||
| sleep 2 | ||
|
|
||
| >&2 echo "Elasticsearch is up." | ||
|
|
||
|
|
||
| ############################################################################## | ||
| # Waiting for wazuh alerts template | ||
| ############################################################################## | ||
|
|
||
| strlen=0 | ||
|
|
||
| while [[ $strlen -eq 0 ]] | ||
| do | ||
| template=$(curl ${auth} $el_url/_cat/templates/wazuh -s) | ||
| strlen=${#template} | ||
| >&2 echo "Wazuh alerts template not loaded - sleeping." | ||
| sleep 2 | ||
| done | ||
|
|
||
| sleep 2 | ||
|
|
||
| >&2 echo "Wazuh alerts template is loaded." | ||
|
|
||
| ./xpack_config.sh | ||
|
|
||
| ./wazuh_app_config.sh | ||
|
|
||
| sleep 5 | ||
|
|
||
| ./kibana_settings.sh & | ||
|
|
||
| sleep 2 | ||
|
|
||
| /usr/local/bin/kibana-docker |
Oops, something went wrong.