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

Bump version.

Browse Source
This commit is contained in:
Jose M
2019-05-24 16:39:24 +02:00
parent 1922ae145a
commit 6a82b98fcf
5 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
elasticsearch/Dockerfile
+5 -3
View File
@@ -1,5 +1,5 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM docker.elastic.co/elasticsearch/elasticsearch:7.0.0 FROM docker.elastic.co/elasticsearch/elasticsearch:7.1.0
ENV ELASTICSEARCH_URL="http://elasticsearch:9200" ENV ELASTICSEARCH_URL="http://elasticsearch:9200"
@@ -15,6 +15,7 @@ ENV ENABLE_CONFIGURE_S3="false"
# Elasticearch cluster configuration environment variables # Elasticearch cluster configuration environment variables
# If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration # If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration
# CLUSTER_INITIAL_MASTER_NODES set to own node by default.
ENV ELASTIC_CLUSTER="false" \ ENV ELASTIC_CLUSTER="false" \
CLUSTER_NAME="wazuh" \ CLUSTER_NAME="wazuh" \
CLUSTER_NODE_MASTER="true" \ CLUSTER_NODE_MASTER="true" \
@@ -25,7 +26,8 @@ ENV ELASTIC_CLUSTER="false" \
CLUSTER_DISCOVERY_SERVICE="wazuh-elasticsearch" \ CLUSTER_DISCOVERY_SERVICE="wazuh-elasticsearch" \
CLUSTER_NUMBER_OF_MASTERS="2" \ CLUSTER_NUMBER_OF_MASTERS="2" \
CLUSTER_MAX_NODES="1" \ CLUSTER_MAX_NODES="1" \
CLUSTER_DELAYED_TIMEOUT="1m" CLUSTER_DELAYED_TIMEOUT="1m" \
CLUSTER_INITIAL_MASTER_NODES="wazuh-elasticsearch"
COPY config/entrypoint.sh /entrypoint.sh COPY config/entrypoint.sh /entrypoint.sh
@@ -35,7 +37,7 @@ COPY --chown=elasticsearch:elasticsearch ./config/load_settings.sh ./
RUN chmod +x ./load_settings.sh RUN chmod +x ./load_settings.sh
RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-7.0.0.zip RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-7.1.0.zip
COPY config/configure_s3.sh ./config/configure_s3.sh COPY config/configure_s3.sh ./config/configure_s3.sh
RUN chmod 755 ./config/configure_s3.sh RUN chmod 755 ./config/configure_s3.sh
elasticsearch/config/load_settings.sh
+1 -1
View File
@@ -11,7 +11,7 @@ else
wazuh_url="${WAZUH_API_URL}" wazuh_url="${WAZUH_API_URL}"
fi fi
if [ ${ENABLED_XPACK} != "true" || "x${ELASTICSEARCH_USERNAME}" = "x" || "x${ELASTICSEARCH_PASSWORD}" = "x" ]; then if [[ ${ENABLED_XPACK} != "true" || "x${ELASTICSEARCH_USERNAME}" = "x" || "x${ELASTICSEARCH_PASSWORD}" = "x" ]]; then
auth="" auth=""
else else
auth="--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" auth="--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}"
kibana/Dockerfile
+3 -3
View File
@@ -1,9 +1,9 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM docker.elastic.co/kibana/kibana:7.0.0 FROM docker.elastic.co/kibana/kibana:7.1.0
ARG WAZUH_APP_VERSION=3.9.0_7.0.0-rc5 ARG WAZUH_APP_VERSION=3.9.1_7.1.0
USER root USER root
ADD https://packages-dev.wazuh.com/staging/app/kibana/wazuhapp-3.9.0_7.0.0-rc5.zip /tmp ADD https://packages.wazuh.com/wazuhapp/wazuhapp-3.9.1_7.1.0.zip /tmp
RUN /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip RUN /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip
RUN rm -rf /tmp/wazuhapp-${WAZUH_APP_VERSION}.zip RUN rm -rf /tmp/wazuhapp-${WAZUH_APP_VERSION}.zip
wazuh/Dockerfile
+5 -4
View File
@@ -1,7 +1,7 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM phusion/baseimage:latest FROM phusion/baseimage:latest
ARG FILEBEAT_VERSION=7.0.0 ARG FILEBEAT_VERSION=7.1.0
ARG WAZUH_VERSION=3.9.0-1 ARG WAZUH_VERSION=3.9.1-1
ENV API_USER="foo" \ ENV API_USER="foo" \
API_PASS="bar" API_PASS="bar"
@@ -68,8 +68,9 @@ RUN chmod +x /etc/service/wazuh-api/run && \
chmod +x /etc/service/postfix/run && \ chmod +x /etc/service/postfix/run && \
chmod +x /etc/service/filebeat/run chmod +x /etc/service/filebeat/run
ADD https://raw.githubusercontent.com/wazuh/wazuh/$TEMPLATE_VERSION/extensions/elasticsearch/wazuh-elastic7-template-alerts.json /etc/filebeat
RUN chmod go-w /etc/filebeat/wazuh-elastic7-template-alerts.json ADD https://raw.githubusercontent.com/wazuh/wazuh/v3.9.1/extensions/elasticsearch/7.x/wazuh-template.json /etc/filebeat
RUN chmod go-w /etc/filebeat/wazuh-template.json
# Run all services # Run all services
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
wazuh/config/filebeat.yml
+1 -1
View File
@@ -5,7 +5,7 @@ filebeat.inputs:
- '/var/ossec/logs/alerts/alerts.json' - '/var/ossec/logs/alerts/alerts.json'
setup.template.json.enabled: true setup.template.json.enabled: true
setup.template.json.path: "/etc/filebeat/wazuh-elastic7-template-alerts.json" setup.template.json.path: "/etc/filebeat/wazuh-template.json"
setup.template.json.name: "wazuh" setup.template.json.name: "wazuh"
setup.template.overwrite: true setup.template.overwrite: true