opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 18:12:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

mysql: improved mysql data source, added test feature when adding data source, fixed cache issue

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-05-11 10:50:24 +02:00
parent ab6740c685
commit 4ce0bf4d16
4 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/datasources.go
View File

@ -149,8 +149,8 @@ func fillWithSecureJsonData(cmd *m.UpdateDataSourceCommand) error {
if err != nil {
return err
}
secureJsonData := ds.SecureJsonData.Decrypt()
secureJsonData := ds.SecureJsonData.Decrypt()
for k, v := range secureJsonData {
if _, ok := cmd.SecureJsonData[k]; !ok {
@ -158,6 +158,8 @@ func fillWithSecureJsonData(cmd *m.UpdateDataSourceCommand) error {
}
}
// set version from db
cmd.Version = ds.Version
return nil
}