From da5d876d9193e8e88fccff4f7072407cd282d71a Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Sat, 20 Feb 2016 23:40:09 -0800 Subject: [PATCH] Add SystemUsage to returned CpuStats Signed-off-by: Kenfe-Mickael Laventure --- api/grpc/server/server.go | 58 ++++++++++ api/grpc/types/api.pb.go | 215 +++++++++++++++++++++----------------- api/grpc/types/api.proto | 5 +- 3 files changed, 180 insertions(+), 98 deletions(-) diff --git a/api/grpc/server/server.go b/api/grpc/server/server.go index 61685f6..03857bb 100644 --- a/api/grpc/server/server.go +++ b/api/grpc/server/server.go @@ -1,8 +1,12 @@ package server import ( + "bufio" "errors" "fmt" + "os" + "strconv" + "strings" "syscall" "time" @@ -14,6 +18,7 @@ import ( "github.com/docker/containerd/supervisor" "github.com/opencontainers/runc/libcontainer" "github.com/opencontainers/runc/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/system" "github.com/opencontainers/specs" "golang.org/x/net/context" ) @@ -316,6 +321,7 @@ func convertToPb(st *runtime.Stat) *types.StatsResponse { return pbSt } cpuSt := lcSt.CgroupStats.CpuStats + systemUsage, _ := getSystemCPUUsage() pbSt.CgroupStats.CpuStats = &types.CpuStats{ CpuUsage: &types.CpuUsage{ TotalUsage: cpuSt.CpuUsage.TotalUsage, @@ -328,6 +334,7 @@ func convertToPb(st *runtime.Stat) *types.StatsResponse { ThrottledPeriods: cpuSt.ThrottlingData.ThrottledPeriods, ThrottledTime: cpuSt.ThrottlingData.ThrottledTime, }, + SystemUsage: systemUsage, } memSt := lcSt.CgroupStats.MemoryStats pbSt.CgroupStats.MemoryStats = &types.MemoryStats{ @@ -377,3 +384,54 @@ func convertBlkioEntryToPb(b []cgroups.BlkioStatEntry) []*types.BlkioStatsEntry } return pbEs } + +const nanoSecondsPerSecond = 1e9 + +var clockTicksPerSecond = uint64(system.GetClockTicks()) + +// getSystemCPUUsage returns the host system's cpu usage in +// nanoseconds. An error is returned if the format of the underlying +// file does not match. +// +// Uses /proc/stat defined by POSIX. Looks for the cpu +// statistics line and then sums up the first seven fields +// provided. See `man 5 proc` for details on specific field +// information. +func getSystemCPUUsage() (uint64, error) { + var line string + f, err := os.Open("/proc/stat") + if err != nil { + return 0, err + } + bufReader := bufio.NewReaderSize(nil, 128) + defer func() { + bufReader.Reset(nil) + f.Close() + }() + bufReader.Reset(f) + err = nil + for err == nil { + line, err = bufReader.ReadString('\n') + if err != nil { + break + } + parts := strings.Fields(line) + switch parts[0] { + case "cpu": + if len(parts) < 8 { + return 0, fmt.Errorf("bad format of cpu stats") + } + var totalClockTicks uint64 + for _, i := range parts[1:8] { + v, err := strconv.ParseUint(i, 10, 64) + if err != nil { + return 0, fmt.Errorf("error parsing cpu stats") + } + totalClockTicks += v + } + return (totalClockTicks * nanoSecondsPerSecond) / + clockTicksPerSecond, nil + } + } + return 0, fmt.Errorf("bad stats format") +} diff --git a/api/grpc/types/api.pb.go b/api/grpc/types/api.pb.go index b3af682..77166fc 100644 --- a/api/grpc/types/api.pb.go +++ b/api/grpc/types/api.pb.go @@ -444,6 +444,7 @@ func (*ThrottlingData) Descriptor() ([]byte, []int) { return fileDescriptor0, [] type CpuStats struct { CpuUsage *CpuUsage `protobuf:"bytes,1,opt,name=cpu_usage" json:"cpu_usage,omitempty"` ThrottlingData *ThrottlingData `protobuf:"bytes,2,opt,name=throttling_data" json:"throttling_data,omitempty"` + SystemUsage uint64 `protobuf:"varint,3,opt,name=system_usage" json:"system_usage,omitempty"` } func (m *CpuStats) Reset() { *m = CpuStats{} } @@ -1093,100 +1094,122 @@ var _API_serviceDesc = grpc.ServiceDesc{ } var fileDescriptor0 = []byte{ - // 1517 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0xd9, 0x6e, 0x1c, 0x45, - 0x17, 0xf6, 0xec, 0x33, 0x67, 0x16, 0xdb, 0xed, 0x6d, 0x3c, 0xf9, 0xf3, 0xc7, 0x74, 0x02, 0x89, - 0x50, 0x64, 0x05, 0x87, 0x25, 0x04, 0x09, 0x08, 0x4e, 0x44, 0x40, 0x09, 0x98, 0xd8, 0x46, 0xe2, - 0x86, 0x51, 0x4f, 0x77, 0x31, 0xd3, 0xb8, 0x37, 0xba, 0xaa, 0xbd, 0x48, 0x3c, 0x01, 0xdc, 0xf3, - 0x16, 0x48, 0x5c, 0xf1, 0x00, 0x3c, 0x0e, 0x4f, 0xc1, 0xe9, 0xda, 0xa6, 0xbb, 0x67, 0x31, 0xb9, - 0xe0, 0xc6, 0x72, 0x55, 0x9d, 0xf3, 0x9d, 0xef, 0x6c, 0x55, 0x7d, 0x06, 0x5a, 0x56, 0xe4, 0xee, - 0x47, 0x71, 0xc8, 0x42, 0xa3, 0xc6, 0xae, 0x22, 0x42, 0xcd, 0x11, 0x6c, 0x9e, 0x46, 0x8e, 0xc5, - 0xc8, 0x51, 0x1c, 0xda, 0x84, 0xd2, 0x57, 0xe4, 0xa7, 0x84, 0x50, 0x66, 0x00, 0x94, 0x5d, 0xa7, - 0x5f, 0xda, 0x2b, 0xdd, 0x6b, 0x19, 0x6d, 0xa8, 0x44, 0xb8, 0x28, 0xf3, 0x05, 0x9e, 0xd8, 0x5e, - 0x48, 0xc9, 0x31, 0x73, 0xdc, 0xa0, 0x5f, 0xc1, 0xbd, 0xa6, 0xd1, 0x85, 0xda, 0x85, 0xeb, 0xb0, - 0x49, 0xbf, 0x8a, 0xcb, 0xae, 0xd1, 0x83, 0xfa, 0x84, 0xb8, 0xe3, 0x09, 0xeb, 0xd7, 0xd2, 0xb5, - 0xb9, 0x03, 0x5b, 0x05, 0x1b, 0x34, 0x0a, 0x03, 0x4a, 0xcc, 0x5f, 0x4b, 0xb0, 0x7d, 0x18, 0x13, - 0x3c, 0x39, 0x0c, 0x03, 0x66, 0xb9, 0x01, 0x89, 0xe7, 0xd9, 0xc7, 0xc5, 0x28, 0x09, 0x1c, 0x8f, - 0x1c, 0x59, 0x68, 0x63, 0x4a, 0x63, 0x42, 0xec, 0xb3, 0x28, 0x74, 0x03, 0xc6, 0x69, 0xb4, 0x52, - 0x1a, 0x94, 0xb3, 0xaa, 0xf2, 0x25, 0xd2, 0xc0, 0x65, 0x98, 0x08, 0x1a, 0x6a, 0x4d, 0xe2, 0xb8, - 0x5f, 0x57, 0x6b, 0xcf, 0x1a, 0x11, 0x8f, 0xf6, 0x1b, 0x7b, 0x95, 0x7b, 0x2d, 0xf3, 0x63, 0xd8, - 0x99, 0x21, 0x23, 0x88, 0x1a, 0xb7, 0xa1, 0x65, 0xab, 0x4d, 0x4e, 0xaa, 0x7d, 0xb0, 0xb6, 0xcf, - 0x03, 0xb8, 0xaf, 0x85, 0xcd, 0x47, 0xd0, 0x3d, 0x76, 0xc7, 0x81, 0xe5, 0x5d, 0x1b, 0xc3, 0x94, - 0x09, 0x97, 0xe4, 0xc4, 0xbb, 0xe6, 0x1a, 0xf4, 0x94, 0xa6, 0x8c, 0xcc, 0x1f, 0x25, 0x58, 0x7f, - 0xe2, 0x38, 0x4b, 0x92, 0xb2, 0x06, 0x4d, 0x46, 0x62, 0xdf, 0x4d, 0x51, 0xca, 0x3c, 0x0b, 0xbb, - 0x50, 0x4d, 0x28, 0xf2, 0xab, 0x70, 0x7e, 0x6d, 0xc9, 0xef, 0x14, 0xb7, 0x8c, 0x0e, 0x54, 0xad, - 0x78, 0x4c, 0x31, 0x30, 0x15, 0xc1, 0x85, 0x04, 0xe7, 0x18, 0x15, 0xb9, 0xb0, 0x2f, 0x1c, 0x19, - 0x12, 0xc9, 0xb2, 0x91, 0x0f, 0x67, 0xb3, 0x10, 0xce, 0x56, 0x21, 0x9c, 0x90, 0xae, 0xd1, 0xfd, - 0x2a, 0xb7, 0x85, 0x18, 0x89, 0x64, 0xd9, 0x4d, 0x17, 0x63, 0xe9, 0x76, 0xd7, 0xd8, 0x86, 0x9e, - 0xe5, 0x38, 0x2e, 0x73, 0x43, 0x24, 0xfd, 0xb9, 0xeb, 0x50, 0xa4, 0x5a, 0x41, 0xf7, 0x37, 0xc1, - 0xc8, 0xfa, 0x2a, 0x43, 0xf0, 0x42, 0xa7, 0x43, 0xe7, 0x79, 0x5e, 0x1c, 0xde, 0xcc, 0x15, 0x42, - 0x99, 0xfb, 0xbe, 0xae, 0x72, 0xa3, 0x0f, 0xcc, 0x01, 0xf4, 0x67, 0xd1, 0xa4, 0xa5, 0x87, 0xb0, - 0xf3, 0x94, 0x78, 0xe4, 0x3a, 0x4b, 0x18, 0xc4, 0xc0, 0xf2, 0x89, 0xc8, 0x61, 0x0a, 0x38, 0xab, - 0x24, 0x01, 0x6f, 0xc3, 0xd6, 0x0b, 0x97, 0xb2, 0xa5, 0x70, 0xe6, 0x77, 0x00, 0x53, 0x01, 0x0d, - 0xae, 0x4d, 0x91, 0x4b, 0x97, 0xc9, 0xc4, 0x62, 0x10, 0x99, 0x1d, 0xc9, 0x5e, 0xdb, 0x80, 0x76, - 0x12, 0xb8, 0x97, 0xc7, 0xa1, 0x7d, 0x46, 0x18, 0xe5, 0xa5, 0xce, 0x1b, 0x90, 0x4e, 0x88, 0xe7, - 0xf1, 0x4a, 0x6f, 0x9a, 0x9f, 0xc2, 0x76, 0xd1, 0xbe, 0x2c, 0xe4, 0xb7, 0xa0, 0x3d, 0x8d, 0x16, - 0x45, 0x6b, 0x95, 0x45, 0xe1, 0xea, 0x1c, 0x33, 0x8c, 0xd6, 0x3c, 0xe2, 0x7b, 0xd0, 0xd3, 0x45, - 0xcf, 0x85, 0x44, 0x29, 0x58, 0x2c, 0xa1, 0x52, 0xe2, 0xf7, 0x12, 0x34, 0x64, 0x3a, 0x55, 0x49, - 0xfd, 0x87, 0x45, 0xbb, 0x0e, 0x2d, 0x7a, 0x45, 0x19, 0xf1, 0x8f, 0x64, 0xe9, 0x76, 0x5f, 0xb7, - 0x74, 0x7f, 0x86, 0x96, 0xf6, 0xe8, 0xda, 0x9b, 0xe7, 0x0d, 0x68, 0x45, 0xc2, 0x37, 0x22, 0x0a, - 0xb8, 0x7d, 0xd0, 0x93, 0xb4, 0x95, 0xcf, 0xd3, 0x78, 0x54, 0x0b, 0x37, 0x8d, 0xa0, 0x8f, 0x9e, - 0x45, 0x69, 0xf9, 0xd7, 0x79, 0xf9, 0xdf, 0x85, 0xc6, 0x4b, 0xcb, 0x9e, 0xa0, 0xf1, 0xf4, 0xc0, - 0x8e, 0x64, 0x18, 0xf9, 0x3d, 0xea, 0x13, 0x3f, 0x8c, 0xaf, 0xb8, 0xe5, 0xaa, 0xf9, 0x2d, 0x5e, - 0x30, 0x22, 0x29, 0x32, 0x9b, 0x77, 0xb0, 0xf6, 0x15, 0x6f, 0x95, 0xcc, 0x99, 0x7b, 0xc9, 0xb8, - 0x05, 0x0d, 0x5f, 0xe0, 0xcb, 0xf6, 0x50, 0x74, 0xa5, 0x55, 0xf3, 0x09, 0x6c, 0x8b, 0xfb, 0x79, - 0xe9, 0x2d, 0x3c, 0x73, 0x83, 0x09, 0x0f, 0xf9, 0xd5, 0x6b, 0xee, 0xc2, 0xce, 0x0c, 0x84, 0x6c, - 0x06, 0x13, 0xba, 0xcf, 0xce, 0x09, 0x56, 0x9b, 0x02, 0xc5, 0x7c, 0x31, 0xd7, 0xc7, 0xff, 0x2c, - 0x3f, 0xe2, 0xd8, 0x55, 0xf3, 0x1b, 0xa8, 0x71, 0x99, 0x34, 0x00, 0x29, 0x37, 0x69, 0x52, 0x98, - 0x9f, 0x67, 0xb1, 0xab, 0xe8, 0x54, 0x55, 0x09, 0x4c, 0x21, 0x6b, 0x1c, 0xf2, 0xcf, 0x12, 0x74, - 0xbe, 0x22, 0xec, 0x22, 0x8c, 0xcf, 0xd2, 0xa0, 0xd1, 0x42, 0x87, 0x61, 0x25, 0xc6, 0x97, 0xc3, - 0xd1, 0x15, 0xc3, 0x24, 0xf2, 0xe8, 0xa6, 0xb9, 0xc6, 0x9d, 0x23, 0x4b, 0xf4, 0x55, 0x85, 0xef, - 0x21, 0xee, 0xab, 0xcb, 0x21, 0x16, 0x4a, 0x18, 0x8b, 0x5c, 0x72, 0x31, 0xdc, 0x72, 0xe2, 0x30, - 0x8a, 0x88, 0x23, 0x6c, 0xa5, 0x60, 0x27, 0x0a, 0xac, 0xae, 0xa4, 0x70, 0x27, 0x92, 0x60, 0x0d, - 0x05, 0x76, 0xa2, 0xc1, 0x9a, 0x19, 0x31, 0x05, 0xd6, 0xe2, 0xc4, 0x7d, 0x68, 0x1e, 0x46, 0xc9, - 0x29, 0xb5, 0xc6, 0x24, 0x6d, 0x76, 0x16, 0x32, 0xcb, 0x1b, 0x26, 0xe9, 0x52, 0x04, 0xcb, 0xd8, - 0x84, 0x4e, 0x44, 0x62, 0xac, 0x13, 0xb9, 0x5b, 0xc6, 0xbc, 0x57, 0x8d, 0x1b, 0xb0, 0xc1, 0x97, - 0x43, 0x37, 0x18, 0x9e, 0x91, 0x38, 0x20, 0x9e, 0x1f, 0x3a, 0x44, 0xfa, 0xb1, 0x0b, 0xeb, 0xfa, - 0x30, 0x6d, 0x37, 0x7e, 0xc4, 0xfd, 0x31, 0x4f, 0xa0, 0x77, 0x32, 0xc1, 0x2f, 0x02, 0xe6, 0xb9, - 0xc1, 0xf8, 0xa9, 0xc5, 0x2c, 0x63, 0x15, 0x1a, 0x88, 0xef, 0x86, 0x0e, 0x95, 0x06, 0x51, 0x9b, - 0x09, 0x11, 0xe2, 0x0c, 0xd5, 0x91, 0x08, 0x1a, 0x5e, 0xe9, 0xd3, 0xa3, 0x34, 0x05, 0xc2, 0xa0, - 0xf9, 0x3d, 0x77, 0x42, 0x04, 0xde, 0xc4, 0xc7, 0x53, 0x93, 0x15, 0x8f, 0xe7, 0xaa, 0x2a, 0x52, - 0xe5, 0xe8, 0x3e, 0xac, 0x32, 0xcd, 0x62, 0x88, 0x85, 0x64, 0xc9, 0x5a, 0xdd, 0x92, 0x92, 0x79, - 0x8e, 0xe6, 0x27, 0x00, 0x2f, 0x79, 0x6b, 0x70, 0xc6, 0xd8, 0xee, 0xd9, 0x00, 0x61, 0xa0, 0x7d, - 0xeb, 0x52, 0x47, 0x27, 0xdd, 0x42, 0x9f, 0x7e, 0xb0, 0x5c, 0xcf, 0x96, 0xdf, 0x0a, 0x55, 0xf3, - 0xef, 0x12, 0xb4, 0x05, 0x82, 0x20, 0x89, 0x10, 0x36, 0xb6, 0x83, 0x82, 0xd8, 0x53, 0x88, 0xf9, - 0x07, 0x25, 0x63, 0x13, 0xdf, 0x1d, 0x7a, 0x61, 0x45, 0xd2, 0x4a, 0x65, 0x91, 0xd8, 0x5d, 0xe8, - 0x88, 0x6c, 0x48, 0xc1, 0xea, 0x22, 0xc1, 0xfb, 0xe9, 0x95, 0x85, 0x4c, 0xf8, 0x15, 0xd1, 0x3e, - 0xb8, 0x99, 0x93, 0xe0, 0x1c, 0xf7, 0xf9, 0xdf, 0x67, 0x01, 0x8b, 0xaf, 0x06, 0xf7, 0x01, 0xa6, - 0xab, 0xb4, 0x17, 0xce, 0xc8, 0x95, 0xac, 0x6c, 0xf4, 0xe4, 0xdc, 0xf2, 0x12, 0xe9, 0xf9, 0xe3, - 0xf2, 0xa3, 0x92, 0xf9, 0x25, 0xac, 0x7e, 0xe6, 0x9d, 0xb9, 0x61, 0x46, 0x05, 0xa5, 0x7c, 0xeb, - 0xc7, 0x30, 0x96, 0xfe, 0xa6, 0x4b, 0x37, 0xc0, 0xa5, 0x08, 0x17, 0x36, 0x5e, 0x18, 0x4d, 0xbf, - 0xaa, 0x04, 0x9e, 0xa8, 0x97, 0xbf, 0x2a, 0x00, 0x53, 0x30, 0xe3, 0x31, 0x0c, 0xdc, 0x70, 0x88, - 0x25, 0x75, 0xee, 0xda, 0x44, 0xb4, 0xc0, 0x30, 0x26, 0x76, 0x12, 0x53, 0xf7, 0x9c, 0xc8, 0x2b, - 0x69, 0x5b, 0xfa, 0x52, 0xe4, 0xf0, 0x1e, 0x6c, 0x4d, 0x75, 0x9d, 0x8c, 0x5a, 0x79, 0xa9, 0xda, - 0x43, 0xd8, 0x40, 0x35, 0xbc, 0x4b, 0x92, 0x9c, 0x52, 0x65, 0xa9, 0xd2, 0x87, 0xb0, 0x9b, 0xe1, - 0x99, 0x56, 0x6a, 0x46, 0xb5, 0xba, 0x54, 0xf5, 0x7d, 0xd8, 0x46, 0xd5, 0x0b, 0xcb, 0x65, 0x45, - 0xbd, 0xda, 0xbf, 0xe0, 0xe9, 0x93, 0x78, 0x9c, 0xe3, 0x59, 0x5f, 0xaa, 0xf4, 0x0e, 0xac, 0xa3, - 0x52, 0xc1, 0x4e, 0xe3, 0x3a, 0x15, 0x4a, 0x6c, 0x86, 0xb7, 0x4a, 0x46, 0xa5, 0xb9, 0x4c, 0x05, - 0x6f, 0xfc, 0xce, 0xf3, 0x64, 0x4c, 0x98, 0x37, 0xd2, 0xd5, 0xff, 0xba, 0x0d, 0xf4, 0x4b, 0x19, - 0xda, 0x87, 0xe3, 0x38, 0x4c, 0xa2, 0x5c, 0x97, 0x8b, 0x1a, 0x9e, 0xe9, 0x72, 0x21, 0x73, 0x0f, - 0x3a, 0xe2, 0x41, 0x93, 0x62, 0xa2, 0xb9, 0x8c, 0xd9, 0x52, 0x4f, 0xbf, 0x53, 0x46, 0x29, 0x67, - 0x29, 0x98, 0x6f, 0xaf, 0x4c, 0xf9, 0x7d, 0x04, 0xdd, 0x89, 0x70, 0x44, 0x4a, 0x8a, 0x54, 0xde, - 0x51, 0x96, 0xa7, 0x04, 0xf7, 0xb3, 0x0e, 0x8b, 0x26, 0x7a, 0x0e, 0xeb, 0x33, 0x9b, 0xf9, 0x5e, - 0x32, 0xb3, 0xbd, 0xd4, 0x3e, 0xd8, 0x90, 0xb0, 0x59, 0x2d, 0xde, 0x60, 0x97, 0xe2, 0x65, 0xd6, - 0x1f, 0xaf, 0xc6, 0xdb, 0xd0, 0x0d, 0xc4, 0xe3, 0xa3, 0x23, 0x52, 0xc9, 0x00, 0xe4, 0x1e, 0x26, - 0x8c, 0x8a, 0xcd, 0x79, 0xce, 0x8d, 0x4a, 0x36, 0xc6, 0xb9, 0x67, 0x4e, 0xa4, 0x41, 0x7e, 0xa8, - 0xcd, 0x1b, 0x11, 0x0e, 0x7e, 0xab, 0x43, 0xe5, 0xc9, 0xd1, 0x17, 0xc6, 0x2b, 0x58, 0x2d, 0x0c, - 0x36, 0x86, 0xba, 0x5e, 0xe6, 0x4f, 0x5f, 0x83, 0xff, 0x2f, 0x3a, 0x96, 0x6f, 0xfa, 0x4a, 0x8a, - 0x59, 0x78, 0xf0, 0x35, 0xe6, 0xfc, 0x6f, 0x09, 0x8d, 0xb9, 0xe8, 0x3b, 0x61, 0xc5, 0xf8, 0x00, - 0xea, 0x62, 0x0c, 0x32, 0x36, 0xa5, 0x6c, 0x6e, 0x9e, 0x1a, 0x6c, 0x15, 0x76, 0xb5, 0xe2, 0x0b, - 0xe8, 0xe6, 0x06, 0x4c, 0xe3, 0x46, 0xce, 0x56, 0x7e, 0x8a, 0x1a, 0xfc, 0x6f, 0xfe, 0xa1, 0x46, - 0x3b, 0x04, 0x98, 0x8e, 0x23, 0x46, 0x5f, 0x4a, 0xcf, 0x4c, 0x63, 0x83, 0xdd, 0x39, 0x27, 0x1a, - 0xe4, 0x14, 0xd6, 0x8a, 0xf3, 0x86, 0x51, 0x88, 0x6a, 0x71, 0x3a, 0x18, 0xdc, 0x5a, 0x78, 0x9e, - 0x85, 0x2d, 0x4e, 0x1d, 0x1a, 0x76, 0xc1, 0x0c, 0xa3, 0x61, 0x17, 0x8e, 0x2b, 0x2b, 0xc6, 0xd7, - 0xd0, 0xcb, 0x0f, 0x0c, 0x86, 0x0a, 0xd2, 0xdc, 0x39, 0x66, 0x70, 0x73, 0xc1, 0xa9, 0x06, 0x7c, - 0x17, 0x6a, 0x62, 0x34, 0x50, 0x15, 0x9f, 0x9d, 0x26, 0x06, 0x9b, 0xf9, 0x4d, 0xad, 0xf5, 0x00, - 0xea, 0xe2, 0x53, 0x51, 0x17, 0x40, 0xee, 0xcb, 0x71, 0xd0, 0xc9, 0xee, 0x9a, 0x2b, 0x0f, 0x4a, - 0xca, 0x0e, 0xcd, 0xd9, 0xa1, 0xf3, 0xec, 0x64, 0x92, 0x33, 0xaa, 0xf3, 0x9f, 0x40, 0x1e, 0xfe, - 0x13, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xed, 0x36, 0x83, 0x0f, 0x11, 0x00, 0x00, + // 1857 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xc4, 0x58, 0x49, 0x6f, 0x1b, 0xc9, + 0x15, 0x16, 0x77, 0xf2, 0x71, 0x91, 0x58, 0xd6, 0x42, 0xd1, 0x6b, 0x1a, 0x49, 0xec, 0x6c, 0x82, + 0x23, 0xdb, 0x88, 0x11, 0x20, 0x01, 0x6c, 0xd9, 0x49, 0x1c, 0x5b, 0x89, 0xdc, 0x92, 0x10, 0x04, + 0x09, 0x40, 0xb4, 0xba, 0x2b, 0x64, 0x47, 0x64, 0x77, 0xa7, 0xbb, 0x28, 0x51, 0x97, 0x1c, 0x73, + 0xcc, 0x31, 0x97, 0x00, 0x73, 0x99, 0xdb, 0x00, 0xf3, 0x37, 0x66, 0xfe, 0xc9, 0x9c, 0xe7, 0x30, + 0x3f, 0x60, 0x5e, 0x2d, 0x5d, 0x5d, 0xcd, 0x45, 0xf2, 0x00, 0x06, 0xe6, 0x42, 0x54, 0xbd, 0xe5, + 0x7b, 0x4b, 0xbd, 0xf7, 0x58, 0x5d, 0xd0, 0x70, 0x22, 0x7f, 0x2f, 0x8a, 0x43, 0x16, 0x92, 0x0a, + 0xbb, 0x8a, 0x68, 0x62, 0xfd, 0xa7, 0x00, 0x9b, 0xa7, 0x91, 0xe7, 0x30, 0x7a, 0x14, 0x87, 0x2e, + 0x4d, 0x12, 0x9b, 0xfe, 0x6b, 0x4a, 0x13, 0x46, 0x3a, 0x50, 0xf4, 0xbd, 0x5e, 0xe1, 0x41, 0xe1, + 0x51, 0xc3, 0xc6, 0x15, 0xd9, 0x80, 0x52, 0x84, 0x84, 0xa2, 0x20, 0xf0, 0x25, 0xb9, 0x07, 0xe0, + 0x8e, 0xc3, 0x84, 0x1e, 0x33, 0xcf, 0x0f, 0x7a, 0x25, 0x64, 0xd4, 0x6d, 0x83, 0x42, 0x36, 0xa1, + 0x72, 0xe9, 0x7b, 0x6c, 0xd4, 0x2b, 0x23, 0xab, 0x6d, 0xcb, 0x0d, 0xd9, 0x86, 0xea, 0x88, 0xfa, + 0xc3, 0x11, 0xeb, 0x55, 0x04, 0x59, 0xed, 0xac, 0x1d, 0xd8, 0x9a, 0xf3, 0x23, 0x89, 0xc2, 0x20, + 0xa1, 0xd6, 0x17, 0x05, 0xd8, 0x3e, 0x88, 0x29, 0x72, 0x0e, 0xc2, 0x80, 0x39, 0x7e, 0x40, 0xe3, + 0x55, 0x3e, 0xa2, 0x47, 0x67, 0xd3, 0xc0, 0x1b, 0xd3, 0x23, 0x07, 0xcd, 0x4a, 0x57, 0x0d, 0x8a, + 0xf0, 0x78, 0x44, 0xdd, 0xf3, 0x28, 0xf4, 0x03, 0x26, 0x3c, 0x46, 0x7e, 0x46, 0xe1, 0x1e, 0x27, + 0x22, 0x98, 0xb2, 0x60, 0xc9, 0x0d, 0xf7, 0x18, 0x17, 0xe1, 0x54, 0x7a, 0xdc, 0xb0, 0xd5, 0x4e, + 0xd1, 0x69, 0x1c, 0xf7, 0xaa, 0x9a, 0x8e, 0x3b, 0x4e, 0x1f, 0x3b, 0x67, 0x74, 0x9c, 0xf4, 0x6a, + 0x0f, 0x4a, 0x9c, 0x2e, 0x77, 0xd6, 0x1b, 0xd8, 0x59, 0x88, 0x43, 0xc6, 0x48, 0xf6, 0xa0, 0xe1, + 0xa6, 0x44, 0x11, 0x4f, 0x73, 0x7f, 0x63, 0x4f, 0x1c, 0xd0, 0x5e, 0x26, 0x9c, 0x89, 0x20, 0x54, + 0xfb, 0xd8, 0x1f, 0x06, 0xce, 0xf8, 0xc3, 0x4f, 0x8b, 0x7b, 0x2b, 0x54, 0x44, 0xdc, 0x98, 0x77, + 0xb9, 0xb3, 0x36, 0xa0, 0x93, 0x42, 0xa9, 0x84, 0x7f, 0x5d, 0x80, 0xee, 0x0b, 0xcf, 0xbb, 0xa1, + 0x1e, 0xfa, 0x50, 0x67, 0x34, 0x9e, 0xf8, 0x1c, 0xb1, 0x28, 0xce, 0x5e, 0xef, 0xc9, 0x7d, 0x28, + 0x4f, 0x13, 0x8c, 0xa4, 0x24, 0x22, 0x69, 0xaa, 0x48, 0x4e, 0x91, 0x64, 0x0b, 0x06, 0x21, 0x50, + 0x76, 0xe2, 0x61, 0x82, 0x79, 0xe6, 0x09, 0x12, 0x6b, 0xee, 0x32, 0x0d, 0x2e, 0x30, 0xc7, 0x9c, + 0xc4, 0x97, 0x9c, 0xe2, 0x5e, 0x7a, 0x2a, 0xbb, 0x7c, 0x99, 0x86, 0x55, 0xcb, 0xc2, 0xd2, 0x47, + 0x56, 0x5f, 0x7e, 0x64, 0x8d, 0x15, 0x47, 0x06, 0xe6, 0x91, 0x59, 0x36, 0x94, 0xb9, 0x77, 0x1c, + 0x7f, 0xaa, 0xa2, 0x6c, 0xdb, 0x7c, 0xc9, 0x29, 0x43, 0x95, 0x48, 0xa4, 0xe0, 0x92, 0xfc, 0x18, + 0x3a, 0x8e, 0xe7, 0xf9, 0xcc, 0x0f, 0x31, 0xd4, 0xdf, 0xfb, 0x5e, 0x82, 0x61, 0x96, 0x90, 0x39, + 0x47, 0xb5, 0x36, 0x81, 0x98, 0x59, 0x54, 0xc9, 0xfd, 0xbb, 0x2e, 0x02, 0x5d, 0x76, 0xab, 0x32, + 0xfc, 0xcb, 0x5c, 0xb5, 0x16, 0x45, 0x2e, 0xbb, 0x69, 0x55, 0x64, 0xda, 0x86, 0x90, 0xd5, 0x87, + 0xde, 0x22, 0xba, 0xb2, 0xfc, 0x1b, 0xd8, 0x79, 0x45, 0xc7, 0xf4, 0x43, 0x2c, 0xe3, 0xf1, 0x04, + 0xce, 0x84, 0xaa, 0xf2, 0x11, 0x6b, 0x0e, 0xbd, 0xa8, 0xae, 0xa0, 0x1f, 0xc2, 0xd6, 0x3b, 0x3f, + 0x61, 0x37, 0x02, 0x5b, 0xff, 0x06, 0xc8, 0x84, 0xb4, 0x99, 0x42, 0x66, 0x86, 0xd3, 0xe8, 0xcc, + 0x67, 0xaa, 0xa4, 0xc4, 0x9a, 0x9f, 0x01, 0x73, 0x23, 0x35, 0x61, 0xf8, 0x92, 0x3c, 0x80, 0xe6, + 0x34, 0xf0, 0x67, 0xc7, 0xa1, 0x7b, 0x4e, 0x59, 0x22, 0xda, 0xb5, 0x6e, 0x9b, 0x24, 0x51, 0x17, + 0x23, 0x3a, 0x1e, 0x8b, 0x9e, 0xad, 0xdb, 0x72, 0x63, 0x1d, 0xc2, 0xf6, 0xbc, 0xa3, 0xaa, 0x03, + 0x9f, 0x40, 0x33, 0xcb, 0x63, 0x82, 0x2e, 0x95, 0x96, 0x67, 0xdb, 0x94, 0xb2, 0xee, 0x41, 0xeb, + 0x98, 0x61, 0xb6, 0x57, 0x85, 0xfb, 0x08, 0x3a, 0xba, 0x7d, 0x85, 0xa0, 0x2c, 0x40, 0x87, 0x4d, + 0x13, 0x25, 0xa5, 0x76, 0xd6, 0x37, 0x05, 0xa8, 0xa9, 0x52, 0x49, 0x8b, 0xbc, 0x90, 0x15, 0xf9, + 0xf7, 0xd2, 0x6b, 0x77, 0xa0, 0x91, 0x5c, 0x25, 0x8c, 0x4e, 0x8e, 0x54, 0xc7, 0xb5, 0xed, 0x8c, + 0xf0, 0x91, 0xfa, 0xee, 0xf3, 0x02, 0x34, 0x74, 0x86, 0xbe, 0xf3, 0x38, 0xff, 0x39, 0x34, 0x22, + 0x99, 0x33, 0x2a, 0x9b, 0xb0, 0xb9, 0xdf, 0x51, 0xf1, 0xa7, 0x6d, 0x97, 0x09, 0x18, 0xa9, 0x2f, + 0x9b, 0xa9, 0x37, 0xc6, 0x75, 0xc5, 0x1c, 0xd7, 0x3c, 0x6f, 0x11, 0xef, 0xee, 0xaa, 0xe8, 0x6e, + 0xb1, 0xb6, 0x9e, 0x41, 0xed, 0xd0, 0x71, 0x47, 0xe8, 0x2d, 0x67, 0xbb, 0x91, 0x3a, 0x47, 0x64, + 0xf3, 0x35, 0x87, 0x9a, 0xd0, 0x49, 0x18, 0x5f, 0x09, 0x67, 0xcb, 0xb6, 0xda, 0x59, 0xe7, 0x38, + 0xae, 0x65, 0x9d, 0xa8, 0x6a, 0x7b, 0x8c, 0xad, 0x9d, 0x86, 0x9d, 0x16, 0xdb, 0xe2, 0xc0, 0x37, + 0x64, 0xc8, 0x23, 0xa8, 0x4d, 0xa4, 0x65, 0x35, 0x09, 0xd2, 0x48, 0x95, 0x3f, 0x76, 0xca, 0xc6, + 0x59, 0xb6, 0x2d, 0xff, 0x48, 0x6f, 0xfc, 0xbb, 0x5c, 0xfe, 0x27, 0x21, 0x73, 0x54, 0xca, 0x95, + 0xe7, 0x2e, 0xec, 0x2c, 0x60, 0xaa, 0xde, 0xff, 0x05, 0xb4, 0x5f, 0x5f, 0x50, 0xec, 0x86, 0xd4, + 0x0a, 0xd6, 0x0d, 0xf3, 0x27, 0xb8, 0x72, 0x26, 0x91, 0x30, 0x56, 0xb6, 0x33, 0x82, 0x95, 0x40, + 0x45, 0x88, 0xf3, 0xfc, 0xf1, 0x00, 0xd2, 0xe6, 0xe7, 0x6b, 0xe5, 0x60, 0x51, 0x3b, 0x98, 0x77, + 0xa7, 0xad, 0x8f, 0x4c, 0x39, 0x5e, 0xce, 0x1c, 0xcf, 0x19, 0xad, 0xcc, 0x1b, 0xfd, 0x6f, 0x11, + 0x5a, 0x7f, 0xa2, 0xec, 0x32, 0x8c, 0xcf, 0xf9, 0x39, 0x24, 0x4b, 0x27, 0xcf, 0x2e, 0xd4, 0xe3, + 0xd9, 0xe0, 0xec, 0x8a, 0x61, 0x31, 0xc9, 0xe3, 0xab, 0xc5, 0xb3, 0x97, 0x7c, 0x4b, 0xee, 0x02, + 0x20, 0xeb, 0xc8, 0x91, 0xd3, 0xa6, 0x24, 0xe1, 0xe3, 0x99, 0x22, 0x90, 0xdb, 0xd0, 0xb0, 0x67, + 0x03, 0xac, 0xe7, 0x30, 0x96, 0xc5, 0x55, 0xb6, 0x11, 0xea, 0xb5, 0xd8, 0x73, 0x5d, 0x64, 0x7a, + 0x71, 0x18, 0x45, 0xd4, 0x4b, 0x5d, 0x8b, 0x67, 0xaf, 0x24, 0x81, 0x5b, 0x3d, 0x49, 0xad, 0x56, + 0xa5, 0x55, 0x96, 0x59, 0x45, 0x56, 0xa4, 0xac, 0xd6, 0x54, 0x50, 0xa6, 0xd5, 0x13, 0x6d, 0xb5, + 0x2e, 0xad, 0x32, 0xc3, 0xea, 0x49, 0x66, 0xb5, 0x91, 0xea, 0x2a, 0xab, 0xd6, 0x67, 0x05, 0xa8, + 0x1f, 0x44, 0xd3, 0xd3, 0xc4, 0x19, 0x52, 0x9c, 0x20, 0x4d, 0x16, 0x32, 0x67, 0x3c, 0x98, 0xf2, + 0xad, 0x3a, 0x32, 0x10, 0x24, 0x29, 0xf0, 0x03, 0x68, 0x45, 0x34, 0xc6, 0x0a, 0x57, 0x12, 0x45, + 0xac, 0xd7, 0xb2, 0xdd, 0x94, 0x34, 0x29, 0xb2, 0x07, 0xb7, 0x04, 0x6f, 0xe0, 0x07, 0x83, 0x73, + 0x1a, 0x07, 0x74, 0x3c, 0x09, 0x3d, 0xaa, 0x52, 0xd5, 0x15, 0xac, 0x37, 0xc1, 0x5b, 0xcd, 0x20, + 0x3f, 0x85, 0xae, 0x96, 0xe7, 0x53, 0x4a, 0x48, 0xcb, 0xd4, 0xad, 0x2b, 0xe9, 0x53, 0x45, 0xc6, + 0x3f, 0x8d, 0xce, 0xc9, 0x08, 0xef, 0xac, 0x6c, 0xec, 0x07, 0xc3, 0x57, 0x0e, 0x73, 0x48, 0x0f, + 0x6a, 0x68, 0xdc, 0x0f, 0xbd, 0x44, 0x79, 0x9b, 0x6e, 0xc9, 0xcf, 0xa0, 0xcb, 0xa4, 0x2c, 0xf5, + 0x06, 0xa9, 0x8c, 0x3c, 0xcd, 0x0d, 0xcd, 0x38, 0x52, 0xc2, 0x3f, 0x82, 0x4e, 0x26, 0xcc, 0xab, + 0x45, 0xf9, 0xdb, 0xd6, 0xd4, 0x13, 0x24, 0x5a, 0xff, 0x97, 0xc9, 0x92, 0x95, 0x83, 0x33, 0x27, + 0x4b, 0x84, 0xbc, 0xa9, 0xad, 0xa7, 0x8d, 0xab, 0x92, 0x61, 0xd7, 0x75, 0x5a, 0x7e, 0x0b, 0xeb, + 0x4c, 0xbb, 0x3e, 0xc0, 0x06, 0x72, 0x54, 0xf7, 0x6e, 0x29, 0x9d, 0x7c, 0x60, 0x76, 0x87, 0xe5, + 0x03, 0xc5, 0xcc, 0xcb, 0x91, 0xab, 0x0c, 0x4a, 0xff, 0x9a, 0x92, 0x26, 0x4c, 0x58, 0x7f, 0x05, + 0x38, 0x14, 0x53, 0x46, 0x28, 0xe0, 0x58, 0x36, 0x4f, 0x51, 0x6e, 0x78, 0xa9, 0x4c, 0x9c, 0x99, + 0x3e, 0x3d, 0x51, 0x2a, 0x48, 0x90, 0x3e, 0x62, 0x32, 0xff, 0xe1, 0xf8, 0x63, 0x57, 0xdd, 0x88, + 0x31, 0x99, 0x6a, 0x6b, 0x7d, 0x5a, 0x84, 0xa6, 0xc4, 0x96, 0xb1, 0x23, 0xb8, 0x8b, 0x43, 0x46, + 0x83, 0x8b, 0x0d, 0x79, 0x98, 0x9a, 0xcc, 0xdf, 0x50, 0x32, 0xa7, 0x52, 0x2f, 0x70, 0xe8, 0x25, + 0x97, 0x4e, 0x64, 0x84, 0xb2, 0x54, 0xba, 0xc1, 0x85, 0xa4, 0x6b, 0x4f, 0xa1, 0x25, 0x8b, 0x49, + 0xe9, 0x94, 0x57, 0xe9, 0x34, 0xa5, 0x98, 0xd4, 0x7a, 0xc2, 0xff, 0x9a, 0xd0, 0x5f, 0x31, 0xcf, + 0x9b, 0xfb, 0x77, 0x73, 0xe2, 0x22, 0x92, 0x3d, 0xf1, 0xfb, 0x3a, 0x60, 0xf1, 0x95, 0x2d, 0x65, + 0xfb, 0xcf, 0x01, 0x32, 0x22, 0x1f, 0x30, 0xe7, 0xf4, 0x2a, 0xfd, 0x0b, 0xc6, 0x25, 0x8f, 0xfd, + 0xc2, 0x19, 0x4f, 0xd3, 0xf4, 0xc9, 0xcd, 0xaf, 0x8b, 0xcf, 0x0b, 0x96, 0x0b, 0xeb, 0x2f, 0xc7, + 0xe7, 0x7e, 0x68, 0xa8, 0xa3, 0xf0, 0xc4, 0xf9, 0x67, 0x18, 0xa7, 0x89, 0x12, 0x1b, 0x41, 0xf5, + 0x03, 0xa4, 0x2a, 0x08, 0xb1, 0xe1, 0x33, 0x2f, 0x8c, 0xd4, 0xb8, 0xc5, 0x55, 0x66, 0xa8, 0x6c, + 0x18, 0xb2, 0xbe, 0x2a, 0x03, 0x64, 0x56, 0xc8, 0x31, 0xf4, 0xfd, 0x70, 0x80, 0x0d, 0x72, 0xe1, + 0xbb, 0x54, 0x4e, 0x8f, 0x41, 0x4c, 0xdd, 0x69, 0x9c, 0xf8, 0x17, 0x54, 0xfd, 0x9f, 0x6c, 0xab, + 0xb8, 0xe7, 0x9c, 0xb3, 0x77, 0x70, 0x27, 0x15, 0xc5, 0x98, 0xb1, 0x53, 0x35, 0xf2, 0x47, 0xd8, + 0xca, 0x40, 0x3d, 0x03, 0xaf, 0x78, 0x2d, 0xde, 0x2d, 0x8d, 0xe7, 0x65, 0x58, 0xbf, 0x03, 0x24, + 0x0f, 0xf0, 0x0f, 0x61, 0x9a, 0x43, 0x2a, 0x5d, 0x8b, 0xd4, 0xf5, 0xc3, 0xf7, 0x42, 0x23, 0xc3, + 0x79, 0x0f, 0xbb, 0x46, 0xa0, 0xbc, 0x47, 0x0d, 0xb4, 0xf2, 0xb5, 0x68, 0xdb, 0xda, 0x2f, 0xde, + 0xc5, 0x19, 0xe4, 0x5b, 0x40, 0xce, 0xe0, 0xd2, 0xf1, 0xd9, 0x3c, 0x5e, 0xe5, 0xa6, 0x38, 0xff, + 0x82, 0x4a, 0x79, 0x30, 0x19, 0xe7, 0x84, 0xc6, 0xc3, 0x5c, 0x9c, 0xd5, 0x9b, 0xe2, 0x3c, 0x14, + 0x1a, 0x19, 0xce, 0x4b, 0x40, 0xe2, 0xbc, 0x3f, 0xb5, 0x6b, 0x51, 0xd6, 0xfd, 0x30, 0xef, 0xcb, + 0x01, 0x74, 0x13, 0xea, 0x32, 0x1c, 0xff, 0x06, 0x46, 0xfd, 0x5a, 0x8c, 0x0d, 0xa5, 0xa0, 0x41, + 0xac, 0xbf, 0x41, 0xeb, 0x0f, 0xd3, 0x21, 0x65, 0xe3, 0x33, 0xdd, 0xf3, 0x1f, 0x6f, 0xa0, 0x7c, + 0x89, 0x03, 0xe5, 0x60, 0x18, 0x87, 0xd3, 0x28, 0x37, 0x4c, 0x65, 0xb7, 0x2e, 0x0c, 0x53, 0x21, + 0x23, 0x86, 0xa9, 0x94, 0x7e, 0x06, 0x2d, 0x79, 0x9f, 0x52, 0x0a, 0x72, 0xde, 0x90, 0xc5, 0xf6, + 0xb6, 0x9b, 0x13, 0x63, 0x6a, 0xed, 0x43, 0xf3, 0x8c, 0x87, 0xad, 0xb4, 0xf2, 0x73, 0x27, 0x4b, + 0x08, 0xde, 0x2c, 0xb3, 0xfe, 0xc2, 0xef, 0xeb, 0x91, 0xcc, 0x82, 0xd2, 0x92, 0xa5, 0xf6, 0xc3, + 0xd4, 0xb9, 0x2c, 0x86, 0x3d, 0x33, 0x5b, 0x32, 0xa9, 0xad, 0x91, 0x41, 0xea, 0x9f, 0x40, 0x77, + 0x41, 0x64, 0xc9, 0x7c, 0xf9, 0x89, 0x39, 0x5f, 0x9a, 0xfb, 0xb7, 0x94, 0x25, 0x53, 0xd5, 0x1c, + 0x3a, 0x9f, 0x14, 0xe4, 0x95, 0x52, 0x7f, 0x58, 0x92, 0xe7, 0xd0, 0x0e, 0xe4, 0x15, 0x47, 0xe7, + 0xb3, 0x64, 0x00, 0x99, 0xd7, 0x1f, 0xbb, 0x15, 0x98, 0x97, 0x21, 0xcc, 0xab, 0x2b, 0x02, 0x5a, + 0x9a, 0x57, 0x23, 0x56, 0xfc, 0xf8, 0x31, 0x0e, 0x2f, 0x77, 0xe5, 0x2a, 0xcd, 0x5f, 0xb9, 0xd4, + 0xa7, 0xd1, 0xaa, 0xe7, 0x83, 0xfd, 0xff, 0x55, 0xa1, 0xf4, 0xe2, 0xe8, 0x0d, 0xb1, 0x61, 0x7d, + 0xee, 0x51, 0x84, 0xa4, 0x03, 0x7b, 0xf9, 0xa3, 0x4f, 0xff, 0xde, 0x2a, 0xb6, 0xba, 0x90, 0xae, + 0x71, 0xcc, 0xb9, 0xdb, 0xaa, 0xc6, 0x5c, 0x7e, 0x33, 0xd6, 0x98, 0xab, 0x2e, 0xb9, 0x6b, 0xe4, + 0x57, 0x50, 0x95, 0xcf, 0x24, 0x64, 0x53, 0xc9, 0xe6, 0x1e, 0x60, 0xfa, 0x5b, 0x73, 0x54, 0xad, + 0xf8, 0x0e, 0xda, 0xb9, 0x77, 0x2d, 0x72, 0x3b, 0x67, 0x2b, 0xff, 0xca, 0xd2, 0xbf, 0xb3, 0x9c, + 0xa9, 0xd1, 0x0e, 0x00, 0xb2, 0x47, 0x05, 0xd2, 0x53, 0xd2, 0x0b, 0xaf, 0x35, 0xfd, 0xdd, 0x25, + 0x1c, 0x0d, 0x72, 0x0a, 0x1b, 0xf3, 0xaf, 0x04, 0x64, 0x2e, 0xab, 0xf3, 0x5f, 0xf2, 0xfd, 0xfb, + 0x2b, 0xf9, 0x26, 0xec, 0xfc, 0x0b, 0x81, 0x86, 0x5d, 0xf1, 0xf2, 0xa0, 0x61, 0x57, 0x3e, 0x2d, + 0xac, 0x91, 0x3f, 0x43, 0x27, 0xff, 0xcd, 0x4e, 0xd2, 0x24, 0x2d, 0x7d, 0x73, 0xe8, 0xdf, 0x5d, + 0xc1, 0xd5, 0x80, 0x4f, 0xa1, 0x22, 0x3f, 0xc6, 0xd3, 0xde, 0x30, 0xbf, 0xe1, 0xfb, 0x9b, 0x79, + 0xa2, 0xd6, 0x7a, 0x0c, 0x55, 0xf9, 0x9d, 0xa3, 0x0b, 0x20, 0xf7, 0xd9, 0xd3, 0x6f, 0x99, 0x54, + 0x6b, 0xed, 0x71, 0x21, 0xb5, 0x93, 0xe4, 0xec, 0x24, 0xcb, 0xec, 0x18, 0x87, 0x73, 0x56, 0x15, + 0xcf, 0xb3, 0x4f, 0xbe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x6d, 0x22, 0x37, 0xe2, 0xab, 0x15, 0x00, + 0x00, } diff --git a/api/grpc/types/api.proto b/api/grpc/types/api.proto index 4b6b4a0..89d1d24 100644 --- a/api/grpc/types/api.proto +++ b/api/grpc/types/api.proto @@ -17,7 +17,7 @@ service API { } message UpdateProcessRequest { - string id = 1; + string id = 1; string pid = 2; bool closeStdin = 3; // Close stdin of the container uint32 width = 4; @@ -57,7 +57,7 @@ message AddProcessRequest { repeated string args = 4; // Arguments for process, first is binary path itself repeated string env = 5; // List of environment variables for process string cwd = 6; // Workind directory of process - string pid = 7; // Process ID + string pid = 7; // Process ID string stdin = 8; // path to the file where stdin will be read (optional) string stdout = 9; // path to file where stdout will be written (optional) string stderr = 10; // path to file where stderr will be written (optional) @@ -195,6 +195,7 @@ message ThrottlingData { message CpuStats { CpuUsage cpu_usage = 1; ThrottlingData throttling_data = 2; + uint64 system_usage = 3; } message MemoryData {