IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14888 from bugficks/8570-mysql-ssl-datasource

Browse Source 
MySQL SSL CA in datasource connector
This commit is contained in:
Marcus Efraimsson
2019-02-11 09:00:18 +01:00
committed by GitHub
parent be11da5b31 1bc2a0af70
commit 75f89ecf1f
7 changed files with 134 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/tsdb/mysql/mysql.go
View File

@@ -32,6 +32,18 @@ func newMysqlQueryEndpoint(datasource *models.DataSource) (tsdb.TsdbQueryEndpoin
datasource.Url,
datasource.Database,
)
tlsConfig, err := datasource.GetTLSConfig()
if err != nil {
return nil, err
}
if tlsConfig.RootCAs != nil || len(tlsConfig.Certificates) > 0 {
tlsConfigString := fmt.Sprintf("ds%d", datasource.Id)
mysql.RegisterTLSConfig(tlsConfigString, tlsConfig)
cnnstr += "&tls=" + tlsConfigString
}
logger.Debug("getEngine", "connection", cnnstr)
config := tsdb.SqlQueryEndpointConfiguration{