Fix formatting of mapStateJSON and layerListJSON in dashboard assets

filebeat/tests/system/test_base.py

@@ -1,5 +1,9 @@
 import os
 import unittest
+import pytest
+import semver
+import requests
+import shutil
 from filebeat import BaseTest
 from elasticsearch import Elasticsearch
 from beat.beat import INTEGRATION_TESTS
@@ -57,3 +61,41 @@ def test_template_migration(self):
         assert exit_code == 0
         assert self.log_contains('Loaded index template')
         assert len(es.cat.templates(name='filebeat-*', h='name')) > 0
+
+    @unittest.skipUnless(INTEGRATION_TESTS, "integration test")
+    @pytest.mark.timeout(5*60, func_only=True)
+    def test_dashboards(self):
+        """
+        Test that the dashboards can be loaded with `setup --dashboards`
+        """
+        if not self.is_saved_object_api_available():
+            raise unittest.SkipTest(
+                "Kibana Saved Objects API is used since 7.15")
+
+        shutil.copytree(self.kibana_dir(), os.path.join(self.working_dir, "kibana"))
+
+        es = Elasticsearch([self.get_elasticsearch_url()])
+        self.render_config_template(
+            elasticsearch={"host": self.get_elasticsearch_url()},
+            kibana={"host": self.get_kibana_url()},
+        )
+        exit_code = self.run_beat(extra_args=["setup", "--dashboards"])
+
+        assert exit_code == 0, 'Error output: ' + self.get_log()
+        assert self.log_contains("Kibana dashboards successfully loaded.")
+
+    def is_saved_object_api_available(self):
+        kibana_semver = semver.VersionInfo.parse(self.get_version())
+        return semver.VersionInfo.parse("7.14.0") <= kibana_semver
+
+    def get_version(self):
+        url = self.get_kibana_url() + "/api/status"
+
+        r = requests.get(url)
+        body = r.json()
+        version = body["version"]["number"]
+
+        return version
+
+    def kibana_dir(self):
+        return os.path.join(self.beat_path, "build", "kibana")

libbeat/dashboards/modify_json.go

@@ -386,26 +386,27 @@ func EncodeJSONObjects(content []byte) []byte {
 		}
 	}
 
-	fieldsToStr := []string{"visState", "uiStateJSON", "optionsJSON"}
+	fieldsToStr := []string{
+		"layerListJSON",
+		"mapStateJSON",
+		"optionsJSON",
+		"panelsJSON",
+		"uiStateJSON",
+		"visState",
+	}
 	for _, field := range fieldsToStr {
-		if rootField, ok := attributes[field].(map[string]interface{}); ok {
+		switch rootField := attributes[field].(type) {
+		case map[string]interface{}, []interface{}:
 			b, err := json.Marshal(rootField)
 			if err != nil {
 				return content
 			}
 			attributes[field] = string(b)
+		default:
+			continue
 		}
 	}
 
-	if panelsJSON, ok := attributes["panelsJSON"].([]interface{}); ok {
-		b, err := json.Marshal(panelsJSON)
-		if err != nil {
-			return content
-		}
-		attributes["panelsJSON"] = string(b)
-
-	}
-
 	b, err := json.Marshal(objectMap)
 	if err != nil {
 		logger.Error("Error marshaling modified dashboard: %+v", err)

metricbeat/tests/system/test_base.py

@@ -59,12 +59,12 @@ def test_template(self):
         assert len(es.cat.templates(name='metricbeat-*', h='name')) > 0
 
     @unittest.skipUnless(INTEGRATION_TESTS, "integration test")
-    @pytest.mark.timeout(180, func_only=True)
+    @pytest.mark.timeout(5*60, func_only=True)
     def test_dashboards(self):
         """
         Test that the dashboards can be loaded with `setup --dashboards`
         """
-        if self.is_saved_object_api_available():
+        if not self.is_saved_object_api_available():
             raise unittest.SkipTest(
                 "Kibana Saved Objects API is used since 7.15")
 

packetbeat/tests/system/test_base.py

@@ -5,4 +5,41 @@
 
 
 class Test(BaseTest, common_tests.TestExportsMixin):
-    pass
+
+    @unittest.skipUnless(INTEGRATION_TESTS, "integration test")
+    @pytest.mark.timeout(5*60, func_only=True)
+    def test_dashboards(self):
+        """
+        Test that the dashboards can be loaded with `setup --dashboards`
+        """
+        if not self.is_saved_object_api_available():
+            raise unittest.SkipTest(
+                "Kibana Saved Objects API is used since 7.15")
+
+        shutil.copytree(self.kibana_dir(), os.path.join(self.working_dir, "kibana"))
+
+        es = Elasticsearch([self.get_elasticsearch_url()])
+        self.render_config_template(
+            elasticsearch={"host": self.get_elasticsearch_url()},
+            kibana={"host": self.get_kibana_url()},
+        )
+        exit_code = self.run_beat(extra_args=["setup", "--dashboards"])
+
+        assert exit_code == 0, 'Error output: ' + self.get_log()
+        assert self.log_contains("Kibana dashboards successfully loaded.")
+
+    def is_saved_object_api_available(self):
+        kibana_semver = semver.VersionInfo.parse(self.get_version())
+        return semver.VersionInfo.parse("7.14.0") <= kibana_semver
+
+    def get_version(self):
+        url = self.get_kibana_url() + "/api/status"
+
+        r = requests.get(url)
+        body = r.json()
+        version = body["version"]["number"]
+
+        return version
+
+    def kibana_dir(self):
+        return os.path.join(self.beat_path, "build", "kibana")