Commit b6e69358 by bergquist

plugins: send secureJsonData unencrypted

parent 81bb3e1e
......@@ -28,12 +28,13 @@ func (tw *DatasourcePluginWrapper) Query(ctx context.Context, ds *models.DataSou
pbQuery := &datasource.DatasourceRequest{
Datasource: &datasource.DatasourceInfo{
JsonData: string(jsonData),
Name: ds.Name,
Type: ds.Type,
Url: ds.Url,
Id: ds.Id,
OrgId: ds.OrgId,
JsonData: string(jsonData),
DecryptedSecureJsonData: ds.SecureJsonData.Decrypt(),
},
TimeRange: &datasource.TimeRange{
FromRaw: query.TimeRange.From,
......
......@@ -483,10 +483,10 @@
"revisionTime": "2016-12-15T22:53:35Z"
},
{
"checksumSHA1": "EtBErX/rtSQmC2z8fgl6WFBCt+E=",
"checksumSHA1": "pJYGEIHFn2dy4vmu6nhaglsq6L0=",
"path": "github.com/grafana/grafana_plugin_model/go/datasource",
"revision": "50b475deb168a09c6b9be2658a230add915e913b",
"revisionTime": "2018-01-17T10:10:56Z"
"revision": "dfe5dc0a6ce05825ba7fe2d0323d92e631bffa89",
"revisionTime": "2018-01-18T10:12:58Z"
},
{
"checksumSHA1": "0OUXdKhaE6TzpHevY0VFlAA5YJ8=",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment