[Libbeat] Log debug message if the Kibana dashboard can not be imported from the archive (#12211) (#20150)

kvch · dplavcic · web-flow · commit c2bb3f0d152b · 2020-07-29T16:55:42.000+02:00
There is a predefined combination of directory structure and setup.dashboards.beat property that has to be defined to successfully import dashboards to the Kibana.

Co-authored-by: dplavcic &lt;dalibor.plavcic@gmail.com&gt;
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -152,6 +152,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix seccomp policy for calls to `chmod` and `chown`. {pull}20054[20054]
 - Remove unnecessary restarts of metricsets while using Node autodiscover {pull}19974[19974]
 - Output errors when Kibana index pattern setup fails. {pull}20121[20121]
+- Log debug message if the Kibana dashboard can not be imported from the archive because of the invalid archive directory structure {issue}12211[12211], {pull}13387[13387]
 
 *Auditbeat*
 
diff --git a/libbeat/dashboards/importer.go b/libbeat/dashboards/importer.go
@@ -246,6 +246,8 @@ func (imp Importer) ImportArchive() error {
 			if err != nil {
 				return err
 			}
+		} else {
+			imp.loader.statusMsg("Skipping import of %s directory. Beat name: %s, base dir name: %s.", dir, imp.cfg.Beat, filepath.Base(dir))
 		}
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,8 @@ func (imp Importer) ImportArchive() error {`
`246`	`246`	`if err != nil {`
`247`	`247`	`return err`
`248`	`248`	`}`
	`249`	`+ } else {`
	`250`	`+ imp.loader.statusMsg("Skipping import of %s directory. Beat name: %s, base dir name: %s.", dir, imp.cfg.Beat, filepath.Base(dir))`
`249`	`251`	`}`
`250`	`252`	`}`
`251`	`253`	`return nil`