diff --git a/elk/elasticClient/client.go b/elk/elasticClient/client.go index a8e9f4c9c7e95154f816d1dbd55a12f3714ef57f..97ea936eaf6eccb153446183010709d07a3f010b 100644 --- a/elk/elasticClient/client.go +++ b/elk/elasticClient/client.go @@ -2,6 +2,7 @@ package elasticClient import ( "context" + "crypto/tls" "fmt" "net" "net/http" @@ -23,16 +24,21 @@ type ElasticClient_v7 struct { } func InitElasticClient() { + addresses := []string{} + if conf.Global_Config.Elk.Https_enabled { + addresses = append(addresses, fmt.Sprintf("https://%s", conf.Global_Config.Elasticsearch.Addr)) + } else { + addresses = append(addresses, fmt.Sprintf("http://%s", conf.Global_Config.Elasticsearch.Addr)) + } cfg := elastic.Config{ - Addresses: []string{ - fmt.Sprintf("http://%s", conf.Global_Config.Elasticsearch.Addr), - }, - Username: conf.Global_Config.Elasticsearch.Username, - Password: conf.Global_Config.Elasticsearch.Password, + Addresses: addresses, + Username: conf.Global_Config.Elasticsearch.Username, + Password: conf.Global_Config.Elasticsearch.Password, Transport: &http.Transport{ MaxIdleConnsPerHost: 10, ResponseHeaderTimeout: time.Second, DialContext: (&net.Dialer{Timeout: time.Second}).DialContext, + TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, }, } diff --git a/elk/kibanaClient/7_17_16/client.go b/elk/kibanaClient/7_17_16/client.go index 19ed9efb2a3f4b783cfd5335bd4c8b54c704c597..3e57673fa4854a52cbf39d06c4ee2f3d3197841b 100644 --- a/elk/kibanaClient/7_17_16/client.go +++ b/elk/kibanaClient/7_17_16/client.go @@ -3,6 +3,7 @@ package kibanaClient import ( "context" "fmt" + "time" "github.com/pkg/errors" @@ -12,6 +13,8 @@ import ( "gitee.com/openeuler/PilotGo-plugin-elk/kibanaClient/7_17_16/meta" "gitee.com/openeuler/PilotGo-plugin-elk/pluginclient" "github.com/elastic/elastic-agent-libs/kibana" + "github.com/elastic/elastic-agent-libs/transport/httpcommon" + "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) var Global_kibana *KibanaClient_v7 @@ -23,10 +26,18 @@ type KibanaClient_v7 struct { func InitKibanaClient() { cfg := &kibana.ClientConfig{ - Protocol: "http", + Protocol: "https", Host: conf.Global_Config.Kibana.Addr, Username: conf.Global_Config.Kibana.Username, Password: conf.Global_Config.Kibana.Password, + Transport: httpcommon.HTTPTransportSettings{ + Proxy: httpcommon.DefaultHTTPClientProxySettings(), + Timeout: 90 * time.Second, + TLS: &tlscommon.Config{ + Enabled: kibana.TRUE, + VerificationMode: 1, + }, + }, } ki_client, err := kibana.NewClientWithConfig(cfg, "", "", "", "")