InfluxDB: Move database information into jsondata (#62308)

* Use dbName in jsonData instead of database

* Use dbName in instead of database

* Remove database fields and define dbName instead

* Fix tests

* set database field as empty string

pkg/tsdb/influxdb/influxdb.go

@@ -69,10 +69,14 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 		if version == "" {
 			version = influxVersionInfluxQL
 		}
+		database := jsonData.DbName
+		if database == "" {
+			database = settings.Database
+		}
 		model := &models.DatasourceInfo{
 			HTTPClient:    client,
 			URL:           settings.URL,
-			Database:      settings.Database,
+			DbName:        database,
 			Version:       version,
 			HTTPMode:      httpMode,
 			TimeInterval:  jsonData.TimeInterval,
@@ -178,7 +182,7 @@ func (s *Service) createRequest(ctx context.Context, logger log.Logger, dsInfo *
 	req.Header.Set("User-Agent", "Grafana")
 
 	params := req.URL.Query()
-	params.Set("db", dsInfo.Database)
+	params.Set("db", dsInfo.DbName)
 	params.Set("epoch", "ms")
 
 	if httpMode == "GET" {

pkg/tsdb/influxdb/influxdb_test.go

@@ -15,7 +15,7 @@ import (
 func TestExecutor_createRequest(t *testing.T) {
 	datasource := &models.DatasourceInfo{
 		URL:      "http://awesome-influxdb:1337",
-		Database: "awesome-db",
+		DbName:   "awesome-db",
 		HTTPMode: "GET",
 	}
 	query := "SELECT awesomeness FROM somewhere"

pkg/tsdb/influxdb/mocks_test.go

@@ -68,7 +68,7 @@ func (f *fakeInstance) Get(pluginContext backend.PluginContext) (instancemgmt.In
 		HTTPClient:    client,
 		Token:         "sometoken",
 		URL:           "https://awesome-influx.com",
-		Database:      "testdb",
+		DbName:        "testdb",
 		Version:       f.version,
 		HTTPMode:      "GET",
 		TimeInterval:  "10s",

pkg/tsdb/influxdb/models/datasource_info.go

@@ -9,7 +9,7 @@ type DatasourceInfo struct {
 	Token      string
 	URL        string
 
-	Database      string `json:"database"`
+	DbName        string `json:"dbName"`
 	Version       string `json:"version"`
 	HTTPMode      string `json:"httpMode"`
 	TimeInterval  string `json:"timeInterval"`