From 0fa7de6c54159460ea5f0d7d5cb7df8587aae996 Mon Sep 17 00:00:00 2001 From: Andrew Kroh Date: Thu, 23 Jul 2020 12:46:40 -0400 Subject: [PATCH] Don't swallow Kibana index pattern errors (#20121) (#20195) While running 'beat setup --dashboads' any errors that occur while importing the generated Kibana index pattern or silently ignored. This changes that by causing the dashboard setup to stop and return the error. Dashboards won't work without the index pattern anyways. (cherry picked from commit 7a7279fd789d2296dd8c9123bb66b74669d0da51) --- CHANGELOG.next.asciidoc | 1 + libbeat/dashboards/importer.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 85ad37a69a7..c3cee7d5db7 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -172,6 +172,7 @@ field. You can revert this change by configuring tags for the module and omittin - Server-side TLS config now validates certificate and key are both specified {pull}19584[19584] - Fix terminating pod autodiscover issue. {pull}20084[20084] - Fix seccomp policy for calls to `chmod` and `chown`. {pull}20054[20054] +- Output errors when Kibana index pattern setup fails. {pull}20121[20121] *Auditbeat* diff --git a/libbeat/dashboards/importer.go b/libbeat/dashboards/importer.go index eb399ba1b3d..178a5837284 100644 --- a/libbeat/dashboards/importer.go +++ b/libbeat/dashboards/importer.go @@ -300,7 +300,9 @@ func (imp Importer) ImportKibanaDir(dir string) error { // Loads the internal index pattern if imp.fields != nil { - imp.loader.ImportIndex(imp.fields) + if err = imp.loader.ImportIndex(imp.fields); err != nil { + return errw.Wrap(err, "failed to import Kibana index pattern") + } } dir = path.Join(dir, versionPath)