From c1a33b7185523bc8669234e8ff89c20f53be682f Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Tue, 19 Mar 2019 14:35:44 +0100 Subject: [PATCH 1/9] kibana welcome --- kibana/Dockerfile | 7 +++++++ kibana/config/welcome_wazuh.sh | 15 +++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 kibana/config/welcome_wazuh.sh diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 8bb08523..b8a29ea8 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -49,6 +49,7 @@ ARG XPACK_DEVTOOLS="true" ARG XPACK_MONITORING="true" ARG XPACK_APM="true" +ARG CHANGE_WELLCOME="false" COPY --chown=kibana:kibana ./config/wazuh_app_config.sh ./ @@ -66,4 +67,10 @@ RUN ./xpack_config.sh RUN /usr/local/bin/kibana-docker --optimize +COPY --chown=kibana:kibana ./config/welcome_wazuh.sh ./ + +RUN chmod +x ./welcome_wazuh.sh + +RUN ./welcome_wazuh.sh + ENTRYPOINT /entrypoint.sh diff --git a/kibana/config/welcome_wazuh.sh b/kibana/config/welcome_wazuh.sh new file mode 100644 index 00000000..1c94c41c --- /dev/null +++ b/kibana/config/welcome_wazuh.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +if [[ $CHANGE_WELLCOME == "true" ]] +then + + kibana_path="/usr/share/kibana" + # Set Wazuh app as the default landing page + echo "Set Wazuh app as the default landing page" + echo "server.defaultRoute: /app/wazuh" >> /etc/kibana/kibana.yml + + # Redirect Kibana welcome screen to Discover + echo "Redirect Kibana welcome screen to Discover" + sed -i "s:'/app/kibana#/home':'/app/kibana#/discover':g" $kibana_path/src/ui/public/chrome/directives/global_nav/global_nav.html + sed -i "s:'/app/kibana#/home':'/app/kibana#/discover':g" $kibana_path/src/ui/public/chrome/directives/header_global_nav/header_global_nav.js +fi From d0df9a06e1c8b62dacea8a081b9c1a7b8f23bf09 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Tue, 19 Mar 2019 14:50:12 +0100 Subject: [PATCH 2/9] fix typo --- kibana/Dockerfile | 2 +- kibana/config/welcome_wazuh.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kibana/Dockerfile b/kibana/Dockerfile index b8a29ea8..1b4c3b92 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -49,7 +49,7 @@ ARG XPACK_DEVTOOLS="true" ARG XPACK_MONITORING="true" ARG XPACK_APM="true" -ARG CHANGE_WELLCOME="false" +ARG CHANGE_WELCOME="false" COPY --chown=kibana:kibana ./config/wazuh_app_config.sh ./ diff --git a/kibana/config/welcome_wazuh.sh b/kibana/config/welcome_wazuh.sh index 1c94c41c..ceb72ed3 100644 --- a/kibana/config/welcome_wazuh.sh +++ b/kibana/config/welcome_wazuh.sh @@ -1,6 +1,6 @@ #!/bin/bash -if [[ $CHANGE_WELLCOME == "true" ]] +if [[ $CHANGE_WELCOME == "true" ]] then kibana_path="/usr/share/kibana" From 666708c47f7145ad6c66a070b585afa7aaa597f3 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Tue, 19 Mar 2019 16:26:14 +0100 Subject: [PATCH 3/9] kibana yml is in other path --- kibana/config/welcome_wazuh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kibana/config/welcome_wazuh.sh b/kibana/config/welcome_wazuh.sh index ceb72ed3..3ed3586e 100644 --- a/kibana/config/welcome_wazuh.sh +++ b/kibana/config/welcome_wazuh.sh @@ -6,7 +6,7 @@ then kibana_path="/usr/share/kibana" # Set Wazuh app as the default landing page echo "Set Wazuh app as the default landing page" - echo "server.defaultRoute: /app/wazuh" >> /etc/kibana/kibana.yml + echo "server.defaultRoute: /app/wazuh" >> /usr/share/kibana/config/kibana.yml # Redirect Kibana welcome screen to Discover echo "Redirect Kibana welcome screen to Discover" From e182e0d4f8a5e3255a66866579fb72a26d572ac5 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Tue, 19 Mar 2019 16:51:51 +0100 Subject: [PATCH 4/9] change redirect to wazuh app --- kibana/config/welcome_wazuh.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kibana/config/welcome_wazuh.sh b/kibana/config/welcome_wazuh.sh index 3ed3586e..a42f38f2 100644 --- a/kibana/config/welcome_wazuh.sh +++ b/kibana/config/welcome_wazuh.sh @@ -10,6 +10,6 @@ then # Redirect Kibana welcome screen to Discover echo "Redirect Kibana welcome screen to Discover" - sed -i "s:'/app/kibana#/home':'/app/kibana#/discover':g" $kibana_path/src/ui/public/chrome/directives/global_nav/global_nav.html - sed -i "s:'/app/kibana#/home':'/app/kibana#/discover':g" $kibana_path/src/ui/public/chrome/directives/header_global_nav/header_global_nav.js + sed -i "s:'/app/kibana#/home':'/app/wazuh:g" $kibana_path/src/ui/public/chrome/directives/global_nav/global_nav.html + sed -i "s:'/app/kibana#/home':'/app/wazuh:g" $kibana_path/src/ui/public/chrome/directives/header_global_nav/header_global_nav.js fi From e6062f28f3b42912940b0f8af2ef6ff5448984e1 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Tue, 19 Mar 2019 17:07:01 +0100 Subject: [PATCH 5/9] removing optimize bundles --- kibana/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 1b4c3b92..a7c44edf 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -65,7 +65,7 @@ RUN chmod +x ./xpack_config.sh RUN ./xpack_config.sh -RUN /usr/local/bin/kibana-docker --optimize +RUN rm -rf ./optimize/bundles COPY --chown=kibana:kibana ./config/welcome_wazuh.sh ./ @@ -73,4 +73,6 @@ RUN chmod +x ./welcome_wazuh.sh RUN ./welcome_wazuh.sh +RUN /usr/local/bin/kibana-docker --optimize + ENTRYPOINT /entrypoint.sh From 9b0602766fcfde244ff744db9dab39462355897f Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Tue, 19 Mar 2019 17:43:14 +0100 Subject: [PATCH 6/9] fix typo --- kibana/config/welcome_wazuh.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kibana/config/welcome_wazuh.sh b/kibana/config/welcome_wazuh.sh index a42f38f2..0bb9a77d 100644 --- a/kibana/config/welcome_wazuh.sh +++ b/kibana/config/welcome_wazuh.sh @@ -10,6 +10,6 @@ then # Redirect Kibana welcome screen to Discover echo "Redirect Kibana welcome screen to Discover" - sed -i "s:'/app/kibana#/home':'/app/wazuh:g" $kibana_path/src/ui/public/chrome/directives/global_nav/global_nav.html - sed -i "s:'/app/kibana#/home':'/app/wazuh:g" $kibana_path/src/ui/public/chrome/directives/header_global_nav/header_global_nav.js + sed -i "s:'/app/kibana#/home':'/app/wazuh':g" $kibana_path/src/ui/public/chrome/directives/global_nav/global_nav.html + sed -i "s:'/app/kibana#/home':'/app/wazuh':g" $kibana_path/src/ui/public/chrome/directives/header_global_nav/header_global_nav.js fi From b7537453e31af6c8a5a911bb1c246f4a08faeda0 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Wed, 20 Mar 2019 15:47:14 +0100 Subject: [PATCH 7/9] Hide undesired links --- kibana/Dockerfile | 2 -- kibana/config/welcome_wazuh.sh | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/kibana/Dockerfile b/kibana/Dockerfile index a7c44edf..92beac63 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -65,8 +65,6 @@ RUN chmod +x ./xpack_config.sh RUN ./xpack_config.sh -RUN rm -rf ./optimize/bundles - COPY --chown=kibana:kibana ./config/welcome_wazuh.sh ./ RUN chmod +x ./welcome_wazuh.sh diff --git a/kibana/config/welcome_wazuh.sh b/kibana/config/welcome_wazuh.sh index 0bb9a77d..3deb1e82 100644 --- a/kibana/config/welcome_wazuh.sh +++ b/kibana/config/welcome_wazuh.sh @@ -3,6 +3,8 @@ if [[ $CHANGE_WELCOME == "true" ]] then + rm -rf ./optimize/bundles + kibana_path="/usr/share/kibana" # Set Wazuh app as the default landing page echo "Set Wazuh app as the default landing page" @@ -12,4 +14,10 @@ then echo "Redirect Kibana welcome screen to Discover" sed -i "s:'/app/kibana#/home':'/app/wazuh':g" $kibana_path/src/ui/public/chrome/directives/global_nav/global_nav.html sed -i "s:'/app/kibana#/home':'/app/wazuh':g" $kibana_path/src/ui/public/chrome/directives/header_global_nav/header_global_nav.js + + # Redirect Kibana welcome screen to Discover + echo "Hide undesired links" + sed -i 's#visible: true#visible: false#g' $kibana_path/x-pack/plugins/rollup/public/crud_app/index.js + sed -i 's#visible: true#visible: false#g' $kibana_path/x-pack/plugins/license_management/public/management_section.js fi + From 699f2bb82e32b37714024b21c48eb80f60c62d0f Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Wed, 20 Mar 2019 16:30:44 +0100 Subject: [PATCH 8/9] fix visible path --- kibana/config/welcome_wazuh.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kibana/config/welcome_wazuh.sh b/kibana/config/welcome_wazuh.sh index 3deb1e82..0925d57a 100644 --- a/kibana/config/welcome_wazuh.sh +++ b/kibana/config/welcome_wazuh.sh @@ -17,7 +17,7 @@ then # Redirect Kibana welcome screen to Discover echo "Hide undesired links" - sed -i 's#visible: true#visible: false#g' $kibana_path/x-pack/plugins/rollup/public/crud_app/index.js - sed -i 's#visible: true#visible: false#g' $kibana_path/x-pack/plugins/license_management/public/management_section.js + sed -i 's#visible: true#visible: false#g' $kibana_path/node_modules/x-pack/plugins/rollup/public/crud_app/index.js + sed -i 's#visible: true#visible: false#g' $kibana_path/node_modules/x-pack/plugins/license_management/public/management_section.js fi From fc97c3623be46320c4d1d6044279a53752f7b37b Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 21 Mar 2019 19:18:17 +0100 Subject: [PATCH 9/9] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd900438..55d51374 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file. - Adding the option to disable some xpack features. ([#111](https://github.com/wazuh/wazuh-docker/pull/111)) - Wazuh-Kibana customizable at plugin level. ([#117](https://github.com/wazuh/wazuh-docker/pull/117)) - Adding env variables for alerts data flow. ([#118](https://github.com/wazuh/wazuh-docker/pull/118)) +- Welcome screen management. ([#133](https://github.com/wazuh/wazuh-docker/pull/133)) ### Changed