From a082864fdfd44581ed04c419a2d4c763fea04f80 Mon Sep 17 00:00:00 2001 From: manuasir Date: Tue, 25 Jun 2019 16:32:28 +0200 Subject: [PATCH] Disabling every XPACK option at build time --- kibana/Dockerfile | 20 ++++++++---- kibana/config/kibana_settings.sh | 8 ----- kibana/config/xpack_config.sh | 55 ++++++++++++++------------------ 3 files changed, 37 insertions(+), 46 deletions(-) diff --git a/kibana/Dockerfile b/kibana/Dockerfile index f72e8093..2728bf5f 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -41,13 +41,19 @@ ENV PATTERN="" \ WAZUH_MONITORING_REPLICAS="" \ 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" +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" diff --git a/kibana/config/kibana_settings.sh b/kibana/config/kibana_settings.sh index fb5768e5..575950d9 100644 --- a/kibana/config/kibana_settings.sh +++ b/kibana/config/kibana_settings.sh @@ -30,14 +30,6 @@ if [ "$KIBANA_INDEX" != "" ]; then echo "kibana.index: $KIBANA_INDEX" >> /usr/share/kibana/config/kibana.yml fi -# If XPACK_SECURITY_ENABLED was set, then change the xpack.security.enabled option from true (default) to false. -if [ "$XPACK_SECURITY_ENABLED" != "" ]; then - if grep -q 'xpack.security.enabled' /usr/share/kibana/config/kibana.yml; then - sed -i '/xpack.security.enabled/d' /usr/share/kibana/config/kibana.yml - fi - echo "xpack.security.enabled: $XPACK_SECURITY_ENABLED" >> /usr/share/kibana/config/kibana.yml -fi - if [ "$KIBANA_IP" != "" ]; then kibana_ip="$KIBANA_IP" else diff --git a/kibana/config/xpack_config.sh b/kibana/config/xpack_config.sh index 0dbd5ce8..386a9d82 100644 --- a/kibana/config/xpack_config.sh +++ b/kibana/config/xpack_config.sh @@ -1,36 +1,29 @@ #!/bin/bash kibana_config_file="/usr/share/kibana/config/kibana.yml" -if grep -Fq "#xpack features" "$kibana_config_file"; -then - 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 - [console.enabled]=$XPACK_DEVTOOLS - ) - for i in "${!CONFIG_MAP[@]}" +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 [ "${CONFIG_MAP[$i]}" != "" ]; then - sed -i 's/.'"$i"'.*/'"$i"': '"${CONFIG_MAP[$i]}"'/' $kibana_config_file + 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 -else - echo " -#xpack features -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 -console.enabled: $XPACK_DEVTOOLS -" >> $kibana_config_file -fi + done \ No newline at end of file