diff --git a/kibana/Dockerfile b/kibana/Dockerfile index ab4a4ab3..89e81102 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,5 +1,5 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/kibana/kibana:6.5.4 +FROM docker.elastic.co/kibana/kibana:6.5.4-oss ARG WAZUH_APP_VERSION=3.8.2_6.5.4 USER root @@ -35,20 +35,6 @@ ENV PATTERN="" \ WAZUH_MONITORING_REPLICAS="" \ ADMIN_PRIVILEGES="" -ARG XPACK_CANVAS="false" -ARG XPACK_LOGS="false" -ARG XPACK_INFRA="false" -ARG XPACK_ML="false" -ARG XPACK_DEVTOOLS="false" -ARG XPACK_MONITORING="false" -ARG XPACK_APM="false" -ARG XPACK_SECURITY_ENABLED="false" -ARG XPACK_REPORTING_ENABLED="false" -ARG XPACK_SPACES_ENABLED="false" -ARG XPACK_APM_ENABLED="false" -ARG XPACK_GRAPH_ENABLED="false" -ARG XPACK_MONITORING_ENABLED="false" - ARG CHANGE_WELCOME="false" COPY --chown=kibana:kibana ./config/wazuh_app_config.sh ./ @@ -59,12 +45,6 @@ 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 - -RUN ./xpack_config.sh - COPY --chown=kibana:kibana ./config/welcome_wazuh.sh ./ RUN chmod +x ./welcome_wazuh.sh diff --git a/kibana/config/xpack_config.sh b/kibana/config/xpack_config.sh deleted file mode 100644 index 386a9d82..00000000 --- a/kibana/config/xpack_config.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -kibana_config_file="/usr/share/kibana/config/kibana.yml" -declare -A CONFIG_MAP=( - [xpack.apm.ui.enabled]=$XPACK_APM - [xpack.grokdebugger.enabled]=$XPACK_DEVTOOLS - [xpack.searchprofiler.enabled]=$XPACK_DEVTOOLS - [xpack.ml.enabled]=$XPACK_ML - [xpack.canvas.enabled]=$XPACK_CANVAS - [xpack.logstash.enabled]=$XPACK_LOGS - [xpack.infra.enabled]=$XPACK_INFRA - [xpack.monitoring.enabled]=$XPACK_MONITORING_ENABLED - [console.enabled]=$XPACK_DEVTOOLS - [xpack.security.enabled]=$XPACK_SECURITY_ENABLED - [xpack.reporting.enabled]=$XPACK_REPORTING_ENABLED - [xpack.spaces.enabled]=$XPACK_SPACES_ENABLED - [xpack.apm.enabled]=$XPACK_APM_ENABLED - [xpack.graph.enabled]=$XPACK_GRAPH_ENABLED -) -for i in "${!CONFIG_MAP[@]}" - do - if grep -Fq "$i" "$kibana_config_file"; then - if [ "${CONFIG_MAP[$i]}" != "" ]; then - sed -i 's/.'"$i"'.*/'"$i"': '"${CONFIG_MAP[$i]}"'/' $kibana_config_file - fi - else - echo "$i: ${CONFIG_MAP[$i]}" >> $kibana_config_file - fi - done \ No newline at end of file