refactor: change tdengine

Author: 710leo

datasource/tdengine/tdengine.go

@@ -67,12 +67,14 @@ func (td *TDengine) Equal(other datasource.Datasource) bool {
 		return false
 	}
 
-	if td.BasicAuthUser != otherTD.BasicAuthUser {
-		return false
-	}
+	if td.Basic != nil && otherTD.Basic != nil {
+		if td.Basic.User != otherTD.Basic.User {
+			return false
+		}
 
-	if td.BasicAuthPass != otherTD.BasicAuthPass {
-		return false
+		if td.Basic.Password != otherTD.Basic.Password {
+			return false
+		}
 	}
 
 	if td.Token != otherTD.Token {

dscache/sync.go

@@ -9,6 +9,7 @@ import (
 	"github.com/ccfos/nightingale/v6/datasource"
 	_ "github.com/ccfos/nightingale/v6/datasource/ck"
 	"github.com/ccfos/nightingale/v6/datasource/es"
+	"github.com/ccfos/nightingale/v6/dskit/tdengine"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 
@@ -100,15 +101,16 @@ func getDatasourcesFromDBLoop(ctx *ctx.Context, fromAPI bool) {
 
 func tdN9eToDatasourceInfo(ds *datasource.DatasourceInfo, item models.Datasource) {
 	ds.Settings = make(map[string]interface{})
-	ds.Settings["tdengine.datasource_name"] = item.Name
-	ds.Settings["tdengine.url"] = item.HTTPJson.Url
+	ds.Settings["tdengine.cluster_name"] = item.Name
+	ds.Settings["tdengine.addr"] = item.HTTPJson.Url
 	ds.Settings["tdengine.timeout"] = item.HTTPJson.Timeout
 	ds.Settings["tdengine.dial_timeout"] = item.HTTPJson.DialTimeout
 	ds.Settings["tdengine.max_idle_conns_per_host"] = item.HTTPJson.MaxIdleConnsPerHost
 	ds.Settings["tdengine.headers"] = item.HTTPJson.Headers
-	ds.Settings["tdengine.basic_auth_user"] = item.AuthJson.BasicAuthUser
-	ds.Settings["tdengine.basic_auth_pass"] = item.AuthJson.BasicAuthPassword
-
+	ds.Settings["tdengine.basic"] = tdengine.TDengineBasicAuth{
+		User:     item.AuthJson.BasicAuthUser,
+		Password: item.AuthJson.BasicAuthPassword,
+	}
 }
 
 func esN9eToDatasourceInfo(ds *datasource.DatasourceInfo, item models.Datasource) {

dskit/tdengine/tdengine.go

@@ -17,25 +17,29 @@ import (
 )
 
 type Tdengine struct {
-	DatasourceName string `json:"tdengine.datasource_name" mapstructure:"tdengine.datasource_name"`
-	Addr           string `json:"tdengine.addr" mapstructure:"tdengine.addr"`
-	BasicAuthUser  string `json:"tdengine.basic_auth_user" mapstructure:"tdengine.basic_auth_user"`
-	BasicAuthPass  string `json:"tdengine.basic_auth_pass" mapstructure:"tdengine.basic_auth_pass"`
-	Token          string `json:"tdengine.token" mapstructure:"tdengine.token"`
-
-	Timeout     int64 `json:"tdengine.timeout" mapstructure:"tdengine.timeout"`
-	DialTimeout int64 `json:"tdengine.dial_timeout" mapstructure:"tdengine.dial_timeout"`
-
-	MaxIdleConnsPerHost int `json:"tdengine.max_idle_conns_per_host" mapstructure:"tdengine.max_idle_conns_per_host"`
-
-	Headers map[string]string `json:"tdengine.headers" mapstructure:"tdengine.headers"`
+	DatasourceName      string             `json:"tdengine.datasource_name" mapstructure:"tdengine.datasource_name"`
+	Addr                string             `json:"tdengine.addr" mapstructure:"tdengine.addr"`
+	Basic               *TDengineBasicAuth `json:"tdengine.basic"`
+	Token               string             `json:"tdengine.token" mapstructure:"tdengine.token"`
+	Timeout             int64              `json:"tdengine.timeout" mapstructure:"tdengine.timeout"`
+	DialTimeout         int64              `json:"tdengine.dial_timeout" mapstructure:"tdengine.dial_timeout"`
+	MaxIdleConnsPerHost int                `json:"tdengine.max_idle_conns_per_host" mapstructure:"tdengine.max_idle_conns_per_host"`
+	Headers             map[string]string  `json:"tdengine.headers" mapstructure:"tdengine.headers"`
+	SkipTlsVerify       bool               `json:"tdengine.skip_tls_verify"`
+	ClusterName         string             `json:"tdengine.cluster_name"`
 
 	tlsx.ClientConfig
 
 	header map[string][]string `json:"-"`
 	client *http.Client        `json:"-"`
 }
 
+type TDengineBasicAuth struct {
+	User      string `json:"tdengine.user"`
+	Password  string `json:"tdengine.password"`
+	IsEncrypt bool   `json:"tdengine.is_encrypt"`
+}
+
 type APIResponse struct {
 	Code       int             `json:"code"`
 	ColumnMeta [][]interface{} `json:"column_meta"`
@@ -76,8 +80,8 @@ func (tc *Tdengine) InitCli() {
 		tc.header[k] = []string{v}
 	}
 
-	if tc.BasicAuthUser != "" {
-		basic := base64.StdEncoding.EncodeToString([]byte(tc.BasicAuthUser + ":" + tc.BasicAuthPass))
+	if tc.Basic != nil {
+		basic := base64.StdEncoding.EncodeToString([]byte(tc.Basic.User + ":" + tc.Basic.Password))
 		tc.header["Authorization"] = []string{fmt.Sprintf("Basic %s", basic)}
 	}
 }