create separate value for minimum required version

elastic · Aug 10, 2021 · ff1ca85 · ff1ca85
1 parent 978336e
commit ff1ca85
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/libbeat/dashboards/kibana_loader.go b/libbeat/dashboards/kibana_loader.go
@@ -91,8 +91,8 @@ func getKibanaClient(ctx context.Context, cfg *common.Config, retryCfg *Retry, r
 
 // ImportIndexFile imports an index pattern from a file
 func (loader KibanaLoader) ImportIndexFile(file string) error {
-	if loader.version.LessThanOrEqual(true, common.MustNewVersion("7.14.0")) {
-		return fmt.Errorf("Kibana version must be newer than 7.14")
+	if loader.version.LessThan(kibana.MinimumRequiredVersionSavedObjects) {
+		return fmt.Errorf("Kibana version must be at least " + kibana.MinimumRequiredVersionSavedObjects.String())
 	}
 
 	loader.statusMsg("Importing index file from %s", file)
@@ -114,8 +114,8 @@ func (loader KibanaLoader) ImportIndexFile(file string) error {
 
 // ImportIndex imports the passed index pattern to Kibana
 func (loader KibanaLoader) ImportIndex(pattern common.MapStr) error {
-	if loader.version.LessThanOrEqual(true, common.MustNewVersion("7.14.0")) {
-		return fmt.Errorf("Kibana version must be newer than 7.14")
+	if loader.version.LessThan(kibana.MinimumRequiredVersionSavedObjects) {
+		return fmt.Errorf("Kibana version must be at least " + kibana.MinimumRequiredVersionSavedObjects.String())
 	}
 
 	var errs multierror.Errors
@@ -135,8 +135,8 @@ func (loader KibanaLoader) ImportIndex(pattern common.MapStr) error {
 
 // ImportDashboard imports the dashboard file
 func (loader KibanaLoader) ImportDashboard(file string) error {
-	if loader.version.LessThanOrEqual(true, common.MustNewVersion("7.14.0")) {
-		return fmt.Errorf("Kibana version must be newer than 7.14")
+	if loader.version.LessThan(kibana.MinimumRequiredVersionSavedObjects) {
+		return fmt.Errorf("Kibana version must be at least " + kibana.MinimumRequiredVersionSavedObjects.String())
 	}
 
 	loader.statusMsg("Importing dashboard from %s", file)

diff --git a/libbeat/kibana/client.go b/libbeat/kibana/client.go
@@ -37,6 +37,10 @@ import (
 	"github.com/elastic/beats/v7/libbeat/logp"
 )
 
+var (
+	MinimumRequiredVersionSavedObjects = common.MustNewVersion("7.15.0")
+)
+
 type Connection struct {
 	URL      string
 	Username string
@@ -315,8 +319,8 @@ func (client *Client) Close() error { return nil }
 
 // GetDashboard returns the dashboard with the given id with the index pattern removed
 func (client *Client) GetDashboard(id string) ([]byte, error) {
-	if client.Version.LessThanOrEqual(true, common.MustNewVersion("7.14.0")) {
-		return nil, fmt.Errorf("Kibana version must be newer than 7.14")
+	if client.Version.LessThan(MinimumRequiredVersionSavedObjects) {
+		return nil, fmt.Errorf("Kibana version must be at least " + MinimumRequiredVersionSavedObjects.String())
 	}
 
 	body := fmt.Sprintf(`{"objects": [{"type": "dashboard", "id": "%s" }], "includeReferencesDeep": true, "excludeExportDetails": true}`, id)