From b6e69358219dd18e27ab205b8d65f2ded7e378b6 Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 18 Jan 2018 11:22:44 +0100 Subject: [PATCH] plugins: send secureJsonData unencrypted --- .../wrapper/datasource_plugin_wrapper.go | 3 +- .../go/datasource/datasource.pb.go | 126 +++++++++--------- vendor/vendor.json | 6 +- 3 files changed, 69 insertions(+), 66 deletions(-) diff --git a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go index 5e7076ec0a6..490fa0f573a 100644 --- a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go +++ b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go @@ -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, diff --git a/vendor/github.com/grafana/grafana_plugin_model/go/datasource/datasource.pb.go b/vendor/github.com/grafana/grafana_plugin_model/go/datasource/datasource.pb.go index 6a317beacf0..35e1c4dee26 100644 --- a/vendor/github.com/grafana/grafana_plugin_model/go/datasource/datasource.pb.go +++ b/vendor/github.com/grafana/grafana_plugin_model/go/datasource/datasource.pb.go @@ -371,13 +371,13 @@ func (m *RowValue) GetBytesValue() []byte { } type DatasourceInfo struct { - Id int64 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"` - OrgId int64 `protobuf:"varint,2,opt,name=orgId" json:"orgId,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"` - Type string `protobuf:"bytes,4,opt,name=type" json:"type,omitempty"` - Url string `protobuf:"bytes,5,opt,name=url" json:"url,omitempty"` - JsonData string `protobuf:"bytes,6,opt,name=jsonData" json:"jsonData,omitempty"` - SecureJsonData string `protobuf:"bytes,7,opt,name=secureJsonData" json:"secureJsonData,omitempty"` + Id int64 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"` + OrgId int64 `protobuf:"varint,2,opt,name=orgId" json:"orgId,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"` + Type string `protobuf:"bytes,4,opt,name=type" json:"type,omitempty"` + Url string `protobuf:"bytes,5,opt,name=url" json:"url,omitempty"` + JsonData string `protobuf:"bytes,6,opt,name=jsonData" json:"jsonData,omitempty"` + DecryptedSecureJsonData map[string]string `protobuf:"bytes,7,rep,name=decryptedSecureJsonData" json:"decryptedSecureJsonData,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` } func (m *DatasourceInfo) Reset() { *m = DatasourceInfo{} } @@ -427,11 +427,11 @@ func (m *DatasourceInfo) GetJsonData() string { return "" } -func (m *DatasourceInfo) GetSecureJsonData() string { +func (m *DatasourceInfo) GetDecryptedSecureJsonData() map[string]string { if m != nil { - return m.SecureJsonData + return m.DecryptedSecureJsonData } - return "" + return nil } type TimeSeries struct { @@ -581,56 +581,58 @@ var _DatasourcePlugin_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("datasource.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 808 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x55, 0x5b, 0x6f, 0xf3, 0x44, - 0x10, 0xc5, 0x97, 0x5c, 0x3c, 0xf9, 0x1a, 0xdc, 0xe5, 0xa2, 0x10, 0x55, 0x28, 0x58, 0x05, 0x02, - 0x12, 0x01, 0x85, 0xaa, 0x20, 0x90, 0x78, 0x48, 0x1b, 0xa1, 0x94, 0xd0, 0x96, 0x6d, 0x8a, 0x54, - 0x84, 0x84, 0x9c, 0x64, 0x13, 0x4c, 0x6d, 0x6f, 0xba, 0xbb, 0x6e, 0x88, 0x78, 0xe2, 0xc7, 0x20, - 0xf1, 0x8c, 0x78, 0xe7, 0xaf, 0xa1, 0x1d, 0x5f, 0xd3, 0xf6, 0x6d, 0xe7, 0x9c, 0x33, 0x97, 0x9d, - 0x1d, 0x8f, 0xc1, 0x5d, 0xfa, 0xca, 0x97, 0x3c, 0x11, 0x0b, 0x36, 0xd8, 0x08, 0xae, 0x38, 0xa9, - 0x47, 0x7c, 0xc9, 0x42, 0xe9, 0xfd, 0x65, 0xc0, 0xe1, 0x79, 0x41, 0x52, 0xf6, 0x90, 0x30, 0xa9, - 0xc8, 0xa7, 0xe0, 0xa8, 0x20, 0x62, 0xd4, 0x8f, 0xd7, 0xac, 0x63, 0xf4, 0x8c, 0x7e, 0x6b, 0x78, - 0x38, 0x48, 0x3d, 0x06, 0xb3, 0x9c, 0xa0, 0xa5, 0x86, 0x9c, 0x02, 0x94, 0x29, 0x3a, 0x26, 0x7a, - 0xbc, 0x9d, 0x7b, 0x94, 0xf1, 0x27, 0xf1, 0x8a, 0xd3, 0x8a, 0x92, 0x7c, 0x08, 0x8d, 0x87, 0x84, - 0x89, 0x80, 0xc9, 0x8e, 0xd5, 0xb3, 0xfa, 0xad, 0xe1, 0x41, 0xee, 0xf4, 0x43, 0xc2, 0xc4, 0x8e, - 0xe6, 0xac, 0xf7, 0xa7, 0x01, 0x35, 0x84, 0xc8, 0x9b, 0x50, 0x13, 0x6c, 0x35, 0x59, 0x62, 0x5d, - 0x0e, 0x4d, 0x0d, 0x72, 0x0c, 0x07, 0x91, 0xff, 0xbb, 0xce, 0x74, 0xcd, 0x83, 0x58, 0x49, 0xac, - 0xc1, 0xa2, 0xfb, 0x20, 0x79, 0x17, 0x20, 0x88, 0x15, 0x13, 0x8f, 0x7e, 0xf8, 0xbd, 0xce, 0xa8, - 0x25, 0x15, 0x84, 0x1c, 0x81, 0x83, 0xe9, 0x2f, 0x24, 0x8f, 0x3b, 0x36, 0xc6, 0x2f, 0x01, 0xef, - 0x0f, 0x70, 0x8a, 0xcb, 0x93, 0x0e, 0x34, 0x56, 0x82, 0x47, 0xd4, 0xdf, 0x66, 0x85, 0xe4, 0xa6, - 0x2e, 0x50, 0x71, 0x8d, 0x9b, 0x69, 0x81, 0x68, 0x90, 0x1e, 0xb4, 0xb4, 0x60, 0xbc, 0xe1, 0x8b, - 0x5f, 0x8b, 0xdc, 0x55, 0x48, 0x27, 0x57, 0x3c, 0xe7, 0x6d, 0xe4, 0x4b, 0xc0, 0x3b, 0x03, 0x52, - 0x7d, 0x27, 0xb9, 0xe1, 0xb1, 0x64, 0xe4, 0x13, 0x68, 0x08, 0x26, 0x93, 0x50, 0xc9, 0x8e, 0x81, - 0xfd, 0x7b, 0x63, 0xbf, 0x7f, 0xc8, 0xd1, 0x5c, 0xe3, 0xfd, 0x6d, 0x40, 0xab, 0x42, 0xe8, 0x52, - 0x99, 0x10, 0x5c, 0xe4, 0xbd, 0x44, 0xa3, 0xec, 0xb0, 0x59, 0xed, 0x70, 0x17, 0x9a, 0x11, 0x53, - 0x3e, 0xb6, 0xc6, 0x42, 0xa2, 0xb0, 0xc9, 0xc7, 0x50, 0x97, 0xe9, 0x2b, 0xda, 0x58, 0x05, 0xa9, - 0x0e, 0xcb, 0x0d, 0x32, 0x34, 0x53, 0x90, 0xf7, 0xa1, 0xae, 0xfc, 0x79, 0xc8, 0x64, 0xa7, 0xb6, - 0xff, 0xe2, 0x33, 0x8d, 0xd2, 0x8c, 0xf4, 0x7e, 0x86, 0x1a, 0x02, 0xfa, 0x8a, 0x0b, 0x1e, 0x26, - 0x51, 0xfc, 0xec, 0x8a, 0xc8, 0x9f, 0x21, 0x47, 0x73, 0x0d, 0x39, 0x06, 0x5b, 0xf0, 0xad, 0x7e, - 0x7f, 0xad, 0x75, 0xf7, 0x83, 0xf3, 0x2d, 0x45, 0xd6, 0x7b, 0x0f, 0x5a, 0x15, 0x6f, 0x42, 0xc0, - 0x8e, 0xfd, 0x88, 0x65, 0x6d, 0xc0, 0xb3, 0x77, 0x02, 0xcd, 0xdc, 0x89, 0xf4, 0xa1, 0xfe, 0xe8, - 0x87, 0x09, 0xcb, 0x4b, 0x28, 0xc2, 0x52, 0xbe, 0xfd, 0x51, 0x13, 0x34, 0xe3, 0xbd, 0xff, 0x4c, - 0x68, 0xe6, 0x20, 0xf9, 0x08, 0xec, 0xfb, 0x20, 0x4e, 0x27, 0xb5, 0x3d, 0x7c, 0xeb, 0xa9, 0xd3, - 0xe0, 0xbb, 0x20, 0x5e, 0x52, 0x94, 0xe8, 0xf1, 0x58, 0xf2, 0x64, 0x1e, 0x32, 0x64, 0xb0, 0xf3, - 0x06, 0xad, 0x42, 0xd9, 0xec, 0x9e, 0x9e, 0xa4, 0x82, 0x72, 0x76, 0x33, 0x44, 0x8f, 0xcf, 0x9c, - 0xf3, 0x30, 0xa5, 0xf5, 0xf8, 0x34, 0x69, 0x09, 0xe8, 0xf8, 0x52, 0x89, 0x20, 0x5e, 0xa7, 0x7c, - 0x0d, 0x2f, 0x5a, 0x85, 0x74, 0xfc, 0xf9, 0x4e, 0x31, 0x99, 0x0a, 0xea, 0x3d, 0xa3, 0xff, 0x8a, - 0x56, 0x10, 0x6f, 0x05, 0xb6, 0xae, 0x97, 0x1c, 0x80, 0x33, 0xbb, 0xbb, 0x1e, 0xff, 0x72, 0x79, - 0x3b, 0x9d, 0xba, 0xaf, 0x91, 0xd7, 0xa1, 0x85, 0xe6, 0xf9, 0xd5, 0xed, 0x68, 0x3a, 0x76, 0x0d, - 0xd2, 0x06, 0x40, 0x60, 0x72, 0x39, 0x3b, 0x3d, 0x71, 0xcd, 0x42, 0x3f, 0xba, 0xba, 0x9a, 0xba, - 0x56, 0xa1, 0xbf, 0x99, 0xd1, 0xc9, 0xe5, 0xb7, 0xae, 0x5d, 0xe8, 0x47, 0x77, 0xb3, 0xf1, 0x8d, - 0x5b, 0xf3, 0xfe, 0x35, 0xa0, 0xbd, 0xbf, 0x31, 0x48, 0x1b, 0xcc, 0x20, 0xed, 0xa2, 0x45, 0xcd, - 0x60, 0xa9, 0x07, 0x94, 0x8b, 0x75, 0x36, 0xa0, 0x16, 0x4d, 0x8d, 0xe2, 0x11, 0xad, 0xf2, 0x11, - 0x35, 0xa6, 0x76, 0x1b, 0x96, 0x7d, 0xcb, 0x78, 0x26, 0x2e, 0x58, 0x89, 0x08, 0xb3, 0x16, 0xe8, - 0xa3, 0x1e, 0xed, 0xdf, 0x24, 0x8f, 0x75, 0x56, 0xbc, 0xb8, 0x43, 0x0b, 0x9b, 0x7c, 0x00, 0x6d, - 0xc9, 0x16, 0x89, 0x60, 0x17, 0xb9, 0xa2, 0x81, 0x8a, 0x27, 0xa8, 0xf7, 0x8f, 0x01, 0x50, 0x4e, - 0xfb, 0x4b, 0x13, 0x45, 0x3e, 0x03, 0x5b, 0xf9, 0xeb, 0x7c, 0x34, 0x8f, 0x9e, 0x7f, 0x23, 0x83, - 0x99, 0xbf, 0x96, 0xe3, 0x58, 0x89, 0x1d, 0x45, 0xa5, 0xfe, 0x56, 0x36, 0xe9, 0x3a, 0x7b, 0xb2, - 0x1d, 0x71, 0x9f, 0xd1, 0x8c, 0xec, 0x7e, 0x01, 0x4e, 0xe1, 0xa9, 0xaf, 0x77, 0xcf, 0x76, 0x59, - 0x62, 0x7d, 0xd4, 0xed, 0x7a, 0x2c, 0xa6, 0xca, 0xa1, 0xa9, 0xf1, 0x95, 0xf9, 0xa5, 0xe1, 0x7d, - 0x0d, 0x35, 0x8c, 0x84, 0xbb, 0x27, 0x88, 0x98, 0x54, 0x7e, 0xb4, 0xc9, 0x1a, 0x5d, 0x02, 0xfb, - 0x01, 0x8c, 0x2c, 0xc0, 0x90, 0x82, 0x5b, 0xbe, 0xd3, 0x75, 0x98, 0xac, 0x83, 0x98, 0x7c, 0x93, - 0x6f, 0xe9, 0x77, 0x9e, 0x2f, 0xff, 0xec, 0xe7, 0xd2, 0xed, 0xbe, 0x44, 0xa5, 0xfb, 0x6c, 0xf4, - 0xea, 0xa7, 0xca, 0xdf, 0x61, 0x5e, 0xc7, 0x7f, 0xd5, 0xe7, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, - 0x66, 0x11, 0x2d, 0x5a, 0xbf, 0x06, 0x00, 0x00, + // 841 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xdb, 0x8e, 0x23, 0x35, + 0x10, 0xa5, 0x2f, 0xc9, 0xa4, 0x2b, 0x3b, 0xa1, 0xd7, 0xdc, 0x42, 0x34, 0x42, 0xa1, 0xb5, 0x88, + 0x80, 0x44, 0x40, 0xd9, 0xd1, 0x80, 0x40, 0xe2, 0x21, 0x3b, 0x11, 0xca, 0x10, 0x66, 0x06, 0x27, + 0x8b, 0xb4, 0x08, 0x09, 0x75, 0xd2, 0x4e, 0x68, 0xb6, 0xbb, 0x9d, 0xb5, 0xdd, 0x13, 0x22, 0x9e, + 0xf8, 0x18, 0x24, 0x9e, 0xf9, 0x01, 0x1e, 0xf9, 0x2d, 0xe4, 0xea, 0x6b, 0x76, 0x02, 0x12, 0x6f, + 0xae, 0x73, 0x4e, 0x95, 0xcb, 0x55, 0x65, 0x1b, 0xdc, 0xc0, 0x57, 0xbe, 0xe4, 0xa9, 0x58, 0xb1, + 0xe1, 0x56, 0x70, 0xc5, 0x49, 0x33, 0xe6, 0x01, 0x8b, 0xa4, 0xf7, 0xbb, 0x01, 0x0f, 0x2f, 0x4b, + 0x92, 0xb2, 0x17, 0x29, 0x93, 0x8a, 0x7c, 0x0c, 0x8e, 0x0a, 0x63, 0x46, 0xfd, 0x64, 0xc3, 0xba, + 0x46, 0xdf, 0x18, 0xb4, 0x47, 0x0f, 0x87, 0x99, 0xc7, 0x70, 0x51, 0x10, 0xb4, 0xd2, 0x90, 0x0b, + 0x80, 0x6a, 0x8b, 0xae, 0x89, 0x1e, 0x6f, 0x16, 0x1e, 0x55, 0xfc, 0x69, 0xb2, 0xe6, 0xb4, 0xa6, + 0x24, 0xef, 0xc3, 0xc9, 0x8b, 0x94, 0x89, 0x90, 0xc9, 0xae, 0xd5, 0xb7, 0x06, 0xed, 0xd1, 0x69, + 0xe1, 0xf4, 0x6d, 0xca, 0xc4, 0x9e, 0x16, 0xac, 0xf7, 0x9b, 0x01, 0x0d, 0x84, 0xc8, 0xeb, 0xd0, + 0x10, 0x6c, 0x3d, 0x0d, 0x30, 0x2f, 0x87, 0x66, 0x06, 0x79, 0x04, 0xa7, 0xb1, 0xff, 0x8b, 0xde, + 0xe9, 0x96, 0x87, 0x89, 0x92, 0x98, 0x83, 0x45, 0x0f, 0x41, 0xf2, 0x0e, 0x40, 0x98, 0x28, 0x26, + 0xee, 0xfc, 0xe8, 0x1b, 0xbd, 0xa3, 0x96, 0xd4, 0x10, 0x72, 0x06, 0x0e, 0x6e, 0x7f, 0x25, 0x79, + 0xd2, 0xb5, 0x31, 0x7e, 0x05, 0x78, 0xbf, 0x82, 0x53, 0x1e, 0x9e, 0x74, 0xe1, 0x64, 0x2d, 0x78, + 0x4c, 0xfd, 0x5d, 0x9e, 0x48, 0x61, 0xea, 0x04, 0x15, 0xd7, 0xb8, 0x99, 0x25, 0x88, 0x06, 0xe9, + 0x43, 0x5b, 0x0b, 0x26, 0x5b, 0xbe, 0xfa, 0xa9, 0xdc, 0xbb, 0x0e, 0xe9, 0xcd, 0x15, 0x2f, 0x78, + 0x1b, 0xf9, 0x0a, 0xf0, 0x9e, 0x00, 0xa9, 0xf7, 0x49, 0x6e, 0x79, 0x22, 0x19, 0xf9, 0x08, 0x4e, + 0x04, 0x93, 0x69, 0xa4, 0x64, 0xd7, 0xc0, 0xfa, 0xbd, 0x76, 0x58, 0x3f, 0xe4, 0x68, 0xa1, 0xf1, + 0xfe, 0x30, 0xa0, 0x5d, 0x23, 0x74, 0xaa, 0x4c, 0x08, 0x2e, 0x8a, 0x5a, 0xa2, 0x51, 0x55, 0xd8, + 0xac, 0x57, 0xb8, 0x07, 0xad, 0x98, 0x29, 0x1f, 0x4b, 0x63, 0x21, 0x51, 0xda, 0xe4, 0x43, 0x68, + 0xca, 0xac, 0x8b, 0x36, 0x66, 0x41, 0xea, 0xc3, 0x32, 0x47, 0x86, 0xe6, 0x0a, 0xf2, 0x1e, 0x34, + 0x95, 0xbf, 0x8c, 0x98, 0xec, 0x36, 0x0e, 0x3b, 0xbe, 0xd0, 0x28, 0xcd, 0x49, 0xef, 0x07, 0x68, + 0x20, 0xa0, 0x8f, 0xb8, 0xe2, 0x51, 0x1a, 0x27, 0xf7, 0x8e, 0x88, 0xfc, 0x13, 0xe4, 0x68, 0xa1, + 0x21, 0x8f, 0xc0, 0x16, 0x7c, 0xa7, 0xfb, 0xaf, 0xb5, 0xee, 0x61, 0x70, 0xbe, 0xa3, 0xc8, 0x7a, + 0xef, 0x42, 0xbb, 0xe6, 0x4d, 0x08, 0xd8, 0x89, 0x1f, 0xb3, 0xbc, 0x0c, 0xb8, 0xf6, 0xce, 0xa1, + 0x55, 0x38, 0x91, 0x01, 0x34, 0xef, 0xfc, 0x28, 0x65, 0x45, 0x0a, 0x65, 0x58, 0xca, 0x77, 0xdf, + 0x69, 0x82, 0xe6, 0xbc, 0xf7, 0x97, 0x09, 0xad, 0x02, 0x24, 0x1f, 0x80, 0xfd, 0x3c, 0x4c, 0xb2, + 0x49, 0xed, 0x8c, 0xde, 0x78, 0xd9, 0x69, 0xf8, 0x75, 0x98, 0x04, 0x14, 0x25, 0x7a, 0x3c, 0x02, + 0x9e, 0x2e, 0x23, 0x86, 0x0c, 0x56, 0xde, 0xa0, 0x75, 0x28, 0x9f, 0xdd, 0x8b, 0xf3, 0x4c, 0x50, + 0xcd, 0x6e, 0x8e, 0xe8, 0xf1, 0x59, 0x72, 0x1e, 0x65, 0xb4, 0x1e, 0x9f, 0x16, 0xad, 0x00, 0x1d, + 0x5f, 0x2a, 0x11, 0x26, 0x9b, 0x8c, 0x6f, 0xe0, 0x41, 0xeb, 0x90, 0x8e, 0xbf, 0xdc, 0x2b, 0x26, + 0x33, 0x41, 0xb3, 0x6f, 0x0c, 0x1e, 0xd0, 0x1a, 0xe2, 0xad, 0xc1, 0xd6, 0xf9, 0x92, 0x53, 0x70, + 0x16, 0xcf, 0x6e, 0x27, 0x3f, 0x5e, 0x3f, 0x9d, 0xcd, 0xdc, 0x57, 0xc8, 0xab, 0xd0, 0x46, 0xf3, + 0xf2, 0xe6, 0xe9, 0x78, 0x36, 0x71, 0x0d, 0xd2, 0x01, 0x40, 0x60, 0x7a, 0xbd, 0xb8, 0x38, 0x77, + 0xcd, 0x52, 0x3f, 0xbe, 0xb9, 0x99, 0xb9, 0x56, 0xa9, 0x9f, 0x2f, 0xe8, 0xf4, 0xfa, 0x2b, 0xd7, + 0x2e, 0xf5, 0xe3, 0x67, 0x8b, 0xc9, 0xdc, 0x6d, 0x78, 0x7f, 0x9b, 0xd0, 0x39, 0x7c, 0x31, 0x48, + 0x07, 0xcc, 0x30, 0xab, 0xa2, 0x45, 0xcd, 0x30, 0xd0, 0x03, 0xca, 0xc5, 0x26, 0x1f, 0x50, 0x8b, + 0x66, 0x46, 0xd9, 0x44, 0xab, 0x6a, 0xa2, 0xc6, 0xd4, 0x7e, 0xcb, 0xf2, 0xbb, 0x8c, 0x6b, 0xe2, + 0x82, 0x95, 0x8a, 0x28, 0x2f, 0x81, 0x5e, 0xea, 0xd1, 0xfe, 0x59, 0xf2, 0x44, 0xef, 0x8a, 0x07, + 0x77, 0x68, 0x69, 0x93, 0x18, 0xde, 0x0a, 0xd8, 0x4a, 0xec, 0xb7, 0x8a, 0x05, 0x73, 0xb6, 0x4a, + 0x05, 0xbb, 0x2a, 0xa4, 0x27, 0x38, 0x0b, 0x8f, 0x8f, 0x3f, 0x73, 0xc3, 0xcb, 0xe3, 0x5e, 0x93, + 0x44, 0x89, 0x3d, 0xfd, 0xb7, 0x98, 0xbd, 0x2b, 0x38, 0xfb, 0x2f, 0x47, 0x9d, 0xfc, 0x73, 0xb6, + 0xcf, 0x07, 0x55, 0x2f, 0x75, 0x31, 0xee, 0xca, 0x99, 0x71, 0x68, 0x66, 0x7c, 0x6e, 0x7e, 0x66, + 0x78, 0x7f, 0x1a, 0x00, 0xd5, 0x05, 0x3c, 0x36, 0xe4, 0xe4, 0x13, 0xb0, 0x95, 0xbf, 0x29, 0x6e, + 0xcb, 0xd9, 0xfd, 0x6b, 0x3b, 0x5c, 0xf8, 0x1b, 0x99, 0xe5, 0x8c, 0x4a, 0x7d, 0x7d, 0xb7, 0xd9, + 0x0b, 0xfb, 0xd2, 0x83, 0x8d, 0x4f, 0x2c, 0xcd, 0xc9, 0xde, 0xa7, 0xe0, 0x94, 0x9e, 0xff, 0x2b, + 0xe9, 0x2f, 0xa0, 0x81, 0x91, 0xf0, 0x39, 0x0c, 0x63, 0x26, 0x95, 0x1f, 0x6f, 0xf3, 0xde, 0x57, + 0xc0, 0x61, 0x00, 0x23, 0x0f, 0x30, 0xa2, 0xe0, 0x56, 0x5d, 0xb8, 0x8d, 0xd2, 0x4d, 0x98, 0x90, + 0x2f, 0x8b, 0x8f, 0xe3, 0xed, 0xfb, 0x8d, 0xca, 0xff, 0xbb, 0x5e, 0xef, 0x18, 0x95, 0x3d, 0xb1, + 0xe3, 0x07, 0xdf, 0xd7, 0x3e, 0xac, 0x65, 0x13, 0xbf, 0xcf, 0xc7, 0xff, 0x04, 0x00, 0x00, 0xff, + 0xff, 0xab, 0xf8, 0xda, 0x77, 0x52, 0x07, 0x00, 0x00, } diff --git a/vendor/vendor.json b/vendor/vendor.json index 4c9110fcf04..30a0ed98a90 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -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=",