@@ -108,7 +108,7 @@ github.com/docker/containerd 9048e5e50717ea4497b757314bad98ea3763c145

 github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4

 # cluster

-github.com/docker/swarmkit 8f053c2030ebfc90f19f241fb7880e95b9761b7a

+github.com/docker/swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1

 github.com/gogo/protobuf 8d70fb3182befc465c4a1eac8ad4d38ff49778e2

 github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a

 github.com/google/certificate-transparency d90e65c3a07988180c5b1ece71791c0b6506826e

@@ -245,7 +245,12 @@ func (a *Agent) run(ctx context.Context) {

 			nodeDescription = newNodeDescription

 			// close the session

 			log.G(ctx).Info("agent: found node update")

-			session.sendError(nil)

+

+			if err := session.close(); err != nil {

+				log.G(ctx).WithError(err).Error("agent: closing session failed")

+			}

+			sessionq = nil

+			registered = nil

 		}

 	}

@@ -315,8 +320,8 @@ func (a *Agent) run(ctx context.Context) {

 			sessionq = a.sessionq

 		case err := <-session.errs:

 			// TODO(stevvooe): This may actually block if a session is closed

-			// but no error was sent. Session.close must only be called here

-			// for this to work.

+			// but no error was sent. This must be the only place

+			// session.close is called in response to errors, for this to work.

 			if err != nil {

 				log.G(ctx).WithError(err).Error("agent: session failed")

 				backoff = initialSessionFailureBackoff + 2*backoff

@@ -14,9 +14,8 @@ import (

 	"google.golang.org/grpc/codes"

 )

-const dispatcherRPCTimeout = 5 * time.Second

-

 var (

+	dispatcherRPCTimeout = 5 * time.Second

 	errSessionDisconnect = errors.New("agent: session disconnect") // instructed to disconnect

 	errSessionClosed     = errors.New("agent: session closed")

 )

@@ -39,12 +38,14 @@ type session struct {

 	assignments   chan *api.AssignmentsMessage

 	subscriptions chan *api.SubscriptionMessage

+	cancel     func()        // this is assumed to be never nil, and set whenever a session is created

 	registered chan struct{} // closed registration

 	closed     chan struct{}

 	closeOnce  sync.Once

 }

 func newSession(ctx context.Context, agent *Agent, delay time.Duration, sessionID string, description *api.NodeDescription) *session {

+	sessionCtx, sessionCancel := context.WithCancel(ctx)

 	s := &session{

 		agent:         agent,

 		sessionID:     sessionID,

@@ -54,6 +55,7 @@ func newSession(ctx context.Context, agent *Agent, delay time.Duration, sessionI

 		subscriptions: make(chan *api.SubscriptionMessage),

 		registered:    make(chan struct{}),

 		closed:        make(chan struct{}),

+		cancel:        sessionCancel,

 	}

 	// TODO(stevvooe): Need to move connection management up a level or create

@@ -69,7 +71,7 @@ func newSession(ctx context.Context, agent *Agent, delay time.Duration, sessionI

 	}

 	s.conn = cc

-	go s.run(ctx, delay, description)

+	go s.run(sessionCtx, delay, description)

 	return s

 }

@@ -114,6 +116,14 @@ func (s *session) start(ctx context.Context, description *api.NodeDescription) e

 	// Note: we don't defer cancellation of this context, because the

 	// streaming RPC is used after this function returned. We only cancel

 	// it in the timeout case to make sure the goroutine completes.

+

+	// We also fork this context again from the `run` context, because on

+	// `dispatcherRPCTimeout`, we want to cancel establishing a session and

+	// return an error.  If we cancel the `run` context instead of forking,

+	// then in `run` it's possible that we just terminate the function because

+	// `ctx` is done and hence fail to propagate the timeout error to the agent.

+	// If the error is not propogated to the agent, the agent will not close

+	// the session or rebuild a new sesssion.

 	sessionCtx, cancelSession := context.WithCancel(ctx)

 	// Need to run Session in a goroutine since there's no way to set a

@@ -402,10 +412,10 @@ func (s *session) sendError(err error) {

 // of event loop.

 func (s *session) close() error {

 	s.closeOnce.Do(func() {

+		s.cancel()

 		if s.conn != nil {

 			s.conn.Close(false)

 		}

-

 		close(s.closed)

 	})

@@ -1,3 +1,3 @@

 package api

-//go:generate protoc -I.:../protobuf:../vendor:../vendor/github.com/gogo/protobuf --gogoswarm_out=plugins=grpc+deepcopy+storeobject+raftproxy+authenticatedwrapper,import_path=github.com/docker/swarmkit/api,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor,Mplugin/plugin.proto=github.com/docker/swarmkit/protobuf/plugin,Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types:. types.proto specs.proto objects.proto control.proto dispatcher.proto ca.proto snapshot.proto raft.proto health.proto resource.proto logbroker.proto store.proto

+//go:generate protoc -I.:../protobuf:../vendor:../vendor/github.com/gogo/protobuf --gogoswarm_out=plugins=grpc+deepcopy+storeobject+raftproxy+authenticatedwrapper,import_path=github.com/docker/swarmkit/api,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor,Mplugin/plugin.proto=github.com/docker/swarmkit/protobuf/plugin,Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types:. types.proto specs.proto objects.proto control.proto dispatcher.proto ca.proto snapshot.proto raft.proto health.proto resource.proto logbroker.proto watch.proto

@@ -118,6 +118,16 @@ func (m *LogContext) Reset()                    { *m = LogContext{} }

 func (*LogContext) ProtoMessage()               {}

 func (*LogContext) Descriptor() ([]byte, []int) { return fileDescriptorLogbroker, []int{2} }

+// LogAttr is an extra key/value pair that may be have been set by users

+type LogAttr struct {

+	Key   string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`

+	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`

+}

+

+func (m *LogAttr) Reset()                    { *m = LogAttr{} }

+func (*LogAttr) ProtoMessage()               {}

+func (*LogAttr) Descriptor() ([]byte, []int) { return fileDescriptorLogbroker, []int{3} }

+

 // LogMessage

 type LogMessage struct {

 	// Context identifies the source of the log message.

@@ -129,11 +139,14 @@ type LogMessage struct {

 	Stream LogStream `protobuf:"varint,3,opt,name=stream,proto3,enum=docker.swarmkit.v1.LogStream" json:"stream,omitempty"`

 	// Data is the raw log message, as generated by the application.

 	Data []byte `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"`

+	// Attrs is a list of key value pairs representing additional log details

+	// that may have been returned from the logger

+	Attrs []LogAttr `protobuf:"bytes,5,rep,name=attrs" json:"attrs"`

 }

 func (m *LogMessage) Reset()                    { *m = LogMessage{} }

 func (*LogMessage) ProtoMessage()               {}

-func (*LogMessage) Descriptor() ([]byte, []int) { return fileDescriptorLogbroker, []int{3} }

+func (*LogMessage) Descriptor() ([]byte, []int) { return fileDescriptorLogbroker, []int{4} }

 type SubscribeLogsRequest struct {

 	// LogSelector describes the logs to which the subscriber is

@@ -143,7 +156,7 @@ type SubscribeLogsRequest struct {

 func (m *SubscribeLogsRequest) Reset()                    { *m = SubscribeLogsRequest{} }

 func (*SubscribeLogsRequest) ProtoMessage()               {}

-func (*SubscribeLogsRequest) Descriptor() ([]byte, []int) { return fileDescriptorLogbroker, []int{4} }

+func (*SubscribeLogsRequest) Descriptor() ([]byte, []int) { return fileDescriptorLogbroker, []int{5} }

 type SubscribeLogsMessage struct {

 	Messages []LogMessage `protobuf:"bytes,1,rep,name=messages" json:"messages"`

@@ -151,7 +164,7 @@ type SubscribeLogsMessage struct {

 func (m *SubscribeLogsMessage) Reset()                    { *m = SubscribeLogsMessage{} }

 func (*SubscribeLogsMessage) ProtoMessage()               {}

-func (*SubscribeLogsMessage) Descriptor() ([]byte, []int) { return fileDescriptorLogbroker, []int{5} }

+func (*SubscribeLogsMessage) Descriptor() ([]byte, []int) { return fileDescriptorLogbroker, []int{6} }

 // ListenSubscriptionsRequest is a placeholder to begin listening for

 // subscriptions.

@@ -161,7 +174,7 @@ type ListenSubscriptionsRequest struct {

 func (m *ListenSubscriptionsRequest) Reset()      { *m = ListenSubscriptionsRequest{} }

 func (*ListenSubscriptionsRequest) ProtoMessage() {}

 func (*ListenSubscriptionsRequest) Descriptor() ([]byte, []int) {

-	return fileDescriptorLogbroker, []int{6}

+	return fileDescriptorLogbroker, []int{7}

 }

 // SubscriptionMessage instructs the listener to start publishing messages for

@@ -182,7 +195,7 @@ type SubscriptionMessage struct {

 func (m *SubscriptionMessage) Reset()                    { *m = SubscriptionMessage{} }

 func (*SubscriptionMessage) ProtoMessage()               {}

-func (*SubscriptionMessage) Descriptor() ([]byte, []int) { return fileDescriptorLogbroker, []int{7} }

+func (*SubscriptionMessage) Descriptor() ([]byte, []int) { return fileDescriptorLogbroker, []int{8} }

 type PublishLogsMessage struct {

 	// SubscriptionID identifies which subscription the set of messages should

@@ -199,19 +212,20 @@ type PublishLogsMessage struct {

 func (m *PublishLogsMessage) Reset()                    { *m = PublishLogsMessage{} }

 func (*PublishLogsMessage) ProtoMessage()               {}

-func (*PublishLogsMessage) Descriptor() ([]byte, []int) { return fileDescriptorLogbroker, []int{8} }

+func (*PublishLogsMessage) Descriptor() ([]byte, []int) { return fileDescriptorLogbroker, []int{9} }

 type PublishLogsResponse struct {

 }

 func (m *PublishLogsResponse) Reset()                    { *m = PublishLogsResponse{} }

 func (*PublishLogsResponse) ProtoMessage()               {}

-func (*PublishLogsResponse) Descriptor() ([]byte, []int) { return fileDescriptorLogbroker, []int{9} }

+func (*PublishLogsResponse) Descriptor() ([]byte, []int) { return fileDescriptorLogbroker, []int{10} }

 func init() {

 	proto.RegisterType((*LogSubscriptionOptions)(nil), "docker.swarmkit.v1.LogSubscriptionOptions")

 	proto.RegisterType((*LogSelector)(nil), "docker.swarmkit.v1.LogSelector")

 	proto.RegisterType((*LogContext)(nil), "docker.swarmkit.v1.LogContext")

+	proto.RegisterType((*LogAttr)(nil), "docker.swarmkit.v1.LogAttr")

 	proto.RegisterType((*LogMessage)(nil), "docker.swarmkit.v1.LogMessage")

 	proto.RegisterType((*SubscribeLogsRequest)(nil), "docker.swarmkit.v1.SubscribeLogsRequest")

 	proto.RegisterType((*SubscribeLogsMessage)(nil), "docker.swarmkit.v1.SubscribeLogsMessage")

@@ -339,6 +353,21 @@ func (m *LogContext) CopyFrom(src interface{}) {

 	*m = *o

 }

+func (m *LogAttr) Copy() *LogAttr {

+	if m == nil {

+		return nil

+	}

+	o := &LogAttr{}

+	o.CopyFrom(m)

+	return o

+}

+

+func (m *LogAttr) CopyFrom(src interface{}) {

+

+	o := src.(*LogAttr)

+	*m = *o

+}

+

 func (m *LogMessage) Copy() *LogMessage {

 	if m == nil {

 		return nil

@@ -361,6 +390,13 @@ func (m *LogMessage) CopyFrom(src interface{}) {

 		m.Data = make([]byte, len(o.Data))

 		copy(m.Data, o.Data)

 	}

+	if o.Attrs != nil {

+		m.Attrs = make([]LogAttr, len(o.Attrs))

+		for i := range m.Attrs {

+			github_com_docker_swarmkit_api_deepcopy.Copy(&m.Attrs[i], &o.Attrs[i])

+		}

+	}

+

 }

 func (m *SubscribeLogsRequest) Copy() *SubscribeLogsRequest {

@@ -916,6 +952,36 @@ func (m *LogContext) MarshalTo(dAtA []byte) (int, error) {

 	return i, nil

 }

+func (m *LogAttr) Marshal() (dAtA []byte, err error) {

+	size := m.Size()

+	dAtA = make([]byte, size)

+	n, err := m.MarshalTo(dAtA)

+	if err != nil {

+		return nil, err

+	}

+	return dAtA[:n], nil

+}

+

+func (m *LogAttr) MarshalTo(dAtA []byte) (int, error) {

+	var i int

+	_ = i

+	var l int

+	_ = l

+	if len(m.Key) > 0 {

+		dAtA[i] = 0xa

+		i++

+		i = encodeVarintLogbroker(dAtA, i, uint64(len(m.Key)))

+		i += copy(dAtA[i:], m.Key)

+	}

+	if len(m.Value) > 0 {

+		dAtA[i] = 0x12

+		i++

+		i = encodeVarintLogbroker(dAtA, i, uint64(len(m.Value)))

+		i += copy(dAtA[i:], m.Value)

+	}

+	return i, nil

+}

+

 func (m *LogMessage) Marshal() (dAtA []byte, err error) {

 	size := m.Size()

 	dAtA = make([]byte, size)

@@ -960,6 +1026,18 @@ func (m *LogMessage) MarshalTo(dAtA []byte) (int, error) {

 		i = encodeVarintLogbroker(dAtA, i, uint64(len(m.Data)))

 		i += copy(dAtA[i:], m.Data)

 	}

+	if len(m.Attrs) > 0 {

+		for _, msg := range m.Attrs {

+			dAtA[i] = 0x2a

+			i++

+			i = encodeVarintLogbroker(dAtA, i, uint64(msg.Size()))

+			n, err := msg.MarshalTo(dAtA[i:])

+			if err != nil {

+				return 0, err

+			}

+			i += n

+		}

+	}

 	return i, nil

 }

@@ -1563,6 +1641,20 @@ func (m *LogContext) Size() (n int) {

 	return n

 }

+func (m *LogAttr) Size() (n int) {

+	var l int

+	_ = l

+	l = len(m.Key)

+	if l > 0 {

+		n += 1 + l + sovLogbroker(uint64(l))

+	}

+	l = len(m.Value)

+	if l > 0 {

+		n += 1 + l + sovLogbroker(uint64(l))

+	}

+	return n

+}

+

 func (m *LogMessage) Size() (n int) {

 	var l int

 	_ = l

@@ -1579,6 +1671,12 @@ func (m *LogMessage) Size() (n int) {

 	if l > 0 {

 		n += 1 + l + sovLogbroker(uint64(l))

 	}

+	if len(m.Attrs) > 0 {

+		for _, e := range m.Attrs {

+			l = e.Size()

+			n += 1 + l + sovLogbroker(uint64(l))

+		}

+	}

 	return n

 }

@@ -1710,6 +1808,17 @@ func (this *LogContext) String() string {

 	}, "")

 	return s

 }

+func (this *LogAttr) String() string {

+	if this == nil {

+		return "nil"

+	}

+	s := strings.Join([]string{`&LogAttr{`,

+		`Key:` + fmt.Sprintf("%v", this.Key) + `,`,

+		`Value:` + fmt.Sprintf("%v", this.Value) + `,`,

+		`}`,

+	}, "")

+	return s

+}

 func (this *LogMessage) String() string {

 	if this == nil {

 		return "nil"

@@ -1719,6 +1828,7 @@ func (this *LogMessage) String() string {

 		`Timestamp:` + strings.Replace(fmt.Sprintf("%v", this.Timestamp), "Timestamp", "google_protobuf.Timestamp", 1) + `,`,

 		`Stream:` + fmt.Sprintf("%v", this.Stream) + `,`,

 		`Data:` + fmt.Sprintf("%v", this.Data) + `,`,

+		`Attrs:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Attrs), "LogAttr", "LogAttr", 1), `&`, ``, 1) + `,`,

 		`}`,

 	}, "")

 	return s

@@ -2253,6 +2363,114 @@ func (m *LogContext) Unmarshal(dAtA []byte) error {

 	}

 	return nil

 }

+func (m *LogAttr) Unmarshal(dAtA []byte) error {

+	l := len(dAtA)

+	iNdEx := 0

+	for iNdEx < l {

+		preIndex := iNdEx

+		var wire uint64

+		for shift := uint(0); ; shift += 7 {

+			if shift >= 64 {

+				return ErrIntOverflowLogbroker

+			}

+			if iNdEx >= l {

+				return io.ErrUnexpectedEOF

+			}

+			b := dAtA[iNdEx]

+			iNdEx++

+			wire |= (uint64(b) & 0x7F) << shift

+			if b < 0x80 {

+				break

+			}

+		}

+		fieldNum := int32(wire >> 3)

+		wireType := int(wire & 0x7)

+		if wireType == 4 {

+			return fmt.Errorf("proto: LogAttr: wiretype end group for non-group")

+		}

+		if fieldNum <= 0 {

+			return fmt.Errorf("proto: LogAttr: illegal tag %d (wire type %d)", fieldNum, wire)

+		}

+		switch fieldNum {

+		case 1:

+			if wireType != 2 {

+				return fmt.Errorf("proto: wrong wireType = %d for field Key", wireType)

+			}

+			var stringLen uint64

+			for shift := uint(0); ; shift += 7 {

+				if shift >= 64 {

+					return ErrIntOverflowLogbroker

+				}

+				if iNdEx >= l {

+					return io.ErrUnexpectedEOF

+				}

+				b := dAtA[iNdEx]

+				iNdEx++

+				stringLen |= (uint64(b) & 0x7F) << shift

+				if b < 0x80 {

+					break

+				}

+			}

+			intStringLen := int(stringLen)

+			if intStringLen < 0 {

+				return ErrInvalidLengthLogbroker

+			}

+			postIndex := iNdEx + intStringLen

+			if postIndex > l {

+				return io.ErrUnexpectedEOF

+			}

+			m.Key = string(dAtA[iNdEx:postIndex])

+			iNdEx = postIndex

+		case 2:

+			if wireType != 2 {

+				return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType)

+			}

+			var stringLen uint64

+			for shift := uint(0); ; shift += 7 {

+				if shift >= 64 {

+					return ErrIntOverflowLogbroker

+				}

+				if iNdEx >= l {

+					return io.ErrUnexpectedEOF

+				}

+				b := dAtA[iNdEx]

+				iNdEx++

+				stringLen |= (uint64(b) & 0x7F) << shift

+				if b < 0x80 {

+					break

+				}

+			}

+			intStringLen := int(stringLen)

+			if intStringLen < 0 {

+				return ErrInvalidLengthLogbroker

+			}

+			postIndex := iNdEx + intStringLen

+			if postIndex > l {

+				return io.ErrUnexpectedEOF

+			}

+			m.Value = string(dAtA[iNdEx:postIndex])

+			iNdEx = postIndex

+		default:

+			iNdEx = preIndex

+			skippy, err := skipLogbroker(dAtA[iNdEx:])

+			if err != nil {

+				return err

+			}

+			if skippy < 0 {

+				return ErrInvalidLengthLogbroker

+			}

+			if (iNdEx + skippy) > l {

+				return io.ErrUnexpectedEOF

+			}

+			iNdEx += skippy

+		}

+	}

+

+	if iNdEx > l {

+		return io.ErrUnexpectedEOF

+	}

+	return nil

+}

 func (m *LogMessage) Unmarshal(dAtA []byte) error {

 	l := len(dAtA)

 	iNdEx := 0

@@ -2395,6 +2613,37 @@ func (m *LogMessage) Unmarshal(dAtA []byte) error {

 				m.Data = []byte{}

 			}

 			iNdEx = postIndex

+		case 5:

+			if wireType != 2 {

+				return fmt.Errorf("proto: wrong wireType = %d for field Attrs", wireType)

+			}

+			var msglen int

+			for shift := uint(0); ; shift += 7 {

+				if shift >= 64 {

+					return ErrIntOverflowLogbroker

+				}

+				if iNdEx >= l {

+					return io.ErrUnexpectedEOF

+				}

+				b := dAtA[iNdEx]

+				iNdEx++

+				msglen |= (int(b) & 0x7F) << shift

+				if b < 0x80 {

+					break

+				}

+			}

+			if msglen < 0 {

+				return ErrInvalidLengthLogbroker

+			}

+			postIndex := iNdEx + msglen

+			if postIndex > l {

+				return io.ErrUnexpectedEOF

+			}

+			m.Attrs = append(m.Attrs, LogAttr{})

+			if err := m.Attrs[len(m.Attrs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {

+				return err

+			}

+			iNdEx = postIndex

 		default:

 			iNdEx = preIndex

 			skippy, err := skipLogbroker(dAtA[iNdEx:])

@@ -3116,61 +3365,64 @@ var (

 func init() { proto.RegisterFile("logbroker.proto", fileDescriptorLogbroker) }

 var fileDescriptorLogbroker = []byte{

-	// 886 bytes of a gzipped FileDescriptorProto

-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x8f, 0xdb, 0x44,

-	0x18, 0xc6, 0x33, 0xce, 0x36, 0x7f, 0xde, 0x74, 0xff, 0x74, 0xb2, 0x5d, 0x45, 0x11, 0xb5, 0x23,

-	0x57, 0x2a, 0xd1, 0xaa, 0x24, 0x25, 0x08, 0x81, 0x54, 0x09, 0x41, 0x48, 0x85, 0x22, 0xd2, 0x5d,

-	0x34, 0xc9, 0x0a, 0x6e, 0x2b, 0x27, 0x9e, 0x1a, 0x2b, 0x8e, 0x27, 0x78, 0x9c, 0x2e, 0x07, 0x0e,

-	0x1c, 0x8a, 0x84, 0x7a, 0xe0, 0x86, 0x04, 0x87, 0x9e, 0xe8, 0x05, 0x21, 0xc1, 0x9d, 0x0f, 0x80,

-	0x56, 0x9c, 0xe0, 0xc6, 0x29, 0xa2, 0xfe, 0x00, 0x7c, 0x06, 0xe4, 0x99, 0x89, 0xe3, 0x25, 0x49,

-	0x8b, 0xb6, 0x97, 0x64, 0xc6, 0xf3, 0xbc, 0x9e, 0xdf, 0x3c, 0xf3, 0xbc, 0x09, 0xec, 0x7a, 0xcc,

-	0x19, 0x06, 0x6c, 0x4c, 0x83, 0xc6, 0x34, 0x60, 0x21, 0xc3, 0xd8, 0x66, 0xa3, 0x78, 0xc6, 0xcf,

-	0xac, 0x60, 0x32, 0x76, 0xc3, 0xc6, 0xc3, 0xd7, 0xab, 0xfb, 0x0e, 0x73, 0x98, 0x58, 0x6e, 0xc6,

-	0x23, 0xa9, 0xac, 0x1a, 0x0e, 0x63, 0x8e, 0x47, 0x9b, 0x62, 0x36, 0x9c, 0x3d, 0x68, 0x86, 0xee,

-	0x84, 0xf2, 0xd0, 0x9a, 0x4c, 0x95, 0xa0, 0x3c, 0xf5, 0x66, 0x8e, 0xeb, 0x37, 0xe5, 0x97, 0x7c,

-	0x68, 0xfe, 0x82, 0xe0, 0xa0, 0xc7, 0x9c, 0xfe, 0x6c, 0xc8, 0x47, 0x81, 0x3b, 0x0d, 0x5d, 0xe6,

-	0x1f, 0x8b, 0x4f, 0x8e, 0xdf, 0x82, 0x3c, 0x0f, 0x03, 0x6a, 0x4d, 0x78, 0x05, 0xd5, 0xb2, 0xf5,

-	0x9d, 0xd6, 0x8d, 0xc6, 0x2a, 0x4c, 0x23, 0x2e, 0x16, 0x2a, 0xb2, 0x50, 0xe3, 0x03, 0xc8, 0x3d,

-	0x60, 0x9e, 0xc7, 0xce, 0x2a, 0x5a, 0x0d, 0xd5, 0x0b, 0x44, 0xcd, 0x30, 0x86, 0xad, 0xd0, 0x72,

-	0xbd, 0x4a, 0xb6, 0x86, 0xea, 0x59, 0x22, 0xc6, 0xf8, 0x0e, 0x5c, 0xe1, 0xae, 0x3f, 0xa2, 0x95,

-	0xad, 0x1a, 0xaa, 0x97, 0x5a, 0xd5, 0x86, 0x3c, 0x45, 0x63, 0x71, 0x8a, 0xc6, 0x60, 0x71, 0x0a,

-	0x22, 0x85, 0xe6, 0x37, 0x08, 0x4a, 0xf1, 0xa6, 0xd4, 0xa3, 0xa3, 0x90, 0x05, 0xb8, 0x09, 0x25,

-	0x4e, 0x83, 0x87, 0xee, 0x88, 0x9e, 0xba, 0xb6, 0x44, 0x2d, 0xb6, 0x77, 0xa2, 0xb9, 0x01, 0x7d,

-	0xf9, 0xb8, 0xdb, 0xe1, 0x04, 0x94, 0xa4, 0x6b, 0x73, 0x7c, 0x0b, 0x0a, 0x3e, 0xb3, 0xa5, 0x5a,

-	0x13, 0xea, 0x52, 0x34, 0x37, 0xf2, 0x47, 0xcc, 0x16, 0xd2, 0x7c, 0xbc, 0xa8, 0x74, 0xa1, 0xc5,

-	0xc7, 0x42, 0x97, 0x5d, 0xea, 0x06, 0x16, 0x1f, 0x0b, 0x5d, 0xbc, 0xd8, 0xb5, 0xb9, 0xf9, 0x08,

-	0x01, 0xf4, 0x98, 0xf3, 0x3e, 0xf3, 0x43, 0xfa, 0x79, 0x88, 0x6f, 0x03, 0x2c, 0x79, 0x2a, 0xa8,

-	0x86, 0xea, 0xc5, 0xf6, 0x76, 0x34, 0x37, 0x8a, 0x09, 0x0e, 0x29, 0x26, 0x34, 0xf8, 0x26, 0xe4,

-	0x15, 0x8c, 0x30, 0xab, 0xd8, 0x86, 0x68, 0x6e, 0xe4, 0x24, 0x0b, 0xc9, 0x49, 0x94, 0x58, 0xa4,

-	0x48, 0x84, 0x77, 0x4a, 0x24, 0x41, 0x48, 0x4e, 0x72, 0x98, 0x7f, 0x4a, 0x8c, 0xfb, 0x94, 0x73,

-	0xcb, 0xa1, 0xf8, 0x1d, 0xc8, 0x8f, 0x24, 0x91, 0x60, 0x28, 0xb5, 0xf4, 0x0d, 0xb7, 0xa7, 0xb8,

-	0xdb, 0x5b, 0xe7, 0x73, 0x23, 0x43, 0x16, 0x45, 0xf8, 0x6d, 0x28, 0x26, 0x01, 0x12, 0x68, 0xcf,

-	0xbf, 0x9c, 0xa5, 0x18, 0xbf, 0x09, 0x39, 0x99, 0x04, 0x01, 0xfb, 0xc2, 0xd8, 0x28, 0x71, 0x9c,

-	0x0e, 0xdb, 0x0a, 0x2d, 0x11, 0x84, 0xab, 0x44, 0x8c, 0xcd, 0xef, 0x11, 0xec, 0xab, 0x68, 0x0e,

-	0x69, 0x8f, 0x39, 0x9c, 0xd0, 0xcf, 0x66, 0x94, 0x87, 0xf8, 0x2e, 0x14, 0xb8, 0x0a, 0x80, 0x3a,

-	0x9e, 0xb1, 0x69, 0x17, 0x25, 0x23, 0x49, 0x01, 0xee, 0x40, 0x9e, 0xc9, 0x8c, 0xab, 0x83, 0x1d,

-	0x6e, 0xaa, 0x5d, 0xed, 0x0a, 0xb2, 0x28, 0x35, 0x3f, 0xf9, 0x0f, 0xda, 0xc2, 0xf8, 0x77, 0xa1,

-	0x30, 0x91, 0x43, 0x19, 0xc6, 0xcd, 0xce, 0xab, 0x0a, 0xe5, 0x7c, 0x52, 0x65, 0xbe, 0x02, 0xd5,

-	0x9e, 0xcb, 0x43, 0xea, 0xa7, 0xf7, 0x5f, 0x1c, 0xdd, 0xfc, 0x0d, 0x41, 0x39, 0xbd, 0xb0, 0xd8,

-	0xf7, 0x00, 0xb4, 0x24, 0x6f, 0xb9, 0x68, 0x6e, 0x68, 0xdd, 0x0e, 0xd1, 0x5c, 0xfb, 0x82, 0x55,

-	0xda, 0x4b, 0x58, 0x95, 0xbd, 0xb4, 0x55, 0x78, 0x1f, 0xae, 0x8c, 0x3c, 0xc6, 0x65, 0x93, 0x17,

-	0x88, 0x9c, 0x98, 0x3f, 0x22, 0xc0, 0x1f, 0xcd, 0x86, 0x9e, 0xcb, 0x3f, 0x4d, 0xfb, 0x77, 0x17,

-	0x76, 0x79, 0xea, 0x65, 0xcb, 0x26, 0xc2, 0xd1, 0xdc, 0xd8, 0x49, 0xef, 0xd3, 0xed, 0x90, 0x9d,

-	0xb4, 0xb4, 0x6b, 0x5f, 0x30, 0x5f, 0xbb, 0x8c, 0xf9, 0x4b, 0xd6, 0x6c, 0x9a, 0xf5, 0x3a, 0x94,

-	0x53, 0xa8, 0x84, 0xf2, 0x29, 0xf3, 0x39, 0x3d, 0x7c, 0x8a, 0xa0, 0x98, 0x24, 0x19, 0xdf, 0x06,

-	0xdc, 0x3b, 0xfe, 0xe0, 0xb4, 0x3f, 0x20, 0xf7, 0xde, 0xbb, 0x7f, 0x7a, 0x72, 0xf4, 0xe1, 0xd1,

-	0xf1, 0xc7, 0x47, 0x7b, 0x99, 0xea, 0xfe, 0xe3, 0x27, 0xb5, 0xbd, 0x44, 0x76, 0xe2, 0x8f, 0x7d,

-	0x76, 0xe6, 0xe3, 0x43, 0xb8, 0x96, 0x52, 0xf7, 0x07, 0x9d, 0xe3, 0x93, 0xc1, 0x1e, 0xaa, 0x96,

-	0x1f, 0x3f, 0xa9, 0xed, 0x26, 0xe2, 0x7e, 0x68, 0xb3, 0x59, 0xb8, 0xaa, 0xbd, 0x47, 0xc8, 0x9e,

-	0xb6, 0xaa, 0xa5, 0x41, 0x50, 0xbd, 0xf6, 0xf5, 0x0f, 0x7a, 0xe6, 0xd7, 0xa7, 0xfa, 0x12, 0xac,

-	0xf5, 0x08, 0xc1, 0x56, 0xcc, 0x8d, 0xbf, 0x80, 0xed, 0x0b, 0x99, 0xc5, 0xf5, 0x75, 0xee, 0xac,

-	0xeb, 0xb8, 0xea, 0x8b, 0x95, 0xca, 0x51, 0xf3, 0xfa, 0xef, 0x3f, 0xff, 0xf3, 0x9d, 0xb6, 0x0b,

-	0xdb, 0x42, 0xf9, 0xda, 0xc4, 0xf2, 0x2d, 0x87, 0x06, 0x77, 0x50, 0xeb, 0x27, 0x4d, 0xb8, 0xd5,

-	0x16, 0xff, 0x6f, 0xf8, 0x5b, 0x04, 0xe5, 0x35, 0x31, 0xc7, 0x8d, 0xb5, 0x17, 0xb6, 0xb1, 0x1f,

-	0xaa, 0xaf, 0x3e, 0x07, 0x2c, 0xdd, 0x20, 0xe6, 0x4d, 0xc1, 0x75, 0x03, 0xae, 0x4a, 0xae, 0x33,

-	0x16, 0x8c, 0x69, 0xb0, 0x42, 0x89, 0xbf, 0x42, 0x50, 0x4a, 0xdd, 0x35, 0xbe, 0xb5, 0xee, 0xfd,

-	0xab, 0xb9, 0x5d, 0xcf, 0xb1, 0x26, 0x34, 0xff, 0x8b, 0xa3, 0x8e, 0xda, 0x95, 0xf3, 0x67, 0x7a,

-	0xe6, 0xaf, 0x67, 0x7a, 0xe6, 0xcb, 0x48, 0x47, 0xe7, 0x91, 0x8e, 0xfe, 0x88, 0x74, 0xf4, 0x77,

-	0xa4, 0xa3, 0x61, 0x4e, 0xfc, 0xfe, 0xbe, 0xf1, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x37,

-	0x34, 0x6f, 0x2d, 0x08, 0x00, 0x00,

+	// 940 bytes of a gzipped FileDescriptorProto

+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x95, 0xcf, 0x6f, 0x1b, 0x45,

+	0x14, 0xc7, 0x33, 0xeb, 0xc4, 0x3f, 0x9e, 0x9b, 0xc4, 0x1d, 0xa7, 0x91, 0x65, 0xa8, 0x6d, 0x6d,

+	0xa5, 0x62, 0x45, 0xc5, 0x6e, 0x8d, 0x50, 0x91, 0x2a, 0x21, 0x6a, 0x5c, 0x21, 0x0b, 0x37, 0x41,

+	0x63, 0x47, 0x70, 0x8b, 0xd6, 0xde, 0xe9, 0xb2, 0xf2, 0x7a, 0xc7, 0xec, 0x8c, 0x13, 0x90, 0x38,

+	0x70, 0x28, 0x12, 0xca, 0x81, 0x1b, 0x12, 0x1c, 0x7a, 0xa2, 0x17, 0x84, 0x04, 0x77, 0xfe, 0x00,

+	0x14, 0x71, 0xe2, 0xc8, 0xc9, 0xa2, 0xfb, 0x07, 0xf0, 0x37, 0xa0, 0x9d, 0x19, 0xdb, 0x1b, 0x6c,

+	0xb7, 0xa8, 0xbd, 0x24, 0x33, 0x3b, 0x9f, 0xb7, 0xef, 0xfb, 0xbe, 0xf3, 0xde, 0x1a, 0x76, 0x3d,

+	0xe6, 0xf4, 0x03, 0x36, 0xa4, 0x41, 0x6d, 0x1c, 0x30, 0xc1, 0x30, 0xb6, 0xd9, 0x20, 0xda, 0xf1,

+	0x33, 0x2b, 0x18, 0x0d, 0x5d, 0x51, 0x3b, 0xbd, 0x53, 0xdc, 0x73, 0x98, 0xc3, 0xe4, 0x71, 0x3d,

+	0x5a, 0x29, 0xb2, 0x58, 0x76, 0x18, 0x73, 0x3c, 0x5a, 0x97, 0xbb, 0xfe, 0xe4, 0x51, 0x5d, 0xb8,

+	0x23, 0xca, 0x85, 0x35, 0x1a, 0x6b, 0x20, 0x3f, 0xf6, 0x26, 0x8e, 0xeb, 0xd7, 0xd5, 0x3f, 0xf5,

+	0xd0, 0xfc, 0x15, 0xc1, 0x7e, 0x87, 0x39, 0xdd, 0x49, 0x9f, 0x0f, 0x02, 0x77, 0x2c, 0x5c, 0xe6,

+	0x1f, 0xc9, 0xbf, 0x1c, 0xdf, 0x85, 0x14, 0x17, 0x01, 0xb5, 0x46, 0xbc, 0x80, 0x2a, 0x89, 0xea,

+	0x4e, 0xe3, 0x7a, 0x6d, 0x59, 0x4c, 0x2d, 0x0a, 0x96, 0x14, 0x99, 0xd1, 0x78, 0x1f, 0x92, 0x8f,

+	0x98, 0xe7, 0xb1, 0xb3, 0x82, 0x51, 0x41, 0xd5, 0x34, 0xd1, 0x3b, 0x8c, 0x61, 0x53, 0x58, 0xae,

+	0x57, 0x48, 0x54, 0x50, 0x35, 0x41, 0xe4, 0x1a, 0xdf, 0x86, 0x2d, 0xee, 0xfa, 0x03, 0x5a, 0xd8,

+	0xac, 0xa0, 0x6a, 0xb6, 0x51, 0xac, 0xa9, 0x2a, 0x6a, 0xb3, 0x2a, 0x6a, 0xbd, 0x59, 0x15, 0x44,

+	0x81, 0xe6, 0xb7, 0x08, 0xb2, 0x51, 0x52, 0xea, 0xd1, 0x81, 0x60, 0x01, 0xae, 0x43, 0x96, 0xd3,

+	0xe0, 0xd4, 0x1d, 0xd0, 0x13, 0xd7, 0x56, 0x52, 0x33, 0xcd, 0x9d, 0x70, 0x5a, 0x86, 0xae, 0x7a,

+	0xdc, 0x6e, 0x71, 0x02, 0x1a, 0x69, 0xdb, 0x1c, 0xdf, 0x84, 0xb4, 0xcf, 0x6c, 0x45, 0x1b, 0x92,

+	0xce, 0x86, 0xd3, 0x72, 0xea, 0x90, 0xd9, 0x12, 0x4d, 0x45, 0x87, 0x9a, 0x13, 0x16, 0x1f, 0x4a,

+	0x2e, 0xb1, 0xe0, 0x7a, 0x16, 0x1f, 0x4a, 0x2e, 0x3a, 0x6c, 0xdb, 0xdc, 0x7c, 0x8c, 0x00, 0x3a,

+	0xcc, 0x79, 0x9f, 0xf9, 0x82, 0x7e, 0x2e, 0xf0, 0x2d, 0x80, 0x85, 0x9e, 0x02, 0xaa, 0xa0, 0x6a,

+	0xa6, 0xb9, 0x1d, 0x4e, 0xcb, 0x99, 0xb9, 0x1c, 0x92, 0x99, 0xab, 0xc1, 0x37, 0x20, 0xa5, 0xc5,

+	0x48, 0xb3, 0x32, 0x4d, 0x08, 0xa7, 0xe5, 0xa4, 0xd2, 0x42, 0x92, 0x4a, 0x4a, 0x04, 0x69, 0x25,

+	0xd2, 0x3b, 0x0d, 0x29, 0x21, 0x24, 0xa9, 0x74, 0x98, 0x77, 0x20, 0xd5, 0x61, 0xce, 0x7d, 0x21,

+	0x02, 0x9c, 0x83, 0xc4, 0x90, 0x7e, 0xa1, 0x72, 0x93, 0x68, 0x89, 0xf7, 0x60, 0xeb, 0xd4, 0xf2,

+	0x26, 0x54, 0x25, 0x21, 0x6a, 0x63, 0x9e, 0x1b, 0x52, 0xf9, 0x43, 0xca, 0xb9, 0xe5, 0x50, 0xfc,

+	0x2e, 0xa4, 0x06, 0xaa, 0x08, 0x19, 0x9a, 0x6d, 0x94, 0xd6, 0x5c, 0xb8, 0x2e, 0xb5, 0xb9, 0x79,

+	0x31, 0x2d, 0x6f, 0x90, 0x59, 0x10, 0x7e, 0x07, 0x32, 0xf3, 0x9e, 0x93, 0x89, 0x9e, 0x7f, 0x9f,

+	0x0b, 0x18, 0xbf, 0x0d, 0x49, 0xd5, 0x3c, 0xb2, 0xbe, 0x17, 0x76, 0x9a, 0x86, 0xa3, 0x86, 0xb2,

+	0x2d, 0x61, 0xc9, 0xde, 0xb9, 0x42, 0xe4, 0x1a, 0xdf, 0x85, 0x2d, 0x4b, 0x88, 0x80, 0x17, 0xb6,

+	0x2a, 0x89, 0x6a, 0xb6, 0xf1, 0xda, 0x9a, 0x37, 0x45, 0x3e, 0x69, 0xfd, 0x8a, 0x37, 0x7f, 0x40,

+	0xb0, 0xa7, 0xc7, 0xa0, 0x4f, 0x3b, 0xcc, 0xe1, 0x84, 0x7e, 0x36, 0xa1, 0x5c, 0xe0, 0x7b, 0x90,

+	0xe6, 0xba, 0xd9, 0xb4, 0x2f, 0xe5, 0x75, 0xf2, 0x34, 0x46, 0xe6, 0x01, 0xb8, 0x05, 0x29, 0xa6,

+	0xe6, 0x49, 0x3b, 0x72, 0xb0, 0x2e, 0x76, 0x79, 0x02, 0xc9, 0x2c, 0xd4, 0xfc, 0xe4, 0x3f, 0xd2,

+	0x66, 0x37, 0xf6, 0x1e, 0xa4, 0x47, 0x6a, 0xa9, 0x1a, 0x7f, 0xfd, 0x95, 0xe9, 0x08, 0x5d, 0xf2,

+	0x3c, 0xca, 0x7c, 0x1d, 0x8a, 0x1d, 0x97, 0x0b, 0xea, 0xc7, 0xf3, 0xcf, 0x4a, 0x37, 0x7f, 0x47,

+	0x90, 0x8f, 0x1f, 0xcc, 0xf2, 0xee, 0x83, 0x31, 0xef, 0xed, 0x64, 0x38, 0x2d, 0x1b, 0xed, 0x16,

+	0x31, 0x5c, 0xfb, 0x92, 0x55, 0xc6, 0x2b, 0x58, 0x95, 0x78, 0x69, 0xab, 0xa2, 0x4e, 0x1f, 0x78,

+	0x8c, 0xab, 0x0f, 0x4a, 0x9a, 0xa8, 0x8d, 0xf9, 0x13, 0x02, 0xfc, 0xd1, 0xa4, 0xef, 0xb9, 0xfc,

+	0xd3, 0xb8, 0x7f, 0xf7, 0x60, 0x97, 0xc7, 0x5e, 0xb6, 0x18, 0x58, 0x1c, 0x4e, 0xcb, 0x3b, 0xf1,

+	0x3c, 0xed, 0x16, 0xd9, 0x89, 0xa3, 0x6d, 0xfb, 0x92, 0xf9, 0xc6, 0xcb, 0x98, 0xbf, 0xd0, 0x9a,

+	0x88, 0x6b, 0xbd, 0x06, 0xf9, 0x98, 0x54, 0x42, 0xf9, 0x98, 0xf9, 0x9c, 0x1e, 0x3c, 0x45, 0x90,

+	0x99, 0x8f, 0x00, 0xbe, 0x05, 0xb8, 0x73, 0xf4, 0xc1, 0x49, 0xb7, 0x47, 0x1e, 0xdc, 0x7f, 0x78,

+	0x72, 0x7c, 0xf8, 0xe1, 0xe1, 0xd1, 0xc7, 0x87, 0xb9, 0x8d, 0xe2, 0xde, 0xf9, 0x93, 0x4a, 0x6e,

+	0x8e, 0x1d, 0xfb, 0x43, 0x9f, 0x9d, 0xf9, 0xf8, 0x00, 0xae, 0xc6, 0xe8, 0x6e, 0xaf, 0x75, 0x74,

+	0xdc, 0xcb, 0xa1, 0x62, 0xfe, 0xfc, 0x49, 0x65, 0x77, 0x0e, 0x77, 0x85, 0xcd, 0x26, 0x62, 0x99,

+	0x7d, 0x40, 0x48, 0xce, 0x58, 0x66, 0x69, 0x10, 0x14, 0xaf, 0x7e, 0xf3, 0x63, 0x69, 0xe3, 0xb7,

+	0xa7, 0xa5, 0x85, 0xb0, 0xc6, 0x63, 0x04, 0x9b, 0x91, 0x6e, 0xfc, 0x25, 0x6c, 0x5f, 0xea, 0x59,

+	0x5c, 0x5d, 0xe5, 0xce, 0xaa, 0x89, 0x2b, 0xbe, 0x98, 0xd4, 0x8e, 0x9a, 0xd7, 0xfe, 0xf8, 0xe5,

+	0x9f, 0xef, 0x8d, 0x5d, 0xd8, 0x96, 0xe4, 0x9b, 0x23, 0xcb, 0xb7, 0x1c, 0x1a, 0xdc, 0x46, 0x8d,

+	0x9f, 0x0d, 0xe9, 0x56, 0x53, 0xfe, 0x96, 0xe2, 0xef, 0x10, 0xe4, 0x57, 0xb4, 0x39, 0xae, 0xad,

+	0xbc, 0xb0, 0xb5, 0xf3, 0x50, 0x7c, 0xe3, 0x39, 0xc2, 0xe2, 0x03, 0x62, 0xde, 0x90, 0xba, 0xae,

+	0xc3, 0x15, 0xa5, 0xeb, 0x8c, 0x05, 0x43, 0x1a, 0x2c, 0xa9, 0xc4, 0x5f, 0x23, 0xc8, 0xc6, 0xee,

+	0x1a, 0xdf, 0x5c, 0xf5, 0xfe, 0xe5, 0xbe, 0x5d, 0xad, 0x63, 0x45, 0xd3, 0xfc, 0x2f, 0x1d, 0x55,

+	0xd4, 0x2c, 0x5c, 0x3c, 0x2b, 0x6d, 0xfc, 0xf5, 0xac, 0xb4, 0xf1, 0x55, 0x58, 0x42, 0x17, 0x61,

+	0x09, 0xfd, 0x19, 0x96, 0xd0, 0xdf, 0x61, 0x09, 0xf5, 0x93, 0xf2, 0xc3, 0xfd, 0xd6, 0xbf, 0x01,

+	0x00, 0x00, 0xff, 0xff, 0xf8, 0x4f, 0xdd, 0x74, 0x99, 0x08, 0x00, 0x00,

 }

@@ -66,6 +66,12 @@ message LogContext {

 	string task_id = 3;

 }

+// LogAttr is an extra key/value pair that may be have been set by users

+message LogAttr {

+	string key = 1;

+	string value = 2;

+}

+

 // LogMessage

 message LogMessage {

 	// Context identifies the source of the log message.

@@ -80,6 +86,10 @@ message LogMessage {

 	// Data is the raw log message, as generated by the application.

 	bytes data = 4;

+

+	// Attrs is a list of key value pairs representing additional log details

+	// that may have been returned from the logger

+	repeated LogAttr attrs = 5 [(gogoproto.nullable) = false];

 }

 // Logs defines the methods for retrieving task logs messages from a cluster.

deleted file mode 100644

@@ -1,4599 +0,0 @@

-// Code generated by protoc-gen-gogo.

-// source: store.proto

-// DO NOT EDIT!

-

-package api

-

-import proto "github.com/gogo/protobuf/proto"

-import fmt "fmt"

-import math "math"

-import _ "github.com/gogo/protobuf/gogoproto"

-import _ "github.com/docker/swarmkit/protobuf/plugin"

-

-import github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy"

-

-import (

-	context "golang.org/x/net/context"

-	grpc "google.golang.org/grpc"

-)

-

-import raftselector "github.com/docker/swarmkit/manager/raftselector"

-import codes "google.golang.org/grpc/codes"

-import metadata "google.golang.org/grpc/metadata"

-import transport "google.golang.org/grpc/transport"

-import rafttime "time"

-

-import strings "strings"

-import reflect "reflect"

-

-import io "io"

-

-// Reference imports to suppress errors if they are not otherwise used.

-var _ = proto.Marshal

-var _ = fmt.Errorf

-var _ = math.Inf

-

-// WatchActionKind distinguishes between creations, updates, and removals. It

-// is structured as a bitmap so multiple kinds of events can be requested with

-// a mask.

-type WatchActionKind int32

-

-const (

-	WatchActionKindUnknown WatchActionKind = 0

-	WatchActionKindCreate  WatchActionKind = 1

-	WatchActionKindUpdate  WatchActionKind = 2

-	WatchActionKindRemove  WatchActionKind = 4

-)

-

-var WatchActionKind_name = map[int32]string{

-	0: "WATCH_ACTION_UNKNOWN",

-	1: "WATCH_ACTION_CREATE",

-	2: "WATCH_ACTION_UPDATE",

-	4: "WATCH_ACTION_REMOVE",

-}

-var WatchActionKind_value = map[string]int32{

-	"WATCH_ACTION_UNKNOWN": 0,

-	"WATCH_ACTION_CREATE":  1,

-	"WATCH_ACTION_UPDATE":  2,

-	"WATCH_ACTION_REMOVE":  4,

-}

-

-func (x WatchActionKind) String() string {

-	return proto.EnumName(WatchActionKind_name, int32(x))

-}

-func (WatchActionKind) EnumDescriptor() ([]byte, []int) { return fileDescriptorStore, []int{0} }

-

-type Object struct {

-	// Types that are valid to be assigned to Object:

-	//	*Object_Node

-	//	*Object_Service

-	//	*Object_Network

-	//	*Object_Task

-	//	*Object_Cluster

-	//	*Object_Secret

-	//	*Object_Resource

-	//	*Object_Extension

-	//	*Object_Config

-	Object isObject_Object `protobuf_oneof:"Object"`

-}

-

-func (m *Object) Reset()                    { *m = Object{} }

-func (*Object) ProtoMessage()               {}

-func (*Object) Descriptor() ([]byte, []int) { return fileDescriptorStore, []int{0} }

-

-type isObject_Object interface {

-	isObject_Object()

-	MarshalTo([]byte) (int, error)

-	Size() int

-}

-

-type Object_Node struct {

-	Node *Node `protobuf:"bytes,1,opt,name=node,oneof"`

-}

-type Object_Service struct {

-	Service *Service `protobuf:"bytes,2,opt,name=service,oneof"`

-}

-type Object_Network struct {

-	Network *Network `protobuf:"bytes,3,opt,name=network,oneof"`

-}

-type Object_Task struct {

-	Task *Task `protobuf:"bytes,4,opt,name=task,oneof"`

-}

-type Object_Cluster struct {

-	Cluster *Cluster `protobuf:"bytes,5,opt,name=cluster,oneof"`

-}

-type Object_Secret struct {

-	Secret *Secret `protobuf:"bytes,6,opt,name=secret,oneof"`

-}

-type Object_Resource struct {

-	Resource *Resource `protobuf:"bytes,7,opt,name=resource,oneof"`

-}

-type Object_Extension struct {

-	Extension *Extension `protobuf:"bytes,8,opt,name=extension,oneof"`

-}

-type Object_Config struct {

-	Config *Config `protobuf:"bytes,9,opt,name=config,oneof"`

-}

-

-func (*Object_Node) isObject_Object()      {}

-func (*Object_Service) isObject_Object()   {}

-func (*Object_Network) isObject_Object()   {}

-func (*Object_Task) isObject_Object()      {}

-func (*Object_Cluster) isObject_Object()   {}

-func (*Object_Secret) isObject_Object()    {}

-func (*Object_Resource) isObject_Object()  {}

-func (*Object_Extension) isObject_Object() {}

-func (*Object_Config) isObject_Object()    {}

-

-func (m *Object) GetObject() isObject_Object {

-	if m != nil {

-		return m.Object

-	}

-	return nil

-}

-

-func (m *Object) GetNode() *Node {

-	if x, ok := m.GetObject().(*Object_Node); ok {

-		return x.Node

-	}

-	return nil

-}

-

-func (m *Object) GetService() *Service {

-	if x, ok := m.GetObject().(*Object_Service); ok {

-		return x.Service

-	}

-	return nil

-}

-

-func (m *Object) GetNetwork() *Network {

-	if x, ok := m.GetObject().(*Object_Network); ok {

-		return x.Network

-	}

-	return nil

-}

-

-func (m *Object) GetTask() *Task {

-	if x, ok := m.GetObject().(*Object_Task); ok {

-		return x.Task

-	}

-	return nil

-}

-

-func (m *Object) GetCluster() *Cluster {

-	if x, ok := m.GetObject().(*Object_Cluster); ok {

-		return x.Cluster

-	}

-	return nil

-}

-

-func (m *Object) GetSecret() *Secret {

-	if x, ok := m.GetObject().(*Object_Secret); ok {

-		return x.Secret

-	}

-	return nil

-}

-

-func (m *Object) GetResource() *Resource {

-	if x, ok := m.GetObject().(*Object_Resource); ok {

-		return x.Resource

-	}

-	return nil

-}

-

-func (m *Object) GetExtension() *Extension {

-	if x, ok := m.GetObject().(*Object_Extension); ok {

-		return x.Extension

-	}

-	return nil

-}

-

-func (m *Object) GetConfig() *Config {

-	if x, ok := m.GetObject().(*Object_Config); ok {

-		return x.Config

-	}

-	return nil

-}

-

-// XXX_OneofFuncs is for the internal use of the proto package.

-func (*Object) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {

-	return _Object_OneofMarshaler, _Object_OneofUnmarshaler, _Object_OneofSizer, []interface{}{

-		(*Object_Node)(nil),

-		(*Object_Service)(nil),

-		(*Object_Network)(nil),

-		(*Object_Task)(nil),

-		(*Object_Cluster)(nil),

-		(*Object_Secret)(nil),

-		(*Object_Resource)(nil),

-		(*Object_Extension)(nil),

-		(*Object_Config)(nil),

-	}

-}

-

-func _Object_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {

-	m := msg.(*Object)

-	// Object

-	switch x := m.Object.(type) {

-	case *Object_Node:

-		_ = b.EncodeVarint(1<<3 | proto.WireBytes)

-		if err := b.EncodeMessage(x.Node); err != nil {

-			return err

-		}

-	case *Object_Service:

-		_ = b.EncodeVarint(2<<3 | proto.WireBytes)