Do not overwrite content type if it is multipart in Kibana loader (#27424)

kvch · web-flow · commit 47c0c726b0fa · 2021-08-18T14:15:42.000+02:00
## What does this PR do?

This PR fixes dashboard loading. Kibana loader overwrites every content type to application/json. However, for multipart file transfer it has to be set to multipart/formdata and application/ndjson. Otherwise, loading the assets fails.

Also, a module file has not been updated with new dashboard names.
diff --git a/libbeat/kibana/client.go b/libbeat/kibana/client.go
@@ -24,6 +24,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"mime"
 	"mime/multipart"
 	"net/http"
 	"net/textproto"
@@ -214,6 +215,7 @@ func (conn *Connection) SendWithContext(ctx context.Context, method, extraPath s
 	addHeaders(req.Header, headers)
 
 	contentType := req.Header.Get("Content-Type")
+	contentType, _, _ = mime.ParseMediaType(contentType)
 	if contentType != "multipart/form-data" && contentType != "application/ndjson" {
 		req.Header.Set("Content-Type", "application/json")
 	}
diff --git a/libbeat/kibana/client_test.go b/libbeat/kibana/client_test.go
@@ -119,3 +119,30 @@ headers:
 	assert.Equal(t, []string{"1"}, requests[1].Header.Values("kbn-xsrf"))
 
 }
+
+func TestNewKibanaClientWithMultipartData(t *testing.T) {
+	var requests []*http.Request
+	kibanaTs := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		requests = append(requests, r)
+		if r.URL.Path == "/api/status" {
+			w.Write([]byte(`{"version":{"number":"1.2.3-beta","build_snapshot":true}}`))
+		}
+	}))
+	defer kibanaTs.Close()
+
+	client, err := NewKibanaClient(common.MustNewConfigFrom(fmt.Sprintf(`
+protocol: http
+host: %s
+headers:
+  content-type: multipart/form-data; boundary=46bea21be603a2c2ea6f51571a5e1baf5ea3be8ebd7101199320607b36ff
+  accept: text/plain
+  kbn-xsrf: 0
+`, kibanaTs.Listener.Addr().String())))
+	require.NoError(t, err)
+	require.NotNil(t, client)
+
+	client.Request(http.MethodPost, "/foo", url.Values{}, http.Header{"key": []string{"another_value"}}, nil)
+
+	assert.Equal(t, []string{"multipart/form-data; boundary=46bea21be603a2c2ea6f51571a5e1baf5ea3be8ebd7101199320607b36ff"}, requests[1].Header.Values("Content-Type"))
+
+}
diff --git a/x-pack/filebeat/module/netflow/dashboards.yml b/x-pack/filebeat/module/netflow/dashboards.yml
@@ -2,25 +2,25 @@
 
 dashboards:
   - id: 77326664-23be-4bf1-a126-6d7e60cfc024
-    file: filebeat-netflow-geo-location.json
+    file: filebeat-netflow-geo-location.ndjson
 
   - id: 38012abe-c611-4124-8497-381fcd85acc8
-    file: filebeat-netflow-traffic-analysis.json
+    file: filebeat-netflow-traffic-analysis.ndjson
 
   - id: c64665f9-d222-421e-90b0-c7310d944b8a
-    file: filebeat-netflow-autonomous-systems.json
+    file: filebeat-netflow-autonomous-systems.ndjson
 
   - id: acd7a630-0c71-4840-bc9e-4a3801374a32
-    file: filebeat-netflow-conversation-partners.json
+    file: filebeat-netflow-conversation-partners.ndjson
 
   - id: 34e26884-161a-4448-9556-43b5bf2f62a2
-    file: filebeat-netflow-overview.json
+    file: filebeat-netflow-overview.ndjson
 
   - id: feebb4e6-b13e-4e4e-b9fc-d3a178276425
-    file: filebeat-netflow-flow-exporters.json
+    file: filebeat-netflow-flow-exporters.ndjson
 
   - id: 94972700-de4a-4272-9143-2fa8d4981365
-    file: filebeat-netflow-flow-records.json
+    file: filebeat-netflow-flow-records.ndjson
 
   - id: 14387a13-53bc-43a4-b9cd-63977aa8d87c
-    file: filebeat-netflow-top-n.json
+    file: filebeat-netflow-top-n.ndjson
