From 2c0478a6f4f0e5a9e9019d30012016d8a6cbdab8 Mon Sep 17 00:00:00 2001 From: Rashmi Gottipati Date: Mon, 10 Jul 2017 12:15:27 -0700 Subject: [PATCH] Communicate taskID to streaming plugins --- control/available_plugin.go | 2 +- control/control_grpc_server_test.go | 2 +- control/control_security_test.go | 2 +- control/plugin/client/client.go | 2 +- control/plugin/client/grpc.go | 32 +- control/plugin/rpc/plugin.pb.go | 538 +++++++++++++++++++++------- glide.lock | 52 ++- glide.yaml | 3 +- grpc/common/common.pb.go | 122 ++++++- grpc/controlproxy/controlproxy.go | 5 +- grpc/controlproxy/rpc/control.pb.go | 91 ++++- pkg/rpcutil/rpc.go | 10 +- pkg/rpcutil/rpc_medium_test.go | 3 +- 13 files changed, 685 insertions(+), 179 deletions(-) diff --git a/control/available_plugin.go b/control/available_plugin.go index 0dbae0224..fed7333cc 100644 --- a/control/available_plugin.go +++ b/control/available_plugin.go @@ -531,7 +531,7 @@ func (ap *availablePlugins) streamMetrics( return nil, nil, serror.New(errors.New("Invalid streaming client")) } - metricChan, errChan, err := cli.StreamMetrics(metricTypes) + metricChan, errChan, err := cli.StreamMetrics(taskID, metricTypes) if err != nil { return nil, nil, serror.New(err) } diff --git a/control/control_grpc_server_test.go b/control/control_grpc_server_test.go index 525c2ec15..e2b4d579d 100644 --- a/control/control_grpc_server_test.go +++ b/control/control_grpc_server_test.go @@ -132,7 +132,7 @@ func TestGRPCServerScheduler(t *testing.T) { } <-lpe.done - conn, err := rpcutil.GetClientConnection(c.Config.ListenAddr, c.Config.ListenPort) + conn, err := rpcutil.GetClientConnection(context.Background(), c.Config.ListenAddr, c.Config.ListenPort) Convey("Creating an rpc connection", t, func() { Convey("Should not error", func() { diff --git a/control/control_security_test.go b/control/control_security_test.go index b656edc44..826b83d81 100644 --- a/control/control_security_test.go +++ b/control/control_security_test.go @@ -242,7 +242,7 @@ func TestSecureStreamingCollector(t *testing.T) { mtsin := []core.Metric{} m := plugin.MetricType{Namespace_: core.NewNamespace(strings.Fields("a b integer")...)} mtsin = append(mtsin, m) - mch, errch, err := cli.StreamMetrics(mtsin) + mch, errch, err := cli.StreamMetrics("test-taskID", mtsin) So(err, ShouldBeNil) Convey("streaming should deliver metrics rather than error", func() { select { diff --git a/control/plugin/client/client.go b/control/plugin/client/client.go index 1514c4fe8..9cc1d2211 100644 --- a/control/plugin/client/client.go +++ b/control/plugin/client/client.go @@ -46,7 +46,7 @@ type PluginCollectorClient interface { type PluginStreamCollectorClient interface { PluginClient - StreamMetrics([]core.Metric) (chan []core.Metric, chan error, error) + StreamMetrics(string, []core.Metric) (chan []core.Metric, chan error, error) GetMetricTypes(plugin.ConfigType) ([]core.Metric, error) UpdateCollectedMetrics([]core.Metric) error UpdatePluginConfig([]byte) error diff --git a/control/plugin/client/grpc.go b/control/plugin/client/grpc.go index 4b3ed76c1..3586c3afa 100644 --- a/control/plugin/client/grpc.go +++ b/control/plugin/client/grpc.go @@ -45,6 +45,7 @@ import ( "github.com/intelsdi-x/snap/core/cdata" "github.com/intelsdi-x/snap/core/ctypes" "github.com/intelsdi-x/snap/pkg/rpcutil" + "google.golang.org/grpc/metadata" ) // SecureSide identifies security mode to apply in securing gRPC @@ -69,6 +70,7 @@ type grpcClient struct { processor rpc.ProcessorClient publisher rpc.PublisherClient plugin pluginClient + context context.Context // Channel used to signal death of stream collector to scheduler killChan chan struct{} @@ -123,7 +125,8 @@ func SecurityTLSOff() GRPCSecurity { // NewCollectorGrpcClient returns a collector gRPC Client. func NewCollectorGrpcClient(address string, timeout time.Duration, security GRPCSecurity) (PluginCollectorClient, error) { - p, err := newPluginGrpcClient(address, timeout, security, plugin.CollectorPluginType) + ctx := context.Background() + p, err := newPluginGrpcClient(ctx, address, timeout, security, plugin.CollectorPluginType) if err != nil { return nil, err } @@ -132,7 +135,8 @@ func NewCollectorGrpcClient(address string, timeout time.Duration, security GRPC // NewStreamCollectorGrpcClient returns a stream collector gRPC client func NewStreamCollectorGrpcClient(address string, timeout time.Duration, security GRPCSecurity) (PluginStreamCollectorClient, error) { - p, err := newPluginGrpcClient(address, timeout, security, plugin.StreamCollectorPluginType) + ctx := context.Background() + p, err := newPluginGrpcClient(ctx, address, timeout, security, plugin.StreamCollectorPluginType) if err != nil { return nil, err } @@ -141,7 +145,8 @@ func NewStreamCollectorGrpcClient(address string, timeout time.Duration, securit // NewProcessorGrpcClient returns a processor gRPC Client. func NewProcessorGrpcClient(address string, timeout time.Duration, security GRPCSecurity) (PluginProcessorClient, error) { - p, err := newPluginGrpcClient(address, timeout, security, plugin.ProcessorPluginType) + ctx := context.Background() + p, err := newPluginGrpcClient(ctx, address, timeout, security, plugin.ProcessorPluginType) if err != nil { return nil, err } @@ -150,7 +155,8 @@ func NewProcessorGrpcClient(address string, timeout time.Duration, security GRPC // NewPublisherGrpcClient returns a publisher gRPC Client. func NewPublisherGrpcClient(address string, timeout time.Duration, security GRPCSecurity) (PluginPublisherClient, error) { - p, err := newPluginGrpcClient(address, timeout, security, plugin.PublisherPluginType) + ctx := context.Background() + p, err := newPluginGrpcClient(ctx, address, timeout, security, plugin.PublisherPluginType) if err != nil { return nil, err } @@ -249,7 +255,7 @@ func buildCredentials(security GRPCSecurity) (creds credentials.TransportCredent } // newPluginGrpcClient returns a configured gRPC Client. -func newPluginGrpcClient(address string, timeout time.Duration, security GRPCSecurity, typ plugin.PluginType) (interface{}, error) { +func newPluginGrpcClient(ctx context.Context, address string, timeout time.Duration, security GRPCSecurity, typ plugin.PluginType) (interface{}, error) { address, port, err := parseAddress(address) if err != nil { return nil, err @@ -259,7 +265,7 @@ func newPluginGrpcClient(address string, timeout time.Duration, security GRPCSec if creds, err = buildCredentials(security); err != nil { return nil, err } - p, err = newGrpcClient(address, int(port), timeout, typ, creds) + p, err = newGrpcClient(ctx, address, int(port), timeout, typ, creds) if err != nil { return nil, err } @@ -279,15 +285,16 @@ func parseAddress(address string) (string, int64, error) { return address, port, nil } -func newGrpcClient(addr string, port int, timeout time.Duration, typ plugin.PluginType, creds credentials.TransportCredentials) (*grpcClient, error) { +func newGrpcClient(ctx context.Context, addr string, port int, timeout time.Duration, typ plugin.PluginType, creds credentials.TransportCredentials) (*grpcClient, error) { var conn *grpc.ClientConn var err error - if conn, err = rpcutil.GetClientConnectionWithCreds(addr, port, creds); err != nil { + if conn, err = rpcutil.GetClientConnectionWithCreds(ctx, addr, port, creds); err != nil { return nil, err } p := &grpcClient{ timeout: timeout, conn: conn, + context: ctx, } switch typ { @@ -455,7 +462,7 @@ func (g *grpcClient) UpdateMetricsBuffer(maxMetricsBuffer int64) error { return nil } -func (g *grpcClient) StreamMetrics(mts []core.Metric) (chan []core.Metric, chan error, error) { +func (g *grpcClient) StreamMetrics(taskID string, mts []core.Metric) (chan []core.Metric, chan error, error) { arg := &rpc.CollectArg{ Metrics_Arg: &rpc.MetricsArg{Metrics: NewMetrics(mts)}, } @@ -514,7 +521,12 @@ func (g *grpcClient) StreamMetrics(mts []core.Metric) (chan []core.Metric, chan } } - s, err := g.streamCollector.StreamMetrics(context.Background()) + header := metadata.New(map[string]string{ + "task-id": taskID, + }) + ctx := metadata.NewContext(g.context, header) + + s, err := g.streamCollector.StreamMetrics(ctx) if err != nil { return nil, nil, err } diff --git a/control/plugin/rpc/plugin.pb.go b/control/plugin/rpc/plugin.pb.go index 025801c57..c0062f964 100644 --- a/control/plugin/rpc/plugin.pb.go +++ b/control/plugin/rpc/plugin.pb.go @@ -17,9 +17,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by protoc-gen-go. +// Code generated by protoc-gen-go. DO NOT EDIT. // source: github.com/intelsdi-x/snap/control/plugin/rpc/plugin.proto -// DO NOT EDIT! /* Package rpc is a generated protocol buffer package. @@ -76,14 +75,19 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package // Request that can be passed a stream collector type CollectArg struct { // Request these metrics to be collected on the plugins schedule - Metrics_Arg *MetricsArg `protobuf:"bytes,1,opt,name=Metrics_Arg,json=metricsArg" json:"Metrics_Arg,omitempty"` - // Set minimum collection duration --duration in ms - MaxCollectDuration int64 `protobuf:"varint,2,opt,name=MaxCollectDuration,json=maxCollectDuration" json:"MaxCollectDuration,omitempty"` - // Set max number of metrics to buffer before forcing send - // 0 means no forced send - MaxMetricsBuffer int64 `protobuf:"varint,3,opt,name=MaxMetricsBuffer,json=maxMetricsBuffer" json:"MaxMetricsBuffer,omitempty"` + Metrics_Arg *MetricsArg `protobuf:"bytes,1,opt,name=Metrics_Arg,json=MetricsArg" json:"Metrics_Arg,omitempty"` + // Set Maximum collection duration in ns. The events will be buffered + // until the max duration is reached and/or the maxMetric buffer amount is + // reached. 0 means the events will be sent immediately. + MaxCollectDuration int64 `protobuf:"varint,2,opt,name=MaxCollectDuration" json:"MaxCollectDuration,omitempty"` + // Set max number of metrics to buffer before forcing sending. Events + // are sent as soon as MaxMetricsBuffer is reached or MaxCollectDuration + // is exceeded, whichever happens first. If MaxMetricsBuffer is 0 metrics + // will be sent immediately. If MaxCollectDuration is set to 0 then + // maxMetricsBuffer will not be used as metrics will be sent immediately. + MaxMetricsBuffer int64 `protobuf:"varint,3,opt,name=MaxMetricsBuffer" json:"MaxMetricsBuffer,omitempty"` // Blob of domain specific info - Other []byte `protobuf:"bytes,4,opt,name=Other,json=other,proto3" json:"Other,omitempty"` + Other []byte `protobuf:"bytes,4,opt,name=Other,proto3" json:"Other,omitempty"` } func (m *CollectArg) Reset() { *m = CollectArg{} } @@ -98,11 +102,32 @@ func (m *CollectArg) GetMetrics_Arg() *MetricsArg { return nil } +func (m *CollectArg) GetMaxCollectDuration() int64 { + if m != nil { + return m.MaxCollectDuration + } + return 0 +} + +func (m *CollectArg) GetMaxMetricsBuffer() int64 { + if m != nil { + return m.MaxMetricsBuffer + } + return 0 +} + +func (m *CollectArg) GetOther() []byte { + if m != nil { + return m.Other + } + return nil +} + // Replies that can be sent from a stream collector type CollectReply struct { // Reply with metrics - Metrics_Reply *MetricsReply `protobuf:"bytes,1,opt,name=Metrics_Reply,json=metricsReply" json:"Metrics_Reply,omitempty"` - Error *ErrReply `protobuf:"bytes,2,opt,name=Error,json=error" json:"Error,omitempty"` + Metrics_Reply *MetricsReply `protobuf:"bytes,1,opt,name=Metrics_Reply,json=MetricsReply" json:"Metrics_Reply,omitempty"` + Error *ErrReply `protobuf:"bytes,2,opt,name=Error" json:"Error,omitempty"` } func (m *CollectReply) Reset() { *m = CollectReply{} } @@ -141,6 +166,13 @@ func (m *ErrReply) String() string { return proto.CompactTextString(m func (*ErrReply) ProtoMessage() {} func (*ErrReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } +func (m *ErrReply) GetError() string { + if m != nil { + return m.Error + } + return "" +} + type Time struct { Sec int64 `protobuf:"varint,1,opt,name=sec" json:"sec,omitempty"` Nsec int64 `protobuf:"varint,2,opt,name=nsec" json:"nsec,omitempty"` @@ -151,10 +183,24 @@ func (m *Time) String() string { return proto.CompactTextString(m) } func (*Time) ProtoMessage() {} func (*Time) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } +func (m *Time) GetSec() int64 { + if m != nil { + return m.Sec + } + return 0 +} + +func (m *Time) GetNsec() int64 { + if m != nil { + return m.Nsec + } + return 0 +} + type NamespaceElement struct { - Value string `protobuf:"bytes,1,opt,name=Value,json=value" json:"Value,omitempty"` - Description string `protobuf:"bytes,2,opt,name=Description,json=description" json:"Description,omitempty"` - Name string `protobuf:"bytes,3,opt,name=Name,json=name" json:"Name,omitempty"` + Value string `protobuf:"bytes,1,opt,name=Value" json:"Value,omitempty"` + Description string `protobuf:"bytes,2,opt,name=Description" json:"Description,omitempty"` + Name string `protobuf:"bytes,3,opt,name=Name" json:"Name,omitempty"` } func (m *NamespaceElement) Reset() { *m = NamespaceElement{} } @@ -162,9 +208,30 @@ func (m *NamespaceElement) String() string { return proto.CompactText func (*NamespaceElement) ProtoMessage() {} func (*NamespaceElement) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } +func (m *NamespaceElement) GetValue() string { + if m != nil { + return m.Value + } + return "" +} + +func (m *NamespaceElement) GetDescription() string { + if m != nil { + return m.Description + } + return "" +} + +func (m *NamespaceElement) GetName() string { + if m != nil { + return m.Name + } + return "" +} + type PubProcArg struct { - Metrics []*Metric `protobuf:"bytes,1,rep,name=Metrics,json=metrics" json:"Metrics,omitempty"` - Config *ConfigMap `protobuf:"bytes,2,opt,name=Config,json=config" json:"Config,omitempty"` + Metrics []*Metric `protobuf:"bytes,1,rep,name=Metrics" json:"Metrics,omitempty"` + Config *ConfigMap `protobuf:"bytes,2,opt,name=Config" json:"Config,omitempty"` } func (m *PubProcArg) Reset() { *m = PubProcArg{} } @@ -188,14 +255,14 @@ func (m *PubProcArg) GetConfig() *ConfigMap { // core.Metric type Metric struct { - Namespace []*NamespaceElement `protobuf:"bytes,1,rep,name=Namespace,json=namespace" json:"Namespace,omitempty"` - Version int64 `protobuf:"varint,2,opt,name=Version,json=version" json:"Version,omitempty"` - Config *ConfigMap `protobuf:"bytes,3,opt,name=Config,json=config" json:"Config,omitempty"` - LastAdvertisedTime *Time `protobuf:"bytes,4,opt,name=LastAdvertisedTime,json=lastAdvertisedTime" json:"LastAdvertisedTime,omitempty"` - Tags map[string]string `protobuf:"bytes,5,rep,name=Tags,json=tags" json:"Tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - Timestamp *Time `protobuf:"bytes,6,opt,name=Timestamp,json=timestamp" json:"Timestamp,omitempty"` - Unit string `protobuf:"bytes,7,opt,name=Unit,json=unit" json:"Unit,omitempty"` - Description string `protobuf:"bytes,8,opt,name=Description,json=description" json:"Description,omitempty"` + Namespace []*NamespaceElement `protobuf:"bytes,1,rep,name=Namespace" json:"Namespace,omitempty"` + Version int64 `protobuf:"varint,2,opt,name=Version" json:"Version,omitempty"` + Config *ConfigMap `protobuf:"bytes,3,opt,name=Config" json:"Config,omitempty"` + LastAdvertisedTime *Time `protobuf:"bytes,4,opt,name=LastAdvertisedTime" json:"LastAdvertisedTime,omitempty"` + Tags map[string]string `protobuf:"bytes,5,rep,name=Tags" json:"Tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Timestamp *Time `protobuf:"bytes,6,opt,name=Timestamp" json:"Timestamp,omitempty"` + Unit string `protobuf:"bytes,7,opt,name=Unit" json:"Unit,omitempty"` + Description string `protobuf:"bytes,8,opt,name=Description" json:"Description,omitempty"` // Types that are valid to be assigned to Data: // *Metric_StringData // *Metric_Float32Data @@ -270,6 +337,13 @@ func (m *Metric) GetNamespace() []*NamespaceElement { return nil } +func (m *Metric) GetVersion() int64 { + if m != nil { + return m.Version + } + return 0 +} + func (m *Metric) GetConfig() *ConfigMap { if m != nil { return m.Config @@ -298,6 +372,20 @@ func (m *Metric) GetTimestamp() *Time { return nil } +func (m *Metric) GetUnit() string { + if m != nil { + return m.Unit + } + return "" +} + +func (m *Metric) GetDescription() string { + if m != nil { + return m.Description + } + return "" +} + func (m *Metric) GetStringData() string { if x, ok := m.GetData().(*Metric_StringData); ok { return x.StringData @@ -530,11 +618,11 @@ func _Metric_OneofSizer(msg proto.Message) (n int) { } type ConfigMap struct { - IntMap map[string]int64 `protobuf:"bytes,1,rep,name=IntMap,json=intMap" json:"IntMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` - StringMap map[string]string `protobuf:"bytes,2,rep,name=StringMap,json=stringMap" json:"StringMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + IntMap map[string]int64 `protobuf:"bytes,1,rep,name=IntMap" json:"IntMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` + StringMap map[string]string `protobuf:"bytes,2,rep,name=StringMap" json:"StringMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // double is float64 - FloatMap map[string]float64 `protobuf:"bytes,3,rep,name=FloatMap,json=floatMap" json:"FloatMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"` - BoolMap map[string]bool `protobuf:"bytes,4,rep,name=BoolMap,json=boolMap" json:"BoolMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` + FloatMap map[string]float64 `protobuf:"bytes,3,rep,name=FloatMap" json:"FloatMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"` + BoolMap map[string]bool `protobuf:"bytes,4,rep,name=BoolMap" json:"BoolMap,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` } func (m *ConfigMap) Reset() { *m = ConfigMap{} } @@ -571,7 +659,7 @@ func (m *ConfigMap) GetBoolMap() map[string]bool { } type KillArg struct { - Reason string `protobuf:"bytes,1,opt,name=Reason,json=reason" json:"Reason,omitempty"` + Reason string `protobuf:"bytes,1,opt,name=Reason" json:"Reason,omitempty"` } func (m *KillArg) Reset() { *m = KillArg{} } @@ -579,6 +667,13 @@ func (m *KillArg) String() string { return proto.CompactTextString(m) func (*KillArg) ProtoMessage() {} func (*KillArg) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } +func (m *KillArg) GetReason() string { + if m != nil { + return m.Reason + } + return "" +} + type GetConfigPolicyReply struct { Error string `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` BoolPolicy map[string]*BoolPolicy `protobuf:"bytes,2,rep,name=bool_policy,json=boolPolicy" json:"bool_policy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` @@ -592,6 +687,13 @@ func (m *GetConfigPolicyReply) String() string { return proto.Compact func (*GetConfigPolicyReply) ProtoMessage() {} func (*GetConfigPolicyReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} } +func (m *GetConfigPolicyReply) GetError() string { + if m != nil { + return m.Error + } + return "" +} + func (m *GetConfigPolicyReply) GetBoolPolicy() map[string]*BoolPolicy { if m != nil { return m.BoolPolicy @@ -631,6 +733,27 @@ func (m *BoolRule) String() string { return proto.CompactTextString(m func (*BoolRule) ProtoMessage() {} func (*BoolRule) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } +func (m *BoolRule) GetRequired() bool { + if m != nil { + return m.Required + } + return false +} + +func (m *BoolRule) GetDefault() bool { + if m != nil { + return m.Default + } + return false +} + +func (m *BoolRule) GetHasDefault() bool { + if m != nil { + return m.HasDefault + } + return false +} + type BoolPolicy struct { Rules map[string]*BoolRule `protobuf:"bytes,1,rep,name=rules" json:"rules,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` Key []string `protobuf:"bytes,2,rep,name=key" json:"key,omitempty"` @@ -648,6 +771,13 @@ func (m *BoolPolicy) GetRules() map[string]*BoolRule { return nil } +func (m *BoolPolicy) GetKey() []string { + if m != nil { + return m.Key + } + return nil +} + type FloatRule struct { Required bool `protobuf:"varint,1,opt,name=required" json:"required,omitempty"` Minimum float64 `protobuf:"fixed64,2,opt,name=minimum" json:"minimum,omitempty"` @@ -663,6 +793,55 @@ func (m *FloatRule) String() string { return proto.CompactTextString( func (*FloatRule) ProtoMessage() {} func (*FloatRule) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} } +func (m *FloatRule) GetRequired() bool { + if m != nil { + return m.Required + } + return false +} + +func (m *FloatRule) GetMinimum() float64 { + if m != nil { + return m.Minimum + } + return 0 +} + +func (m *FloatRule) GetMaximum() float64 { + if m != nil { + return m.Maximum + } + return 0 +} + +func (m *FloatRule) GetDefault() float64 { + if m != nil { + return m.Default + } + return 0 +} + +func (m *FloatRule) GetHasDefault() bool { + if m != nil { + return m.HasDefault + } + return false +} + +func (m *FloatRule) GetHasMin() bool { + if m != nil { + return m.HasMin + } + return false +} + +func (m *FloatRule) GetHasMax() bool { + if m != nil { + return m.HasMax + } + return false +} + type FloatPolicy struct { Rules map[string]*FloatRule `protobuf:"bytes,1,rep,name=rules" json:"rules,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` Key []string `protobuf:"bytes,2,rep,name=key" json:"key,omitempty"` @@ -680,6 +859,13 @@ func (m *FloatPolicy) GetRules() map[string]*FloatRule { return nil } +func (m *FloatPolicy) GetKey() []string { + if m != nil { + return m.Key + } + return nil +} + type IntegerRule struct { Required bool `protobuf:"varint,1,opt,name=required" json:"required,omitempty"` Minimum int64 `protobuf:"varint,2,opt,name=minimum" json:"minimum,omitempty"` @@ -695,6 +881,55 @@ func (m *IntegerRule) String() string { return proto.CompactTextStrin func (*IntegerRule) ProtoMessage() {} func (*IntegerRule) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} } +func (m *IntegerRule) GetRequired() bool { + if m != nil { + return m.Required + } + return false +} + +func (m *IntegerRule) GetMinimum() int64 { + if m != nil { + return m.Minimum + } + return 0 +} + +func (m *IntegerRule) GetMaximum() int64 { + if m != nil { + return m.Maximum + } + return 0 +} + +func (m *IntegerRule) GetDefault() int64 { + if m != nil { + return m.Default + } + return 0 +} + +func (m *IntegerRule) GetHasDefault() bool { + if m != nil { + return m.HasDefault + } + return false +} + +func (m *IntegerRule) GetHasMin() bool { + if m != nil { + return m.HasMin + } + return false +} + +func (m *IntegerRule) GetHasMax() bool { + if m != nil { + return m.HasMax + } + return false +} + type IntegerPolicy struct { Rules map[string]*IntegerRule `protobuf:"bytes,1,rep,name=rules" json:"rules,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` Key []string `protobuf:"bytes,2,rep,name=key" json:"key,omitempty"` @@ -712,6 +947,13 @@ func (m *IntegerPolicy) GetRules() map[string]*IntegerRule { return nil } +func (m *IntegerPolicy) GetKey() []string { + if m != nil { + return m.Key + } + return nil +} + type StringRule struct { Required bool `protobuf:"varint,1,opt,name=required" json:"required,omitempty"` Default string `protobuf:"bytes,2,opt,name=default" json:"default,omitempty"` @@ -723,6 +965,27 @@ func (m *StringRule) String() string { return proto.CompactTextString func (*StringRule) ProtoMessage() {} func (*StringRule) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} } +func (m *StringRule) GetRequired() bool { + if m != nil { + return m.Required + } + return false +} + +func (m *StringRule) GetDefault() string { + if m != nil { + return m.Default + } + return "" +} + +func (m *StringRule) GetHasDefault() bool { + if m != nil { + return m.HasDefault + } + return false +} + type StringPolicy struct { Rules map[string]*StringRule `protobuf:"bytes,1,rep,name=rules" json:"rules,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` Key []string `protobuf:"bytes,2,rep,name=key" json:"key,omitempty"` @@ -740,6 +1003,13 @@ func (m *StringPolicy) GetRules() map[string]*StringRule { return nil } +func (m *StringPolicy) GetKey() []string { + if m != nil { + return m.Key + } + return nil +} + type MetricsArg struct { Metrics []*Metric `protobuf:"bytes,1,rep,name=metrics" json:"metrics,omitempty"` } @@ -773,6 +1043,13 @@ func (m *MetricsReply) GetMetrics() []*Metric { return nil } +func (m *MetricsReply) GetError() string { + if m != nil { + return m.Error + } + return "" +} + type GetMetricTypesArg struct { Config *ConfigMap `protobuf:"bytes,1,opt,name=config" json:"config,omitempty"` } @@ -820,7 +1097,7 @@ var _ grpc.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion3 +const _ = grpc.SupportPackageIsVersion4 // Client API for Collector service @@ -1015,7 +1292,7 @@ var _Collector_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: fileDescriptor0, + Metadata: "github.com/intelsdi-x/snap/control/plugin/rpc/plugin.proto", } // Client API for Processor service @@ -1178,7 +1455,7 @@ var _Processor_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: fileDescriptor0, + Metadata: "github.com/intelsdi-x/snap/control/plugin/rpc/plugin.proto", } // Client API for Publisher service @@ -1341,7 +1618,7 @@ var _Publisher_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: fileDescriptor0, + Metadata: "github.com/intelsdi-x/snap/control/plugin/rpc/plugin.proto", } // Client API for StreamCollector service @@ -1570,7 +1847,7 @@ var _StreamCollector_serviceDesc = grpc.ServiceDesc{ ClientStreams: true, }, }, - Metadata: fileDescriptor0, + Metadata: "github.com/intelsdi-x/snap/control/plugin/rpc/plugin.proto", } func init() { @@ -1578,101 +1855,100 @@ func init() { } var fileDescriptor0 = []byte{ - // 1532 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xdc, 0x58, 0x4b, 0x6f, 0xdb, 0xc6, - 0x16, 0x16, 0x4d, 0xbd, 0x78, 0x28, 0xf9, 0x31, 0xc8, 0xcd, 0xd5, 0x55, 0x12, 0x44, 0xa1, 0x6f, - 0x12, 0xe5, 0x71, 0xe5, 0x5c, 0x39, 0x75, 0x13, 0xa7, 0x5d, 0x38, 0xb1, 0x1b, 0x27, 0xa9, 0x53, - 0x83, 0x71, 0xb3, 0x29, 0xd0, 0x60, 0x24, 0x8f, 0x65, 0x22, 0x7c, 0x75, 0x48, 0x06, 0xf6, 0x5f, - 0xe8, 0xb6, 0xab, 0x02, 0x05, 0x0a, 0xf4, 0x17, 0x74, 0xdd, 0x55, 0x17, 0x5d, 0x14, 0xfd, 0x13, - 0xfd, 0x2b, 0xc5, 0x3c, 0x28, 0x0e, 0x29, 0x29, 0xb2, 0x17, 0x05, 0x82, 0xee, 0x78, 0x5e, 0x9f, - 0xce, 0xf9, 0xce, 0x99, 0x21, 0x8f, 0x60, 0x73, 0xe4, 0xc4, 0xc7, 0xc9, 0xa0, 0x37, 0x0c, 0xbc, - 0x35, 0xc7, 0x8f, 0x89, 0x1b, 0x1d, 0x3a, 0xff, 0x3b, 0x59, 0x8b, 0x7c, 0x1c, 0xae, 0x0d, 0x03, - 0x3f, 0xa6, 0x81, 0xbb, 0x16, 0xba, 0xc9, 0xc8, 0xf1, 0xd7, 0x68, 0x38, 0x94, 0x8f, 0xbd, 0x90, - 0x06, 0x71, 0x80, 0x74, 0x1a, 0x0e, 0xad, 0x9f, 0x35, 0x80, 0x27, 0x81, 0xeb, 0x92, 0x61, 0xbc, - 0x45, 0x47, 0xe8, 0x1e, 0x98, 0x7b, 0x24, 0xa6, 0xce, 0x30, 0x7a, 0xb3, 0x45, 0x47, 0x2d, 0xad, - 0xa3, 0x75, 0xcd, 0xfe, 0x52, 0x8f, 0x86, 0xc3, 0x9e, 0xd4, 0x6f, 0xd1, 0x91, 0x0d, 0xde, 0xf8, - 0x19, 0xf5, 0x00, 0xed, 0xe1, 0x13, 0x09, 0xb1, 0x9d, 0x50, 0x1c, 0x3b, 0x81, 0xdf, 0x5a, 0xe8, - 0x68, 0x5d, 0xdd, 0x46, 0xde, 0x84, 0x05, 0xdd, 0x86, 0xe5, 0x3d, 0x7c, 0x22, 0xc1, 0x1e, 0x27, - 0x47, 0x47, 0x84, 0xb6, 0x74, 0xee, 0xbd, 0xec, 0x15, 0xf4, 0xe8, 0x02, 0x54, 0xbe, 0x88, 0x8f, - 0x09, 0x6d, 0x95, 0x3b, 0x5a, 0xb7, 0x61, 0x57, 0x02, 0x26, 0x58, 0x6f, 0xa1, 0x21, 0x41, 0x6d, - 0x12, 0xba, 0xa7, 0x68, 0x03, 0x9a, 0x69, 0xce, 0x5c, 0x21, 0xb3, 0x5e, 0x51, 0xb3, 0xe6, 0x06, - 0xbb, 0xe1, 0x29, 0x12, 0x5a, 0x85, 0xca, 0x0e, 0xa5, 0x01, 0xe5, 0xc9, 0x9a, 0xfd, 0x26, 0xf7, - 0xdf, 0xa1, 0x54, 0xf8, 0x56, 0x08, 0xb3, 0x59, 0x35, 0xa8, 0xec, 0x78, 0x61, 0x7c, 0x6a, 0x75, - 0xa0, 0x9e, 0xda, 0x58, 0x5e, 0xdc, 0xca, 0x7f, 0xc9, 0x48, 0x5d, 0xef, 0x42, 0xf9, 0xc0, 0xf1, - 0x08, 0x5a, 0x06, 0x3d, 0x22, 0x43, 0x6e, 0xd3, 0x6d, 0xf6, 0x88, 0x10, 0x94, 0x7d, 0xa6, 0x12, - 0xac, 0xf0, 0x67, 0xeb, 0x6b, 0x58, 0x7e, 0x89, 0x3d, 0x12, 0x85, 0x78, 0x48, 0x76, 0x5c, 0xe2, - 0x11, 0x3f, 0x66, 0xb8, 0xaf, 0xb1, 0x9b, 0x90, 0x14, 0xf7, 0x1d, 0x13, 0x50, 0x07, 0xcc, 0x6d, - 0x12, 0x0d, 0xa9, 0x13, 0x8e, 0xa9, 0x35, 0x6c, 0xf3, 0x30, 0x53, 0x31, 0x7c, 0x86, 0xc5, 0x79, - 0x34, 0xec, 0xb2, 0x8f, 0x3d, 0x62, 0x7d, 0x05, 0xb0, 0x9f, 0x0c, 0xf6, 0x69, 0x30, 0x64, 0x5d, - 0xba, 0x0e, 0x35, 0xc9, 0x44, 0x4b, 0xeb, 0xe8, 0x5d, 0xb3, 0x6f, 0x2a, 0xec, 0xd8, 0x35, 0xc9, - 0x0b, 0xba, 0x01, 0xd5, 0x27, 0x81, 0x7f, 0xe4, 0x8c, 0x24, 0x27, 0x8b, 0xdc, 0x4b, 0xa8, 0xf6, - 0x70, 0x68, 0x57, 0x87, 0xfc, 0xd1, 0xfa, 0xa5, 0x02, 0x55, 0x11, 0x8b, 0xd6, 0xc1, 0x18, 0xd7, - 0x21, 0xb1, 0xff, 0xc5, 0xa3, 0x8a, 0xd5, 0xd9, 0x86, 0x9f, 0x6a, 0x50, 0x0b, 0x6a, 0xaf, 0x09, - 0x8d, 0xb2, 0x49, 0xa9, 0xbd, 0x13, 0xa2, 0x92, 0x81, 0xfe, 0xbe, 0x0c, 0xd0, 0x43, 0x40, 0x9f, - 0xe3, 0x28, 0xde, 0x3a, 0x7c, 0x47, 0x68, 0xec, 0x44, 0xe4, 0x90, 0x51, 0xcf, 0xe7, 0xc4, 0xec, - 0x1b, 0x3c, 0x86, 0x29, 0x6c, 0xe4, 0x4e, 0x38, 0xa1, 0x5b, 0x50, 0x3e, 0xc0, 0xa3, 0xa8, 0x55, - 0x51, 0x92, 0x15, 0xc5, 0xf4, 0x98, 0x7e, 0xc7, 0x8f, 0xe9, 0xa9, 0x5d, 0x8e, 0xf1, 0x28, 0x42, - 0x37, 0xc1, 0x60, 0x21, 0x51, 0x8c, 0xbd, 0xb0, 0x55, 0x2d, 0x82, 0x1b, 0x71, 0x6a, 0x63, 0x1d, - 0xf8, 0xd2, 0x77, 0xe2, 0x56, 0x4d, 0x74, 0x20, 0xf1, 0x9d, 0xb8, 0xd8, 0xb7, 0xfa, 0x64, 0xdf, - 0xae, 0x81, 0x19, 0xc5, 0xd4, 0xf1, 0x47, 0x6f, 0x0e, 0x71, 0x8c, 0x5b, 0x06, 0xf3, 0xd8, 0x2d, - 0xd9, 0x20, 0x94, 0xdb, 0x38, 0xc6, 0x68, 0x15, 0x1a, 0x47, 0x6e, 0x80, 0xe3, 0xf5, 0xbe, 0xf0, - 0x81, 0x8e, 0xd6, 0x5d, 0xd8, 0x2d, 0xd9, 0xa6, 0xd4, 0xe6, 0x9c, 0x36, 0xee, 0x0b, 0x27, 0xb3, - 0xa3, 0x75, 0xb5, 0xb1, 0xd3, 0xc6, 0x7d, 0xee, 0x74, 0x15, 0xc0, 0xf1, 0xc7, 0x38, 0x8d, 0x8e, - 0xd6, 0xad, 0xec, 0x96, 0x6c, 0x83, 0xeb, 0x14, 0x87, 0x14, 0xa3, 0xc9, 0xfa, 0x22, 0x1d, 0x32, - 0x84, 0xc1, 0x69, 0x4c, 0x22, 0xe1, 0xb0, 0xc8, 0xce, 0x24, 0x73, 0xe0, 0x3a, 0xee, 0x70, 0x05, - 0x8c, 0x41, 0x10, 0xb8, 0xc2, 0xbe, 0xd4, 0xd1, 0xba, 0xf5, 0xdd, 0x92, 0x5d, 0x67, 0x2a, 0x6e, - 0xbe, 0x06, 0x66, 0xa2, 0xa4, 0xb0, 0xdc, 0xd1, 0xba, 0x4d, 0x56, 0x6e, 0x92, 0xe5, 0x20, 0x5d, - 0xd2, 0x24, 0x56, 0x3a, 0x5a, 0xb7, 0x9c, 0xba, 0x88, 0x2c, 0xda, 0x1f, 0x83, 0x31, 0x6e, 0x13, - 0x3b, 0x6b, 0x6f, 0xc9, 0xa9, 0x3c, 0x2f, 0xec, 0x91, 0x9d, 0x21, 0x7e, 0x6c, 0xe4, 0x39, 0x11, - 0xc2, 0xe6, 0xc2, 0x03, 0xed, 0x71, 0x15, 0xca, 0x0c, 0xd4, 0xfa, 0x53, 0x07, 0x63, 0x3c, 0x50, - 0xa8, 0x0f, 0xd5, 0x67, 0x7e, 0xbc, 0x87, 0x43, 0x39, 0xbc, 0xed, 0xfc, 0xc0, 0xf5, 0x84, 0x51, - 0x0c, 0x45, 0xd5, 0xe1, 0x02, 0x7a, 0x04, 0xc6, 0x2b, 0xde, 0x22, 0x16, 0xb6, 0xc0, 0xc3, 0xae, - 0x14, 0xc2, 0xc6, 0x76, 0x11, 0x69, 0x44, 0xa9, 0x8c, 0x1e, 0x40, 0xfd, 0x33, 0xd6, 0x16, 0x16, - 0xab, 0xf3, 0xd8, 0xcb, 0x85, 0xd8, 0xd4, 0x2c, 0x42, 0xeb, 0x47, 0x52, 0x44, 0x1f, 0x41, 0xed, - 0x71, 0x10, 0xb8, 0x2c, 0xb0, 0xcc, 0x03, 0x2f, 0x15, 0x02, 0xa5, 0x55, 0xc4, 0xd5, 0x06, 0x42, - 0x6a, 0x3f, 0x04, 0x53, 0x29, 0x62, 0x1e, 0x65, 0xba, 0x42, 0x59, 0xfb, 0x13, 0x58, 0xcc, 0x17, - 0x72, 0x1e, 0xc2, 0xdb, 0x8f, 0xa0, 0x99, 0x2b, 0x65, 0x5e, 0xb0, 0xa6, 0x06, 0x6f, 0x42, 0x43, - 0x2d, 0x67, 0x5e, 0x6c, 0x5d, 0x89, 0xb5, 0xae, 0x41, 0xed, 0x85, 0xe3, 0xba, 0xec, 0xe2, 0xbb, - 0x08, 0x55, 0x9b, 0xe0, 0x28, 0xf0, 0x65, 0x64, 0x95, 0x72, 0x89, 0xdd, 0x60, 0x17, 0x9e, 0x92, - 0x58, 0x70, 0xb7, 0x1f, 0xb8, 0xce, 0xf0, 0xf4, 0x3d, 0x77, 0x3b, 0x7a, 0x0e, 0x26, 0x9f, 0xec, - 0x90, 0x7b, 0xca, 0x9e, 0xdf, 0xe2, 0xf4, 0x4f, 0x43, 0xe1, 0x9d, 0x10, 0xb2, 0x68, 0x06, 0x0c, - 0xc6, 0x0a, 0xb4, 0x27, 0x4f, 0x6b, 0x0a, 0x26, 0x86, 0xe0, 0xf6, 0x6c, 0x30, 0x4e, 0xa2, 0x8a, - 0x26, 0xce, 0xb5, 0x84, 0x7b, 0x05, 0x8b, 0xec, 0xcd, 0x3f, 0x22, 0x34, 0x05, 0x14, 0xc3, 0x71, - 0x77, 0x36, 0xe0, 0x33, 0xe1, 0xaf, 0x42, 0x36, 0x1d, 0x55, 0x87, 0xf6, 0xa1, 0x29, 0x6f, 0x26, - 0x89, 0x29, 0x2e, 0xcb, 0x3b, 0xb3, 0x31, 0xc5, 0x9c, 0xa8, 0x90, 0x8d, 0x48, 0x51, 0xb5, 0x5f, - 0xc2, 0x52, 0x81, 0x94, 0x29, 0x2d, 0xbd, 0xae, 0xb6, 0x34, 0xfd, 0xf0, 0xc8, 0xc2, 0xd4, 0xf9, - 0xd8, 0x87, 0xe5, 0x22, 0x2f, 0x53, 0x00, 0x6f, 0xe4, 0x01, 0x97, 0x39, 0xa0, 0x12, 0xa7, 0x22, - 0x1e, 0x00, 0x9a, 0x24, 0x66, 0x0a, 0x66, 0x37, 0x8f, 0x89, 0x38, 0x66, 0x2e, 0x52, 0x45, 0xb5, - 0x61, 0x65, 0x82, 0x9a, 0x29, 0xa0, 0x37, 0xf3, 0xa0, 0xe2, 0xe3, 0x45, 0x0d, 0x54, 0xe7, 0x1b, - 0x43, 0x9d, 0x91, 0x62, 0x27, 0x2e, 0x41, 0x6d, 0xa8, 0x53, 0xf2, 0x4d, 0xe2, 0x50, 0x72, 0xc8, - 0xf1, 0xea, 0xf6, 0x58, 0x66, 0xaf, 0xd9, 0x43, 0x72, 0x84, 0x13, 0x37, 0x96, 0x67, 0x24, 0x15, - 0xd1, 0x55, 0x30, 0x8f, 0x71, 0xf4, 0x26, 0xb5, 0xea, 0xdc, 0x0a, 0xc7, 0x38, 0xda, 0x16, 0x1a, - 0xeb, 0x7b, 0x0d, 0x20, 0x23, 0x1e, 0xdd, 0x83, 0x0a, 0x4d, 0x5c, 0x12, 0xe5, 0x2e, 0xc9, 0xcc, - 0xde, 0x63, 0xa9, 0xc8, 0x37, 0xa7, 0x70, 0x4c, 0x4b, 0x64, 0x27, 0x45, 0x94, 0xd8, 0x7e, 0x0a, - 0x90, 0xb9, 0x4d, 0xa1, 0x60, 0x35, 0x4f, 0x41, 0x73, 0xfc, 0x1b, 0x2c, 0x4a, 0x2d, 0xff, 0x77, - 0x0d, 0x0c, 0xde, 0xc3, 0xb3, 0x10, 0xe0, 0x39, 0xbe, 0xe3, 0x25, 0x9e, 0xbc, 0x60, 0x52, 0x91, - 0x5b, 0xf0, 0x09, 0xb7, 0xe8, 0xd2, 0x22, 0x44, 0x95, 0xb4, 0xb2, 0xb0, 0xcc, 0x20, 0xad, 0x52, - 0x24, 0x0d, 0xfd, 0x1b, 0x6a, 0xcc, 0xc1, 0x73, 0x7c, 0xfe, 0xb1, 0x50, 0xb7, 0xab, 0xc7, 0x38, - 0xda, 0x73, 0xfc, 0xb1, 0x01, 0x9f, 0xf0, 0x2f, 0x04, 0x69, 0xc0, 0x27, 0xd6, 0x0f, 0x1a, 0x98, - 0xca, 0x38, 0xa2, 0xff, 0xe7, 0x79, 0xbe, 0x54, 0x9c, 0xd7, 0x33, 0x11, 0xbd, 0x3b, 0x87, 0xe8, - 0xff, 0xe6, 0x89, 0x5e, 0xcc, 0x7e, 0xa4, 0xc8, 0xf4, 0x1f, 0x1a, 0x7f, 0x77, 0xb0, 0xc9, 0x3e, - 0x2f, 0xd7, 0xfa, 0x4c, 0xae, 0xf5, 0x99, 0x5c, 0xeb, 0x7f, 0x2b, 0xd7, 0x3f, 0x69, 0xd0, 0xcc, - 0x1d, 0x53, 0xb4, 0x9e, 0x67, 0xfb, 0xca, 0xe4, 0x49, 0x3e, 0x13, 0xdf, 0xcf, 0xe7, 0xf0, 0x3d, - 0xf5, 0x12, 0x52, 0x68, 0x55, 0x19, 0x1f, 0x02, 0x88, 0x53, 0x7f, 0xde, 0xc3, 0x6d, 0x9c, 0xe3, - 0x70, 0xff, 0xa8, 0x41, 0x43, 0xbd, 0x5b, 0x50, 0x3f, 0x4f, 0xc4, 0xe5, 0x89, 0xdb, 0xe7, 0x4c, - 0x3c, 0x3c, 0x9b, 0xc3, 0xc3, 0xd4, 0xdb, 0x3d, 0xab, 0x56, 0xa5, 0x61, 0x1d, 0x20, 0xdb, 0x37, - 0xd9, 0xf6, 0xe2, 0xcd, 0xdf, 0x5e, 0xac, 0x17, 0xd0, 0x50, 0xd7, 0xbd, 0x33, 0x86, 0x65, 0x6f, - 0xfc, 0x05, 0x75, 0x9b, 0x7b, 0x04, 0x2b, 0x4f, 0x49, 0x2c, 0x7c, 0x0f, 0x4e, 0x43, 0xc2, 0x13, - 0xb9, 0x01, 0x72, 0xff, 0x90, 0x3b, 0xe6, 0x8c, 0xed, 0xa4, 0xff, 0xed, 0x02, 0xfb, 0xc4, 0xe4, - 0x3b, 0x6a, 0x40, 0xd1, 0x06, 0x2c, 0x4a, 0x41, 0xa6, 0x87, 0x8a, 0x1b, 0x75, 0x7b, 0x72, 0x59, - 0xb5, 0x4a, 0xe8, 0x53, 0x58, 0xcc, 0xa7, 0x80, 0x2e, 0xa6, 0xef, 0xdf, 0x7c, 0x5e, 0xd3, 0xc3, - 0x57, 0xa1, 0xbc, 0xef, 0xf8, 0x23, 0x04, 0x62, 0xb1, 0x65, 0x5b, 0x6c, 0x3b, 0xbf, 0xe4, 0x5a, - 0x25, 0x74, 0x1d, 0xca, 0xec, 0x53, 0x09, 0x35, 0xb8, 0x41, 0x7e, 0x35, 0x4d, 0xba, 0x6d, 0xc2, - 0x52, 0xe1, 0xad, 0x9f, 0x83, 0xfd, 0xcf, 0xcc, 0xef, 0x02, 0xab, 0xd4, 0xff, 0x4d, 0x03, 0x83, - 0xed, 0xa1, 0x24, 0x8a, 0x02, 0x8a, 0xd6, 0xa0, 0x26, 0x05, 0xc9, 0x42, 0xb6, 0xa5, 0x7e, 0xd8, - 0x65, 0xfc, 0xca, 0xca, 0x48, 0x06, 0xae, 0x13, 0x1d, 0x13, 0x8a, 0xee, 0x40, 0x4d, 0x0a, 0x93, - 0x65, 0x4c, 0xfc, 0xec, 0x87, 0x52, 0xc2, 0x77, 0x0b, 0xb0, 0xf4, 0x2a, 0xa6, 0x04, 0x7b, 0xd9, - 0x70, 0x3e, 0x84, 0xa6, 0x50, 0xe5, 0x67, 0x33, 0xfb, 0x4f, 0x48, 0x76, 0x45, 0xfd, 0xcb, 0xc5, - 0x2a, 0x75, 0xb5, 0x7b, 0xda, 0x3f, 0x64, 0x3e, 0x07, 0x55, 0xfe, 0x77, 0xd8, 0xfa, 0x5f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x04, 0x49, 0xf2, 0x93, 0x4c, 0x13, 0x00, 0x00, + // 1505 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xdc, 0x58, 0xcb, 0x6e, 0xdb, 0x46, + 0x17, 0x16, 0x4d, 0xdd, 0x78, 0x28, 0xf9, 0x32, 0xc8, 0x9f, 0x5f, 0x55, 0x12, 0x44, 0xa1, 0xeb, + 0x44, 0xb9, 0x54, 0x4e, 0xe5, 0xd4, 0x4d, 0x9c, 0x76, 0xe1, 0xc4, 0x6e, 0x9c, 0xa4, 0x4a, 0x0d, + 0xc6, 0xcd, 0xa6, 0x40, 0x83, 0x11, 0x3d, 0x96, 0x89, 0x50, 0x24, 0x3b, 0x24, 0x03, 0xeb, 0x15, + 0xba, 0xed, 0xaa, 0x40, 0x81, 0x02, 0x7d, 0x82, 0xae, 0xbb, 0xea, 0xa2, 0x8b, 0xa2, 0x2f, 0xd1, + 0x57, 0x29, 0xe6, 0x42, 0x71, 0xa8, 0x4b, 0x6c, 0x2f, 0x0a, 0x04, 0xdd, 0x71, 0xce, 0xf9, 0xce, + 0xa7, 0x73, 0xbe, 0x73, 0x66, 0xc8, 0x11, 0x6c, 0x0d, 0xdc, 0xf8, 0x38, 0xe9, 0x77, 0x9c, 0x60, + 0xb8, 0xee, 0xfa, 0x31, 0xf1, 0xa2, 0x43, 0xf7, 0xa3, 0x93, 0xf5, 0xc8, 0xc7, 0xe1, 0xba, 0x13, + 0xf8, 0x31, 0x0d, 0xbc, 0xf5, 0xd0, 0x4b, 0x06, 0xae, 0xbf, 0x4e, 0x43, 0x47, 0x3e, 0x76, 0x42, + 0x1a, 0xc4, 0x01, 0xd2, 0x69, 0xe8, 0x58, 0xbf, 0x6a, 0x00, 0x8f, 0x03, 0xcf, 0x23, 0x4e, 0xbc, + 0x4d, 0x07, 0xe8, 0x2e, 0x98, 0x3d, 0x12, 0x53, 0xd7, 0x89, 0x5e, 0x6f, 0xd3, 0x41, 0x43, 0x6b, + 0x69, 0x6d, 0xb3, 0xbb, 0xd4, 0xa1, 0xa1, 0xd3, 0x91, 0xf6, 0x6d, 0x3a, 0xb0, 0x21, 0x7b, 0x46, + 0x1d, 0x40, 0x3d, 0x7c, 0x22, 0x29, 0x76, 0x12, 0x8a, 0x63, 0x37, 0xf0, 0x1b, 0x0b, 0x2d, 0xad, + 0xad, 0xdb, 0x33, 0x3c, 0xe8, 0x16, 0x2c, 0xf7, 0xf0, 0x89, 0x24, 0x78, 0x94, 0x1c, 0x1d, 0x11, + 0xda, 0xd0, 0x39, 0x7a, 0xca, 0x8e, 0x2e, 0x40, 0xe9, 0xab, 0xf8, 0x98, 0xd0, 0x46, 0xb1, 0xa5, + 0xb5, 0x6b, 0xb6, 0x58, 0x58, 0x6f, 0xa0, 0x26, 0x49, 0x6d, 0x12, 0x7a, 0x23, 0xb4, 0x09, 0xf5, + 0x34, 0x67, 0x6e, 0x90, 0x59, 0xaf, 0xa8, 0x59, 0x73, 0x87, 0x5d, 0x53, 0x57, 0x68, 0x15, 0x4a, + 0xbb, 0x94, 0x06, 0x94, 0x27, 0x6b, 0x76, 0xeb, 0x1c, 0xbf, 0x4b, 0xa9, 0xc0, 0x0a, 0x9f, 0x55, + 0x81, 0xd2, 0xee, 0x30, 0x8c, 0x47, 0x56, 0x0b, 0xaa, 0xa9, 0x8f, 0xe5, 0x45, 0x78, 0x24, 0xfb, + 0x25, 0xc3, 0x16, 0x0b, 0xeb, 0x0e, 0x14, 0x0f, 0xdc, 0x21, 0x41, 0xcb, 0xa0, 0x47, 0xc4, 0xe1, + 0x3e, 0xdd, 0x66, 0x8f, 0x08, 0x41, 0xd1, 0x67, 0x26, 0xa1, 0x0a, 0x7f, 0xb6, 0xbe, 0x85, 0xe5, + 0x17, 0x78, 0x48, 0xa2, 0x10, 0x3b, 0x64, 0xd7, 0x23, 0x43, 0xe2, 0xc7, 0x8c, 0xf7, 0x15, 0xf6, + 0x12, 0x92, 0xf2, 0xf2, 0x05, 0x6a, 0x81, 0xb9, 0x43, 0x22, 0x87, 0xba, 0xe1, 0x58, 0x5a, 0xc3, + 0x56, 0x4d, 0x8c, 0x9f, 0x71, 0x71, 0x1d, 0x0d, 0x9b, 0x3f, 0x5b, 0xdf, 0x00, 0xec, 0x27, 0xfd, + 0x7d, 0x1a, 0x38, 0xac, 0x4b, 0x6b, 0x50, 0x91, 0xb5, 0x37, 0xb4, 0x96, 0xde, 0x36, 0xbb, 0xa6, + 0xa2, 0x8e, 0x9d, 0xfa, 0xd0, 0x75, 0x28, 0x3f, 0x0e, 0xfc, 0x23, 0x77, 0x20, 0x35, 0x59, 0xe4, + 0x28, 0x61, 0xea, 0xe1, 0xd0, 0x96, 0x5e, 0xeb, 0xb7, 0x12, 0x94, 0x45, 0x0c, 0xda, 0x00, 0x63, + 0x5c, 0x87, 0xe4, 0xfe, 0x1f, 0x8f, 0x9a, 0xac, 0xce, 0xce, 0x70, 0xa8, 0x01, 0x95, 0x57, 0x84, + 0x46, 0xd9, 0xa4, 0xa4, 0x4b, 0x25, 0x03, 0xfd, 0x5d, 0x19, 0xa0, 0x07, 0x80, 0xbe, 0xc4, 0x51, + 0xbc, 0x7d, 0xf8, 0x96, 0xd0, 0xd8, 0x8d, 0xc8, 0x21, 0x93, 0x9e, 0xcf, 0x89, 0xd9, 0x35, 0x78, + 0x0c, 0x33, 0xd8, 0x33, 0x40, 0xe8, 0x26, 0x14, 0x0f, 0xf0, 0x20, 0x6a, 0x94, 0x94, 0x64, 0x45, + 0x31, 0x1d, 0x66, 0xdf, 0xf5, 0x63, 0x3a, 0xb2, 0x39, 0x04, 0xdd, 0x00, 0x83, 0x85, 0x44, 0x31, + 0x1e, 0x86, 0x8d, 0xf2, 0x24, 0x79, 0xe6, 0x63, 0x1d, 0xf8, 0xda, 0x77, 0xe3, 0x46, 0x45, 0x74, + 0x80, 0x3d, 0x4f, 0xf6, 0xad, 0x3a, 0xdd, 0xb7, 0x6b, 0x60, 0x46, 0x31, 0x75, 0xfd, 0xc1, 0xeb, + 0x43, 0x1c, 0xe3, 0x86, 0xc1, 0x10, 0x7b, 0x05, 0x1b, 0x84, 0x71, 0x07, 0xc7, 0x18, 0xad, 0x42, + 0xed, 0xc8, 0x0b, 0x70, 0xbc, 0xd1, 0x15, 0x18, 0x68, 0x69, 0xed, 0x85, 0xbd, 0x82, 0x6d, 0x4a, + 0x6b, 0x0e, 0xb4, 0x79, 0x4f, 0x80, 0xcc, 0x96, 0xd6, 0xd6, 0xc6, 0xa0, 0xcd, 0x7b, 0x1c, 0x74, + 0x15, 0xc0, 0xf5, 0xc7, 0x3c, 0xb5, 0x96, 0xd6, 0x2e, 0xed, 0x15, 0x6c, 0x83, 0xdb, 0x14, 0x40, + 0xca, 0x51, 0x67, 0x7d, 0x91, 0x80, 0x8c, 0xa1, 0x3f, 0x8a, 0x49, 0x24, 0x00, 0x8b, 0x6c, 0x4f, + 0x32, 0x00, 0xb7, 0x71, 0xc0, 0x15, 0x30, 0xfa, 0x41, 0xe0, 0x09, 0xff, 0x52, 0x4b, 0x6b, 0x57, + 0xf7, 0x0a, 0x76, 0x95, 0x99, 0xb8, 0xfb, 0x1a, 0x98, 0x89, 0x92, 0xc2, 0x72, 0x4b, 0x6b, 0xd7, + 0x59, 0xb9, 0x49, 0x96, 0x83, 0x84, 0xa4, 0x49, 0xac, 0xb4, 0xb4, 0x76, 0x31, 0x85, 0x88, 0x2c, + 0x9a, 0x9f, 0x82, 0x31, 0x6e, 0x13, 0xdb, 0x6b, 0x6f, 0xc8, 0x48, 0xee, 0x17, 0xf6, 0xc8, 0xf6, + 0xd0, 0x5b, 0xbe, 0x87, 0xc4, 0x3e, 0x11, 0x8b, 0xad, 0x85, 0xfb, 0xda, 0xa3, 0x32, 0x14, 0x19, + 0xa9, 0xf5, 0xb7, 0x0e, 0xc6, 0x78, 0xa0, 0x50, 0x17, 0xca, 0x4f, 0xfd, 0xb8, 0x87, 0x43, 0x39, + 0xbc, 0xcd, 0xfc, 0xc0, 0x75, 0x84, 0x53, 0x0c, 0x85, 0x44, 0xa2, 0x87, 0x60, 0xbc, 0xe4, 0x2d, + 0x62, 0x61, 0x0b, 0x3c, 0xec, 0xca, 0x44, 0xd8, 0xd8, 0x2f, 0x22, 0x33, 0x3c, 0xba, 0x0f, 0xd5, + 0x2f, 0x58, 0x5b, 0x58, 0xac, 0xce, 0x63, 0x2f, 0x4f, 0xc4, 0xa6, 0x6e, 0x11, 0x3a, 0x46, 0xa3, + 0x4f, 0xa0, 0xf2, 0x28, 0x08, 0x3c, 0x16, 0x58, 0xe4, 0x81, 0x97, 0x26, 0x02, 0xa5, 0x57, 0xc4, + 0xa5, 0xd8, 0xe6, 0x03, 0x30, 0x95, 0x22, 0x4e, 0x93, 0x4c, 0x57, 0x24, 0x6b, 0x7e, 0x06, 0x8b, + 0xf9, 0x42, 0xce, 0x23, 0x78, 0xf3, 0x21, 0xd4, 0x73, 0xa5, 0x9c, 0x16, 0xac, 0xa9, 0xc1, 0x5b, + 0x50, 0x53, 0xcb, 0x39, 0x2d, 0xb6, 0xaa, 0xc4, 0x5a, 0xd7, 0xa0, 0xf2, 0xdc, 0xf5, 0x3c, 0x76, + 0xf0, 0x5d, 0x84, 0xb2, 0x4d, 0x70, 0x14, 0xf8, 0x32, 0x52, 0xae, 0xd8, 0x09, 0x76, 0xe1, 0x09, + 0x89, 0x85, 0x76, 0xfb, 0x81, 0xe7, 0x3a, 0xa3, 0x77, 0x9c, 0xed, 0xe8, 0x19, 0x98, 0x7c, 0xb2, + 0x43, 0x8e, 0x94, 0x3d, 0xbf, 0xc9, 0xe5, 0x9f, 0xc5, 0xc2, 0x3b, 0x21, 0xd6, 0xa2, 0x19, 0xd0, + 0x1f, 0x1b, 0x50, 0x4f, 0xee, 0xd6, 0x94, 0x4c, 0x0c, 0xc1, 0xad, 0xf9, 0x64, 0x5c, 0x44, 0x95, + 0x4d, 0xec, 0x6b, 0x49, 0xf7, 0x12, 0x16, 0xd9, 0x9b, 0x7f, 0x40, 0x68, 0x4a, 0x28, 0x86, 0xe3, + 0xce, 0x7c, 0xc2, 0xa7, 0x02, 0xaf, 0x52, 0xd6, 0x5d, 0xd5, 0x86, 0xf6, 0xa1, 0x2e, 0x4f, 0x26, + 0xc9, 0x29, 0x0e, 0xcb, 0xdb, 0xf3, 0x39, 0xc5, 0x9c, 0xa8, 0x94, 0xb5, 0x48, 0x31, 0x35, 0x5f, + 0xc0, 0xd2, 0x84, 0x28, 0x33, 0x5a, 0xba, 0xa6, 0xb6, 0x34, 0xfd, 0xf0, 0xc8, 0xc2, 0xd4, 0xf9, + 0xd8, 0x87, 0xe5, 0x49, 0x5d, 0x66, 0x10, 0x5e, 0xcf, 0x13, 0x2e, 0x73, 0x42, 0x25, 0x4e, 0x65, + 0x3c, 0x00, 0x34, 0x2d, 0xcc, 0x0c, 0xce, 0x76, 0x9e, 0x13, 0x71, 0xce, 0x5c, 0xa4, 0xca, 0x6a, + 0xc3, 0xca, 0x94, 0x34, 0x33, 0x48, 0x6f, 0xe4, 0x49, 0xc5, 0xc7, 0x8b, 0x1a, 0xa8, 0xce, 0x37, + 0x86, 0x2a, 0x13, 0xc5, 0x4e, 0x3c, 0x82, 0x9a, 0x50, 0xa5, 0xe4, 0xbb, 0xc4, 0xa5, 0xe4, 0x90, + 0xf3, 0x55, 0xed, 0xf1, 0x9a, 0xbd, 0x66, 0x0f, 0xc9, 0x11, 0x4e, 0xbc, 0x58, 0xee, 0x91, 0x74, + 0x89, 0xae, 0x82, 0x79, 0x8c, 0xa3, 0xd7, 0xa9, 0x57, 0xe7, 0x5e, 0x38, 0xc6, 0xd1, 0x8e, 0xb0, + 0x58, 0x3f, 0x6a, 0x00, 0x99, 0xf0, 0xe8, 0x2e, 0x94, 0x68, 0xe2, 0x91, 0x28, 0x77, 0x48, 0x66, + 0xfe, 0x0e, 0x4b, 0x45, 0xbe, 0x39, 0x05, 0x30, 0x2d, 0x91, 0xed, 0x14, 0x51, 0x62, 0xf3, 0x09, + 0x40, 0x06, 0x9b, 0x21, 0xc1, 0x6a, 0x5e, 0x82, 0xfa, 0xf8, 0x37, 0x58, 0x94, 0x5a, 0xfe, 0x9f, + 0x1a, 0x18, 0xbc, 0x87, 0x67, 0x11, 0x60, 0xe8, 0xfa, 0xee, 0x30, 0x19, 0xca, 0x03, 0x26, 0x5d, + 0x72, 0x0f, 0x3e, 0xe1, 0x1e, 0x5d, 0x7a, 0xc4, 0x52, 0x15, 0xad, 0x28, 0x3c, 0x73, 0x44, 0x2b, + 0x4d, 0x8a, 0x86, 0xfe, 0x0f, 0x15, 0x06, 0x18, 0xba, 0x3e, 0xff, 0x58, 0xa8, 0xda, 0xe5, 0x63, + 0x1c, 0xf5, 0x5c, 0x7f, 0xec, 0xc0, 0x27, 0xfc, 0x0b, 0x41, 0x3a, 0xf0, 0x89, 0xf5, 0x93, 0x06, + 0xa6, 0x32, 0x8e, 0xe8, 0xe3, 0xbc, 0xce, 0x97, 0x26, 0xe7, 0xf5, 0x4c, 0x42, 0xef, 0x9d, 0x22, + 0xf4, 0x87, 0x79, 0xa1, 0x17, 0xb3, 0x1f, 0x99, 0x54, 0xfa, 0x2f, 0x8d, 0xbf, 0x3b, 0xd8, 0x64, + 0x9f, 0x57, 0x6b, 0x7d, 0xae, 0xd6, 0xfa, 0x5c, 0xad, 0xf5, 0x7f, 0x55, 0xeb, 0x5f, 0x34, 0xa8, + 0xe7, 0xb6, 0x29, 0xda, 0xc8, 0xab, 0x7d, 0x65, 0x7a, 0x27, 0x9f, 0x49, 0xef, 0x67, 0xa7, 0xe8, + 0x3d, 0xf3, 0x10, 0x52, 0x64, 0x55, 0x15, 0x77, 0x00, 0xc4, 0xae, 0x3f, 0xef, 0xe6, 0x36, 0xce, + 0xb1, 0xb9, 0x7f, 0xd6, 0xa0, 0xa6, 0x9e, 0x2d, 0xa8, 0x9b, 0x17, 0xe2, 0xf2, 0xd4, 0xe9, 0x73, + 0x26, 0x1d, 0x9e, 0x9e, 0xa2, 0xc3, 0xcc, 0xd3, 0x3d, 0xab, 0x56, 0x95, 0x61, 0x03, 0xd4, 0x3b, + 0xe6, 0x1a, 0x54, 0x86, 0xef, 0xb8, 0xbd, 0x48, 0x9f, 0xf5, 0x1c, 0xf2, 0x17, 0xbc, 0xb3, 0x85, + 0x65, 0x6f, 0xfc, 0x05, 0xf5, 0x36, 0xf7, 0x10, 0x56, 0x9e, 0x90, 0x58, 0x60, 0x0f, 0x46, 0x21, + 0xe1, 0x89, 0x5c, 0x87, 0xb2, 0x23, 0x6e, 0x27, 0xda, 0xec, 0xdb, 0x89, 0xf0, 0x76, 0xbf, 0x5f, + 0x60, 0x9f, 0x98, 0xfc, 0x8e, 0x1a, 0x50, 0xb4, 0x09, 0x8b, 0x72, 0x91, 0xde, 0xb3, 0x26, 0x6f, + 0xd4, 0xcd, 0xe9, 0xcb, 0xaa, 0x55, 0x40, 0x9f, 0xc3, 0x62, 0x3e, 0x05, 0x74, 0x31, 0x7d, 0xff, + 0xe6, 0xf3, 0x9a, 0x1d, 0xbe, 0x0a, 0xc5, 0x7d, 0xd7, 0x1f, 0x20, 0x10, 0x17, 0x5b, 0x76, 0x8b, + 0x6d, 0xe6, 0x2f, 0xb9, 0x56, 0x01, 0xad, 0x41, 0x91, 0x7d, 0x2a, 0xa1, 0x1a, 0x77, 0xc8, 0xaf, + 0xa6, 0x69, 0xd8, 0x16, 0x2c, 0x4d, 0xbc, 0xf5, 0x73, 0xb4, 0x1f, 0xcc, 0xfd, 0x2e, 0xb0, 0x0a, + 0xdd, 0x3f, 0x34, 0x30, 0xd8, 0x3d, 0x94, 0x44, 0x51, 0x40, 0xd1, 0x3a, 0x54, 0xe4, 0x42, 0xaa, + 0x90, 0xdd, 0x52, 0xdf, 0xef, 0x32, 0x7e, 0x67, 0x65, 0x24, 0x7d, 0xcf, 0x8d, 0x8e, 0x09, 0x45, + 0xb7, 0xa1, 0x22, 0x17, 0xd3, 0x65, 0x4c, 0xfd, 0xec, 0xfb, 0x52, 0xc2, 0x0f, 0x0b, 0xb0, 0xf4, + 0x32, 0xa6, 0x04, 0x0f, 0xb3, 0xe1, 0x7c, 0x00, 0x75, 0x61, 0xca, 0xcf, 0x66, 0xf6, 0x9f, 0x90, + 0xec, 0x8a, 0xfa, 0x97, 0x8b, 0x55, 0x68, 0x6b, 0x77, 0xb5, 0xff, 0xc8, 0x7c, 0xf6, 0xcb, 0xfc, + 0xef, 0xb0, 0x8d, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x65, 0x21, 0x51, 0x00, 0x4c, 0x13, 0x00, + 0x00, } diff --git a/glide.lock b/glide.lock index 5d174e9f2..5b01fd025 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 14712d189ae570ecb1e287d5a11120347c831b9b4bb6b2265eecb53acf52dc9d -updated: 2017-05-18T11:52:57.349827646-07:00 +hash: 5e20e63a305141d8725aceaa198ae9cd73f6bbfdb14c51ce7a69fc40978e3fb5 +updated: 2017-07-31T13:10:38.494952622-07:00 imports: - name: github.com/appc/spec version: ba99d6b8ccbbed2942e53eb5395fddae113cdf8e @@ -12,11 +12,11 @@ imports: - schema/types - schema/types/resource - name: github.com/armon/go-metrics - version: 93f237eba9b0602f3e73710416558854a81d9337 + version: f036747b9d0e8590f175a5d654a2194a7d9df4b5 - name: github.com/asaskevich/govalidator version: 9699ab6b38bee2e02cd3fe8b99ecf67665395c96 - name: github.com/coreos/go-semver - version: 294930c1e79c64e7dbe360054274fdad492c8cf5 + version: 1817cd4bea52af76542157eeabd74b057d1a199e subpackages: - semver - name: github.com/ghodss/yaml @@ -25,6 +25,7 @@ imports: version: 888eb0692c857ec880338addf316bd662d5e630e subpackages: - proto + - ptypes/any - name: github.com/hashicorp/go-msgpack version: fa3f63826f7c23912c15263591e65d54d080b458 subpackages: @@ -32,9 +33,9 @@ imports: - name: github.com/hashicorp/memberlist version: a93fbd426dd831f5a66db3adc6a5ffa6f44cc60a - name: github.com/intelsdi-x/gomit - version: db68f6fda248706a71980abc58e969fcd63f5ea6 + version: 286c3ad6599724faed681cd18a9ff595b00d9f3f - name: github.com/intelsdi-x/snap-plugin-lib-go - version: a8b9252d1c8305deb3c24495f1e9ce26607fcbd7 + version: 3e667d03c92e7d5247e536e4df037f6c84692229 subpackages: - v1/plugin - v1/plugin/rpc @@ -49,13 +50,11 @@ imports: - name: github.com/robfig/cron version: 32d9c273155a0506d27cf73dd1246e86a470997e - name: github.com/rs/cors - version: 2d7dd2a10331137ae3f931ba08c21fd00cbf208d -- name: github.com/rs/xhandler - version: ed27b6fd65218132ee50cd95f38474a3d8a2cd12 + version: 8dd4211afb5d08dbb39a533b9bb9e4b486351df6 - name: github.com/Sirupsen/logrus version: be52937128b38f1d99787bb476c789e2af1147f1 - name: github.com/spf13/pflag - version: 94e98a55fb412fcbcfc302555cb990f5e1590627 + version: e57e3eeb33f795204c1ca35f56c44f83227c6e66 - name: github.com/urfave/cli version: 0bdeddeeb0f650497d603c4ad7b20cfe685682f6 - name: github.com/urfave/negroni @@ -69,7 +68,7 @@ imports: - name: github.com/xeipuuv/gojsonschema version: d3178baac32433047aa76f07317f84fbe2be6cda - name: go4.org - version: 03efcb870d84809319ea509714dd6d19a1498483 + version: 034d17a462f7b2dcd1a4a73553ec5357ff6e6c6e subpackages: - errorutil - name: golang.org/x/crypto @@ -84,28 +83,45 @@ imports: - openpgp/s2k - ssh/terminal - name: golang.org/x/net - version: 04557861f124410b768b1ba5bb3a91b705afbfc6 + version: 054b33e6527139ad5b1ec2f6232c3b175bd9a30c subpackages: - context - http2 - http2/hpack + - idna - internal/timeseries - lex/httplex - trace - name: golang.org/x/sys - version: e62c3de784db939836898e5c19ffd41bece347da + version: abf9c25f54453410d0c6668e519582a9e1115027 subpackages: - unix +- name: golang.org/x/text + version: cfdf022e86b4ecfb646e1efbd7db175dd623a8fa + subpackages: + - secure/bidirule + - transform + - unicode/bidi + - unicode/norm +- name: google.golang.org/genproto + version: 40b7550fd0ba4b8f7e9d70ed40fcd4f3375db1de + subpackages: + - googleapis/rpc/status - name: google.golang.org/grpc - version: 0032a855ba5c8a3c8e0d71c2deef354b70af1584 + version: b8669c35455183da6d5c474ea6e72fbf55183274 subpackages: - codes - credentials + - grpclb/grpc_lb_v1 - grpclog - internal + - keepalive - metadata - naming - peer + - stats + - status + - tap - transport - name: gopkg.in/inf.v0 version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 @@ -113,18 +129,18 @@ imports: version: c1cd2254a6dd314c9d73c338c12688c9325d85c6 testImports: - name: github.com/gopherjs/gopherjs - version: 4b53e1bddba0e2f734514aeb6c02db652f4c6fe8 + version: 2b1d432c8a82c9bff0b0baffaeb3ec6e92974112 subpackages: - js - name: github.com/jtolds/gls - version: 8ddce2a84170772b95dd5d576c48d517b22cac63 + version: 77f18212c9c7edc9bd6a33d383a7b545ce62f064 - name: github.com/smartystreets/assertions - version: 443d812296a84445c202c085f19e18fc238f8250 + version: 4ea54c1f28ad3ae597e76607dea3871fa177e263 subpackages: - internal/go-render/render - internal/oglematchers - name: github.com/smartystreets/goconvey - version: 995f5b2e021c69b8b028ba6d0b05c1dd500783db + version: 9e8dc3f972df6c8fcc0375ef492c24d0bb204857 subpackages: - convey - convey/gotest diff --git a/glide.yaml b/glide.yaml index 41fb5ef91..d1bdb0d20 100644 --- a/glide.yaml +++ b/glide.yaml @@ -42,13 +42,12 @@ import: - openpgp - ssh/terminal - package: golang.org/x/net - version: 04557861f124410b768b1ba5bb3a91b705afbfc6 subpackages: - context - trace - http2 - package: google.golang.org/grpc - version: 0032a855ba5c8a3c8e0d71c2deef354b70af1584 + version: ^v1.4 - package: gopkg.in/yaml.v2 version: c1cd2254a6dd314c9d73c338c12688c9325d85c6 - package: github.com/intelsdi-x/snap-plugin-lib-go diff --git a/grpc/common/common.pb.go b/grpc/common/common.pb.go index a812e41f0..ee3496713 100644 --- a/grpc/common/common.pb.go +++ b/grpc/common/common.pb.go @@ -17,9 +17,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by protoc-gen-go. +// Code generated by protoc-gen-go. DO NOT EDIT. // source: github.com/intelsdi-x/snap/grpc/common/common.proto -// DO NOT EDIT! /* Package common is a generated protocol buffer package. @@ -65,6 +64,20 @@ func (m *Time) String() string { return proto.CompactTextString(m) } func (*Time) ProtoMessage() {} func (*Time) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } +func (m *Time) GetSec() int64 { + if m != nil { + return m.Sec + } + return 0 +} + +func (m *Time) GetNsec() int64 { + if m != nil { + return m.Nsec + } + return 0 +} + type Empty struct { } @@ -83,6 +96,13 @@ func (m *SnapError) String() string { return proto.CompactTextString( func (*SnapError) ProtoMessage() {} func (*SnapError) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } +func (m *SnapError) GetErrorString() string { + if m != nil { + return m.ErrorString + } + return "" +} + func (m *SnapError) GetErrorFields() map[string]string { if m != nil { return m.ErrorFields @@ -100,6 +120,20 @@ func (m *Label) String() string { return proto.CompactTextString(m) } func (*Label) ProtoMessage() {} func (*Label) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } +func (m *Label) GetIndex() uint64 { + if m != nil { + return m.Index + } + return 0 +} + +func (m *Label) GetName() string { + if m != nil { + return m.Name + } + return "" +} + // core.Metric type Metric struct { Namespace []*NamespaceElement `protobuf:"bytes,1,rep,name=Namespace" json:"Namespace,omitempty"` @@ -184,6 +218,13 @@ func (m *Metric) GetNamespace() []*NamespaceElement { return nil } +func (m *Metric) GetVersion() int64 { + if m != nil { + return m.Version + } + return 0 +} + func (m *Metric) GetConfig() *ConfigMap { if m != nil { return m.Config @@ -212,6 +253,20 @@ func (m *Metric) GetTimestamp() *Time { return nil } +func (m *Metric) GetUnit() string { + if m != nil { + return m.Unit + } + return "" +} + +func (m *Metric) GetDescription() string { + if m != nil { + return m.Description + } + return "" +} + func (m *Metric) GetStringData() string { if x, ok := m.GetData().(*Metric_StringData); ok { return x.StringData @@ -454,6 +509,27 @@ func (m *NamespaceElement) String() string { return proto.CompactText func (*NamespaceElement) ProtoMessage() {} func (*NamespaceElement) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } +func (m *NamespaceElement) GetValue() string { + if m != nil { + return m.Value + } + return "" +} + +func (m *NamespaceElement) GetDescription() string { + if m != nil { + return m.Description + } + return "" +} + +func (m *NamespaceElement) GetName() string { + if m != nil { + return m.Name + } + return "" +} + // core.SubscribedPlugin type SubscribedPlugin struct { TypeName string `protobuf:"bytes,1,opt,name=TypeName" json:"TypeName,omitempty"` @@ -467,6 +543,27 @@ func (m *SubscribedPlugin) String() string { return proto.CompactText func (*SubscribedPlugin) ProtoMessage() {} func (*SubscribedPlugin) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } +func (m *SubscribedPlugin) GetTypeName() string { + if m != nil { + return m.TypeName + } + return "" +} + +func (m *SubscribedPlugin) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *SubscribedPlugin) GetVersion() int64 { + if m != nil { + return m.Version + } + return 0 +} + func (m *SubscribedPlugin) GetConfig() *ConfigMap { if m != nil { return m.Config @@ -527,6 +624,27 @@ func (m *Plugin) String() string { return proto.CompactTextString(m) func (*Plugin) ProtoMessage() {} func (*Plugin) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } +func (m *Plugin) GetTypeName() string { + if m != nil { + return m.TypeName + } + return "" +} + +func (m *Plugin) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *Plugin) GetVersion() int64 { + if m != nil { + return m.Version + } + return 0 +} + func init() { proto.RegisterType((*Time)(nil), "common.Time") proto.RegisterType((*Empty)(nil), "common.Empty") diff --git a/grpc/controlproxy/controlproxy.go b/grpc/controlproxy/controlproxy.go index 3c52effae..9c2a5ed90 100644 --- a/grpc/controlproxy/controlproxy.go +++ b/grpc/controlproxy/controlproxy.go @@ -19,11 +19,10 @@ limitations under the License. package controlproxy import ( + "context" "errors" "time" - "golang.org/x/net/context" - "github.com/intelsdi-x/snap/core" "github.com/intelsdi-x/snap/core/cdata" "github.com/intelsdi-x/snap/core/ctypes" @@ -49,7 +48,7 @@ type ControlProxy struct { } func New(addr string, port int) (ControlProxy, error) { - conn, err := rpcutil.GetClientConnection(addr, port) + conn, err := rpcutil.GetClientConnection(context.Background(), addr, port) if err != nil { return ControlProxy{}, err } diff --git a/grpc/controlproxy/rpc/control.pb.go b/grpc/controlproxy/rpc/control.pb.go index 4fe3f1919..26641bca8 100644 --- a/grpc/controlproxy/rpc/control.pb.go +++ b/grpc/controlproxy/rpc/control.pb.go @@ -17,9 +17,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by protoc-gen-go. +// Code generated by protoc-gen-go. DO NOT EDIT. // source: github.com/intelsdi-x/snap/grpc/controlproxy/rpc/control.proto -// DO NOT EDIT! /* Package rpc is a generated protocol buffer package. @@ -96,6 +95,20 @@ func (m *PubProcMetricsRequest) GetMetrics() []*common.Metric { return nil } +func (m *PubProcMetricsRequest) GetPluginName() string { + if m != nil { + return m.PluginName + } + return "" +} + +func (m *PubProcMetricsRequest) GetPluginVersion() int64 { + if m != nil { + return m.PluginVersion + } + return 0 +} + func (m *PubProcMetricsRequest) GetConfig() *common.ConfigMap { if m != nil { return m.Config @@ -103,6 +116,13 @@ func (m *PubProcMetricsRequest) GetConfig() *common.ConfigMap { return nil } +func (m *PubProcMetricsRequest) GetTaskId() string { + if m != nil { + return m.TaskId + } + return "" +} + type ErrorReply struct { Errors []string `protobuf:"bytes,1,rep,name=Errors" json:"Errors,omitempty"` } @@ -112,6 +132,13 @@ func (m *ErrorReply) String() string { return proto.CompactTextString func (*ErrorReply) ProtoMessage() {} func (*ErrorReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } +func (m *ErrorReply) GetErrors() []string { + if m != nil { + return m.Errors + } + return nil +} + type ProcessMetricsReply struct { Metrics []*common.Metric `protobuf:"bytes,1,rep,name=Metrics" json:"Metrics,omitempty"` Errors []string `protobuf:"bytes,2,rep,name=Errors" json:"Errors,omitempty"` @@ -129,6 +156,13 @@ func (m *ProcessMetricsReply) GetMetrics() []*common.Metric { return nil } +func (m *ProcessMetricsReply) GetErrors() []string { + if m != nil { + return m.Errors + } + return nil +} + type ValidateDepsRequest struct { Metrics []*common.Metric `protobuf:"bytes,1,rep,name=Metrics" json:"Metrics,omitempty"` Plugins []*common.SubscribedPlugin `protobuf:"bytes,2,rep,name=Plugins" json:"Plugins,omitempty"` @@ -194,6 +228,13 @@ func (m *SubscribeDepsRequest) GetPlugins() []*common.SubscribedPlugin { return nil } +func (m *SubscribeDepsRequest) GetTaskId() string { + if m != nil { + return m.TaskId + } + return "" +} + type SubscribeDepsReply struct { Errors []*common.SnapError `protobuf:"bytes,1,rep,name=Errors" json:"Errors,omitempty"` } @@ -219,6 +260,13 @@ func (m *UnsubscribeDepsRequest) String() string { return proto.Compa func (*UnsubscribeDepsRequest) ProtoMessage() {} func (*UnsubscribeDepsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } +func (m *UnsubscribeDepsRequest) GetTaskId() string { + if m != nil { + return m.TaskId + } + return "" +} + type UnsubscribeDepsReply struct { Errors []*common.SnapError `protobuf:"bytes,1,rep,name=Errors" json:"Errors,omitempty"` } @@ -261,6 +309,20 @@ func (m *MapEntry) String() string { return proto.CompactTextString(m func (*MapEntry) ProtoMessage() {} func (*MapEntry) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } +func (m *MapEntry) GetKey() string { + if m != nil { + return m.Key + } + return "" +} + +func (m *MapEntry) GetValue() string { + if m != nil { + return m.Value + } + return "" +} + type CollectMetricsRequest struct { TaskID string `protobuf:"bytes,1,opt,name=TaskID" json:"TaskID,omitempty"` AllTags map[string]*Map `protobuf:"bytes,2,rep,name=AllTags" json:"AllTags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` @@ -271,6 +333,13 @@ func (m *CollectMetricsRequest) String() string { return proto.Compac func (*CollectMetricsRequest) ProtoMessage() {} func (*CollectMetricsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} } +func (m *CollectMetricsRequest) GetTaskID() string { + if m != nil { + return m.TaskID + } + return "" +} + func (m *CollectMetricsRequest) GetAllTags() map[string]*Map { if m != nil { return m.AllTags @@ -295,6 +364,13 @@ func (m *CollectMetricsResponse) GetMetrics() []*common.Metric { return nil } +func (m *CollectMetricsResponse) GetErrors() []string { + if m != nil { + return m.Errors + } + return nil +} + type ArrString struct { S []*common.NamespaceElement `protobuf:"bytes,1,rep,name=S" json:"S,omitempty"` } @@ -320,6 +396,13 @@ func (m *GetAutodiscoverPathsReply) String() string { return proto.Co func (*GetAutodiscoverPathsReply) ProtoMessage() {} func (*GetAutodiscoverPathsReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} } +func (m *GetAutodiscoverPathsReply) GetPaths() []string { + if m != nil { + return m.Paths + } + return nil +} + func init() { proto.RegisterType((*SerrorReply)(nil), "rpc.SerrorReply") proto.RegisterType((*PubProcMetricsRequest)(nil), "rpc.PubProcMetricsRequest") @@ -345,7 +428,7 @@ var _ grpc.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion3 +const _ = grpc.SupportPackageIsVersion4 // Client API for MetricManager service @@ -608,7 +691,7 @@ var _MetricManager_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: fileDescriptor0, + Metadata: "github.com/intelsdi-x/snap/grpc/controlproxy/rpc/control.proto", } func init() { diff --git a/pkg/rpcutil/rpc.go b/pkg/rpcutil/rpc.go index c6670a8ed..a452d6463 100644 --- a/pkg/rpcutil/rpc.go +++ b/pkg/rpcutil/rpc.go @@ -23,6 +23,7 @@ import ( "fmt" "time" + "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) @@ -31,13 +32,13 @@ import ( const grpcDialDefaultTimeout = 2 * time.Second // GetClientConnection returns a grcp.ClientConn that is unsecured -func GetClientConnection(addr string, port int) (*grpc.ClientConn, error) { - return GetClientConnectionWithCreds(addr, port, nil) +func GetClientConnection(ctx context.Context, addr string, port int) (*grpc.ClientConn, error) { + return GetClientConnectionWithCreds(ctx, addr, port, nil) } // GetClientConnectionWithCreds returns a grcp.ClientConn with optional TLS // security (if creds != nil) -func GetClientConnectionWithCreds(addr string, port int, creds credentials.TransportCredentials) (*grpc.ClientConn, error) { +func GetClientConnectionWithCreds(ctx context.Context, addr string, port int, creds credentials.TransportCredentials) (*grpc.ClientConn, error) { grpcDialOpts := []grpc.DialOption{ grpc.WithTimeout(grpcDialDefaultTimeout), } @@ -46,7 +47,8 @@ func GetClientConnectionWithCreds(addr string, port int, creds credentials.Trans } else { grpcDialOpts = append(grpcDialOpts, grpc.WithInsecure()) } - conn, err := grpc.Dial(fmt.Sprintf("%v:%v", addr, port), grpcDialOpts...) + + conn, err := grpc.DialContext(ctx, fmt.Sprintf("%v:%v", addr, port), grpcDialOpts...) if err != nil { return nil, err } diff --git a/pkg/rpcutil/rpc_medium_test.go b/pkg/rpcutil/rpc_medium_test.go index b536cdab9..b3d755422 100644 --- a/pkg/rpcutil/rpc_medium_test.go +++ b/pkg/rpcutil/rpc_medium_test.go @@ -22,6 +22,7 @@ limitations under the License. package rpcutil import ( + "context" "testing" . "github.com/smartystreets/goconvey/convey" @@ -29,7 +30,7 @@ import ( func TestRpcUtil(t *testing.T) { Convey("Get a client connection", t, func() { - conn, err := GetClientConnection("127.0.0.1", 8183) + conn, err := GetClientConnection(context.Background(), "127.0.0.1", 8183) Convey("Provided a valid address, port", func() { So(err, ShouldBeNil) So(conn, ShouldNotBeNil)