fix: query-range skip tls verify

shengjian-tech · Aug 3, 2023 · 6c42ae9 · 6c42ae9
1 parent 15dcc60
commit 6c42ae9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/prom/option.go b/prom/option.go
@@ -1,6 +1,10 @@
 package prom
 
-import "sync"
+import (
+	"sync"
+
+	"github.com/ccfos/nightingale/v6/pkg/tlsx"
+)
 
 type PromOption struct {
 	ClusterName   string
@@ -15,6 +19,8 @@ type PromOption struct {
 	MaxIdleConnsPerHost int
 
 	Headers []string
+
+	tlsx.ClientConfig
 }
 
 func (po *PromOption) Equal(target PromOption) bool {

diff --git a/prom/reader.go b/prom/reader.go
@@ -89,6 +89,11 @@ func (pc *PromClientMap) loadFromDatabase() {
 			Headers:             header,
 		}
 
+		if strings.HasPrefix(ds.HTTPJson.Url, "https") {
+			po.UseTLS = true
+			po.InsecureSkipVerify = ds.HTTPJson.TLS.SkipTlsVerify
+		}
+
 		if internalAddr != "" && !pc.ctx.IsCenter {
 			// internal addr is set, use internal addr when edge mode
 			po.Url = internalAddr
@@ -130,11 +135,13 @@ func (pc *PromClientMap) loadFromDatabase() {
 }
 
 func (pc *PromClientMap) newReaderClientFromPromOption(po PromOption) (api.Client, error) {
+	tlsConfig, _ := po.TLSConfig()
+
 	return api.NewClient(api.Config{
 		Address: po.Url,
 		RoundTripper: &http.Transport{
-			// TLSClientConfig: tlsConfig,
-			Proxy: http.ProxyFromEnvironment,
+			TLSClientConfig: tlsConfig,
+			Proxy:           http.ProxyFromEnvironment,
 			DialContext: (&net.Dialer{
 				Timeout: time.Duration(po.DialTimeout) * time.Millisecond,
 			}).DialContext,
@@ -145,11 +152,13 @@ func (pc *PromClientMap) newReaderClientFromPromOption(po PromOption) (api.Clien
 }
 
 func (pc *PromClientMap) newWriterClientFromPromOption(po PromOption) (api.Client, error) {
+	tlsConfig, _ := po.TLSConfig()
+
 	return api.NewClient(api.Config{
 		Address: po.WriteAddr,
 		RoundTripper: &http.Transport{
-			// TLSClientConfig: tlsConfig,
-			Proxy: http.ProxyFromEnvironment,
+			TLSClientConfig: tlsConfig,
+			Proxy:           http.ProxyFromEnvironment,
 			DialContext: (&net.Dialer{
 				Timeout: time.Duration(po.DialTimeout) * time.Millisecond,
 			}).DialContext,