diff --git a/assets/swagger.json b/assets/swagger.json index 6e0f33405acd0..5013a1964a4a5 100644 --- a/assets/swagger.json +++ b/assets/swagger.json @@ -784,6 +784,11 @@ "type": "string", "name": "untilTime", "in": "query" + }, + { + "type": "string", + "name": "filter", + "in": "query" } ], "responses": { diff --git a/pkg/apiclient/application/application.pb.go b/pkg/apiclient/application/application.pb.go index cfdc7c4bc251d..12e821ceebe63 100644 --- a/pkg/apiclient/application/application.pb.go +++ b/pkg/apiclient/application/application.pb.go @@ -1362,6 +1362,7 @@ type ApplicationPodLogsQuery struct { TailLines int64 `protobuf:"varint,7,req,name=tailLines" json:"tailLines"` Follow bool `protobuf:"varint,8,req,name=follow" json:"follow"` UntilTime *string `protobuf:"bytes,9,opt,name=untilTime" json:"untilTime,omitempty"` + Filter *string `protobuf:"bytes,10,opt,name=filter" json:"filter,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1463,6 +1464,13 @@ func (m *ApplicationPodLogsQuery) GetUntilTime() string { return "" } +func (m *ApplicationPodLogsQuery) GetFilter() string { + if m != nil && m.Filter != nil { + return *m.Filter + } + return "" +} + type LogEntry struct { Content string `protobuf:"bytes,1,req,name=content" json:"content"` // deprecated in favor of timeStampStr since meta.v1.Time don't support nano time @@ -1973,144 +1981,145 @@ func init() { } var fileDescriptor_df6e82b174b5eaec = []byte{ - // 2191 bytes of a gzipped FileDescriptorProto + // 2205 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xcd, 0x6f, 0x1c, 0x49, 0x15, 0xa7, 0xc6, 0x63, 0xcf, 0xcc, 0x73, 0xb2, 0x49, 0x6a, 0x37, 0xa1, 0xb7, 0xe3, 0xd8, 0xa3, 0x4a, 0xe2, 0x38, 0x4e, 0xdc, 0x13, 0x9b, 0x00, 0x8b, 0x17, 0x14, 0xe2, 0x24, 0x38, 0x06, 0x27, 0x98, 0x76, 0x42, 0x24, 0x24, 0x84, 0x7a, 0xbb, 0xcb, 0xe3, 0xc6, 0x33, 0xdd, 0x4d, 0x77, 0xcf, 0x44, 0xa3, 0x28, 0x07, 0x16, 0x09, 0x71, 0x40, 0x20, 0x04, 0x07, 0x16, 0xf1, 0xb1, 0x82, 0x2b, - 0x37, 0xe0, 0xc2, 0x61, 0x85, 0x84, 0x84, 0x72, 0x44, 0xb0, 0xe7, 0x08, 0x19, 0xfe, 0x00, 0x4e, - 0x9c, 0x51, 0x55, 0x57, 0x75, 0x57, 0x4f, 0x66, 0x7a, 0x26, 0xeb, 0x41, 0x28, 0xb7, 0xa9, 0x57, - 0xd5, 0xef, 0xfd, 0xde, 0x77, 0xd5, 0xd3, 0xc0, 0x85, 0x88, 0x86, 0x5d, 0x1a, 0x36, 0xac, 0x20, - 0x68, 0xb9, 0xb6, 0x15, 0xbb, 0xbe, 0xa7, 0xfe, 0x36, 0x82, 0xd0, 0x8f, 0x7d, 0x3c, 0xab, 0x90, - 0xf4, 0x37, 0x9a, 0x7e, 0xd3, 0xe7, 0xf4, 0x06, 0xfb, 0x95, 0x1c, 0xd1, 0xe7, 0x9a, 0xbe, 0xdf, - 0x6c, 0xd1, 0x86, 0x15, 0xb8, 0x0d, 0xcb, 0xf3, 0xfc, 0x98, 0x1f, 0x8e, 0xc4, 0x2e, 0x39, 0x78, - 0x2b, 0x32, 0x5c, 0x9f, 0xef, 0xda, 0x7e, 0x48, 0x1b, 0xdd, 0xd5, 0x46, 0x93, 0x7a, 0x34, 0xb4, - 0x62, 0xea, 0x88, 0x33, 0xd7, 0xb3, 0x33, 0x6d, 0xcb, 0xde, 0x77, 0x3d, 0x1a, 0xf6, 0x1a, 0xc1, - 0x41, 0x93, 0x11, 0xa2, 0x46, 0x9b, 0xc6, 0xd6, 0xa0, 0xaf, 0xb6, 0x9a, 0x6e, 0xbc, 0xdf, 0x79, - 0xc7, 0xb0, 0xfd, 0x76, 0xc3, 0x0a, 0x39, 0xb0, 0x6f, 0xf2, 0x1f, 0x2b, 0xb6, 0x93, 0x7d, 0xad, - 0xaa, 0xd7, 0x5d, 0xb5, 0x5a, 0xc1, 0xbe, 0xf5, 0x22, 0xab, 0x8d, 0x22, 0x56, 0x21, 0x0d, 0x7c, - 0x61, 0x2b, 0xfe, 0xd3, 0x8d, 0xfd, 0xb0, 0xa7, 0xfc, 0x4c, 0x78, 0x90, 0x3f, 0x22, 0x38, 0x79, - 0x33, 0x13, 0xf6, 0x95, 0x0e, 0x0d, 0x7b, 0x18, 0x43, 0xd9, 0xb3, 0xda, 0x54, 0x43, 0x75, 0xb4, - 0x54, 0x33, 0xf9, 0x6f, 0xac, 0x41, 0x25, 0xa4, 0x7b, 0x21, 0x8d, 0xf6, 0xb5, 0x12, 0x27, 0xcb, - 0x25, 0x5e, 0x84, 0x0a, 0x93, 0x4c, 0xed, 0x58, 0x9b, 0xaa, 0x4f, 0x2d, 0xd5, 0x36, 0x8e, 0x1d, - 0x3e, 0x5f, 0xa8, 0xee, 0x24, 0xa4, 0xc8, 0x94, 0x9b, 0xd8, 0x80, 0x13, 0x21, 0x8d, 0xfc, 0x4e, - 0x68, 0xd3, 0xaf, 0xd2, 0x30, 0x72, 0x7d, 0x4f, 0x2b, 0x33, 0x4e, 0x1b, 0xe5, 0x67, 0xcf, 0x17, - 0x3e, 0x66, 0xf6, 0x6f, 0xe2, 0x3a, 0x54, 0x23, 0xda, 0xa2, 0x76, 0xec, 0x87, 0xda, 0xb4, 0x72, - 0x30, 0xa5, 0x92, 0x05, 0xa8, 0xdd, 0xf7, 0x1d, 0x3a, 0x14, 0x34, 0xd9, 0x84, 0xd3, 0x26, 0xed, - 0xba, 0x8c, 0xdd, 0x3d, 0x1a, 0x5b, 0x8e, 0x15, 0x5b, 0xfd, 0x87, 0x4b, 0xa9, 0x86, 0x3a, 0x54, - 0x43, 0x71, 0x58, 0x2b, 0x71, 0x7a, 0xba, 0x66, 0x66, 0x9a, 0x57, 0xcc, 0x64, 0x0a, 0xa8, 0x77, - 0xba, 0xd4, 0x8b, 0xa3, 0xe1, 0x2c, 0xd7, 0xe0, 0x94, 0xd4, 0xea, 0xbe, 0xd5, 0xa6, 0x51, 0x60, - 0xd9, 0x34, 0xe1, 0x2d, 0x74, 0x79, 0x71, 0x1b, 0x2f, 0xc1, 0x31, 0x95, 0xa8, 0x4d, 0x29, 0xc7, - 0x73, 0x3b, 0x78, 0x11, 0x66, 0xe5, 0xfa, 0xe1, 0xd6, 0x6d, 0xad, 0xac, 0x1c, 0x54, 0x37, 0xc8, - 0x0e, 0x68, 0x0a, 0xf6, 0x7b, 0x96, 0xe7, 0xee, 0xd1, 0x28, 0x1e, 0x8e, 0xba, 0x9e, 0x33, 0x84, - 0x62, 0xf8, 0xd4, 0x1c, 0xa7, 0xe1, 0xf5, 0xbc, 0x35, 0x02, 0xdf, 0x8b, 0x28, 0xf9, 0x00, 0xe5, - 0x24, 0xdd, 0x0a, 0xa9, 0x15, 0x53, 0x93, 0x7e, 0xab, 0x43, 0xa3, 0x18, 0x7b, 0xa0, 0x66, 0x25, - 0x17, 0x38, 0xbb, 0xf6, 0x05, 0x23, 0x8b, 0x61, 0x43, 0xc6, 0x30, 0xff, 0xf1, 0x0d, 0xdb, 0x31, - 0x82, 0x83, 0xa6, 0xc1, 0xd2, 0xc1, 0x50, 0x33, 0x5c, 0xa6, 0x83, 0xa1, 0x48, 0x92, 0x5a, 0x2b, - 0xe7, 0xf0, 0x19, 0x98, 0xe9, 0x04, 0x11, 0x0d, 0x63, 0xae, 0x43, 0xd5, 0x14, 0x2b, 0xe6, 0xe6, - 0xae, 0xd5, 0x72, 0x1d, 0x2b, 0x66, 0xb6, 0x65, 0x3b, 0xe9, 0x9a, 0xbc, 0x9f, 0x57, 0xe0, 0x61, - 0xe0, 0x28, 0x0a, 0xec, 0xff, 0x0f, 0x15, 0xc8, 0x43, 0x57, 0x21, 0x96, 0xfa, 0x20, 0xde, 0xcd, - 0x21, 0xbc, 0x4d, 0x5b, 0x34, 0x43, 0x38, 0xc8, 0x99, 0x1a, 0x54, 0x6c, 0x2b, 0xb2, 0x2d, 0x47, - 0xb2, 0x92, 0x4b, 0xf2, 0xac, 0x0c, 0x67, 0x14, 0x56, 0xbb, 0x3d, 0xcf, 0x2e, 0x62, 0x34, 0x32, - 0x2a, 0xf0, 0x1c, 0xcc, 0x38, 0x61, 0xcf, 0xec, 0x78, 0x89, 0x5d, 0xc5, 0xbe, 0xa0, 0x61, 0x1d, - 0xa6, 0x83, 0xb0, 0xe3, 0x51, 0x9e, 0xf4, 0x72, 0x33, 0x21, 0x61, 0x1b, 0xaa, 0x51, 0xcc, 0x4a, - 0x5b, 0xb3, 0xc7, 0x53, 0x7d, 0x76, 0x6d, 0xf3, 0x08, 0x76, 0x65, 0x9a, 0xec, 0x0a, 0x76, 0x66, - 0xca, 0x18, 0xc7, 0x50, 0x93, 0x59, 0x11, 0x69, 0x95, 0xfa, 0xd4, 0xd2, 0xec, 0xda, 0xce, 0x11, - 0xa5, 0x7c, 0x39, 0x60, 0x05, 0x59, 0x29, 0x08, 0x42, 0xad, 0x4c, 0x10, 0x9e, 0x83, 0x5a, 0x5b, - 0x64, 0x5c, 0xa4, 0x55, 0x59, 0x7d, 0x34, 0x33, 0x02, 0x7e, 0x08, 0xd3, 0xae, 0xb7, 0xe7, 0x47, - 0x5a, 0x8d, 0xe3, 0xb9, 0x71, 0x04, 0x3c, 0x5b, 0xde, 0x9e, 0x6f, 0x26, 0xdc, 0xb0, 0x07, 0xc7, - 0x43, 0x1a, 0x87, 0x3d, 0x69, 0x05, 0x0d, 0xb8, 0x51, 0xef, 0x1e, 0x81, 0xbd, 0xa9, 0xf2, 0x33, - 0xf3, 0xec, 0xc9, 0xef, 0x11, 0xcc, 0xbd, 0x90, 0x37, 0xbb, 0x01, 0x2d, 0x0c, 0x28, 0x07, 0xca, - 0x51, 0x40, 0x6d, 0x5e, 0x0f, 0x67, 0xd7, 0xbe, 0x38, 0x99, 0x44, 0x62, 0x42, 0x85, 0x13, 0x38, - 0xf7, 0xc2, 0x74, 0x6f, 0xc3, 0xc7, 0x95, 0x4f, 0x77, 0xac, 0xd8, 0xde, 0x2f, 0x02, 0xcc, 0x22, - 0x98, 0x9d, 0xc9, 0x55, 0xf0, 0x84, 0x84, 0x09, 0xd4, 0xf8, 0x8f, 0x07, 0xbd, 0x20, 0x5f, 0xb2, - 0x33, 0x32, 0xf9, 0x2e, 0x02, 0x5d, 0xcd, 0x79, 0xbf, 0xd5, 0x7a, 0xc7, 0xb2, 0x0f, 0x8a, 0x45, - 0x96, 0x5c, 0x87, 0xcb, 0x9b, 0xda, 0x00, 0xc6, 0xef, 0xf0, 0xf9, 0x42, 0x69, 0xeb, 0xb6, 0x59, - 0x72, 0x9d, 0x8f, 0x9e, 0x6e, 0xe4, 0xc3, 0x3e, 0x20, 0x22, 0x58, 0x8b, 0x80, 0x10, 0xa8, 0x79, - 0x03, 0x3b, 0x58, 0x46, 0x7e, 0x89, 0xce, 0x35, 0x0f, 0x95, 0x6e, 0x7a, 0x05, 0xc8, 0x0e, 0x49, - 0x22, 0x03, 0xdf, 0x0c, 0xfd, 0x4e, 0xa0, 0x4d, 0xab, 0x96, 0xe6, 0x24, 0xac, 0x41, 0xf9, 0xc0, - 0xf5, 0x1c, 0x6d, 0x46, 0xd9, 0xe2, 0x14, 0xf2, 0x5e, 0x09, 0x16, 0x06, 0xa8, 0x35, 0xd2, 0xaf, - 0xaf, 0x80, 0x6e, 0x59, 0xec, 0x55, 0x46, 0xc4, 0x5e, 0x75, 0x70, 0xec, 0xfd, 0x07, 0x41, 0x7d, - 0x80, 0x6d, 0x46, 0xf7, 0x8f, 0x57, 0xc4, 0x38, 0x7b, 0x7e, 0x68, 0x53, 0xad, 0x92, 0xc6, 0x3a, - 0x32, 0x13, 0x12, 0xf9, 0x37, 0x02, 0x4d, 0x6a, 0x7b, 0xd3, 0xe6, 0xba, 0x77, 0xbc, 0x57, 0x5d, - 0xe1, 0x39, 0x98, 0xb1, 0xb8, 0x2e, 0xb9, 0x70, 0x10, 0x34, 0xf2, 0x3d, 0x04, 0x67, 0xf3, 0x2a, - 0x47, 0xdb, 0x6e, 0x14, 0xcb, 0x6b, 0x1a, 0x76, 0xa1, 0x92, 0x9c, 0x8c, 0x34, 0xc4, 0xdb, 0xce, - 0xd6, 0x91, 0xfa, 0x82, 0x2a, 0x48, 0xaa, 0x27, 0xf8, 0x93, 0x1b, 0x70, 0x76, 0x60, 0xa1, 0x11, - 0x48, 0xea, 0x50, 0x95, 0xbd, 0x30, 0xf1, 0x81, 0xbc, 0x53, 0x48, 0x2a, 0xf9, 0x67, 0x29, 0x5f, - 0xa3, 0x7d, 0x67, 0xdb, 0x6f, 0x16, 0xdc, 0xb8, 0xc7, 0xf1, 0x9e, 0x06, 0x95, 0xc0, 0x77, 0x32, - 0xc7, 0x99, 0x72, 0xc9, 0xbe, 0xb6, 0x7d, 0x2f, 0xb6, 0xd8, 0x5b, 0x2e, 0xe7, 0xaf, 0x8c, 0xcc, - 0x7c, 0x1f, 0xb9, 0x9e, 0x4d, 0x77, 0xa9, 0xed, 0x7b, 0x4e, 0xc4, 0x1d, 0x37, 0x25, 0x7d, 0xaf, - 0xee, 0xe0, 0xbb, 0x50, 0xe3, 0xeb, 0x07, 0x6e, 0x9b, 0x6a, 0x33, 0xbc, 0x03, 0x2f, 0x1b, 0xc9, - 0xa3, 0xd1, 0x50, 0x1f, 0x8d, 0x99, 0x85, 0xd9, 0xa3, 0xd1, 0xe8, 0xae, 0x1a, 0xec, 0x0b, 0x33, - 0xfb, 0x98, 0xe1, 0x8a, 0x2d, 0xb7, 0xb5, 0xed, 0x7a, 0xfc, 0xea, 0x92, 0x09, 0xcc, 0xc8, 0x2c, - 0x26, 0xf6, 0xfc, 0x56, 0xcb, 0x7f, 0xcc, 0x4b, 0x40, 0xda, 0x0e, 0x12, 0x1a, 0xbb, 0x86, 0x74, - 0xbc, 0xd8, 0x6d, 0x71, 0x2c, 0x35, 0xfe, 0x44, 0xca, 0x08, 0xe4, 0x4f, 0x08, 0xaa, 0xdb, 0x7e, - 0xf3, 0x8e, 0x17, 0x87, 0x3d, 0x16, 0xb2, 0x4c, 0x5b, 0xea, 0xe5, 0x7d, 0x22, 0x89, 0x78, 0x07, - 0x6a, 0xb1, 0xdb, 0xa6, 0xbb, 0xb1, 0xd5, 0x0e, 0x44, 0xf3, 0x7e, 0x09, 0xb5, 0x36, 0x66, 0x18, - 0x37, 0x0d, 0x99, 0x19, 0x13, 0x16, 0xe8, 0x2d, 0x2b, 0x8a, 0xb9, 0x37, 0x24, 0x70, 0x4e, 0x61, - 0xc6, 0x4e, 0x8f, 0xed, 0xc6, 0x79, 0x9f, 0xe4, 0x76, 0x48, 0x03, 0xde, 0x4c, 0x6f, 0x63, 0x0f, - 0x68, 0xd8, 0x76, 0x3d, 0xab, 0xb0, 0xb0, 0x91, 0xd5, 0x5c, 0x68, 0xb2, 0xdb, 0xdc, 0x23, 0xd7, - 0x73, 0xfc, 0xc7, 0xc3, 0x83, 0x8b, 0xfc, 0x2d, 0xff, 0x0a, 0x54, 0xbe, 0x49, 0x23, 0xfa, 0x2e, - 0x1c, 0x67, 0xb1, 0xdf, 0xa5, 0x62, 0x43, 0x64, 0x18, 0xc9, 0x25, 0xcf, 0x40, 0x1e, 0x66, 0xfe, - 0x43, 0xbc, 0x0d, 0x27, 0xac, 0x28, 0x72, 0x9b, 0x1e, 0x75, 0x24, 0xaf, 0xd2, 0xd8, 0xbc, 0xfa, - 0x3f, 0x4d, 0x9e, 0x01, 0xfc, 0x44, 0x62, 0x65, 0x53, 0x2e, 0xc9, 0x77, 0x10, 0x9c, 0x1e, 0xc8, - 0x84, 0x99, 0x80, 0xd7, 0x1f, 0x61, 0x02, 0x51, 0x6a, 0xab, 0x91, 0xbd, 0x4f, 0x9d, 0x4e, 0x8b, - 0xca, 0x47, 0xb2, 0x5c, 0xb3, 0x3d, 0xa7, 0x93, 0x78, 0x40, 0x24, 0x56, 0xba, 0xc6, 0xf3, 0x00, - 0x6d, 0xcb, 0xeb, 0x58, 0x2d, 0x0e, 0xa1, 0xcc, 0x21, 0x28, 0x14, 0x32, 0x07, 0xfa, 0x20, 0xf7, - 0x89, 0x87, 0xe5, 0x87, 0x08, 0x5e, 0x93, 0xc5, 0x43, 0xf8, 0xc7, 0x80, 0x13, 0x8a, 0x19, 0xee, - 0xa7, 0xae, 0x12, 0xd5, 0xbf, 0x7f, 0xb3, 0xbf, 0x30, 0xa0, 0xc1, 0x85, 0x21, 0xf1, 0xf9, 0x94, - 0xb2, 0x9d, 0x94, 0x95, 0x5c, 0x19, 0x47, 0x85, 0x65, 0x1c, 0x0d, 0x2f, 0xe3, 0xa8, 0xef, 0xc2, - 0xd2, 0x03, 0xed, 0x9e, 0xe5, 0x59, 0x4d, 0xea, 0xa4, 0xca, 0xa5, 0x81, 0xf4, 0x75, 0x98, 0x76, - 0x63, 0xda, 0x96, 0x01, 0xb4, 0x39, 0x81, 0x12, 0x7d, 0xdb, 0xdd, 0xdb, 0x33, 0x13, 0xae, 0x6b, - 0xef, 0xcd, 0x03, 0x56, 0xbd, 0x4e, 0xc3, 0xae, 0x6b, 0x53, 0xfc, 0x43, 0x04, 0x65, 0xd6, 0x2b, - 0xf0, 0xb9, 0x61, 0x41, 0xc6, 0xad, 0xaf, 0x4f, 0xe8, 0xb6, 0xce, 0x44, 0x91, 0xb9, 0x77, 0xff, - 0xfe, 0xaf, 0x1f, 0x97, 0xce, 0xe0, 0x37, 0xf8, 0xb4, 0xad, 0xbb, 0xaa, 0x0e, 0xbf, 0x22, 0xfc, - 0x7d, 0x04, 0x58, 0x74, 0x2f, 0x65, 0xe4, 0x82, 0xaf, 0x0c, 0xc3, 0x37, 0x60, 0x34, 0xa3, 0x9f, - 0x53, 0xca, 0x93, 0x61, 0xfb, 0x21, 0x65, 0xc5, 0x88, 0x1f, 0xe0, 0x00, 0x96, 0x39, 0x80, 0x0b, - 0x98, 0x0c, 0x02, 0xd0, 0x78, 0xc2, 0x02, 0xe0, 0x69, 0x83, 0x26, 0x72, 0x7f, 0x85, 0x60, 0xfa, - 0x11, 0xbf, 0x75, 0x8d, 0xb0, 0xd0, 0xce, 0x64, 0x2c, 0xc4, 0x65, 0x71, 0xa8, 0xe4, 0x3c, 0x87, - 0x79, 0x0e, 0x9f, 0x95, 0x30, 0xa3, 0x38, 0xa4, 0x56, 0x3b, 0x87, 0xf6, 0x1a, 0xc2, 0xbf, 0x46, - 0x30, 0x93, 0x4c, 0x5e, 0xf0, 0xc5, 0x61, 0x10, 0x73, 0x93, 0x19, 0x7d, 0x42, 0x33, 0x0c, 0x72, - 0x99, 0x03, 0x3c, 0x4f, 0x06, 0x3a, 0x72, 0x3d, 0x37, 0xe1, 0xf8, 0x11, 0x82, 0xa9, 0x4d, 0x3a, - 0x32, 0xcc, 0x26, 0x85, 0xec, 0x05, 0xd3, 0x0d, 0xf0, 0x30, 0xfe, 0x0d, 0x82, 0x37, 0x37, 0x69, - 0x3c, 0xb8, 0xc0, 0xe3, 0xa5, 0xd1, 0x55, 0x57, 0x44, 0xdb, 0x95, 0x31, 0x4e, 0xa6, 0x95, 0xad, - 0xc1, 0x91, 0x5d, 0xc6, 0x97, 0x8a, 0x62, 0x2f, 0xea, 0x79, 0xf6, 0x63, 0x81, 0xe3, 0x2f, 0x08, - 0x4e, 0xf6, 0xcf, 0x34, 0x71, 0xbe, 0x25, 0x0c, 0x1c, 0x79, 0xea, 0x5f, 0x3a, 0x52, 0x05, 0xc9, - 0x73, 0x24, 0x37, 0x39, 0xec, 0xb7, 0xf1, 0x67, 0x8a, 0x60, 0xcb, 0xc1, 0x50, 0xd4, 0x78, 0x22, - 0x7f, 0x3e, 0xe5, 0x73, 0x71, 0x8e, 0xf9, 0x5d, 0x04, 0xc7, 0x36, 0x69, 0x7c, 0x2f, 0x9d, 0x85, - 0x0c, 0x8d, 0xd6, 0xdc, 0xc4, 0x52, 0x9f, 0x33, 0x94, 0x21, 0xb6, 0xdc, 0x4a, 0xed, 0xb9, 0xc2, - 0x81, 0x5d, 0xc2, 0x17, 0x8b, 0x80, 0x65, 0xf3, 0x97, 0x0f, 0x10, 0xcc, 0x24, 0xd3, 0x8a, 0xe1, - 0xe2, 0x73, 0x53, 0xc0, 0x89, 0x85, 0xe4, 0x1d, 0x0e, 0xf4, 0x86, 0x7e, 0x6d, 0x30, 0x50, 0xf5, - 0x7b, 0x69, 0x32, 0x83, 0xa3, 0xcf, 0x27, 0xd2, 0xef, 0x10, 0x40, 0x36, 0x6e, 0xc1, 0x97, 0x8b, - 0x95, 0x50, 0x46, 0x32, 0xfa, 0x04, 0x07, 0x2e, 0xc4, 0xe0, 0xca, 0x2c, 0xe9, 0xf5, 0xc2, 0x28, - 0x0e, 0xa8, 0xbd, 0x9e, 0x0c, 0x65, 0x7e, 0x81, 0x60, 0x9a, 0x3f, 0xcb, 0xf1, 0x85, 0x61, 0x80, - 0xd5, 0x57, 0xfb, 0xc4, 0x8c, 0xbe, 0xc8, 0x71, 0xd6, 0xd7, 0x8a, 0xea, 0xc0, 0x3a, 0x5a, 0xc6, - 0x5d, 0x98, 0x49, 0x5e, 0xc6, 0xc3, 0xa3, 0x22, 0xf7, 0x72, 0xd6, 0xeb, 0x05, 0xed, 0x28, 0x09, - 0x4c, 0x51, 0x82, 0x96, 0x0b, 0x4b, 0xd0, 0xfb, 0x08, 0xca, 0xac, 0x4a, 0xe0, 0xf3, 0x45, 0x35, - 0x64, 0xd2, 0x56, 0xb9, 0xc2, 0xa1, 0x5d, 0x24, 0xf5, 0x51, 0x35, 0x88, 0x99, 0xe6, 0xa7, 0x08, - 0x4e, 0xf6, 0x5f, 0x5a, 0xf0, 0xd9, 0xbe, 0xfa, 0xa3, 0xde, 0xd4, 0xf4, 0xbc, 0x09, 0x87, 0x5d, - 0x78, 0xc8, 0xe7, 0x39, 0x8a, 0x75, 0xfc, 0xd6, 0xc8, 0x84, 0xb8, 0x2f, 0x93, 0x98, 0x31, 0x5a, - 0xc9, 0x46, 0xad, 0x7f, 0x40, 0x70, 0x4c, 0xf2, 0x7d, 0x10, 0x52, 0x5a, 0x0c, 0x6b, 0x42, 0xf1, - 0xcf, 0x04, 0x91, 0xcf, 0x72, 0xec, 0x9f, 0xc2, 0xd7, 0xc7, 0xc4, 0x2e, 0x31, 0xaf, 0xc4, 0x0c, - 0xe6, 0x9f, 0x11, 0x9c, 0x7a, 0x94, 0x84, 0xfb, 0xff, 0x03, 0xfc, 0x2d, 0x0e, 0xfe, 0x73, 0xf8, - 0xed, 0x82, 0x7b, 0xc5, 0x28, 0x1d, 0xae, 0x21, 0xfc, 0x5b, 0x04, 0x55, 0x39, 0xd2, 0xc4, 0x97, - 0x86, 0xe6, 0x43, 0x7e, 0xe8, 0x39, 0xb1, 0x18, 0x16, 0x7d, 0x94, 0x5c, 0x28, 0x6c, 0x48, 0x42, - 0x38, 0x8b, 0xe3, 0x9f, 0x20, 0xc0, 0xe9, 0x43, 0x23, 0x7d, 0x7a, 0xe0, 0xc5, 0x9c, 0xa8, 0xa1, - 0x2f, 0x4a, 0xfd, 0xd2, 0xc8, 0x73, 0xf9, 0x86, 0xb4, 0x5c, 0xd8, 0x90, 0xfc, 0x54, 0xfe, 0x0f, - 0x10, 0xcc, 0x6e, 0xd2, 0xf4, 0xb6, 0x5b, 0x60, 0xc8, 0xfc, 0xd0, 0x56, 0x5f, 0x1a, 0x7d, 0x50, - 0x20, 0xba, 0xca, 0x11, 0x2d, 0xe2, 0x62, 0x53, 0x49, 0x00, 0x3f, 0x47, 0x70, 0x7c, 0x47, 0x0d, - 0x4e, 0x7c, 0x75, 0x94, 0xa4, 0x5c, 0xe9, 0x1e, 0x1f, 0xd7, 0x27, 0x38, 0xae, 0x15, 0x32, 0x16, - 0xae, 0x75, 0x31, 0xfb, 0xfc, 0x25, 0x82, 0xd7, 0xd5, 0xe7, 0x81, 0x98, 0x77, 0x7d, 0x54, 0xbb, - 0x15, 0x8c, 0xcd, 0xc8, 0x75, 0x8e, 0xcf, 0xc0, 0x57, 0xc7, 0xc1, 0xd7, 0x10, 0x13, 0x30, 0xfc, - 0x33, 0x04, 0xa7, 0xf8, 0xc4, 0x51, 0x65, 0xdc, 0xd7, 0x56, 0x86, 0xcd, 0x27, 0xc7, 0x68, 0x2b, - 0xa2, 0xf2, 0x90, 0x97, 0x02, 0xb5, 0x2e, 0x26, 0x85, 0xec, 0xb9, 0xf7, 0x9a, 0x6c, 0x64, 0xc2, - 0xbb, 0x2b, 0xa3, 0x0c, 0xf7, 0xb2, 0x8d, 0x4f, 0x84, 0xdb, 0xf2, 0x78, 0xe1, 0xf6, 0x6d, 0x04, - 0x15, 0x31, 0xe4, 0x2b, 0xb8, 0x1b, 0x28, 0x53, 0x40, 0xfd, 0x74, 0xee, 0x94, 0x9c, 0x62, 0x91, - 0x4f, 0x73, 0xb1, 0xab, 0xb8, 0x51, 0x24, 0x36, 0xf0, 0x9d, 0xa8, 0xf1, 0x44, 0x4c, 0xff, 0x9e, - 0x36, 0x5a, 0x7e, 0x33, 0xba, 0x86, 0x36, 0x6e, 0x3d, 0x3b, 0x9c, 0x47, 0x7f, 0x3d, 0x9c, 0x47, - 0xff, 0x38, 0x9c, 0x47, 0x5f, 0xfb, 0xe4, 0x18, 0x7f, 0xd8, 0xb0, 0x5b, 0x2e, 0xf5, 0x62, 0x55, - 0xc4, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x0a, 0xf7, 0xd6, 0x69, 0xa9, 0x22, 0x00, 0x00, + 0x37, 0xe0, 0xc2, 0x61, 0x85, 0x84, 0x84, 0x72, 0x44, 0xb0, 0xe7, 0x08, 0x59, 0xfc, 0x01, 0x9c, + 0xb8, 0x70, 0x41, 0x55, 0x5d, 0xd5, 0x5d, 0x3d, 0x99, 0xe9, 0x99, 0xac, 0x07, 0xa1, 0xdc, 0xa6, + 0x5e, 0x55, 0xbf, 0xf7, 0x7b, 0xdf, 0x55, 0x4f, 0x03, 0x17, 0x22, 0x1a, 0x76, 0x69, 0xd8, 0xb0, + 0x82, 0xa0, 0xe5, 0xda, 0x56, 0xec, 0xfa, 0x9e, 0xfa, 0xdb, 0x08, 0x42, 0x3f, 0xf6, 0xf1, 0xac, + 0x42, 0xd2, 0xdf, 0x68, 0xfa, 0x4d, 0x9f, 0xd3, 0x1b, 0xec, 0x57, 0x72, 0x44, 0x9f, 0x6b, 0xfa, + 0x7e, 0xb3, 0x45, 0x1b, 0x56, 0xe0, 0x36, 0x2c, 0xcf, 0xf3, 0x63, 0x7e, 0x38, 0x12, 0xbb, 0xe4, + 0xe0, 0xad, 0xc8, 0x70, 0x7d, 0xbe, 0x6b, 0xfb, 0x21, 0x6d, 0x74, 0x57, 0x1b, 0x4d, 0xea, 0xd1, + 0xd0, 0x8a, 0xa9, 0x23, 0xce, 0x5c, 0xcf, 0xce, 0xb4, 0x2d, 0x7b, 0xdf, 0xf5, 0x68, 0xd8, 0x6b, + 0x04, 0x07, 0x4d, 0x46, 0x88, 0x1a, 0x6d, 0x1a, 0x5b, 0x83, 0xbe, 0xda, 0x6a, 0xba, 0xf1, 0x7e, + 0xe7, 0x1d, 0xc3, 0xf6, 0xdb, 0x0d, 0x2b, 0xe4, 0xc0, 0xbe, 0xc9, 0x7f, 0xac, 0xd8, 0x4e, 0xf6, + 0xb5, 0xaa, 0x5e, 0x77, 0xd5, 0x6a, 0x05, 0xfb, 0xd6, 0x8b, 0xac, 0x36, 0x8a, 0x58, 0x85, 0x34, + 0xf0, 0x85, 0xad, 0xf8, 0x4f, 0x37, 0xf6, 0xc3, 0x9e, 0xf2, 0x33, 0xe1, 0x41, 0xfe, 0x88, 0xe0, + 0xe4, 0xcd, 0x4c, 0xd8, 0x57, 0x3a, 0x34, 0xec, 0x61, 0x0c, 0x65, 0xcf, 0x6a, 0x53, 0x0d, 0xd5, + 0xd1, 0x52, 0xcd, 0xe4, 0xbf, 0xb1, 0x06, 0x95, 0x90, 0xee, 0x85, 0x34, 0xda, 0xd7, 0x4a, 0x9c, + 0x2c, 0x97, 0x78, 0x11, 0x2a, 0x4c, 0x32, 0xb5, 0x63, 0x6d, 0xaa, 0x3e, 0xb5, 0x54, 0xdb, 0x38, + 0x76, 0xf8, 0x7c, 0xa1, 0xba, 0x93, 0x90, 0x22, 0x53, 0x6e, 0x62, 0x03, 0x4e, 0x84, 0x34, 0xf2, + 0x3b, 0xa1, 0x4d, 0xbf, 0x4a, 0xc3, 0xc8, 0xf5, 0x3d, 0xad, 0xcc, 0x38, 0x6d, 0x94, 0x9f, 0x3d, + 0x5f, 0xf8, 0x98, 0xd9, 0xbf, 0x89, 0xeb, 0x50, 0x8d, 0x68, 0x8b, 0xda, 0xb1, 0x1f, 0x6a, 0xd3, + 0xca, 0xc1, 0x94, 0x4a, 0x16, 0xa0, 0x76, 0xdf, 0x77, 0xe8, 0x50, 0xd0, 0x64, 0x13, 0x4e, 0x9b, + 0xb4, 0xeb, 0x32, 0x76, 0xf7, 0x68, 0x6c, 0x39, 0x56, 0x6c, 0xf5, 0x1f, 0x2e, 0xa5, 0x1a, 0xea, + 0x50, 0x0d, 0xc5, 0x61, 0xad, 0xc4, 0xe9, 0xe9, 0x9a, 0x99, 0x69, 0x5e, 0x31, 0x93, 0x29, 0xa0, + 0xde, 0xe9, 0x52, 0x2f, 0x8e, 0x86, 0xb3, 0x5c, 0x83, 0x53, 0x52, 0xab, 0xfb, 0x56, 0x9b, 0x46, + 0x81, 0x65, 0xd3, 0x84, 0xb7, 0xd0, 0xe5, 0xc5, 0x6d, 0xbc, 0x04, 0xc7, 0x54, 0xa2, 0x36, 0xa5, + 0x1c, 0xcf, 0xed, 0xe0, 0x45, 0x98, 0x95, 0xeb, 0x87, 0x5b, 0xb7, 0xb5, 0xb2, 0x72, 0x50, 0xdd, + 0x20, 0x3b, 0xa0, 0x29, 0xd8, 0xef, 0x59, 0x9e, 0xbb, 0x47, 0xa3, 0x78, 0x38, 0xea, 0x7a, 0xce, + 0x10, 0x8a, 0xe1, 0x53, 0x73, 0x9c, 0x86, 0xd7, 0xf3, 0xd6, 0x08, 0x7c, 0x2f, 0xa2, 0xe4, 0x03, + 0x94, 0x93, 0x74, 0x2b, 0xa4, 0x56, 0x4c, 0x4d, 0xfa, 0xad, 0x0e, 0x8d, 0x62, 0xec, 0x81, 0x9a, + 0x95, 0x5c, 0xe0, 0xec, 0xda, 0x17, 0x8c, 0x2c, 0x86, 0x0d, 0x19, 0xc3, 0xfc, 0xc7, 0x37, 0x6c, + 0xc7, 0x08, 0x0e, 0x9a, 0x06, 0x4b, 0x07, 0x43, 0xcd, 0x70, 0x99, 0x0e, 0x86, 0x22, 0x49, 0x6a, + 0xad, 0x9c, 0xc3, 0x67, 0x60, 0xa6, 0x13, 0x44, 0x34, 0x8c, 0xb9, 0x0e, 0x55, 0x53, 0xac, 0x98, + 0x9b, 0xbb, 0x56, 0xcb, 0x75, 0xac, 0x98, 0xd9, 0x96, 0xed, 0xa4, 0x6b, 0xf2, 0x7e, 0x5e, 0x81, + 0x87, 0x81, 0xa3, 0x28, 0xb0, 0xff, 0x3f, 0x54, 0x20, 0x0f, 0x5d, 0x85, 0x58, 0xea, 0x83, 0x78, + 0x37, 0x87, 0xf0, 0x36, 0x6d, 0xd1, 0x0c, 0xe1, 0x20, 0x67, 0x6a, 0x50, 0xb1, 0xad, 0xc8, 0xb6, + 0x1c, 0xc9, 0x4a, 0x2e, 0xc9, 0xb3, 0x32, 0x9c, 0x51, 0x58, 0xed, 0xf6, 0x3c, 0xbb, 0x88, 0xd1, + 0xc8, 0xa8, 0xc0, 0x73, 0x30, 0xe3, 0x84, 0x3d, 0xb3, 0xe3, 0x25, 0x76, 0x15, 0xfb, 0x82, 0x86, + 0x75, 0x98, 0x0e, 0xc2, 0x8e, 0x47, 0x79, 0xd2, 0xcb, 0xcd, 0x84, 0x84, 0x6d, 0xa8, 0x46, 0x31, + 0x2b, 0x6d, 0xcd, 0x1e, 0x4f, 0xf5, 0xd9, 0xb5, 0xcd, 0x23, 0xd8, 0x95, 0x69, 0xb2, 0x2b, 0xd8, + 0x99, 0x29, 0x63, 0x1c, 0x43, 0x4d, 0x66, 0x45, 0xa4, 0x55, 0xea, 0x53, 0x4b, 0xb3, 0x6b, 0x3b, + 0x47, 0x94, 0xf2, 0xe5, 0x80, 0x15, 0x64, 0xa5, 0x20, 0x08, 0xb5, 0x32, 0x41, 0x78, 0x0e, 0x6a, + 0x6d, 0x91, 0x71, 0x91, 0x56, 0x65, 0xf5, 0xd1, 0xcc, 0x08, 0xf8, 0x21, 0x4c, 0xbb, 0xde, 0x9e, + 0x1f, 0x69, 0x35, 0x8e, 0xe7, 0xc6, 0x11, 0xf0, 0x6c, 0x79, 0x7b, 0xbe, 0x99, 0x70, 0xc3, 0x1e, + 0x1c, 0x0f, 0x69, 0x1c, 0xf6, 0xa4, 0x15, 0x34, 0xe0, 0x46, 0xbd, 0x7b, 0x04, 0xf6, 0xa6, 0xca, + 0xcf, 0xcc, 0xb3, 0x27, 0xbf, 0x47, 0x30, 0xf7, 0x42, 0xde, 0xec, 0x06, 0xb4, 0x30, 0xa0, 0x1c, + 0x28, 0x47, 0x01, 0xb5, 0x79, 0x3d, 0x9c, 0x5d, 0xfb, 0xe2, 0x64, 0x12, 0x89, 0x09, 0x15, 0x4e, + 0xe0, 0xdc, 0x0b, 0xd3, 0xbd, 0x0d, 0x1f, 0x57, 0x3e, 0xdd, 0xb1, 0x62, 0x7b, 0xbf, 0x08, 0x30, + 0x8b, 0x60, 0x76, 0x26, 0x57, 0xc1, 0x13, 0x12, 0x26, 0x50, 0xe3, 0x3f, 0x1e, 0xf4, 0x82, 0x7c, + 0xc9, 0xce, 0xc8, 0xe4, 0xbb, 0x08, 0x74, 0x35, 0xe7, 0xfd, 0x56, 0xeb, 0x1d, 0xcb, 0x3e, 0x28, + 0x16, 0x59, 0x72, 0x1d, 0x2e, 0x6f, 0x6a, 0x03, 0x18, 0xbf, 0xc3, 0xe7, 0x0b, 0xa5, 0xad, 0xdb, + 0x66, 0xc9, 0x75, 0x3e, 0x7a, 0xba, 0x91, 0x0f, 0xfb, 0x80, 0x88, 0x60, 0x2d, 0x02, 0x42, 0xa0, + 0xe6, 0x0d, 0xec, 0x60, 0x19, 0xf9, 0x25, 0x3a, 0xd7, 0x3c, 0x54, 0xba, 0xe9, 0x15, 0x20, 0x3b, + 0x24, 0x89, 0x0c, 0x7c, 0x33, 0xf4, 0x3b, 0x81, 0x36, 0xad, 0x5a, 0x9a, 0x93, 0xb0, 0x06, 0xe5, + 0x03, 0xd7, 0x73, 0xb4, 0x19, 0x65, 0x8b, 0x53, 0xc8, 0x7b, 0x25, 0x58, 0x18, 0xa0, 0xd6, 0x48, + 0xbf, 0xbe, 0x02, 0xba, 0x65, 0xb1, 0x57, 0x19, 0x11, 0x7b, 0xd5, 0xc1, 0xb1, 0xf7, 0x6f, 0x04, + 0xf5, 0x01, 0xb6, 0x19, 0xdd, 0x3f, 0x5e, 0x11, 0xe3, 0xec, 0xf9, 0xa1, 0x4d, 0xb5, 0x4a, 0x1a, + 0xeb, 0xc8, 0x4c, 0x48, 0xe4, 0x5f, 0x08, 0x34, 0xa9, 0xed, 0x4d, 0x9b, 0xeb, 0xde, 0xf1, 0x5e, + 0x75, 0x85, 0xe7, 0x60, 0xc6, 0xe2, 0xba, 0xe4, 0xc2, 0x41, 0xd0, 0xc8, 0xf7, 0x10, 0x9c, 0xcd, + 0xab, 0x1c, 0x6d, 0xbb, 0x51, 0x2c, 0xaf, 0x69, 0xd8, 0x85, 0x4a, 0x72, 0x32, 0xd2, 0x10, 0x6f, + 0x3b, 0x5b, 0x47, 0xea, 0x0b, 0xaa, 0x20, 0xa9, 0x9e, 0xe0, 0x4f, 0x6e, 0xc0, 0xd9, 0x81, 0x85, + 0x46, 0x20, 0xa9, 0x43, 0x55, 0xf6, 0xc2, 0xc4, 0x07, 0xf2, 0x4e, 0x21, 0xa9, 0xe4, 0x3f, 0xa5, + 0x7c, 0x8d, 0xf6, 0x9d, 0x6d, 0xbf, 0x59, 0x70, 0xe3, 0x1e, 0xc7, 0x7b, 0x1a, 0x54, 0x02, 0xdf, + 0xc9, 0x1c, 0x67, 0xca, 0x25, 0xfb, 0xda, 0xf6, 0xbd, 0xd8, 0x62, 0x6f, 0xb9, 0x9c, 0xbf, 0x32, + 0x32, 0xf3, 0x7d, 0xe4, 0x7a, 0x36, 0xdd, 0xa5, 0xb6, 0xef, 0x39, 0x11, 0x77, 0xdc, 0x94, 0xf4, + 0xbd, 0xba, 0x83, 0xef, 0x42, 0x8d, 0xaf, 0x1f, 0xb8, 0x6d, 0xaa, 0xcd, 0xf0, 0x0e, 0xbc, 0x6c, + 0x24, 0x8f, 0x46, 0x43, 0x7d, 0x34, 0x66, 0x16, 0x66, 0x8f, 0x46, 0xa3, 0xbb, 0x6a, 0xb0, 0x2f, + 0xcc, 0xec, 0x63, 0x86, 0x2b, 0xb6, 0xdc, 0xd6, 0xb6, 0xeb, 0xf1, 0xab, 0x4b, 0x26, 0x30, 0x23, + 0xb3, 0x98, 0xd8, 0xf3, 0x5b, 0x2d, 0xff, 0x31, 0x2f, 0x01, 0x69, 0x3b, 0x48, 0x68, 0xec, 0x1a, + 0xd2, 0xf1, 0x62, 0xb7, 0xc5, 0xb1, 0xd4, 0xf8, 0x13, 0x29, 0x23, 0xb0, 0xbb, 0xf2, 0x9e, 0xdb, + 0x8a, 0x69, 0xc8, 0x2f, 0x0a, 0x35, 0x53, 0xac, 0xc8, 0x9f, 0x10, 0x54, 0xb7, 0xfd, 0xe6, 0x1d, + 0x2f, 0x0e, 0x7b, 0x2c, 0x94, 0x99, 0x15, 0xa8, 0x97, 0xf7, 0x95, 0x24, 0xe2, 0x1d, 0xa8, 0xc5, + 0x6e, 0x9b, 0xee, 0xc6, 0x56, 0x3b, 0x10, 0x4d, 0xfd, 0x25, 0xd4, 0xdd, 0x98, 0x61, 0xdc, 0x34, + 0x64, 0x66, 0x4c, 0x58, 0x02, 0xb4, 0xac, 0x28, 0xe6, 0x5e, 0x92, 0x0a, 0x71, 0x0a, 0x73, 0x42, + 0x7a, 0x6c, 0x37, 0xce, 0xfb, 0x2a, 0xb7, 0x43, 0x1a, 0xf0, 0x66, 0x7a, 0x4b, 0x7b, 0x40, 0xc3, + 0xb6, 0xeb, 0x59, 0x85, 0x05, 0x8f, 0xac, 0xe6, 0x42, 0x96, 0xdd, 0xf2, 0x1e, 0xb9, 0x9e, 0xe3, + 0x3f, 0x1e, 0x1e, 0x74, 0xe4, 0x6f, 0xf9, 0xd7, 0xa1, 0xf2, 0x4d, 0x1a, 0xe9, 0x77, 0xe1, 0x38, + 0xcb, 0x89, 0x2e, 0x15, 0x1b, 0x22, 0xf3, 0x48, 0x2e, 0xa9, 0x06, 0xf2, 0x30, 0xf3, 0x1f, 0xe2, + 0x6d, 0x38, 0x61, 0x45, 0x91, 0xdb, 0xf4, 0xa8, 0x23, 0x79, 0x95, 0xc6, 0xe6, 0xd5, 0xff, 0x69, + 0xf2, 0x3c, 0xe0, 0x27, 0x12, 0x2b, 0x9b, 0x72, 0x49, 0xbe, 0x83, 0xe0, 0xf4, 0x40, 0x26, 0xcc, + 0x04, 0xbc, 0x2e, 0x09, 0x13, 0x88, 0x12, 0x5c, 0x8d, 0xec, 0x7d, 0xea, 0x74, 0x5a, 0x54, 0x3e, + 0x9e, 0xe5, 0x9a, 0xed, 0x39, 0x9d, 0xc4, 0x03, 0x22, 0xe1, 0xd2, 0x35, 0x9e, 0x07, 0x68, 0x5b, + 0x5e, 0xc7, 0x6a, 0x71, 0x08, 0x65, 0x0e, 0x41, 0xa1, 0x90, 0x39, 0xd0, 0x07, 0xb9, 0x4f, 0x3c, + 0x38, 0x3f, 0x44, 0xf0, 0x9a, 0x2c, 0x2a, 0xc2, 0x3f, 0x06, 0x9c, 0x50, 0xcc, 0x70, 0x3f, 0x75, + 0x95, 0xe8, 0x0a, 0xfd, 0x9b, 0xfd, 0x05, 0x03, 0x0d, 0x2e, 0x18, 0x89, 0xcf, 0xa7, 0x94, 0xed, + 0xa4, 0xdc, 0xe4, 0xca, 0x3b, 0x2a, 0x2c, 0xef, 0x68, 0x78, 0x79, 0x47, 0x7d, 0x17, 0x99, 0x1e, + 0x68, 0xf7, 0x2c, 0xcf, 0x6a, 0x52, 0x27, 0x55, 0x2e, 0x0d, 0xa4, 0xaf, 0xc3, 0xb4, 0x1b, 0xd3, + 0xb6, 0x0c, 0xa0, 0xcd, 0x09, 0x94, 0xee, 0xdb, 0xee, 0xde, 0x9e, 0x99, 0x70, 0x5d, 0x7b, 0x6f, + 0x1e, 0xb0, 0xea, 0x75, 0x1a, 0x76, 0x5d, 0x9b, 0xe2, 0x1f, 0x22, 0x28, 0xb3, 0x1e, 0x82, 0xcf, + 0x0d, 0x0b, 0x32, 0x6e, 0x7d, 0x7d, 0x42, 0xb7, 0x78, 0x26, 0x8a, 0xcc, 0xbd, 0xfb, 0xf7, 0x7f, + 0xfe, 0xb8, 0x74, 0x06, 0xbf, 0xc1, 0xa7, 0x70, 0xdd, 0x55, 0x75, 0x28, 0x16, 0xe1, 0xef, 0x23, + 0xc0, 0xa2, 0xab, 0x29, 0xa3, 0x18, 0x7c, 0x65, 0x18, 0xbe, 0x01, 0x23, 0x1b, 0xfd, 0x9c, 0x52, + 0x9e, 0x0c, 0xdb, 0x0f, 0x29, 0x2b, 0x46, 0xfc, 0x00, 0x07, 0xb0, 0xcc, 0x01, 0x5c, 0xc0, 0x64, + 0x10, 0x80, 0xc6, 0x13, 0x16, 0x00, 0x4f, 0x1b, 0x34, 0x91, 0xfb, 0x2b, 0x04, 0xd3, 0x8f, 0xf8, + 0x6d, 0x6c, 0x84, 0x85, 0x76, 0x26, 0x63, 0x21, 0x2e, 0x8b, 0x43, 0x25, 0xe7, 0x39, 0xcc, 0x73, + 0xf8, 0xac, 0x84, 0x19, 0xc5, 0x21, 0xb5, 0xda, 0x39, 0xb4, 0xd7, 0x10, 0xfe, 0x35, 0x82, 0x99, + 0x64, 0x22, 0x83, 0x2f, 0x0e, 0x83, 0x98, 0x9b, 0xd8, 0xe8, 0x13, 0x9a, 0x6d, 0x90, 0xcb, 0x1c, + 0xe0, 0x79, 0x32, 0xd0, 0x91, 0xeb, 0xb9, 0xc9, 0xc7, 0x8f, 0x10, 0x4c, 0x6d, 0xd2, 0x91, 0x61, + 0x36, 0x29, 0x64, 0x2f, 0x98, 0x6e, 0x80, 0x87, 0xf1, 0x6f, 0x10, 0xbc, 0xb9, 0x49, 0xe3, 0xc1, + 0x05, 0x1e, 0x2f, 0x8d, 0xae, 0xba, 0x22, 0xda, 0xae, 0x8c, 0x71, 0x32, 0xad, 0x6c, 0x0d, 0x8e, + 0xec, 0x32, 0xbe, 0x54, 0x14, 0x7b, 0x51, 0xcf, 0xb3, 0x1f, 0x0b, 0x1c, 0x7f, 0x41, 0x70, 0xb2, + 0x7f, 0xd6, 0x89, 0xf3, 0x2d, 0x61, 0xe0, 0x28, 0x54, 0xff, 0xd2, 0x91, 0x2a, 0x48, 0x9e, 0x23, + 0xb9, 0xc9, 0x61, 0xbf, 0x8d, 0x3f, 0x53, 0x04, 0x5b, 0x0e, 0x8c, 0xa2, 0xc6, 0x13, 0xf9, 0xf3, + 0x29, 0x9f, 0x97, 0x73, 0xcc, 0xef, 0x22, 0x38, 0xb6, 0x49, 0xe3, 0x7b, 0xe9, 0x8c, 0x64, 0x68, + 0xb4, 0xe6, 0x26, 0x99, 0xfa, 0x9c, 0xa1, 0x0c, 0xb7, 0xe5, 0x56, 0x6a, 0xcf, 0x15, 0x0e, 0xec, + 0x12, 0xbe, 0x58, 0x04, 0x2c, 0x9b, 0xcb, 0x7c, 0x80, 0x60, 0x26, 0x99, 0x62, 0x0c, 0x17, 0x9f, + 0x9b, 0x0e, 0x4e, 0x2c, 0x24, 0xef, 0x70, 0xa0, 0x37, 0xf4, 0x6b, 0x83, 0x81, 0xaa, 0xdf, 0x4b, + 0x93, 0x19, 0x1c, 0x7d, 0x3e, 0x91, 0x7e, 0x87, 0x00, 0xb2, 0x31, 0x0c, 0xbe, 0x5c, 0xac, 0x84, + 0x32, 0xaa, 0xd1, 0x27, 0x38, 0x88, 0x21, 0x06, 0x57, 0x66, 0x49, 0xaf, 0x17, 0x46, 0x71, 0x40, + 0xed, 0xf5, 0x64, 0x58, 0xf3, 0x0b, 0x04, 0xd3, 0xfc, 0xb9, 0x8e, 0x2f, 0x0c, 0x03, 0xac, 0xbe, + 0xe6, 0x27, 0x66, 0xf4, 0x45, 0x8e, 0xb3, 0xbe, 0x56, 0x54, 0x07, 0xd6, 0xd1, 0x32, 0xee, 0xc2, + 0x4c, 0xf2, 0x62, 0x1e, 0x1e, 0x15, 0xb9, 0x17, 0xb5, 0x5e, 0x2f, 0x68, 0x47, 0x49, 0x60, 0x8a, + 0x12, 0xb4, 0x5c, 0x58, 0x82, 0xde, 0x47, 0x50, 0x66, 0x55, 0x02, 0x9f, 0x2f, 0xaa, 0x21, 0x93, + 0xb6, 0xca, 0x15, 0x0e, 0xed, 0x22, 0xa9, 0x8f, 0xaa, 0x41, 0xcc, 0x34, 0x3f, 0x45, 0x70, 0xb2, + 0xff, 0xd2, 0x82, 0xcf, 0xf6, 0xd5, 0x1f, 0xf5, 0xa6, 0xa6, 0xe7, 0x4d, 0x38, 0xec, 0xc2, 0x43, + 0x3e, 0xcf, 0x51, 0xac, 0xe3, 0xb7, 0x46, 0x26, 0xc4, 0x7d, 0x99, 0xc4, 0x8c, 0xd1, 0x4a, 0x36, + 0x82, 0xfd, 0x03, 0x82, 0x63, 0x92, 0xef, 0x83, 0x90, 0xd2, 0x62, 0x58, 0x13, 0x8a, 0x7f, 0x26, + 0x88, 0x7c, 0x96, 0x63, 0xff, 0x14, 0xbe, 0x3e, 0x26, 0x76, 0x89, 0x79, 0x25, 0x66, 0x30, 0xff, + 0x8c, 0xe0, 0xd4, 0xa3, 0x24, 0xdc, 0xff, 0x1f, 0xe0, 0x6f, 0x71, 0xf0, 0x9f, 0xc3, 0x6f, 0x17, + 0xdc, 0x2b, 0x46, 0xe9, 0x70, 0x0d, 0xe1, 0xdf, 0x22, 0xa8, 0xca, 0x51, 0x27, 0xbe, 0x34, 0x34, + 0x1f, 0xf2, 0xc3, 0xd0, 0x89, 0xc5, 0xb0, 0xe8, 0xa3, 0xe4, 0x42, 0x61, 0x43, 0x12, 0xc2, 0x59, + 0x1c, 0xff, 0x04, 0x01, 0x4e, 0x1f, 0x1a, 0xe9, 0xd3, 0x03, 0x2f, 0xe6, 0x44, 0x0d, 0x7d, 0x51, + 0xea, 0x97, 0x46, 0x9e, 0xcb, 0x37, 0xa4, 0xe5, 0xc2, 0x86, 0xe4, 0xa7, 0xf2, 0x7f, 0x80, 0x60, + 0x76, 0x93, 0xa6, 0xb7, 0xdd, 0x02, 0x43, 0xe6, 0x87, 0xb9, 0xfa, 0xd2, 0xe8, 0x83, 0x02, 0xd1, + 0x55, 0x8e, 0x68, 0x11, 0x17, 0x9b, 0x4a, 0x02, 0xf8, 0x39, 0x82, 0xe3, 0x3b, 0x6a, 0x70, 0xe2, + 0xab, 0xa3, 0x24, 0xe5, 0x4a, 0xf7, 0xf8, 0xb8, 0x3e, 0xc1, 0x71, 0xad, 0x90, 0xb1, 0x70, 0xad, + 0x8b, 0x99, 0xe8, 0x2f, 0x11, 0xbc, 0xae, 0x3e, 0x0f, 0xc4, 0x1c, 0xec, 0xa3, 0xda, 0xad, 0x60, + 0x9c, 0x46, 0xae, 0x73, 0x7c, 0x06, 0xbe, 0x3a, 0x0e, 0xbe, 0x86, 0x98, 0x8c, 0xe1, 0x9f, 0x21, + 0x38, 0xc5, 0x27, 0x91, 0x2a, 0xe3, 0xbe, 0xb6, 0x32, 0x6c, 0x6e, 0x39, 0x46, 0x5b, 0x11, 0x95, + 0x87, 0xbc, 0x14, 0xa8, 0x75, 0x31, 0x41, 0x64, 0xcf, 0xbd, 0xd7, 0x64, 0x23, 0x13, 0xde, 0x5d, + 0x19, 0x65, 0xb8, 0x97, 0x6d, 0x7c, 0x22, 0xdc, 0x96, 0xc7, 0x0b, 0xb7, 0x6f, 0x23, 0xa8, 0x88, + 0xe1, 0x5f, 0xc1, 0xdd, 0x40, 0x99, 0x0e, 0xea, 0xa7, 0x73, 0xa7, 0xe4, 0x14, 0x8b, 0x7c, 0x9a, + 0x8b, 0x5d, 0xc5, 0x8d, 0x22, 0xb1, 0x81, 0xef, 0x44, 0x8d, 0x27, 0x62, 0x2a, 0xf8, 0xb4, 0xd1, + 0xf2, 0x9b, 0xd1, 0x35, 0xb4, 0x71, 0xeb, 0xd9, 0xe1, 0x3c, 0xfa, 0xeb, 0xe1, 0x3c, 0xfa, 0xc7, + 0xe1, 0x3c, 0xfa, 0xda, 0x27, 0xc7, 0xf8, 0x23, 0x87, 0xdd, 0x72, 0xa9, 0x17, 0xab, 0x22, 0xfe, + 0x1b, 0x00, 0x00, 0xff, 0xff, 0xe4, 0x05, 0x7a, 0x61, 0xc1, 0x22, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -4204,6 +4213,13 @@ func (m *ApplicationPodLogsQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.Filter != nil { + i -= len(*m.Filter) + copy(dAtA[i:], *m.Filter) + i = encodeVarintApplication(dAtA, i, uint64(len(*m.Filter))) + i-- + dAtA[i] = 0x52 + } if m.UntilTime != nil { i -= len(*m.UntilTime) copy(dAtA[i:], *m.UntilTime) @@ -5124,6 +5140,10 @@ func (m *ApplicationPodLogsQuery) Size() (n int) { l = len(*m.UntilTime) n += 1 + l + sovApplication(uint64(l)) } + if m.Filter != nil { + l = len(*m.Filter) + n += 1 + l + sovApplication(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -8965,6 +8985,39 @@ func (m *ApplicationPodLogsQuery) Unmarshal(dAtA []byte) error { s := string(dAtA[iNdEx:postIndex]) m.UntilTime = &s iNdEx = postIndex + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Filter", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApplication + } + 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 ErrInvalidLengthApplication + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthApplication + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + s := string(dAtA[iNdEx:postIndex]) + m.Filter = &s + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipApplication(dAtA[iNdEx:]) diff --git a/server/application/application.go b/server/application/application.go index b64110f6cde07..a10add0b81bec 100644 --- a/server/application/application.go +++ b/server/application/application.go @@ -1081,6 +1081,16 @@ func (s *Server) PodLogs(q *application.ApplicationPodLogsQuery, ws application. if q.TailLines > 0 { tailLines = &q.TailLines } + + literal := "" + inverse := false + if q.Filter != nil { + literal = *q.Filter + if literal[0] == '!' { + literal = literal[1:] + inverse = true + } + } stream, err := kubeClientset.CoreV1().Pods(pod.Namespace).GetLogs(*q.PodName, &v1.PodLogOptions{ Container: q.Container, Follow: q.Follow, @@ -1113,6 +1123,12 @@ func (s *Server) PodLogs(q *application.ApplicationPodLogsQuery, ws application. if err == nil { lines := strings.Join(parts[1:], " ") for _, line := range strings.Split(lines, "\r") { + if q.Filter != nil { + lineContainsFilter := strings.Contains(line, literal) + if (inverse && lineContainsFilter) || (!inverse && !lineContainsFilter) { + continue + } + } if q.UntilTime != nil && !metaLogTime.Before(untilTime) { _ = ws.Send(&application.LogEntry{Last: true}) close(done) diff --git a/server/application/application.proto b/server/application/application.proto index 968f21c179283..aef8dfab23eda 100644 --- a/server/application/application.proto +++ b/server/application/application.proto @@ -164,6 +164,7 @@ message ApplicationPodLogsQuery { required int64 tailLines = 7 [(gogoproto.nullable) = false]; required bool follow = 8 [(gogoproto.nullable) = false]; optional string untilTime = 9; + optional string filter = 10; } message LogEntry { diff --git a/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.scss b/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.scss index f680547603bb6..ec4e874197dd9 100644 --- a/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.scss +++ b/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.scss @@ -1,85 +1,90 @@ .pod-logs-viewer { - height: 90%; - font-size: 14px; - line-height: 1.5em; - background-color: white; - padding: 15px; - padding-left: 5px; - color: black; - &--inverted { - background-color: black; - color: white; - } - &__settings { - display: flex; - margin-bottom: 1em; - .argo-button { - margin-right: 5px; - } - } - &__menu { - display: flex; - margin-bottom: 1em; - padding-left: 10px; - i { - cursor: pointer; - border-radius: 7px; - $size: 25px; - width: $size; - height: $size; - display: flex; - align-items: center; - justify-content: center; - border: 1px solid black; - margin: 0 2px; - &:hover { + height: 90%; + font-size: 14px; + line-height: 1.5em; + background-color: white; + padding: 15px; + padding-left: 5px; + color: black; + &--inverted { background-color: black; color: white; - } - &.disabled { - opacity: 0.5; - cursor: not-allowed; - } } - &--inverted { - i { - border-color: white; - &:hover { - background-color: white; - color: black; + &__settings { + display: flex; + margin-bottom: 1em; + .argo-button { + margin-right: 5px; } - } } - } - &__line { - padding-left: 0.5ch; - &--selected { - background-color: red; - box-shadow: -3px 0 0 0 darkred; + &__filter { + display: flex; + margin-left: auto; + width: 350px; } &__menu { - border-radius: 6px; - text-align: center; - min-width: 25px; - opacity: 0; - flex-shrink: 0; - box-shadow: 0 0 0 1px red inset; - &--visible { - opacity: 1; - } - &:hover { - color: red; - } + display: flex; + margin-bottom: 1em; + padding-left: 10px; + i { + cursor: pointer; + border-radius: 7px; + $size: 25px; + width: $size; + height: $size; + display: flex; + align-items: center; + justify-content: center; + border: 1px solid black; + margin: 0 2px; + &:hover { + background-color: black; + color: white; + } + &.disabled { + opacity: 0.5; + cursor: not-allowed; + } + } + &--inverted { + i { + border-color: white; + &:hover { + background-color: white; + color: black; + } + } + } } - &__number { - text-align: right; - min-width: 3ch; - margin-right: 2ch; - opacity: 0.5; - cursor: pointer; - &:hover { - opacity: 1; - } + &__line { + padding-left: 0.5ch; + &--selected { + background-color: red; + box-shadow: -3px 0 0 0 darkred; + } + &__menu { + border-radius: 6px; + text-align: center; + min-width: 25px; + opacity: 0; + flex-shrink: 0; + box-shadow: 0 0 0 1px red inset; + &--visible { + opacity: 1; + } + &:hover { + color: red; + } + } + &__number { + text-align: right; + min-width: 3ch; + margin-right: 2ch; + opacity: 0.5; + cursor: pointer; + &:hover { + opacity: 1; + } + } } - } } diff --git a/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.tsx b/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.tsx index ef1c9fc41fd0e..e3097fcfb14a5 100644 --- a/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.tsx +++ b/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.tsx @@ -1,8 +1,8 @@ import {DataLoader, DropDownMenu} from 'argo-ui'; import * as classNames from 'classnames'; import * as React from 'react'; - import {useState} from 'react'; +import {Observable} from 'rxjs'; import * as models from '../../../shared/models'; import {services} from '../../../shared/services'; import './pod-logs-viewer.scss'; @@ -21,6 +21,16 @@ export const PodsLogsViewer = (props: {applicationName: string; pod: models.Reso const [selectedLine, setSelectedLine] = useState(-1); const bottom = React.useRef(null); const [page, setPage] = useState<{number: number; untilTimes: string[]}>({number: 0, untilTimes: []}); + + interface FilterData { + literal: string; + inverse: boolean; + } + const [filter, setFilter] = useState({inverse: false, literal: ''} as FilterData); + + const filterQuery = () => { + return filter.literal && `${filter.inverse ? '!' : ''}${filter.literal}`; + }; return ( services.viewPreferences.getPreferences()}> {prefs => ( @@ -85,6 +95,33 @@ export const PodsLogsViewer = (props: {applicationName: string; pod: models.Reso }}> {prefs.appDetails.darkMode ? : } +
+ + { + if (input) { + Observable.fromEvent(input, 'keyup') + .debounceTime(500) + .subscribe(() => { + if (loader) { + loader.reload(); + } + }); + } + }} + type='text' + placeholder='Filter string' + className='argo-field' + value={filter.literal} + onChange={e => setFilter({...filter, literal: e.target.value})} + style={{padding: 0}} + /> +
(loader = l)} @@ -105,7 +142,8 @@ export const PodsLogsViewer = (props: {applicationName: string; pod: models.Reso container.name, maxLines * (page.number + 1), prefs.appDetails.followLogs && page.number === 0, - page.untilTimes[page.untilTimes.length - 1] + page.untilTimes[page.untilTimes.length - 1], + filterQuery() ) // show only current page lines .scan((lines, logEntry) => { diff --git a/ui/src/app/shared/services/applications-service.ts b/ui/src/app/shared/services/applications-service.ts index c8c445ee49af9..48fb6dc7e5c4d 100644 --- a/ui/src/app/shared/services/applications-service.ts +++ b/ui/src/app/shared/services/applications-service.ts @@ -168,7 +168,8 @@ export class ApplicationsService { containerName: string, tail?: number, follow?: boolean, - untilTime?: string + untilTime?: string, + filter?: string ): Observable { if (follow === undefined || follow === null) { follow = true; @@ -177,7 +178,7 @@ export class ApplicationsService { .loadEventSource( `/applications/${applicationName}/pods/${podName}/logs?container=${containerName}&follow=${follow}&namespace=${namespace}${tail ? '&tailLines=' + tail : ''}${ untilTime ? '&untilTime=' + untilTime : '' - }` + }${filter ? '&filter=' + filter : ''}` ) .map(data => JSON.parse(data).result as models.LogEntry); return new Observable(observer => {