feat: http_response add DialTLSContext

conf/input.http_response/http_response.toml

@@ -8,8 +8,8 @@
 
 [[instances]]
 targets = [
-#     "http://localhost",
-#     "https://www.baidu.com"
+    #     "http://localhost",
+    #     "https://www.baidu.com"
 ]
 
 ## append some labels for series
@@ -38,7 +38,7 @@ targets = [
 # password = "pa$$word"
 
 ## Optional headers
-# headers = ["Header-Key-1", "Header-Value-1", "Header-Key-2", "Header-Value-2"]
+# headers = { "Accept-Encoding" = "Gzip" }
 
 ## Optional HTTP Request Body
 # body = '''
@@ -57,9 +57,11 @@ targets = [
 # expect_response_status_codes = "200|301"
 
 ## Optional TLS Config
-# use_tls = false
+# use_tls = true
+# tls_remote_addr = "10.10.10.10:443"
 # tls_ca = "/etc/categraf/ca.pem"
 # tls_cert = "/etc/categraf/cert.pem"
 # tls_key = "/etc/categraf/key.pem"
+# tls_server_name = "www.baidu.com"
 ## Use TLS but skip chain & host verification
 # insecure_skip_verify = false

inputs/http_response/http_response.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -39,8 +38,8 @@ type Instance struct {
 	Targets                         []string        `toml:"targets"`
 	Interface                       string          `toml:"interface"`
 	ResponseTimeout                 config.Duration `toml:"response_timeout"`
-	Headers                         []string        `toml:"headers"`
 	Body                            string          `toml:"body"`
+	TlsRemoteAddr                   string          `toml:"tls_remote_addr"`
 	ExpectResponseSubstring         string          `toml:"expect_response_substring"`
 	ExpectResponseRegularExpression string          `toml:"expect_response_regular_expression"`
 	ExpectResponseStatusCode        *int            `toml:"expect_response_status_code"`
@@ -105,7 +104,6 @@ func (ins *Instance) createHTTPClient() (*http.Client, error) {
 	}
 
 	dialer := &net.Dialer{}
-
 	if ins.Interface != "" {
 		dialer.LocalAddr, err = netx.LocalAddressByInterfaceName(ins.Interface)
 		if err != nil {
@@ -120,7 +118,7 @@ func (ins *Instance) createHTTPClient() (*http.Client, error) {
 
 	client := httpx.CreateHTTPClient(httpx.TlsConfig(tlsCfg),
 		httpx.NetDialer(dialer), httpx.Proxy(proxy),
-
+		httpx.SetTransportTlsRemoteAddr(ins.TlsRemoteAddr, tlsCfg),
 		httpx.DisableKeepAlives(*ins.DisableKeepAlives),
 		httpx.Timeout(time.Duration(ins.Timeout)),
 		httpx.FollowRedirects(*ins.FollowRedirects))
@@ -242,12 +240,7 @@ func (ins *Instance) httpGather(target string) (map[string]string, map[string]in
 		return nil, nil, err
 	}
 
-	// compatible with old config
-	for i := 0; i < len(ins.Headers); i += 2 {
-		ins.HTTPCommonConfig.Headers[ins.Headers[i]] = ins.Headers[i+1]
-	}
 	ins.SetHeaders(request)
-
 	// Start Timer
 	start := time.Now()
 	resp, err := ins.client.Do(request)
@@ -300,7 +293,7 @@ func (ins *Instance) httpGather(target string) (map[string]string, map[string]in
 	// metric: response_code
 	fields["response_code"] = resp.StatusCode
 
-	bs, err := ioutil.ReadAll(resp.Body)
+	bs, err := io.ReadAll(resp.Body)
 	if err != nil {
 		log.Println("E! failed to read response body:", err)
 		return tags, fields, nil

pkg/httpx/client.go

@@ -6,6 +6,7 @@
 package httpx
 
 import (
+	"context"
 	"crypto/tls"
 	"log"
 	"net"
@@ -112,6 +113,28 @@ func DisableKeepAlives(disableKeepAlives bool) Option {
 	}
 }
 
+func SetTransportTlsRemoteAddr(remoteAddr string, tlsConfig *tls.Config) Option {
+	return func(client *http.Client) {
+		if len(remoteAddr) > 0 && tlsConfig != nil {
+			client.Transport.(*http.Transport).DialTLSContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
+				conn, err := client.Transport.(*http.Transport).DialContext(ctx, network, remoteAddr)
+				if err != nil {
+					return nil, err
+				}
+
+				// 建立 TLS 连接
+				tlsConn := tls.Client(conn, tlsConfig)
+				if err := tlsConn.Handshake(); err != nil {
+					conn.Close()
+					return nil, err
+				}
+
+				return tlsConn, nil
+			}
+		}
+	}
+}
+
 func CreateHTTPClient(opts ...Option) *http.Client {
 	client := &http.Client{
 		Transport: &http.Transport{},