Introduce httpcommon package in libbeat (add support for Proxy) (#25219)

(cherry picked from commit 4accfa8) # Conflicts: # libbeat/monitoring/report/elasticsearch/config.go # metricbeat/module/elasticsearch/index/data_test.go # x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go
elastic · Jul 19, 2021 · 3ed5a1c · 3ed5a1c
1 parent 72faf0e
commit 3ed5a1c
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 0 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -624,6 +624,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 - Bundle synthetics deps with heartbeat docker image. {pull}23274[23274]
 - Add support for `copytruncate` method when rotating input logs with an external tool in `filestream` input. {pull}23457[23457]
+- Add mime type detection for http responses. {pull}22976[22976]
 - Add `proxy_headers` to HTTP monitor. {pull}25219[25219]
 
 *Heartbeat*

diff --git a/libbeat/monitoring/report/elasticsearch/config.go b/libbeat/monitoring/report/elasticsearch/config.go
@@ -22,7 +22,10 @@ import (
 	"time"
 
 	"github.com/elastic/beats/v7/libbeat/common/transport/httpcommon"
+<<<<<<< HEAD
 	"github.com/elastic/beats/v7/libbeat/monitoring/report"
+=======
+>>>>>>> 4accfa821 (Introduce httpcommon package in libbeat (add support for Proxy) (#25219))
 )
 
 // config is subset of libbeat/outputs/elasticsearch config tailored

diff --git a/metricbeat/module/elasticsearch/index/data_test.go b/metricbeat/module/elasticsearch/index/data_test.go
@@ -25,6 +25,12 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+<<<<<<< HEAD
+=======
+	"github.com/elastic/beats/v7/libbeat/common/transport/httpcommon"
+	"github.com/elastic/beats/v7/metricbeat/helper"
+	"github.com/elastic/beats/v7/metricbeat/mb"
+>>>>>>> 4accfa821 (Introduce httpcommon package in libbeat (add support for Proxy) (#25219))
 	mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
 	"github.com/elastic/beats/v7/metricbeat/module/elasticsearch"
 )
@@ -35,7 +41,32 @@ var info = elasticsearch.Info{
 }
 
 func TestMapper(t *testing.T) {
+<<<<<<< HEAD
 	elasticsearch.TestMapperWithInfo(t, "../index/_meta/test/stats.*.json", eventsMapping)
+=======
+	t.Skip("Skipping to fix in a follow up")
+
+	mux := createEsMuxer("7.6.0", "platinum", false)
+
+	server := httptest.NewServer(mux)
+	defer server.Close()
+
+	httpClient, err := helper.NewHTTPFromConfig(helper.Config{
+		ConnectTimeout: 30 * time.Second,
+		Transport: httpcommon.HTTPTransportSettings{
+			Timeout: 30 * time.Second,
+		},
+	}, mb.HostData{
+		URI:          server.URL,
+		SanitizedURI: server.URL,
+		Host:         server.URL,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	elasticsearch.TestMapperWithHttpHelper(t, "../index/_meta/test/stats.*.json", httpClient, eventsMapping)
+>>>>>>> 4accfa821 (Introduce httpcommon package in libbeat (add support for Proxy) (#25219))
 }
 
 func TestEmpty(t *testing.T) {

diff --git a/x-pack/elastic-agent/CHANGELOG.next.asciidoc b/x-pack/elastic-agent/CHANGELOG.next.asciidoc
@@ -121,5 +121,7 @@
 - Set `agent.id` to the Fleet Agent ID in events published from inputs backed by Beats. {issue}21121[21121] {pull}26394[26394] {pull}26548[26548]
 - Add proxy support to artifact downloader and communication with fleet server. {pull}25219[25219]
 - Add proxy support to enroll command. {pull}26514[26514]
+- Set `agent.id` to the Fleet Agent ID in events published from inputs backed by Beats. {issue}21121[21121] {pull}26394[26394]
+- Add proxy support to artifact downloader and communication with fleet server. {pull}25219[25219]
 - Enable configuring monitoring namespace {issue}26439[26439]
 - Communicate with Fleet Server over HTTP2. {pull}26474[26474]
diff --git a/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go b/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go
@@ -120,6 +120,7 @@ func (e *enrollCmdOption) remoteConfig() (remote.Config, error) {
 	}
 	if e.Insecure {
 		tlsCfg.VerificationMode = tlscommon.VerifyNone
+<<<<<<< HEAD
 	}
 
 	cfg.Transport.TLS = &tlsCfg
@@ -146,6 +147,11 @@ func (e *enrollCmdOption) remoteConfig() (remote.Config, error) {
 		Headers: headers,
 	}
 
+=======
+	}
+
+	cfg.Transport.TLS = &tlsCfg
+>>>>>>> 4accfa821 (Introduce httpcommon package in libbeat (add support for Proxy) (#25219))
 	return cfg, nil
 }