minor fixes

elastic · Aug 31, 2021 · bc5503f · bc5503f
1 parent 4d91ae7
commit bc5503f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/libbeat/dashboards/kibana_loader.go b/libbeat/dashboards/kibana_loader.go
@@ -154,7 +154,7 @@ func (loader KibanaLoader) ImportDashboard(file string) error {
 	}
 
 	content = ReplaceIndexInDashboardObject(loader.config.Index, content)
-	content = ConvertToStr(content)
+	content = EncodeJSONObjects(content)
 	content = ReplaceStringInDashboard("CHANGEME_HOSTNAME", loader.hostname, content)
 
 	err = loader.importReferences(file, content)

diff --git a/libbeat/dashboards/modify_json.go b/libbeat/dashboards/modify_json.go
@@ -192,13 +192,11 @@ func ReplaceIndexInDashboardObject(index string, content []byte) []byte {
 	}
 
 	if kibanaSavedObject, ok := attributes["kibanaSavedObjectMeta"].(map[string]interface{}); ok {
-		ba := ReplaceIndexInSavedObject(logger, index, kibanaSavedObject)
-		attributes["kibanaSavedObjectMeta"] = ba
+		attributes["kibanaSavedObjectMeta"] = ReplaceIndexInSavedObject(logger, index, kibanaSavedObject)
 	}
 
 	if visState, ok := attributes["visState"].(string); ok {
-		nya := ReplaceIndexInVisState(logger, index, visState)
-		attributes["visState"] = nya
+		attributes["visState"] = ReplaceIndexInVisState(logger, index, visState)
 	}
 
 	b, err := json.Marshal(objectMap)
@@ -210,7 +208,7 @@ func ReplaceIndexInDashboardObject(index string, content []byte) []byte {
 	return b
 }
 
-func ConvertToStr(content []byte) []byte {
+func EncodeJSONObjects(content []byte) []byte {
 	logger := logp.NewLogger("dashboards")
 
 	if len(bytes.TrimSpace(content)) == 0 {

diff --git a/libbeat/dashboards/modify_json_test.go b/libbeat/dashboards/modify_json_test.go
@@ -72,18 +72,14 @@ func TestReplaceIndexInDashboardObject(t *testing.T) {
 		expected  []byte
 	}{
 		{
-			[]byte(`{"attributes":{"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"index\":\"metricbeat-*\"}"}}}
-`),
+			[]byte(`{"attributes":{"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"index\":\"metricbeat-*\"}"}}}`),
 			"otherindex-*",
-			[]byte(`{"attributes":{"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"index\":\"otherindex-*\"}"}}}
-`),
+			[]byte(`{"attributes":{"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"index\":\"otherindex-*\"}"}}}`),
 		},
 		{
-			[]byte(`{"attributes":{"kibanaSavedObjectMeta":{"visState":"{\"params\":{\"index_pattern\":\"metricbeat-*\"}}"}}}
-`),
+			[]byte(`{"attributes":{"kibanaSavedObjectMeta":{"visState":"{\"params\":{\"index_pattern\":\"metricbeat-*\"}}"}}}`),
 			"otherindex-*",
-			[]byte(`{"attributes":{"kibanaSavedObjectMeta":{"visState":"{\"params\":{\"index_pattern\":\"otherindex-*\"}}"}}}
-`),
+			[]byte(`{"attributes":{"kibanaSavedObjectMeta":{"visState":"{\"params\":{\"index_pattern\":\"otherindex-*\"}}"}}}`),
 		},
 	}