Use bumped filebeat module

wazuh · Aug 24, 2020 · 8158941 · 8158941
1 parent 5bb1127
commit 8158941
Show file tree

Hide file tree

Showing 9 changed files with 1,997 additions and 6 deletions.
diff --git a/wazuh-opendistro/Dockerfile b/wazuh-opendistro/Dockerfile
@@ -4,7 +4,7 @@ FROM centos:7
 ARG FILEBEAT_VERSION=7.8.0
 ARG WAZUH_VERSION=4.0.0-braulio.test
 ARG TEMPLATE_VERSION="v3.13.1"
-ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz"
+# ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz"
 
 ENV API_USER="foo" \
    API_PASS="bar"
@@ -26,10 +26,7 @@ RUN yum --enablerepo=updates clean metadata && \
 RUN curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-oss-${FILEBEAT_VERSION}-x86_64.rpm &&\
   rpm -i filebeat-oss-${FILEBEAT_VERSION}-x86_64.rpm && rm -f filebeat-oss-${FILEBEAT_VERSION}-x86_64.rpm
 
-RUN curl -so /etc/filebeat/wazuh-template.json https://raw.githubusercontent.com/wazuh/wazuh/${TEMPLATE_VERSION}/extensions/elasticsearch/7.x/wazuh-template.json &&\
-  chmod go+r /etc/filebeat/wazuh-template.json
-
-RUN curl -s https://packages.wazuh.com/3.x/filebeat/${WAZUH_FILEBEAT_MODULE} | tar -xvz -C /usr/share/filebeat/module
+COPY config/wazuh/ /usr/share/filebeat/module/wazuh/
 
 ARG S6_VERSION="v2.0.0.1"
 RUN curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-amd64.tar.gz \
@@ -42,7 +39,7 @@ COPY config/filebeat.yml /etc/filebeat/
 
 RUN chmod go-w /etc/filebeat/filebeat.yml
 
-ADD https://raw.githubusercontent.com/wazuh/wazuh/$TEMPLATE_VERSION/extensions/elasticsearch/7.x/wazuh-template.json /etc/filebeat
+COPY config/wazuh-template.json /etc/filebeat
 RUN chmod go-w /etc/filebeat/wazuh-template.json
 
 COPY config/etc/ /etc/