Don't swallow Kibana index pattern errors (elastic#20121) (elastic#20195)

andrewkroh · web-flow · commit 0fa7de6c5415 · 2020-07-23T12:46:40.000-04:00
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 7a7279f)
diff --git 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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,9 @@ func (imp Importer) ImportKibanaDir(dir string) error {`
`300`	`300`
`301`	`301`	`// Loads the internal index pattern`
`302`	`302`	`if imp.fields != nil {`
`303`		`- imp.loader.ImportIndex(imp.fields)`
	`303`	`+ if err = imp.loader.ImportIndex(imp.fields); err != nil {`
	`304`	`+ return errw.Wrap(err, "failed to import Kibana index pattern")`
	`305`	`+ }`
`304`	`306`	`}`
`305`	`307`
`306`	`308`	`dir = path.Join(dir, versionPath)`