From f9a3493d3a75c460db25fb7364b5d58309ce3742 Mon Sep 17 00:00:00 2001 From: Loek van Gool Date: Wed, 11 Apr 2018 16:34:24 +0200 Subject: [PATCH 1/3] add note about overwriting dashboards --- libbeat/docs/dashboardsconfig.asciidoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libbeat/docs/dashboardsconfig.asciidoc b/libbeat/docs/dashboardsconfig.asciidoc index 03a24c41c5d..0cc31bc717a 100644 --- a/libbeat/docs/dashboardsconfig.asciidoc +++ b/libbeat/docs/dashboardsconfig.asciidoc @@ -41,7 +41,9 @@ You can specify the following options in the `setup.dashboards` section of the If this option is set to true, {beatname_uc} loads the sample Kibana dashboards automatically on startup. If no other options are set, the dashboard are loaded -from the local `kibana` directory in the home path of the installation. +from the local `kibana` directory in the home path of the installation. Note that +any existing dashboards with the same names will be overwritten anytime Beats +starts. To load dashboards from a different location, you can configure one of the following options: <>, From 6f832186e56bf90488bc8e379b6c21193d268900 Mon Sep 17 00:00:00 2001 From: Loek van Gool Date: Fri, 13 Apr 2018 15:32:47 +0200 Subject: [PATCH 2/3] New wording --- libbeat/docs/dashboardsconfig.asciidoc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libbeat/docs/dashboardsconfig.asciidoc b/libbeat/docs/dashboardsconfig.asciidoc index 0cc31bc717a..0f9d32da0c9 100644 --- a/libbeat/docs/dashboardsconfig.asciidoc +++ b/libbeat/docs/dashboardsconfig.asciidoc @@ -40,10 +40,11 @@ You can specify the following options in the `setup.dashboards` section of the ==== `setup.dashboards.enabled` If this option is set to true, {beatname_uc} loads the sample Kibana dashboards -automatically on startup. If no other options are set, the dashboard are loaded -from the local `kibana` directory in the home path of the installation. Note that -any existing dashboards with the same names will be overwritten anytime Beats -starts. +from the local `kibana` directory in the home path of the {beatname_uc} installation. + +NOTE: When dashboard loading is enabled, {beatname_uc} overwrites any existing +dashboards that match the names of the dashboards you are loading. This happens +every time {beatname_uc} starts. To load dashboards from a different location, you can configure one of the following options: <>, From c5a1dd764c7edde1883a972439ad8ce061a97714 Mon Sep 17 00:00:00 2001 From: Loek van Gool Date: Tue, 17 Apr 2018 19:57:39 +0200 Subject: [PATCH 3/3] Reinstating removed sentence --- libbeat/docs/dashboardsconfig.asciidoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libbeat/docs/dashboardsconfig.asciidoc b/libbeat/docs/dashboardsconfig.asciidoc index 0f9d32da0c9..b44bccb5b9f 100644 --- a/libbeat/docs/dashboardsconfig.asciidoc +++ b/libbeat/docs/dashboardsconfig.asciidoc @@ -46,6 +46,8 @@ NOTE: When dashboard loading is enabled, {beatname_uc} overwrites any existing dashboards that match the names of the dashboards you are loading. This happens every time {beatname_uc} starts. +If no other options are set, the dashboard are loaded +from the local `kibana` directory in the home path of the {beatname_uc} installation. To load dashboards from a different location, you can configure one of the following options: <>, <>, or