From c79a81f60147592761eb071415c7b97b824e8e6c Mon Sep 17 00:00:00 2001
From: AlfonsoRBJ <sitoruizbravo@hotmail.com>
Date: Thu, 7 Feb 2019 17:49:43 +0100
Subject: [PATCH 1/3] First approach

---
 kibana/Dockerfile           | 30 +++++++++++++++++-------------
 kibana/config/entrypoint.sh |  2 +-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 60e5d3a9..5a17ffdd 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,13 +1,13 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/kibana/kibana:6.5.4
-ARG WAZUH_APP_VERSION=3.8.2_6.5.4
+FROM wazuh/wazuh-kibana:3.8.2_6.5.4
+#ARG WAZUH_APP_VERSION=3.8.2_6.5.4
 USER root
 
-ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
+#ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
 
-RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip &&\
-    chown -R kibana:kibana /usr/share/kibana &&\
-    rm -rf /tmp/*
+#RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip &&\
+#    chown -R kibana:kibana /usr/share/kibana &&\
+#    rm -rf /tmp/*
 
 COPY config/entrypoint.sh /entrypoint.sh
 RUN chmod 755 /entrypoint.sh
@@ -40,13 +40,13 @@ ENV PATTERN="" \
     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"
+    XPACK_CANVAS="false"\
+    XPACK_LOGS="false"\
+    XPACK_INFRA="false"\
+    XPACK_ML="false"\
+    XPACK_DEVTOOLS="false"\
+    XPACK_MONITORING="false"\
+    XPACK_APM="false"
 
 
 COPY --chown=kibana:kibana ./config/wazuh_app_config.sh ./
@@ -61,5 +61,9 @@ COPY --chown=kibana:kibana ./config/xpack_config.sh ./
 
 RUN chmod +x ./xpack_config.sh
 
+RUN ./xpack_config.sh
+
+RUN /usr/local/bin/kibana-docker --optimize
+
 ENTRYPOINT /entrypoint.sh
 
diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh
index a50c3d11..e59f8ec3 100644
--- a/kibana/config/entrypoint.sh
+++ b/kibana/config/entrypoint.sh
@@ -21,7 +21,7 @@ done
 
 sleep 5
 
-./xpack_config.sh 
+#./xpack_config.sh 
 
 ./kibana_settings.sh &
 

From cb10fd20bae566a40a112a8a0e51e5941f3806cf Mon Sep 17 00:00:00 2001
From: AlfonsoRBJ <sitoruizbravo@hotmail.com>
Date: Fri, 8 Feb 2019 14:52:13 +0100
Subject: [PATCH 2/3] ARGs added to set kibana.yml

---
 kibana/Dockerfile | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 5a17ffdd..6816c5ba 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,13 +1,13 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
-FROM wazuh/wazuh-kibana:3.8.2_6.5.4
-#ARG WAZUH_APP_VERSION=3.8.2_6.5.4
+FROM docker.elastic.co/kibana/kibana:6.5.4
+ARG WAZUH_APP_VERSION=3.8.2_6.5.4
 USER root
 
-#ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
+ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
 
-#RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip &&\
-#    chown -R kibana:kibana /usr/share/kibana &&\
-#    rm -rf /tmp/*
+RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip &&\
+    chown -R kibana:kibana /usr/share/kibana &&\
+    rm -rf /tmp/*
 
 COPY config/entrypoint.sh /entrypoint.sh
 RUN chmod 755 /entrypoint.sh
@@ -39,14 +39,15 @@ ENV PATTERN="" \
     WAZUH_MONITORING_FREQUENCY="" \
     WAZUH_MONITORING_SHARDS="" \
     WAZUH_MONITORING_REPLICAS="" \
-    ADMIN_PRIVILEGES=""\
-    XPACK_CANVAS="false"\
-    XPACK_LOGS="false"\
-    XPACK_INFRA="false"\
-    XPACK_ML="false"\
-    XPACK_DEVTOOLS="false"\
-    XPACK_MONITORING="false"\
-    XPACK_APM="false"
+    ADMIN_PRIVILEGES=""
+
+ARG XPACK_CANVAS="true"
+ARG XPACK_LOGS="true"
+ARG XPACK_INFRA="true"
+ARG XPACK_ML="true"
+ARG XPACK_DEVTOOLS="true"
+ARG XPACK_MONITORING="true"
+ARG XPACK_APM="true"
 
 
 COPY --chown=kibana:kibana ./config/wazuh_app_config.sh ./
@@ -66,4 +67,3 @@ RUN ./xpack_config.sh
 RUN /usr/local/bin/kibana-docker --optimize
 
 ENTRYPOINT /entrypoint.sh
-

From 159b3c02f05c3e95c2a00d0b7e62afabe371a3b5 Mon Sep 17 00:00:00 2001
From: AlfonsoRBJ <sitoruizbravo@hotmail.com>
Date: Fri, 8 Feb 2019 15:06:05 +0100
Subject: [PATCH 3/3] remove xpack settings script from entrypoint

---
 kibana/config/entrypoint.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh
index e59f8ec3..e34029b7 100644
--- a/kibana/config/entrypoint.sh
+++ b/kibana/config/entrypoint.sh
@@ -21,10 +21,6 @@ done
 
 sleep 5
 
-#./xpack_config.sh 
-
 ./kibana_settings.sh &
 
-
-
 /usr/local/bin/kibana-docker