diff --git a/api/monitor/types.go b/api/monitor/types.go index 7a97f8048..c7f83c2d2 100644 --- a/api/monitor/types.go +++ b/api/monitor/types.go @@ -215,11 +215,17 @@ type ClusterOverviewResult struct { NodeAbnormal int32 WorkloadCount int32 WorkloadAbnormal int32 + CPUCapacity float64 + CPUAllocatable float64 + MemCapacity int64 + MemAllocatable int64 + PodCount int32 Clusters []*ClusterStatistic } type ClusterStatistic struct { ClusterID string + TenantID string ClusterPhase string NodeCount int32 NodeAbnormal int32 @@ -242,6 +248,7 @@ type ClusterStatistic struct { MemRequestRate string MemAllocatableRate string MemUsage string + PodCount int32 SchedulerHealthy bool ControllerManagerHealthy bool EtcdHealthy bool diff --git a/api/monitor/v1/generated.pb.go b/api/monitor/v1/generated.pb.go index b1c846dea..26c96a6ff 100644 --- a/api/monitor/v1/generated.pb.go +++ b/api/monitor/v1/generated.pb.go @@ -496,138 +496,141 @@ func init() { } var fileDescriptor_c9feea175c75e123 = []byte{ - // 2089 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcf, 0x6f, 0x1b, 0xc7, - 0xf5, 0x37, 0x45, 0x91, 0x26, 0x47, 0x92, 0xa5, 0x8c, 0xe5, 0x84, 0x5f, 0x19, 0x5f, 0x4a, 0x60, - 0xd0, 0xc0, 0x49, 0xda, 0x65, 0xed, 0x26, 0xad, 0xdb, 0xa2, 0x41, 0x45, 0xda, 0x6d, 0x9c, 0x98, - 0x12, 0x33, 0xb2, 0xa2, 0x36, 0xc8, 0xa1, 0xa3, 0xe5, 0x88, 0xdc, 0x90, 0xfb, 0xc3, 0xb3, 0xb3, - 0xb4, 0x59, 0xf4, 0x90, 0x4b, 0xef, 0xed, 0xa1, 0x97, 0xf6, 0x4f, 0xe8, 0x1f, 0xd0, 0x53, 0xd1, - 0xab, 0x4f, 0x45, 0x8e, 0x06, 0x0a, 0x08, 0xb5, 0x7a, 0xec, 0xa5, 0xe7, 0x9c, 0x8a, 0x79, 0x33, - 0x3b, 0x3b, 0x4b, 0x51, 0x16, 0xe5, 0xa0, 0xba, 0x71, 0xdf, 0xe7, 0xf3, 0x79, 0xef, 0xed, 0xbc, - 0xc7, 0x37, 0x33, 0x8b, 0x1c, 0x31, 0x64, 0xb1, 0xa0, 0xee, 0xd0, 0xf1, 0xc2, 0xa6, 0x18, 0xb2, - 0x26, 0x8d, 0xbc, 0xa6, 0x1f, 0x06, 0x9e, 0x08, 0x79, 0x73, 0x7c, 0xbb, 0xd9, 0x67, 0x01, 0xe3, - 0x54, 0xb0, 0x9e, 0x13, 0xf1, 0x50, 0x84, 0xb8, 0x6e, 0xf1, 0xa5, 0xd6, 0xa1, 0x91, 0xe7, 0x68, - 0xbe, 0x33, 0xbe, 0xbd, 0xf1, 0x9d, 0xbe, 0x27, 0x06, 0xc9, 0xa1, 0xe3, 0x86, 0x7e, 0xb3, 0x1f, - 0xf6, 0xc3, 0x26, 0xc8, 0x0e, 0x93, 0x23, 0x78, 0x82, 0x07, 0xf8, 0xa5, 0xdc, 0x6d, 0xbc, 0x37, - 0xbc, 0x1b, 0xcb, 0xc8, 0x34, 0xf2, 0x7c, 0xea, 0x0e, 0xbc, 0x80, 0xf1, 0x49, 0x33, 0x1a, 0xf6, - 0x21, 0x0d, 0xce, 0xe2, 0x30, 0xe1, 0x2e, 0x9b, 0x4e, 0xe2, 0xa5, 0xaa, 0xb8, 0xe9, 0x33, 0x41, - 0x67, 0xa4, 0xbe, 0xd1, 0x3c, 0x4b, 0xc5, 0x93, 0x40, 0x78, 0xfe, 0xe9, 0x30, 0xdf, 0x3f, 0x4f, - 0x10, 0xbb, 0x03, 0xe6, 0xd3, 0x69, 0x5d, 0xe3, 0xef, 0x05, 0xb4, 0xda, 0x1e, 0x25, 0xb1, 0x60, - 0x7c, 0x77, 0xcc, 0xf8, 0xd8, 0x63, 0x4f, 0xf0, 0xaf, 0x50, 0x45, 0xe6, 0xd5, 0xa3, 0x82, 0xd6, - 0x0a, 0x5b, 0x85, 0x5b, 0x4b, 0x77, 0xbe, 0xeb, 0x28, 0xf7, 0x8e, 0xed, 0xde, 0x89, 0x86, 0x7d, - 0x69, 0x88, 0x1d, 0xc9, 0x76, 0xc6, 0xb7, 0x9d, 0xdd, 0xc3, 0x2f, 0x98, 0x2b, 0x3a, 0x4c, 0xd0, - 0x16, 0x7e, 0x76, 0xbc, 0x79, 0xe5, 0xe4, 0x78, 0x13, 0x65, 0x36, 0x62, 0xbc, 0xe2, 0x5f, 0xa2, - 0x32, 0x67, 0x71, 0x32, 0x12, 0xb5, 0x05, 0xf0, 0xff, 0xbe, 0xf3, 0xf2, 0x52, 0x39, 0x53, 0x29, - 0x12, 0x10, 0xb7, 0xd0, 0xc9, 0xf1, 0x66, 0x59, 0xfd, 0x26, 0xda, 0x61, 0xe3, 0x1f, 0x8b, 0xe8, - 0xc6, 0x4c, 0x36, 0xbe, 0x8b, 0x96, 0x5d, 0x05, 0xb4, 0xc3, 0x24, 0x10, 0xf0, 0x6a, 0xa5, 0xd6, - 0xba, 0x4e, 0x74, 0xb9, 0x6d, 0x61, 0x24, 0xc7, 0xc4, 0xdb, 0x68, 0x55, 0x3f, 0x6f, 0x1f, 0x06, - 0x21, 0xf7, 0xe9, 0x08, 0xf2, 0x2e, 0xb5, 0xde, 0xd0, 0xe2, 0x74, 0x09, 0x53, 0x98, 0x4c, 0xf3, - 0x65, 0xf0, 0x88, 0x87, 0x72, 0x29, 0x54, 0xf0, 0x62, 0x3e, 0x78, 0xd7, 0xc2, 0x48, 0x8e, 0x29, - 0x83, 0xeb, 0x67, 0x13, 0x7c, 0x31, 0x1f, 0xbc, 0x9b, 0x87, 0xc9, 0x34, 0x1f, 0x37, 0x51, 0x35, - 0x08, 0x7b, 0x4c, 0x45, 0x2e, 0x81, 0xf8, 0x35, 0x2d, 0xae, 0xee, 0xa4, 0x00, 0xc9, 0x38, 0x32, - 0x5b, 0xf9, 0x60, 0x02, 0x96, 0xf3, 0xd9, 0xee, 0x58, 0x18, 0xc9, 0x31, 0xf1, 0x8f, 0xd1, 0xca, - 0x93, 0x90, 0x0f, 0x47, 0x21, 0xed, 0xa9, 0x70, 0x57, 0x41, 0x7a, 0x43, 0x4b, 0x57, 0x0e, 0x6c, - 0x90, 0xe4, 0xb9, 0xf8, 0x1e, 0x5a, 0x4b, 0x0d, 0x26, 0x74, 0x05, 0xf4, 0x35, 0xad, 0x5f, 0x3b, - 0x98, 0xc2, 0xc9, 0x29, 0x05, 0xfe, 0x0c, 0x55, 0xf4, 0xea, 0xc7, 0xb5, 0xea, 0x56, 0x11, 0xda, - 0x77, 0xbe, 0xf6, 0xda, 0x13, 0x54, 0x78, 0xb1, 0xf0, 0xdc, 0xd6, 0xf2, 0xc9, 0xf1, 0x66, 0x45, - 0x5b, 0x63, 0x62, 0xfc, 0x35, 0x7e, 0xbb, 0x8c, 0xd6, 0xa6, 0xc9, 0x72, 0x79, 0x35, 0xe1, 0xc1, - 0x3d, 0xe8, 0xaa, 0x6a, 0xb6, 0xbc, 0xed, 0x14, 0x20, 0x19, 0xc7, 0xea, 0xc4, 0xee, 0x80, 0xc6, - 0x0c, 0x9a, 0xa9, 0x7a, 0xaa, 0x13, 0x01, 0x23, 0x39, 0x66, 0xbe, 0x92, 0xc5, 0x57, 0xa8, 0xe4, - 0xe2, 0xab, 0x57, 0xb2, 0xf4, 0x0d, 0x2b, 0x59, 0xbe, 0x70, 0x25, 0xb7, 0xd1, 0xea, 0x80, 0xc6, - 0x1d, 0x26, 0xb8, 0xe7, 0xee, 0x31, 0x3e, 0x66, 0x1c, 0xda, 0xa9, 0x92, 0xb5, 0xfe, 0x87, 0x79, - 0x98, 0x4c, 0xf3, 0xf1, 0xdb, 0xe8, 0xaa, 0x1b, 0x25, 0xfb, 0x31, 0xeb, 0x41, 0x27, 0x15, 0x5a, - 0xab, 0x5a, 0x7a, 0xb5, 0xdd, 0xdd, 0x97, 0x66, 0x92, 0xe2, 0xf8, 0x0e, 0x42, 0x6e, 0x94, 0x10, - 0xf6, 0x38, 0x61, 0xb1, 0xa8, 0x55, 0x81, 0x6d, 0xc6, 0x58, 0xbb, 0xbb, 0xaf, 0x11, 0x62, 0xb1, - 0xf0, 0xb7, 0x51, 0xc5, 0x8d, 0x92, 0x87, 0x9e, 0xef, 0x89, 0x1a, 0x02, 0xc5, 0x9a, 0x56, 0x54, - 0xda, 0xdd, 0x7d, 0xb0, 0x13, 0xc3, 0xc0, 0xef, 0xa3, 0x25, 0x37, 0x4a, 0xda, 0x34, 0xa2, 0xae, - 0x27, 0x26, 0xb5, 0x25, 0x10, 0x5c, 0xd7, 0x82, 0xa5, 0x76, 0x77, 0x3f, 0x85, 0x88, 0xcd, 0xc3, - 0x1f, 0xa0, 0x6b, 0x6e, 0x94, 0x6c, 0x8f, 0x46, 0xa1, 0x4b, 0x05, 0x3d, 0x1c, 0xb1, 0xda, 0x32, - 0x28, 0x5f, 0xd7, 0xca, 0x6b, 0xed, 0xee, 0xbe, 0x85, 0x92, 0x29, 0xb6, 0xd6, 0xa7, 0xe9, 0x53, - 0xc1, 0x6a, 0x2b, 0xd0, 0x70, 0xb6, 0xde, 0x42, 0xc9, 0x14, 0x1b, 0x7f, 0x84, 0x70, 0xde, 0x23, - 0xf8, 0xb8, 0x06, 0x3e, 0x36, 0xb4, 0x0f, 0x3c, 0x95, 0x83, 0xf4, 0x33, 0x43, 0xa5, 0x17, 0x6c, - 0x3f, 0xa6, 0x7d, 0x56, 0x5b, 0x05, 0x0f, 0xf6, 0x82, 0x81, 0x9d, 0x18, 0x86, 0xac, 0x9e, 0xcf, - 0x7c, 0xa8, 0xde, 0xda, 0x56, 0xe1, 0x56, 0x31, 0xab, 0x5e, 0x47, 0x99, 0x49, 0x8a, 0xcb, 0xea, - 0xf9, 0xcc, 0x4f, 0xab, 0xf7, 0x1a, 0xb0, 0x4d, 0xf5, 0x3a, 0x06, 0x21, 0x16, 0x4b, 0x26, 0xe3, - 0x33, 0x5f, 0x55, 0x0f, 0x83, 0xc2, 0x24, 0xd3, 0xd1, 0x76, 0x62, 0x18, 0xb2, 0x7a, 0x3e, 0xf3, - 0x4d, 0xf5, 0xae, 0x83, 0xc0, 0x54, 0xaf, 0x93, 0x41, 0xc4, 0xe6, 0xc9, 0xd5, 0xf7, 0x99, 0x6f, - 0x57, 0x6f, 0x1d, 0x94, 0x66, 0xf5, 0x3b, 0x39, 0x94, 0x4c, 0xb1, 0xb5, 0xde, 0xae, 0xde, 0x8d, - 0x7c, 0xf5, 0x3a, 0x39, 0x94, 0x4c, 0xb1, 0x65, 0xf5, 0xf2, 0x1e, 0xc1, 0xc7, 0xeb, 0xf9, 0xea, - 0x75, 0x4e, 0x31, 0xc8, 0x0c, 0x95, 0x5e, 0x30, 0x55, 0xbd, 0x37, 0xf2, 0xd5, 0xeb, 0x68, 0x3b, - 0x31, 0x0c, 0x39, 0x04, 0xe4, 0xa9, 0xa3, 0x97, 0x8c, 0x18, 0xff, 0x90, 0xd1, 0x91, 0x18, 0x4c, - 0x6a, 0x35, 0xf8, 0xff, 0x9a, 0x21, 0xb0, 0x37, 0x85, 0x93, 0x53, 0x0a, 0xfc, 0x39, 0xaa, 0xb9, - 0x61, 0x20, 0x78, 0x38, 0x1a, 0x31, 0xde, 0xa1, 0x01, 0xed, 0x67, 0xde, 0xfe, 0x0f, 0xbc, 0x6d, - 0x69, 0x6f, 0xb5, 0xf6, 0x19, 0x3c, 0x72, 0xa6, 0x07, 0x59, 0x54, 0x26, 0xdc, 0x5e, 0xea, 0x70, - 0x03, 0x1c, 0x9a, 0xa2, 0xde, 0xcf, 0x20, 0x62, 0xf3, 0x1a, 0x7f, 0x2e, 0xa2, 0x6a, 0x3b, 0x0c, - 0x8e, 0xbc, 0x7e, 0x87, 0x46, 0x97, 0x70, 0x60, 0xda, 0x47, 0x8b, 0xe0, 0x7d, 0x01, 0xf6, 0xb3, - 0xef, 0x9d, 0xbb, 0x9f, 0xa5, 0xa9, 0x39, 0xf7, 0xa8, 0xa0, 0xf7, 0x03, 0xc1, 0x27, 0xad, 0x65, - 0x1d, 0x60, 0x51, 0x9a, 0x08, 0xb8, 0xc3, 0x3e, 0x42, 0x87, 0x5e, 0x40, 0xf9, 0x44, 0xda, 0x6a, - 0x45, 0x70, 0xfe, 0xc3, 0xf9, 0x9d, 0xb7, 0x8c, 0x56, 0x85, 0x30, 0xef, 0x90, 0x01, 0xc4, 0x0a, - 0xb0, 0xf1, 0x03, 0x54, 0x35, 0x64, 0xbc, 0x86, 0x8a, 0x43, 0x36, 0x51, 0xfb, 0x25, 0x91, 0x3f, - 0xf1, 0x3a, 0x2a, 0x8d, 0xe9, 0x28, 0xd1, 0xfb, 0x21, 0x51, 0x0f, 0x3f, 0x5a, 0xb8, 0x5b, 0xd8, - 0xf8, 0x09, 0x5a, 0x9d, 0x8a, 0x75, 0x9e, 0x7c, 0xd9, 0x92, 0x37, 0xfe, 0x5a, 0x40, 0x2b, 0x26, - 0xeb, 0x87, 0x5e, 0x2c, 0xf0, 0xe7, 0xa7, 0x2a, 0xe6, 0xcc, 0x57, 0x31, 0xa9, 0x86, 0x7a, 0x99, - 0xc6, 0x4f, 0x2d, 0x56, 0xb5, 0x76, 0x50, 0xc9, 0x13, 0xcc, 0x8f, 0x75, 0xb9, 0xde, 0x9e, 0x7b, - 0x45, 0x5b, 0x2b, 0xda, 0x6b, 0xe9, 0x81, 0xd4, 0x13, 0xe5, 0xa6, 0xf1, 0x9f, 0x02, 0x2a, 0xab, - 0x5d, 0xed, 0x12, 0x5a, 0xad, 0x8b, 0x4a, 0x8f, 0x13, 0xc6, 0x27, 0xfa, 0x68, 0xfe, 0xee, 0x79, - 0xc9, 0xab, 0xc4, 0x3e, 0x91, 0x92, 0x2c, 0x7d, 0x78, 0x24, 0xca, 0x91, 0x1c, 0xcd, 0x5f, 0xc4, - 0x61, 0xa0, 0x8e, 0xe1, 0x70, 0x6a, 0xa9, 0x66, 0x39, 0x7c, 0xb4, 0xb7, 0xbb, 0xa3, 0x8f, 0xf0, - 0x16, 0xab, 0xf1, 0x97, 0x02, 0x42, 0xca, 0xf3, 0x25, 0xd4, 0xeb, 0xe3, 0x7c, 0xbd, 0xde, 0x9a, - 0xef, 0x95, 0xcf, 0x28, 0xd6, 0xf3, 0x22, 0x5a, 0xb2, 0xd6, 0x04, 0xbf, 0x89, 0x4a, 0x6a, 0xec, - 0xab, 0x93, 0xa1, 0x11, 0x3d, 0x82, 0xa9, 0xaa, 0x30, 0xfc, 0x2e, 0xaa, 0xc6, 0x82, 0x72, 0xf1, - 0xc8, 0xf3, 0x55, 0xff, 0x16, 0x5b, 0x2b, 0xf2, 0x4c, 0xb7, 0x97, 0x1a, 0x49, 0x86, 0xe3, 0x6f, - 0xa1, 0xab, 0x2c, 0xe8, 0x01, 0xb5, 0x08, 0xd4, 0x25, 0xb9, 0x23, 0xde, 0x57, 0x26, 0x92, 0x62, - 0xb8, 0x81, 0xca, 0x47, 0x1e, 0x1b, 0xf5, 0xe2, 0xda, 0xe2, 0x56, 0xf1, 0x56, 0x55, 0xdd, 0x96, - 0x7e, 0x06, 0x16, 0xa2, 0x11, 0x3c, 0x40, 0xc8, 0x0d, 0x83, 0x9e, 0x27, 0xbc, 0x30, 0x88, 0x6b, - 0x25, 0x78, 0xfd, 0xf7, 0x2e, 0x50, 0xf1, 0x76, 0x2a, 0xb6, 0x4e, 0x4a, 0xc6, 0x1f, 0xb1, 0x7c, - 0xcb, 0xad, 0x3c, 0xe4, 0x3d, 0xc6, 0x5b, 0x13, 0x38, 0x08, 0x56, 0xb3, 0xad, 0x7c, 0x57, 0x99, - 0x49, 0x8a, 0xcb, 0x15, 0x83, 0x9f, 0x70, 0xd8, 0xb3, 0x56, 0x0c, 0x88, 0x44, 0x61, 0x72, 0x11, - 0xfa, 0x3c, 0x4c, 0xa2, 0xd6, 0xa4, 0x56, 0x81, 0xd7, 0x83, 0x45, 0xf8, 0xb9, 0x32, 0x91, 0x14, - 0x93, 0xbe, 0x46, 0xb0, 0xbf, 0x57, 0xe1, 0xf4, 0x69, 0x7c, 0xa9, 0xcd, 0x5d, 0x61, 0xf8, 0x2d, - 0x54, 0x0e, 0x8f, 0x8e, 0x62, 0xa6, 0xce, 0x70, 0xa5, 0xd6, 0x35, 0xcd, 0x2a, 0xef, 0x82, 0x95, - 0x68, 0xb4, 0xf1, 0x1b, 0xb4, 0x3e, 0xeb, 0xdd, 0xf1, 0xff, 0x5b, 0xb3, 0xa8, 0xb5, 0xa4, 0xc5, - 0xc5, 0x8f, 0xd9, 0x44, 0x0d, 0xa6, 0x2d, 0xb4, 0xc8, 0x9e, 0x46, 0x5c, 0x1f, 0xf3, 0xcd, 0x1c, - 0xbe, 0xff, 0x34, 0xe2, 0x04, 0x10, 0x99, 0xa5, 0x1a, 0x5d, 0xc5, 0xfc, 0x1b, 0x7f, 0x2a, 0x8d, - 0x7a, 0x92, 0x35, 0xfe, 0xb8, 0x80, 0x50, 0x97, 0x87, 0x3e, 0x13, 0x03, 0x96, 0xc4, 0x97, 0x32, - 0x09, 0x16, 0xe3, 0x88, 0xb9, 0x7a, 0x10, 0x38, 0xe7, 0xb5, 0x45, 0x96, 0xdb, 0x5e, 0xc4, 0xdc, - 0xec, 0x3d, 0xe5, 0x13, 0x01, 0x4f, 0xf8, 0x17, 0xa8, 0x1c, 0x0b, 0x2a, 0x92, 0x18, 0x5e, 0x74, - 0x8e, 0x8b, 0x99, 0xe5, 0x13, 0x74, 0x59, 0x69, 0xd4, 0x33, 0xd1, 0xfe, 0x1a, 0x7f, 0x2b, 0xa0, - 0x6b, 0x19, 0xf9, 0x12, 0x66, 0xc6, 0x6e, 0x7e, 0x66, 0xbc, 0x33, 0xff, 0x9b, 0x9c, 0x31, 0x37, - 0x7c, 0xb4, 0x9e, 0x71, 0x08, 0xf3, 0x43, 0xc1, 0xb6, 0x7b, 0x3d, 0x2e, 0x47, 0xc3, 0x13, 0xee, - 0xa9, 0x87, 0x5a, 0x01, 0x5a, 0x1d, 0x46, 0xc3, 0x41, 0x6a, 0x24, 0x19, 0x8e, 0x6f, 0xa1, 0x0a, - 0x67, 0xb4, 0x07, 0xdc, 0x05, 0xe0, 0xc2, 0x4d, 0x96, 0x68, 0x1b, 0x31, 0x68, 0xe3, 0x4f, 0x65, - 0x7b, 0xc1, 0x64, 0x8d, 0xe4, 0xe9, 0x4e, 0xb0, 0x80, 0x06, 0xc2, 0x5c, 0x63, 0xcd, 0x02, 0x3c, - 0xd2, 0x76, 0x62, 0x18, 0x70, 0x99, 0x51, 0x57, 0xd3, 0x1d, 0xea, 0xa7, 0x77, 0xd8, 0xec, 0x32, - 0x93, 0x41, 0xc4, 0xe6, 0xc9, 0x39, 0x30, 0x66, 0x3c, 0xf6, 0xc2, 0x40, 0x37, 0xbb, 0x99, 0x03, - 0x9f, 0x2a, 0x33, 0x49, 0x71, 0xcc, 0x11, 0x8a, 0x93, 0x43, 0x6d, 0x86, 0x21, 0xb6, 0x74, 0xe7, - 0x83, 0x8b, 0x75, 0xa1, 0xb3, 0x67, 0x1c, 0x4c, 0x1d, 0x51, 0x32, 0x80, 0x58, 0x51, 0xf0, 0x63, - 0xb4, 0xc2, 0xcd, 0xda, 0xb3, 0x38, 0x86, 0x5b, 0xef, 0x1c, 0x33, 0x71, 0x56, 0xe9, 0xb2, 0xbb, - 0x32, 0xb1, 0x5d, 0x92, 0x7c, 0x04, 0x79, 0xd1, 0x0e, 0x42, 0xe1, 0x1d, 0x4d, 0x0e, 0xd8, 0xe1, - 0x20, 0x0c, 0x87, 0x7a, 0x3e, 0x1a, 0xf1, 0x8e, 0x0d, 0x92, 0x3c, 0x17, 0x33, 0x54, 0x4d, 0x3f, - 0x3d, 0xc6, 0x30, 0x2f, 0xe7, 0xc8, 0x95, 0x68, 0x81, 0xbc, 0x25, 0x78, 0x9c, 0xf9, 0x2c, 0x10, - 0x71, 0xf6, 0x19, 0x21, 0x45, 0x63, 0x92, 0x79, 0x96, 0xc5, 0xe6, 0x49, 0xb0, 0x1b, 0x74, 0xa8, - 0x2c, 0x24, 0x5c, 0xa5, 0xad, 0x63, 0x32, 0xc9, 0x20, 0x62, 0xf3, 0x70, 0x07, 0x5d, 0xa7, 0x23, - 0xc6, 0x05, 0x61, 0x11, 0xa3, 0xe2, 0x41, 0x20, 0x18, 0x1f, 0xd3, 0x11, 0xcc, 0xe2, 0x6a, 0xeb, - 0xa6, 0x96, 0x5f, 0xdf, 0x3e, 0x4d, 0x21, 0xb3, 0x74, 0xb2, 0x77, 0x9e, 0x78, 0x62, 0xb0, 0xd3, - 0xbd, 0x07, 0x83, 0xba, 0x92, 0xf5, 0xce, 0x81, 0x32, 0x93, 0x14, 0x97, 0x27, 0xc6, 0xa9, 0xd2, - 0x5f, 0xe4, 0xc0, 0xd9, 0xf8, 0xc3, 0x22, 0x5a, 0x9b, 0x9e, 0x3d, 0x76, 0xeb, 0x16, 0xce, 0x69, - 0xdd, 0xdb, 0xa8, 0x14, 0x59, 0x9f, 0x76, 0xd2, 0x57, 0x2d, 0xc1, 0x57, 0x9c, 0xaf, 0x8f, 0x37, - 0xd1, 0x76, 0xaf, 0x17, 0x06, 0xea, 0x0b, 0x8f, 0x62, 0xca, 0x4d, 0x88, 0x33, 0x1a, 0x9b, 0xff, - 0x85, 0x99, 0x74, 0x04, 0xac, 0x44, 0xa3, 0xf2, 0x34, 0xc5, 0x99, 0x90, 0xdb, 0x4f, 0x12, 0x08, - 0xfd, 0x3d, 0xc7, 0x74, 0x35, 0x31, 0x08, 0xb1, 0x58, 0xf8, 0xf7, 0x05, 0x74, 0x73, 0x44, 0x63, - 0x41, 0xd8, 0x83, 0xc0, 0x13, 0x1e, 0x1d, 0x79, 0xbf, 0xf6, 0x82, 0xbe, 0x3c, 0x25, 0xc4, 0x82, - 0xfa, 0x91, 0x6e, 0xf2, 0x77, 0xe6, 0x1b, 0x8f, 0x52, 0xd6, 0x7a, 0x53, 0x47, 0xbc, 0xf9, 0xf0, - 0x6c, 0xb7, 0xe4, 0x65, 0x31, 0xb1, 0xc8, 0xfd, 0xbb, 0xcb, 0xf0, 0xef, 0xfe, 0xe9, 0x45, 0xf7, - 0x83, 0x8b, 0xfe, 0xbf, 0xbf, 0x69, 0x5f, 0xfc, 0xbb, 0x88, 0xd6, 0x67, 0xfd, 0x7d, 0xf0, 0x53, - 0x54, 0x86, 0xb3, 0x44, 0x0c, 0x23, 0x7a, 0x8e, 0x37, 0x99, 0xe5, 0xc5, 0x81, 0x53, 0x49, 0xac, - 0xde, 0xa4, 0x9e, 0xd6, 0x5f, 0x19, 0xbf, 0x3e, 0xde, 0x5c, 0x4e, 0x35, 0x72, 0x3b, 0x22, 0x3a, - 0x1e, 0xfe, 0xb2, 0x20, 0x67, 0x3e, 0xdc, 0xf7, 0xd3, 0xcd, 0xa8, 0xf5, 0x4a, 0xc1, 0xf5, 0x47, - 0x03, 0x1d, 0x3e, 0xbd, 0x54, 0x57, 0x52, 0xf3, 0xa9, 0x04, 0x4c, 0xd4, 0x0d, 0x0f, 0x2d, 0x59, - 0x99, 0xcf, 0x58, 0xd0, 0x7b, 0xf6, 0x82, 0x9e, 0xb3, 0x0f, 0x3b, 0xe9, 0xd4, 0x71, 0x3e, 0x49, - 0x68, 0x20, 0x3c, 0x31, 0xb1, 0x6f, 0x82, 0x43, 0xb4, 0x92, 0xcb, 0xf3, 0x7f, 0x19, 0xac, 0x75, - 0xeb, 0xd9, 0x8b, 0xfa, 0x95, 0xaf, 0x5e, 0xd4, 0xaf, 0x3c, 0x7f, 0x51, 0xbf, 0xf2, 0xe5, 0x49, - 0xbd, 0xf0, 0xec, 0xa4, 0x5e, 0xf8, 0xea, 0xa4, 0x5e, 0x78, 0x7e, 0x52, 0x2f, 0xfc, 0xf3, 0xa4, - 0x5e, 0xf8, 0xdd, 0xbf, 0xea, 0x57, 0x3e, 0x5b, 0x18, 0xdf, 0xfe, 0x6f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x87, 0x40, 0xf0, 0x83, 0x9b, 0x1a, 0x00, 0x00, + // 2137 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4d, 0x73, 0x23, 0x47, + 0xf9, 0xf7, 0x58, 0x96, 0x2c, 0xb5, 0x5f, 0xd3, 0xeb, 0x4d, 0xf4, 0xf7, 0xfe, 0x91, 0x5d, 0x4a, + 0x91, 0x72, 0x12, 0x18, 0xe1, 0x25, 0x81, 0x05, 0x8a, 0x14, 0x96, 0xbc, 0x10, 0x27, 0x2b, 0x5b, + 0x69, 0xaf, 0x63, 0x48, 0xe5, 0x40, 0x7b, 0xd4, 0x96, 0x26, 0xd2, 0xbc, 0x6c, 0x4f, 0x8f, 0x76, + 0x45, 0x71, 0xc8, 0x47, 0x80, 0x03, 0x17, 0xf8, 0x08, 0x7c, 0x00, 0x4e, 0x14, 0xd7, 0x3d, 0x51, + 0x39, 0xee, 0xc9, 0xc5, 0x9a, 0x23, 0x17, 0x6e, 0x54, 0xe5, 0x44, 0xf5, 0xcb, 0xf4, 0xf4, 0x8c, + 0xe5, 0xb5, 0xec, 0x14, 0xbe, 0x4d, 0x3f, 0xbf, 0xdf, 0xf3, 0xd2, 0xfd, 0xf4, 0xf3, 0x74, 0xf7, + 0x00, 0x9b, 0x0d, 0x48, 0xc4, 0xb0, 0x33, 0xb0, 0xdd, 0xa0, 0xc1, 0x06, 0xa4, 0x81, 0x43, 0xb7, + 0xe1, 0x05, 0xbe, 0xcb, 0x02, 0xda, 0x18, 0x6d, 0x37, 0x7a, 0xc4, 0x27, 0x14, 0x33, 0xd2, 0xb5, + 0x43, 0x1a, 0xb0, 0x00, 0xd6, 0x0c, 0x3e, 0xd7, 0xb5, 0x71, 0xe8, 0xda, 0x8a, 0x6f, 0x8f, 0xb6, + 0xd7, 0xbf, 0xdb, 0x73, 0x59, 0x3f, 0x3e, 0xb1, 0x9d, 0xc0, 0x6b, 0xf4, 0x82, 0x5e, 0xd0, 0x10, + 0x6a, 0x27, 0xf1, 0xa9, 0x18, 0x89, 0x81, 0xf8, 0x92, 0xe6, 0xd6, 0xdf, 0x1b, 0x3c, 0x88, 0xb8, + 0x67, 0x1c, 0xba, 0x1e, 0x76, 0xfa, 0xae, 0x4f, 0xe8, 0xb8, 0x11, 0x0e, 0x7a, 0x22, 0x0c, 0x4a, + 0xa2, 0x20, 0xa6, 0x0e, 0xc9, 0x07, 0xf1, 0x4a, 0xad, 0xa8, 0xe1, 0x11, 0x86, 0x27, 0x84, 0xbe, + 0xde, 0xb8, 0x4c, 0x8b, 0xc6, 0x3e, 0x73, 0xbd, 0x8b, 0x6e, 0x7e, 0x70, 0x95, 0x42, 0xe4, 0xf4, + 0x89, 0x87, 0xf3, 0x7a, 0xf5, 0xbf, 0x5b, 0x60, 0xa5, 0x35, 0x8c, 0x23, 0x46, 0xe8, 0xc1, 0x88, + 0xd0, 0x91, 0x4b, 0x9e, 0xc2, 0x5f, 0x83, 0x32, 0x8f, 0xab, 0x8b, 0x19, 0xae, 0x5a, 0x9b, 0xd6, + 0xd6, 0xc2, 0xfd, 0xef, 0xd9, 0xd2, 0xbc, 0x6d, 0x9a, 0xb7, 0xc3, 0x41, 0x8f, 0x0b, 0x22, 0x9b, + 0xb3, 0xed, 0xd1, 0xb6, 0x7d, 0x70, 0xf2, 0x05, 0x71, 0x58, 0x9b, 0x30, 0xdc, 0x84, 0xcf, 0xcf, + 0x36, 0x66, 0xce, 0xcf, 0x36, 0x40, 0x2a, 0x43, 0xda, 0x2a, 0xfc, 0x15, 0x28, 0x51, 0x12, 0xc5, + 0x43, 0x56, 0x9d, 0x15, 0xf6, 0xdf, 0xb7, 0x5f, 0x9d, 0x2a, 0x3b, 0x17, 0x22, 0x12, 0xca, 0x4d, + 0x70, 0x7e, 0xb6, 0x51, 0x92, 0xdf, 0x48, 0x19, 0xac, 0xff, 0xa7, 0x04, 0xee, 0x4e, 0x64, 0xc3, + 0x07, 0x60, 0xd1, 0x91, 0x40, 0x2b, 0x88, 0x7d, 0x26, 0xa6, 0x56, 0x6c, 0xae, 0xa9, 0x40, 0x17, + 0x5b, 0x06, 0x86, 0x32, 0x4c, 0xb8, 0x03, 0x56, 0xd4, 0x78, 0xe7, 0xc4, 0x0f, 0xa8, 0x87, 0x87, + 0x22, 0xee, 0x62, 0xf3, 0x0d, 0xa5, 0x9c, 0x2c, 0x61, 0x02, 0xa3, 0x3c, 0x9f, 0x3b, 0x0f, 0x69, + 0xc0, 0x97, 0x42, 0x3a, 0x2f, 0x64, 0x9d, 0x77, 0x0c, 0x0c, 0x65, 0x98, 0xdc, 0xb9, 0x1a, 0x6b, + 0xe7, 0x73, 0x59, 0xe7, 0x9d, 0x2c, 0x8c, 0xf2, 0x7c, 0xd8, 0x00, 0x15, 0x3f, 0xe8, 0x12, 0xe9, + 0xb9, 0x28, 0x94, 0x5f, 0x53, 0xca, 0x95, 0xfd, 0x04, 0x40, 0x29, 0x87, 0x47, 0xcb, 0x07, 0xda, + 0x61, 0x29, 0x1b, 0xed, 0xbe, 0x81, 0xa1, 0x0c, 0x13, 0xfe, 0x04, 0x2c, 0x3d, 0x0d, 0xe8, 0x60, + 0x18, 0xe0, 0xae, 0x74, 0x37, 0x2f, 0x54, 0xef, 0x2a, 0xd5, 0xa5, 0x63, 0x13, 0x44, 0x59, 0x2e, + 0xdc, 0x05, 0xab, 0x89, 0x40, 0xbb, 0x2e, 0x0b, 0xfd, 0xaa, 0xd2, 0x5f, 0x3d, 0xce, 0xe1, 0xe8, + 0x82, 0x06, 0x7c, 0x1f, 0x2c, 0x38, 0x61, 0xdc, 0xc2, 0x21, 0x76, 0x5c, 0x36, 0xae, 0x56, 0x36, + 0xad, 0x2d, 0xab, 0x79, 0x47, 0x19, 0x58, 0x68, 0x75, 0x8e, 0x12, 0x08, 0x99, 0x3c, 0xf8, 0x01, + 0x58, 0x76, 0xc2, 0x78, 0x67, 0x38, 0x0c, 0x1c, 0xcc, 0xf0, 0xc9, 0x90, 0x54, 0x81, 0xd0, 0x7c, + 0x5d, 0x69, 0x2e, 0xb7, 0x3a, 0x47, 0x06, 0x8a, 0x72, 0x6c, 0xee, 0xd6, 0x23, 0x9e, 0x76, 0xbb, + 0xb0, 0x69, 0x6d, 0x15, 0x52, 0xb7, 0xed, 0x14, 0x42, 0x26, 0x8f, 0xbb, 0xf5, 0x88, 0x67, 0xba, + 0x5d, 0x14, 0x9a, 0xda, 0x6d, 0x3b, 0x83, 0xa2, 0x1c, 0x1b, 0x7e, 0x07, 0x94, 0xc3, 0x40, 0xad, + 0xf5, 0x92, 0x58, 0xab, 0x55, 0xa5, 0x59, 0xee, 0x28, 0x39, 0xd2, 0x0c, 0xf8, 0x19, 0x28, 0xab, + 0x9d, 0x19, 0x55, 0x97, 0x37, 0x0b, 0xa2, 0xb4, 0xa7, 0x2b, 0xbd, 0x43, 0x86, 0x99, 0x1b, 0x31, + 0xd7, 0x69, 0x2e, 0x72, 0xdb, 0x4a, 0x1a, 0x21, 0x6d, 0xaf, 0xfe, 0x72, 0x11, 0xac, 0xe6, 0xc9, + 0x7c, 0xeb, 0x29, 0xc2, 0xde, 0xae, 0xa8, 0xb8, 0x4a, 0xba, 0xf5, 0x5a, 0x09, 0x80, 0x52, 0x0e, + 0x9f, 0x0f, 0x23, 0x3e, 0xf6, 0xd9, 0xde, 0xae, 0x28, 0xb2, 0x4a, 0x3a, 0x9f, 0xc7, 0x4a, 0x8e, + 0x34, 0xc3, 0xa8, 0xe9, 0x4e, 0x1f, 0x47, 0x44, 0x94, 0x55, 0xe5, 0x42, 0x4d, 0x0b, 0x0c, 0x65, + 0x98, 0xd9, 0x9a, 0x98, 0xbb, 0x41, 0x4d, 0x14, 0x6f, 0x5e, 0x13, 0xa5, 0x6f, 0x58, 0x13, 0xf3, + 0xd7, 0xae, 0x89, 0x1d, 0xb0, 0xd2, 0xc7, 0x51, 0x9b, 0x30, 0xea, 0x3a, 0x87, 0x84, 0x8e, 0x08, + 0x15, 0x85, 0x55, 0x4e, 0x9b, 0xc8, 0x87, 0x59, 0x18, 0xe5, 0xf9, 0xf0, 0x6d, 0x30, 0xef, 0x84, + 0xf1, 0x51, 0x44, 0xba, 0xaa, 0xa4, 0x56, 0x94, 0xea, 0x7c, 0xab, 0x73, 0xc4, 0xc5, 0x28, 0xc1, + 0xe1, 0x7d, 0x00, 0x9c, 0x30, 0x46, 0xe4, 0x49, 0x4c, 0x22, 0xa6, 0xca, 0x48, 0x1f, 0x08, 0xad, + 0xce, 0x91, 0x42, 0x90, 0xc1, 0xe2, 0x79, 0x77, 0xc2, 0xf8, 0x91, 0xeb, 0xb9, 0x4c, 0xd4, 0x8e, + 0x95, 0xe6, 0xbd, 0xd5, 0x39, 0x12, 0x72, 0xa4, 0x19, 0xf9, 0x1a, 0x5f, 0xbc, 0x71, 0x8d, 0x2f, + 0x5d, 0xab, 0xc6, 0xa5, 0x7e, 0x12, 0x3e, 0x66, 0xa4, 0xba, 0x2c, 0x36, 0x9c, 0xa9, 0x6f, 0xa0, + 0x28, 0xc7, 0x86, 0x1f, 0x01, 0x98, 0xb5, 0x28, 0x6c, 0xac, 0x08, 0x1b, 0xeb, 0xca, 0x06, 0xcc, + 0xc5, 0xc0, 0xed, 0x4c, 0xd0, 0x52, 0x0b, 0x76, 0x14, 0xe1, 0x1e, 0xa9, 0xae, 0x66, 0x0b, 0x45, + 0x24, 0x04, 0xf7, 0x08, 0xd2, 0x0c, 0x9e, 0x3d, 0x8f, 0x78, 0x22, 0x7b, 0xaf, 0x89, 0xfe, 0xa2, + 0xb3, 0xd7, 0x96, 0x62, 0x94, 0xe0, 0x3c, 0x7b, 0x1e, 0xf1, 0x92, 0xec, 0x41, 0xc1, 0xd6, 0xd9, + 0x6b, 0x6b, 0x04, 0x19, 0x2c, 0x1e, 0x8c, 0x47, 0x3c, 0x99, 0xbd, 0x3b, 0x42, 0x43, 0x07, 0xd3, + 0x56, 0x72, 0xa4, 0x19, 0xf9, 0x56, 0xb9, 0x76, 0xe3, 0x56, 0x79, 0xf7, 0x5a, 0xad, 0x52, 0xea, + 0x9b, 0xd9, 0x7b, 0x3d, 0x9b, 0xbd, 0x76, 0x06, 0x45, 0x39, 0x36, 0xcf, 0x5e, 0xd6, 0xa2, 0xb0, + 0xf1, 0x46, 0x36, 0x7b, 0xed, 0x0b, 0x0c, 0x34, 0x41, 0x4b, 0x2d, 0x98, 0xcc, 0x5e, 0x35, 0x9b, + 0xbd, 0xb6, 0x92, 0x23, 0xcd, 0xc8, 0x34, 0xf9, 0xff, 0xbb, 0xb2, 0xc9, 0xef, 0x82, 0x55, 0x7e, + 0xdb, 0xeb, 0xc6, 0x43, 0x42, 0x3f, 0x24, 0x78, 0xc8, 0xfa, 0xe3, 0xea, 0xba, 0xa8, 0x76, 0xdd, + 0x32, 0x0e, 0x73, 0x38, 0xba, 0xa0, 0x01, 0x3f, 0x07, 0x55, 0x27, 0xf0, 0x19, 0x0d, 0x86, 0x43, + 0x42, 0xdb, 0xd8, 0xc7, 0xbd, 0xd4, 0xda, 0x3d, 0x61, 0x6d, 0x53, 0x59, 0xab, 0xb6, 0x2e, 0xe1, + 0xa1, 0x4b, 0x2d, 0xf0, 0x2d, 0x40, 0x98, 0xd3, 0x4d, 0x0c, 0xfe, 0xbf, 0x30, 0xa8, 0xb7, 0xc0, + 0xc3, 0x14, 0x42, 0x26, 0xaf, 0xfe, 0xe7, 0x02, 0xa8, 0xb4, 0x02, 0xff, 0xd4, 0xed, 0xb5, 0x71, + 0x78, 0x0b, 0x17, 0xd5, 0x23, 0x30, 0x27, 0xac, 0xcf, 0x8a, 0xb3, 0xf2, 0xfb, 0x57, 0x9e, 0x95, + 0x49, 0x68, 0xf6, 0x2e, 0x66, 0xf8, 0xa1, 0xcf, 0xe8, 0xb8, 0xb9, 0xa8, 0x1c, 0xcc, 0x71, 0x11, + 0x12, 0xe6, 0xa0, 0x07, 0xc0, 0x89, 0xeb, 0x63, 0x3a, 0xe6, 0xb2, 0x6a, 0x41, 0x18, 0xff, 0xd1, + 0xf4, 0xc6, 0x9b, 0x5a, 0x57, 0xba, 0xd0, 0x73, 0x48, 0x01, 0x64, 0x38, 0x58, 0xff, 0x21, 0xa8, + 0x68, 0x32, 0x5c, 0x05, 0x85, 0x01, 0x19, 0xcb, 0xb3, 0x18, 0xf1, 0x4f, 0xb8, 0x06, 0x8a, 0x23, + 0x3c, 0x8c, 0x89, 0x3c, 0x6f, 0x91, 0x1c, 0xfc, 0x78, 0xf6, 0x81, 0xb5, 0xfe, 0x53, 0xb0, 0x92, + 0xf3, 0x75, 0x95, 0xfa, 0xa2, 0xa1, 0x5e, 0xff, 0xab, 0x05, 0x96, 0x74, 0xd4, 0x8f, 0xdc, 0x88, + 0xc1, 0xcf, 0x2f, 0x64, 0xcc, 0x9e, 0x2e, 0x63, 0x5c, 0x5b, 0xe4, 0x4b, 0x6f, 0xfc, 0x44, 0x62, + 0x64, 0x6b, 0x1f, 0x14, 0x5d, 0x46, 0xbc, 0x48, 0xa5, 0xeb, 0xed, 0xa9, 0x57, 0xb4, 0xb9, 0xa4, + 0xac, 0x16, 0xf7, 0xb8, 0x3e, 0x92, 0x66, 0xea, 0xff, 0xb6, 0x40, 0x49, 0x9e, 0x81, 0xb7, 0xb0, + 0xd5, 0x3a, 0xa0, 0xf8, 0x24, 0x26, 0x74, 0xac, 0x9e, 0x44, 0xef, 0x5e, 0x15, 0xbc, 0x0c, 0xec, + 0x13, 0xae, 0x92, 0x86, 0x2f, 0x86, 0x48, 0x1a, 0xe2, 0x8d, 0xfc, 0x8b, 0x28, 0xf0, 0xe5, 0xf3, + 0x47, 0x5d, 0x8d, 0x74, 0x0c, 0x1f, 0x1d, 0x1e, 0xec, 0xab, 0xa7, 0x93, 0xc1, 0xaa, 0xff, 0xc5, + 0x02, 0x40, 0x5a, 0xbe, 0x85, 0x7c, 0x7d, 0x9c, 0xcd, 0xd7, 0x5b, 0xd3, 0x4d, 0xf9, 0x92, 0x64, + 0xbd, 0x28, 0x80, 0x05, 0x63, 0x4d, 0xe0, 0x9b, 0xa0, 0x28, 0x0f, 0x09, 0x79, 0xeb, 0xd4, 0x4a, + 0x8f, 0x45, 0x0f, 0x96, 0x18, 0x7c, 0x17, 0x54, 0x22, 0x86, 0x29, 0x7b, 0xec, 0x7a, 0x72, 0xff, + 0x16, 0x9a, 0x4b, 0xfc, 0x06, 0x78, 0x98, 0x08, 0x51, 0x8a, 0xc3, 0x6f, 0x83, 0x79, 0xe2, 0x77, + 0x05, 0xb5, 0x20, 0xa8, 0x0b, 0xfc, 0xfc, 0x7c, 0x28, 0x45, 0x28, 0xc1, 0x60, 0x1d, 0x94, 0x4e, + 0x5d, 0x32, 0xec, 0x46, 0xd5, 0xb9, 0xcd, 0xc2, 0x56, 0x45, 0xbe, 0x52, 0x7f, 0x2e, 0x24, 0x48, + 0x21, 0xb0, 0x0f, 0x80, 0x13, 0xf8, 0x5d, 0x97, 0xb9, 0x81, 0x1f, 0x55, 0x8b, 0x62, 0xfa, 0xef, + 0x5d, 0x23, 0xe3, 0xad, 0x44, 0xd9, 0xb8, 0x57, 0x69, 0x7b, 0xc8, 0xb0, 0xcd, 0x0f, 0xfe, 0x80, + 0x76, 0x09, 0x6d, 0x8e, 0xc5, 0xb5, 0xb3, 0x92, 0x1e, 0xfc, 0x07, 0x52, 0x8c, 0x12, 0x9c, 0xaf, + 0x98, 0xf8, 0x14, 0xf7, 0x4b, 0x63, 0xc5, 0x04, 0x11, 0x49, 0x8c, 0x2f, 0x42, 0x8f, 0x06, 0x71, + 0xd8, 0x1c, 0x57, 0xcb, 0x62, 0x7a, 0x62, 0x11, 0x7e, 0x21, 0x45, 0x28, 0xc1, 0xb8, 0xad, 0xa1, + 0xb8, 0x0d, 0x54, 0xc4, 0x71, 0xa5, 0x6d, 0xc9, 0xab, 0x80, 0xc4, 0xe0, 0x5b, 0xa0, 0x14, 0x9c, + 0x9e, 0x46, 0x44, 0xde, 0x11, 0x8b, 0xcd, 0x65, 0xc5, 0x2a, 0x1d, 0x08, 0x29, 0x52, 0x68, 0xfd, + 0xb7, 0x60, 0x6d, 0xd2, 0xdc, 0xe1, 0xb7, 0x8c, 0x5e, 0xd4, 0x5c, 0x50, 0xca, 0x85, 0x8f, 0xc9, + 0x58, 0x36, 0xa6, 0x4d, 0x30, 0x47, 0x9e, 0x85, 0x54, 0x3d, 0x23, 0x74, 0x1f, 0x7e, 0xf8, 0x2c, + 0xa4, 0x48, 0x20, 0x3c, 0x4a, 0xd9, 0xba, 0x0a, 0xd9, 0x19, 0x7f, 0xca, 0x85, 0xaa, 0x93, 0xd5, + 0xff, 0x38, 0x0b, 0x40, 0x87, 0x06, 0x1e, 0x61, 0x7d, 0x12, 0x47, 0xb7, 0xd2, 0x09, 0xe6, 0xa2, + 0x90, 0x38, 0xaa, 0x11, 0xd8, 0x57, 0x6d, 0x8b, 0x34, 0xb6, 0xc3, 0x90, 0x38, 0xe9, 0x3c, 0xf9, + 0x08, 0x09, 0x4b, 0xf0, 0x97, 0xa0, 0x14, 0x31, 0xcc, 0xe2, 0x48, 0x4c, 0x74, 0x8a, 0x47, 0x9f, + 0x61, 0x53, 0xe8, 0xa5, 0xa9, 0x91, 0x63, 0xa4, 0xec, 0xd5, 0xff, 0x66, 0x81, 0xe5, 0x94, 0x7c, + 0x0b, 0x3d, 0xe3, 0x20, 0xdb, 0x33, 0xde, 0x99, 0x7e, 0x26, 0x97, 0xf4, 0x0d, 0x0f, 0xac, 0xa5, + 0x1c, 0x44, 0xbc, 0x80, 0x91, 0x9d, 0x6e, 0x97, 0xf2, 0xd6, 0xf0, 0x94, 0xba, 0x72, 0x50, 0xb5, + 0xc4, 0x56, 0x17, 0xad, 0xe1, 0x38, 0x11, 0xa2, 0x14, 0x87, 0x5b, 0xa0, 0x4c, 0x09, 0xee, 0x0a, + 0xee, 0xac, 0xe0, 0x8a, 0x57, 0x32, 0x52, 0x32, 0xa4, 0xd1, 0xfa, 0x9f, 0x4a, 0xe6, 0x82, 0xf1, + 0x1c, 0x65, 0x9e, 0xbc, 0xd6, 0x95, 0x4f, 0x5e, 0xfe, 0xf4, 0x91, 0x0f, 0xd9, 0x7d, 0xac, 0x9a, + 0x56, 0xc5, 0x78, 0xfa, 0xa4, 0x10, 0x32, 0x79, 0xbc, 0x0f, 0x8c, 0x08, 0x8d, 0xdc, 0xc0, 0x57, + 0x9b, 0x5d, 0xf7, 0x81, 0x4f, 0xa5, 0x18, 0x25, 0x38, 0xa4, 0x00, 0x44, 0xf1, 0x89, 0x12, 0x8b, + 0x26, 0xb6, 0x70, 0xff, 0x83, 0xeb, 0xed, 0x42, 0xfb, 0x50, 0x1b, 0xc8, 0x5d, 0x51, 0x52, 0x00, + 0x19, 0x5e, 0xe0, 0x13, 0xb0, 0x44, 0xf5, 0xda, 0x93, 0x28, 0x12, 0xcf, 0xeb, 0x29, 0x7a, 0xe2, + 0xa4, 0xd4, 0xa5, 0x2f, 0x6b, 0x64, 0x9a, 0x44, 0x59, 0x0f, 0xfc, 0x59, 0xee, 0x07, 0xcc, 0x3d, + 0x1d, 0x1f, 0x93, 0x93, 0x7e, 0x10, 0x0c, 0x54, 0x7f, 0xd4, 0xca, 0xfb, 0x26, 0x88, 0xb2, 0x5c, + 0x48, 0x40, 0x25, 0xf9, 0xe5, 0x1b, 0x89, 0x7e, 0x39, 0x45, 0xac, 0x48, 0x29, 0xf0, 0x37, 0x85, + 0x4b, 0x89, 0x47, 0x7c, 0x16, 0xa5, 0x3f, 0x1d, 0x12, 0x34, 0x42, 0xa9, 0x65, 0x9e, 0x6c, 0x1a, + 0xfb, 0x07, 0x7e, 0x1b, 0xf3, 0x44, 0xaa, 0x37, 0xbb, 0x4e, 0x36, 0x4a, 0x21, 0x64, 0xf2, 0x60, + 0x1b, 0xdc, 0xc1, 0x43, 0x42, 0x19, 0x22, 0x21, 0xc1, 0x6c, 0xcf, 0x67, 0x84, 0x8e, 0xf0, 0x50, + 0xf4, 0xe2, 0x4a, 0xf3, 0x9e, 0x52, 0xbf, 0xb3, 0x73, 0x91, 0x82, 0x26, 0xe9, 0xf1, 0xbd, 0xf3, + 0xd4, 0x65, 0xfd, 0xfd, 0xce, 0xae, 0x68, 0xd4, 0xe5, 0x74, 0xef, 0x1c, 0x4b, 0x31, 0x4a, 0x70, + 0x7e, 0x63, 0xcc, 0xa5, 0xfe, 0x3a, 0x17, 0xce, 0xfa, 0x1f, 0xe6, 0xc0, 0x6a, 0xbe, 0xf7, 0x98, + 0x5b, 0xd7, 0xba, 0x62, 0xeb, 0x6e, 0x83, 0x62, 0x28, 0x7e, 0x04, 0xcd, 0x66, 0xa6, 0x5a, 0x14, + 0xff, 0x7c, 0xbe, 0x3e, 0xdb, 0x00, 0x3b, 0xdd, 0x6e, 0xe0, 0xcb, 0xff, 0x41, 0x92, 0xc9, 0x0f, + 0x21, 0x4a, 0x70, 0xa4, 0xeb, 0x42, 0x77, 0x3a, 0x24, 0xa4, 0x48, 0xa1, 0xfc, 0x36, 0x45, 0x09, + 0xe3, 0xc7, 0x4f, 0xfa, 0xc7, 0x48, 0xef, 0x6a, 0xa4, 0x11, 0x64, 0xb0, 0xe0, 0xef, 0x2d, 0x70, + 0x6f, 0x88, 0x23, 0x86, 0xc8, 0x9e, 0xef, 0x32, 0x17, 0x0f, 0xdd, 0xdf, 0xb8, 0x7e, 0x8f, 0xdf, + 0x12, 0x22, 0x86, 0xbd, 0x50, 0x6d, 0xf2, 0x77, 0xa6, 0x6b, 0x8f, 0x5c, 0xad, 0xf9, 0xa6, 0xf2, + 0x78, 0xef, 0xd1, 0xe5, 0x66, 0xd1, 0xab, 0x7c, 0x42, 0x96, 0xa9, 0xee, 0x92, 0xa8, 0xee, 0x9f, + 0x5d, 0xf7, 0x3c, 0xb8, 0x6e, 0x7d, 0x7f, 0xd3, 0x7d, 0xf1, 0xaf, 0x02, 0x58, 0x9b, 0x54, 0x3e, + 0xf0, 0x19, 0x28, 0x89, 0xbb, 0x44, 0x24, 0x5a, 0xf4, 0x14, 0x33, 0x99, 0x64, 0xc5, 0x16, 0xb7, + 0x92, 0x48, 0xce, 0xa4, 0x96, 0xe4, 0x5f, 0x0a, 0xbf, 0x3e, 0xdb, 0x58, 0x4c, 0x74, 0xf8, 0x71, + 0x84, 0x94, 0x3f, 0xf8, 0xa5, 0xc5, 0x7b, 0xbe, 0xf8, 0x3b, 0x90, 0x1c, 0x46, 0xcd, 0x1b, 0x39, + 0x57, 0xbf, 0x18, 0x94, 0xfb, 0xe4, 0x51, 0x5d, 0x4e, 0xc4, 0x17, 0x02, 0xd0, 0x5e, 0xd7, 0x5d, + 0xb0, 0x60, 0x44, 0x3e, 0x61, 0x41, 0x77, 0xcd, 0x05, 0xbd, 0xe2, 0x1c, 0xb6, 0x93, 0xae, 0x63, + 0x7f, 0x12, 0x63, 0x9f, 0xb9, 0x6c, 0x6c, 0xbe, 0x04, 0x07, 0x60, 0x29, 0x13, 0xe7, 0xff, 0xd2, + 0x59, 0x73, 0xeb, 0xf9, 0xcb, 0xda, 0xcc, 0x57, 0x2f, 0x6b, 0x33, 0x2f, 0x5e, 0xd6, 0x66, 0xbe, + 0x3c, 0xaf, 0x59, 0xcf, 0xcf, 0x6b, 0xd6, 0x57, 0xe7, 0x35, 0xeb, 0xc5, 0x79, 0xcd, 0xfa, 0xc7, + 0x79, 0xcd, 0xfa, 0xdd, 0x3f, 0x6b, 0x33, 0x9f, 0xcd, 0x8e, 0xb6, 0xff, 0x1b, 0x00, 0x00, 0xff, + 0xff, 0x43, 0x07, 0x1e, 0xf1, 0x13, 0x1c, 0x00, 0x00, } func (m *ClusterOverview) Marshal() (dAtA []byte, err error) { @@ -706,9 +709,26 @@ func (m *ClusterOverviewResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenerated(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x4a + dAtA[i] = 0x72 } } + i = encodeVarintGenerated(dAtA, i, uint64(m.PodCount)) + i-- + dAtA[i] = 0x68 + i = encodeVarintGenerated(dAtA, i, uint64(m.MemAllocatable)) + i-- + dAtA[i] = 0x60 + i = encodeVarintGenerated(dAtA, i, uint64(m.MemCapacity)) + i-- + dAtA[i] = 0x58 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.CPUAllocatable)))) + i-- + dAtA[i] = 0x51 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.CPUCapacity)))) + i-- + dAtA[i] = 0x49 i = encodeVarintGenerated(dAtA, i, uint64(m.WorkloadAbnormal)) i-- dAtA[i] = 0x40 @@ -765,7 +785,7 @@ func (m *ClusterStatistic) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xd0 + dAtA[i] = 0xe0 i-- if m.ControllerManagerHealthy { dAtA[i] = 1 @@ -775,7 +795,7 @@ func (m *ClusterStatistic) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xc8 + dAtA[i] = 0xd8 i-- if m.SchedulerHealthy { dAtA[i] = 1 @@ -785,88 +805,95 @@ func (m *ClusterStatistic) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xc0 + dAtA[i] = 0xd0 + i = encodeVarintGenerated(dAtA, i, uint64(m.PodCount)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xc8 i -= len(m.MemUsage) copy(dAtA[i:], m.MemUsage) i = encodeVarintGenerated(dAtA, i, uint64(len(m.MemUsage))) i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xba + dAtA[i] = 0xc2 i -= len(m.MemAllocatableRate) copy(dAtA[i:], m.MemAllocatableRate) i = encodeVarintGenerated(dAtA, i, uint64(len(m.MemAllocatableRate))) i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xb2 + dAtA[i] = 0xba i -= len(m.MemRequestRate) copy(dAtA[i:], m.MemRequestRate) i = encodeVarintGenerated(dAtA, i, uint64(len(m.MemRequestRate))) i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xaa + dAtA[i] = 0xb2 i = encodeVarintGenerated(dAtA, i, uint64(m.MemAllocatable)) i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xa0 + dAtA[i] = 0xa8 i = encodeVarintGenerated(dAtA, i, uint64(m.MemCapacity)) i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0x98 + dAtA[i] = 0xa0 i = encodeVarintGenerated(dAtA, i, uint64(m.MemLimit)) i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0x90 + dAtA[i] = 0x98 i = encodeVarintGenerated(dAtA, i, uint64(m.MemRequest)) i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0x88 + dAtA[i] = 0x90 i = encodeVarintGenerated(dAtA, i, uint64(m.MemUsed)) i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0x80 + dAtA[i] = 0x88 i -= len(m.CPUUsage) copy(dAtA[i:], m.CPUUsage) i = encodeVarintGenerated(dAtA, i, uint64(len(m.CPUUsage))) i-- - dAtA[i] = 0x7a + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 i -= len(m.CPUAllocatableRate) copy(dAtA[i:], m.CPUAllocatableRate) i = encodeVarintGenerated(dAtA, i, uint64(len(m.CPUAllocatableRate))) i-- - dAtA[i] = 0x72 + dAtA[i] = 0x7a i -= len(m.CPURequestRate) copy(dAtA[i:], m.CPURequestRate) i = encodeVarintGenerated(dAtA, i, uint64(len(m.CPURequestRate))) i-- - dAtA[i] = 0x6a + dAtA[i] = 0x72 i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.CPUAllocatable)))) i-- - dAtA[i] = 0x61 + dAtA[i] = 0x69 i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.CPUCapacity)))) i-- - dAtA[i] = 0x59 + dAtA[i] = 0x61 i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.CPULimit)))) i-- - dAtA[i] = 0x51 + dAtA[i] = 0x59 i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.CPURequest)))) i-- - dAtA[i] = 0x49 + dAtA[i] = 0x51 i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.CPUUsed)))) i-- - dAtA[i] = 0x41 + dAtA[i] = 0x49 i-- if m.HasMetricServer { dAtA[i] = 1 @@ -874,23 +901,28 @@ func (m *ClusterStatistic) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0 } i-- - dAtA[i] = 0x38 + dAtA[i] = 0x40 i = encodeVarintGenerated(dAtA, i, uint64(m.WorkloadAbnormal)) i-- - dAtA[i] = 0x30 + dAtA[i] = 0x38 i = encodeVarintGenerated(dAtA, i, uint64(m.WorkloadCount)) i-- - dAtA[i] = 0x28 + dAtA[i] = 0x30 i = encodeVarintGenerated(dAtA, i, uint64(m.NodeAbnormal)) i-- - dAtA[i] = 0x20 + dAtA[i] = 0x28 i = encodeVarintGenerated(dAtA, i, uint64(m.NodeCount)) i-- - dAtA[i] = 0x18 + dAtA[i] = 0x20 i -= len(m.ClusterPhase) copy(dAtA[i:], m.ClusterPhase) i = encodeVarintGenerated(dAtA, i, uint64(len(m.ClusterPhase))) i-- + dAtA[i] = 0x1a + i -= len(m.TenantID) + copy(dAtA[i:], m.TenantID) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.TenantID))) + i-- dAtA[i] = 0x12 i -= len(m.ClusterID) copy(dAtA[i:], m.ClusterID) @@ -1694,6 +1726,11 @@ func (m *ClusterOverviewResult) Size() (n int) { n += 1 + sovGenerated(uint64(m.NodeAbnormal)) n += 1 + sovGenerated(uint64(m.WorkloadCount)) n += 1 + sovGenerated(uint64(m.WorkloadAbnormal)) + n += 9 + n += 9 + n += 1 + sovGenerated(uint64(m.MemCapacity)) + n += 1 + sovGenerated(uint64(m.MemAllocatable)) + n += 1 + sovGenerated(uint64(m.PodCount)) if len(m.Clusters) > 0 { for _, e := range m.Clusters { l = e.Size() @@ -1711,6 +1748,8 @@ func (m *ClusterStatistic) Size() (n int) { _ = l l = len(m.ClusterID) n += 1 + l + sovGenerated(uint64(l)) + l = len(m.TenantID) + n += 1 + l + sovGenerated(uint64(l)) l = len(m.ClusterPhase) n += 1 + l + sovGenerated(uint64(l)) n += 1 + sovGenerated(uint64(m.NodeCount)) @@ -1728,7 +1767,7 @@ func (m *ClusterStatistic) Size() (n int) { l = len(m.CPUAllocatableRate) n += 1 + l + sovGenerated(uint64(l)) l = len(m.CPUUsage) - n += 1 + l + sovGenerated(uint64(l)) + n += 2 + l + sovGenerated(uint64(l)) n += 2 + sovGenerated(uint64(m.MemUsed)) n += 2 + sovGenerated(uint64(m.MemRequest)) n += 2 + sovGenerated(uint64(m.MemLimit)) @@ -1740,6 +1779,7 @@ func (m *ClusterStatistic) Size() (n int) { n += 2 + l + sovGenerated(uint64(l)) l = len(m.MemUsage) n += 2 + l + sovGenerated(uint64(l)) + n += 2 + sovGenerated(uint64(m.PodCount)) n += 3 n += 3 n += 3 @@ -2056,6 +2096,11 @@ func (this *ClusterOverviewResult) String() string { `NodeAbnormal:` + fmt.Sprintf("%v", this.NodeAbnormal) + `,`, `WorkloadCount:` + fmt.Sprintf("%v", this.WorkloadCount) + `,`, `WorkloadAbnormal:` + fmt.Sprintf("%v", this.WorkloadAbnormal) + `,`, + `CPUCapacity:` + fmt.Sprintf("%v", this.CPUCapacity) + `,`, + `CPUAllocatable:` + fmt.Sprintf("%v", this.CPUAllocatable) + `,`, + `MemCapacity:` + fmt.Sprintf("%v", this.MemCapacity) + `,`, + `MemAllocatable:` + fmt.Sprintf("%v", this.MemAllocatable) + `,`, + `PodCount:` + fmt.Sprintf("%v", this.PodCount) + `,`, `Clusters:` + repeatedStringForClusters + `,`, `}`, }, "") @@ -2067,6 +2112,7 @@ func (this *ClusterStatistic) String() string { } s := strings.Join([]string{`&ClusterStatistic{`, `ClusterID:` + fmt.Sprintf("%v", this.ClusterID) + `,`, + `TenantID:` + fmt.Sprintf("%v", this.TenantID) + `,`, `ClusterPhase:` + fmt.Sprintf("%v", this.ClusterPhase) + `,`, `NodeCount:` + fmt.Sprintf("%v", this.NodeCount) + `,`, `NodeAbnormal:` + fmt.Sprintf("%v", this.NodeAbnormal) + `,`, @@ -2089,6 +2135,7 @@ func (this *ClusterStatistic) String() string { `MemRequestRate:` + fmt.Sprintf("%v", this.MemRequestRate) + `,`, `MemAllocatableRate:` + fmt.Sprintf("%v", this.MemAllocatableRate) + `,`, `MemUsage:` + fmt.Sprintf("%v", this.MemUsage) + `,`, + `PodCount:` + fmt.Sprintf("%v", this.PodCount) + `,`, `SchedulerHealthy:` + fmt.Sprintf("%v", this.SchedulerHealthy) + `,`, `ControllerManagerHealthy:` + fmt.Sprintf("%v", this.ControllerManagerHealthy) + `,`, `EtcdHealthy:` + fmt.Sprintf("%v", this.EtcdHealthy) + `,`, @@ -2644,6 +2691,85 @@ func (m *ClusterOverviewResult) Unmarshal(dAtA []byte) error { } } case 9: + if wireType != 1 { + return fmt.Errorf("proto: wrong wireType = %d for field CPUCapacity", wireType) + } + var v uint64 + if (iNdEx + 8) > l { + return io.ErrUnexpectedEOF + } + v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) + iNdEx += 8 + m.CPUCapacity = float64(math.Float64frombits(v)) + case 10: + if wireType != 1 { + return fmt.Errorf("proto: wrong wireType = %d for field CPUAllocatable", wireType) + } + var v uint64 + if (iNdEx + 8) > l { + return io.ErrUnexpectedEOF + } + v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) + iNdEx += 8 + m.CPUAllocatable = float64(math.Float64frombits(v)) + case 11: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MemCapacity", wireType) + } + m.MemCapacity = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.MemCapacity |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 12: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MemAllocatable", wireType) + } + m.MemAllocatable = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.MemAllocatable |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 13: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field PodCount", wireType) + } + m.PodCount = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.PodCount |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 14: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Clusters", wireType) } @@ -2763,6 +2889,38 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { m.ClusterID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TenantID", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + 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 ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TenantID = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ClusterPhase", wireType) } @@ -2794,7 +2952,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { } m.ClusterPhase = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: + case 4: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field NodeCount", wireType) } @@ -2813,7 +2971,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { break } } - case 4: + case 5: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field NodeAbnormal", wireType) } @@ -2832,7 +2990,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { break } } - case 5: + case 6: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field WorkloadCount", wireType) } @@ -2851,7 +3009,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { break } } - case 6: + case 7: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field WorkloadAbnormal", wireType) } @@ -2870,7 +3028,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { break } } - case 7: + case 8: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field HasMetricServer", wireType) } @@ -2890,7 +3048,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { } } m.HasMetricServer = bool(v != 0) - case 8: + case 9: if wireType != 1 { return fmt.Errorf("proto: wrong wireType = %d for field CPUUsed", wireType) } @@ -2901,7 +3059,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) iNdEx += 8 m.CPUUsed = float64(math.Float64frombits(v)) - case 9: + case 10: if wireType != 1 { return fmt.Errorf("proto: wrong wireType = %d for field CPURequest", wireType) } @@ -2912,7 +3070,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) iNdEx += 8 m.CPURequest = float64(math.Float64frombits(v)) - case 10: + case 11: if wireType != 1 { return fmt.Errorf("proto: wrong wireType = %d for field CPULimit", wireType) } @@ -2923,7 +3081,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) iNdEx += 8 m.CPULimit = float64(math.Float64frombits(v)) - case 11: + case 12: if wireType != 1 { return fmt.Errorf("proto: wrong wireType = %d for field CPUCapacity", wireType) } @@ -2934,7 +3092,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) iNdEx += 8 m.CPUCapacity = float64(math.Float64frombits(v)) - case 12: + case 13: if wireType != 1 { return fmt.Errorf("proto: wrong wireType = %d for field CPUAllocatable", wireType) } @@ -2945,7 +3103,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) iNdEx += 8 m.CPUAllocatable = float64(math.Float64frombits(v)) - case 13: + case 14: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field CPURequestRate", wireType) } @@ -2977,7 +3135,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { } m.CPURequestRate = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 14: + case 15: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field CPUAllocatableRate", wireType) } @@ -3009,7 +3167,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { } m.CPUAllocatableRate = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 15: + case 16: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field CPUUsage", wireType) } @@ -3041,7 +3199,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { } m.CPUUsage = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 16: + case 17: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field MemUsed", wireType) } @@ -3060,7 +3218,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { break } } - case 17: + case 18: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field MemRequest", wireType) } @@ -3079,7 +3237,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { break } } - case 18: + case 19: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field MemLimit", wireType) } @@ -3098,7 +3256,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { break } } - case 19: + case 20: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field MemCapacity", wireType) } @@ -3117,7 +3275,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { break } } - case 20: + case 21: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field MemAllocatable", wireType) } @@ -3136,7 +3294,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { break } } - case 21: + case 22: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MemRequestRate", wireType) } @@ -3168,7 +3326,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { } m.MemRequestRate = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 22: + case 23: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MemAllocatableRate", wireType) } @@ -3200,7 +3358,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { } m.MemAllocatableRate = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 23: + case 24: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MemUsage", wireType) } @@ -3232,7 +3390,26 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { } m.MemUsage = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 24: + case 25: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field PodCount", wireType) + } + m.PodCount = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.PodCount |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 26: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field SchedulerHealthy", wireType) } @@ -3252,7 +3429,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { } } m.SchedulerHealthy = bool(v != 0) - case 25: + case 27: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field ControllerManagerHealthy", wireType) } @@ -3272,7 +3449,7 @@ func (m *ClusterStatistic) Unmarshal(dAtA []byte) error { } } m.ControllerManagerHealthy = bool(v != 0) - case 26: + case 28: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field EtcdHealthy", wireType) } diff --git a/api/monitor/v1/generated.proto b/api/monitor/v1/generated.proto index d5f04cd8d..5397ac05d 100644 --- a/api/monitor/v1/generated.proto +++ b/api/monitor/v1/generated.proto @@ -56,61 +56,75 @@ message ClusterOverviewResult { optional int32 workloadAbnormal = 8; - repeated ClusterStatistic clusters = 9; + optional double cpuCapacity = 9; + + optional double cpuAllocatable = 10; + + optional int64 memCapacity = 11; + + optional int64 memAllocatable = 12; + + optional int32 podCount = 13; + + repeated ClusterStatistic clusters = 14; } message ClusterStatistic { optional string clusterID = 1; - optional string clusterPhase = 2; + optional string tenantID = 2; + + optional string clusterPhase = 3; + + optional int32 nodeCount = 4; - optional int32 nodeCount = 3; + optional int32 nodeAbnormal = 5; - optional int32 nodeAbnormal = 4; + optional int32 workloadCount = 6; - optional int32 workloadCount = 5; + optional int32 workloadAbnormal = 7; - optional int32 workloadAbnormal = 6; + optional bool hasMetricServer = 8; - optional bool hasMetricServer = 7; + optional double cpuUsed = 9; - optional double cpuUsed = 8; + optional double cpuRequest = 10; - optional double cpuRequest = 9; + optional double cpuLimit = 11; - optional double cpuLimit = 10; + optional double cpuCapacity = 12; - optional double cpuCapacity = 11; + optional double cpuAllocatable = 13; - optional double cpuAllocatable = 12; + optional string cpuRequestRate = 14; - optional string cpuRequestRate = 13; + optional string cpuAllocatableRate = 15; - optional string cpuAllocatableRate = 14; + optional string cpuUsage = 16; - optional string cpuUsage = 15; + optional int64 memUsed = 17; - optional int64 memUsed = 16; + optional int64 memRequest = 18; - optional int64 memRequest = 17; + optional int64 memLimit = 19; - optional int64 memLimit = 18; + optional int64 memCapacity = 20; - optional int64 memCapacity = 19; + optional int64 memAllocatable = 21; - optional int64 memAllocatable = 20; + optional string memRequestRate = 22; - optional string memRequestRate = 21; + optional string memAllocatableRate = 23; - optional string memAllocatableRate = 22; + optional string memUsage = 24; - optional string memUsage = 23; + optional int32 podCount = 25; - optional bool schedulerHealthy = 24; + optional bool schedulerHealthy = 26; - optional bool controllerManagerHealthy = 25; + optional bool controllerManagerHealthy = 27; - optional bool etcdHealthy = 26; + optional bool etcdHealthy = 28; } // ConfigMap holds configuration data for tke to consume. diff --git a/api/monitor/v1/types.go b/api/monitor/v1/types.go index ba07b1ebf..716c42639 100644 --- a/api/monitor/v1/types.go +++ b/api/monitor/v1/types.go @@ -214,36 +214,43 @@ type ClusterOverviewResult struct { NodeAbnormal int32 `json:"nodeAbnormal" protobuf:"bytes,6,opt,name=nodeAbnormal"` WorkloadCount int32 `json:"workloadCount" protobuf:"bytes,7,opt,name=workloadCount"` WorkloadAbnormal int32 `json:"workloadAbnormal" protobuf:"bytes,8,opt,name=workloadAbnormal"` - Clusters []*ClusterStatistic `json:"clusters" protobuf:"bytes,9,opt,name=clusters"` + CPUCapacity float64 `json:"cpuCapacity" protobuf:"bytes,9,opt,name=cpuCapacity"` + CPUAllocatable float64 `json:"cpuAllocatable" protobuf:"bytes,10,opt,name=cpuAllocatable"` + MemCapacity int64 `json:"memCapacity" protobuf:"bytes,11,opt,name=memCapacity"` + MemAllocatable int64 `json:"memAllocatable" protobuf:"bytes,12,opt,name=memAllocatable"` + PodCount int32 `json:"podCount" protobuf:"bytes,13,opt,name=podCount"` + Clusters []*ClusterStatistic `json:"clusters" protobuf:"bytes,14,opt,name=clusters"` } type ClusterStatistic struct { ClusterID string `json:"clusterID" protobuf:"bytes,1,opt,name=clusterID"` - ClusterPhase string `json:"clusterPhase" protobuf:"bytes,2,opt,name=clusterPhase"` - NodeCount int32 `json:"nodeCount" protobuf:"bytes,3,opt,name=nodeCount"` - NodeAbnormal int32 `json:"nodeAbnormal" protobuf:"bytes,4,opt,name=nodeAbnormal"` - WorkloadCount int32 `json:"workloadCount" protobuf:"bytes,5,opt,name=workloadCount"` - WorkloadAbnormal int32 `json:"workloadAbnormal" protobuf:"bytes,6,opt,name=workloadAbnormal"` - HasMetricServer bool `json:"hasMetricServer" protobuf:"bytes,7,opt,name=hasMetricServer"` - CPUUsed float64 `json:"cpuUsed" protobuf:"bytes,8,opt,name=cpuUsed"` - CPURequest float64 `json:"cpuRequest" protobuf:"bytes,9,opt,name=cpuRequest"` - CPULimit float64 `json:"cpuLimit" protobuf:"bytes,10,opt,name=cpuLimit"` - CPUCapacity float64 `json:"cpuCapacity" protobuf:"bytes,11,opt,name=cpuCapacity"` - CPUAllocatable float64 `json:"cpuAllocatable" protobuf:"bytes,12,opt,name=cpuAllocatable"` - CPURequestRate string `json:"cpuRequestRate" protobuf:"bytes,13,opt,name=cpuRequestRate"` - CPUAllocatableRate string `json:"cpuAllocatableRate" protobuf:"bytes,14,opt,name=cpuAllocatableRate"` - CPUUsage string `json:"cpuUsage" protobuf:"bytes,15,opt,name=cpuUsage"` - MemUsed int64 `json:"memUsed" protobuf:"bytes,16,opt,name=memUsed"` - MemRequest int64 `json:"memRequest" protobuf:"bytes,17,opt,name=memRequest"` - MemLimit int64 `json:"memLimit" protobuf:"bytes,18,opt,name=memLimit"` - MemCapacity int64 `json:"memCapacity" protobuf:"bytes,19,opt,name=memCapacity"` - MemAllocatable int64 `json:"memAllocatable" protobuf:"bytes,20,opt,name=memAllocatable"` - MemRequestRate string `json:"memRequestRate" protobuf:"bytes,21,opt,name=memRequestRate"` - MemAllocatableRate string `json:"memAllocatableRate" protobuf:"bytes,22,opt,name=memAllocatableRate"` - MemUsage string `json:"memUsage" protobuf:"bytes,23,opt,name=memUsage"` - SchedulerHealthy bool `json:"schedulerHealthy" protobuf:"bytes,24,opt,name=schedulerHealthy"` - ControllerManagerHealthy bool `json:"controllerManagerHealthy" protobuf:"bytes,25,opt,name=controllerManagerHealthy"` - EtcdHealthy bool `json:"etcdHealthy" protobuf:"bytes,26,opt,name=etcdHealthy"` + TenantID string `json:"tenantID" protobuf:"bytes,2,opt,name=tenantID"` + ClusterPhase string `json:"clusterPhase" protobuf:"bytes,3,opt,name=clusterPhase"` + NodeCount int32 `json:"nodeCount" protobuf:"bytes,4,opt,name=nodeCount"` + NodeAbnormal int32 `json:"nodeAbnormal" protobuf:"bytes,5,opt,name=nodeAbnormal"` + WorkloadCount int32 `json:"workloadCount" protobuf:"bytes,6,opt,name=workloadCount"` + WorkloadAbnormal int32 `json:"workloadAbnormal" protobuf:"bytes,7,opt,name=workloadAbnormal"` + HasMetricServer bool `json:"hasMetricServer" protobuf:"bytes,8,opt,name=hasMetricServer"` + CPUUsed float64 `json:"cpuUsed" protobuf:"bytes,9,opt,name=cpuUsed"` + CPURequest float64 `json:"cpuRequest" protobuf:"bytes,10,opt,name=cpuRequest"` + CPULimit float64 `json:"cpuLimit" protobuf:"bytes,11,opt,name=cpuLimit"` + CPUCapacity float64 `json:"cpuCapacity" protobuf:"bytes,12,opt,name=cpuCapacity"` + CPUAllocatable float64 `json:"cpuAllocatable" protobuf:"bytes,13,opt,name=cpuAllocatable"` + CPURequestRate string `json:"cpuRequestRate" protobuf:"bytes,14,opt,name=cpuRequestRate"` + CPUAllocatableRate string `json:"cpuAllocatableRate" protobuf:"bytes,15,opt,name=cpuAllocatableRate"` + CPUUsage string `json:"cpuUsage" protobuf:"bytes,16,opt,name=cpuUsage"` + MemUsed int64 `json:"memUsed" protobuf:"bytes,17,opt,name=memUsed"` + MemRequest int64 `json:"memRequest" protobuf:"bytes,18,opt,name=memRequest"` + MemLimit int64 `json:"memLimit" protobuf:"bytes,19,opt,name=memLimit"` + MemCapacity int64 `json:"memCapacity" protobuf:"bytes,20,opt,name=memCapacity"` + MemAllocatable int64 `json:"memAllocatable" protobuf:"bytes,21,opt,name=memAllocatable"` + MemRequestRate string `json:"memRequestRate" protobuf:"bytes,22,opt,name=memRequestRate"` + MemAllocatableRate string `json:"memAllocatableRate" protobuf:"bytes,23,opt,name=memAllocatableRate"` + MemUsage string `json:"memUsage" protobuf:"bytes,24,opt,name=memUsage"` + PodCount int32 `json:"podCount" protobuf:"bytes,25,opt,name=podCount"` + SchedulerHealthy bool `json:"schedulerHealthy" protobuf:"bytes,26,opt,name=schedulerHealthy"` + ControllerManagerHealthy bool `json:"controllerManagerHealthy" protobuf:"bytes,27,opt,name=controllerManagerHealthy"` + EtcdHealthy bool `json:"etcdHealthy" protobuf:"bytes,28,opt,name=etcdHealthy"` } // +genclient diff --git a/api/monitor/v1/zz_generated.conversion.go b/api/monitor/v1/zz_generated.conversion.go index f3d53c798..83d0cb99d 100644 --- a/api/monitor/v1/zz_generated.conversion.go +++ b/api/monitor/v1/zz_generated.conversion.go @@ -221,6 +221,11 @@ func autoConvert_v1_ClusterOverviewResult_To_monitor_ClusterOverviewResult(in *C out.NodeAbnormal = in.NodeAbnormal out.WorkloadCount = in.WorkloadCount out.WorkloadAbnormal = in.WorkloadAbnormal + out.CPUCapacity = in.CPUCapacity + out.CPUAllocatable = in.CPUAllocatable + out.MemCapacity = in.MemCapacity + out.MemAllocatable = in.MemAllocatable + out.PodCount = in.PodCount out.Clusters = *(*[]*monitor.ClusterStatistic)(unsafe.Pointer(&in.Clusters)) return nil } @@ -239,6 +244,11 @@ func autoConvert_monitor_ClusterOverviewResult_To_v1_ClusterOverviewResult(in *m out.NodeAbnormal = in.NodeAbnormal out.WorkloadCount = in.WorkloadCount out.WorkloadAbnormal = in.WorkloadAbnormal + out.CPUCapacity = in.CPUCapacity + out.CPUAllocatable = in.CPUAllocatable + out.MemCapacity = in.MemCapacity + out.MemAllocatable = in.MemAllocatable + out.PodCount = in.PodCount out.Clusters = *(*[]*ClusterStatistic)(unsafe.Pointer(&in.Clusters)) return nil } @@ -250,6 +260,7 @@ func Convert_monitor_ClusterOverviewResult_To_v1_ClusterOverviewResult(in *monit func autoConvert_v1_ClusterStatistic_To_monitor_ClusterStatistic(in *ClusterStatistic, out *monitor.ClusterStatistic, s conversion.Scope) error { out.ClusterID = in.ClusterID + out.TenantID = in.TenantID out.ClusterPhase = in.ClusterPhase out.NodeCount = in.NodeCount out.NodeAbnormal = in.NodeAbnormal @@ -272,6 +283,7 @@ func autoConvert_v1_ClusterStatistic_To_monitor_ClusterStatistic(in *ClusterStat out.MemRequestRate = in.MemRequestRate out.MemAllocatableRate = in.MemAllocatableRate out.MemUsage = in.MemUsage + out.PodCount = in.PodCount out.SchedulerHealthy = in.SchedulerHealthy out.ControllerManagerHealthy = in.ControllerManagerHealthy out.EtcdHealthy = in.EtcdHealthy @@ -285,6 +297,7 @@ func Convert_v1_ClusterStatistic_To_monitor_ClusterStatistic(in *ClusterStatisti func autoConvert_monitor_ClusterStatistic_To_v1_ClusterStatistic(in *monitor.ClusterStatistic, out *ClusterStatistic, s conversion.Scope) error { out.ClusterID = in.ClusterID + out.TenantID = in.TenantID out.ClusterPhase = in.ClusterPhase out.NodeCount = in.NodeCount out.NodeAbnormal = in.NodeAbnormal @@ -307,6 +320,7 @@ func autoConvert_monitor_ClusterStatistic_To_v1_ClusterStatistic(in *monitor.Clu out.MemRequestRate = in.MemRequestRate out.MemAllocatableRate = in.MemAllocatableRate out.MemUsage = in.MemUsage + out.PodCount = in.PodCount out.SchedulerHealthy = in.SchedulerHealthy out.ControllerManagerHealthy = in.ControllerManagerHealthy out.EtcdHealthy = in.EtcdHealthy diff --git a/api/openapi/zz_generated.openapi.go b/api/openapi/zz_generated.openapi.go index 0198d6aff..714ecc9c0 100644 --- a/api/openapi/zz_generated.openapi.go +++ b/api/openapi/zz_generated.openapi.go @@ -41055,6 +41055,36 @@ func schema_tke_api_monitor_v1_ClusterOverviewResult(ref common.ReferenceCallbac Format: "int32", }, }, + "cpuCapacity": { + SchemaProps: spec.SchemaProps{ + Type: []string{"number"}, + Format: "double", + }, + }, + "cpuAllocatable": { + SchemaProps: spec.SchemaProps{ + Type: []string{"number"}, + Format: "double", + }, + }, + "memCapacity": { + SchemaProps: spec.SchemaProps{ + Type: []string{"integer"}, + Format: "int64", + }, + }, + "memAllocatable": { + SchemaProps: spec.SchemaProps{ + Type: []string{"integer"}, + Format: "int64", + }, + }, + "podCount": { + SchemaProps: spec.SchemaProps{ + Type: []string{"integer"}, + Format: "int32", + }, + }, "clusters": { SchemaProps: spec.SchemaProps{ Type: []string{"array"}, @@ -41068,7 +41098,7 @@ func schema_tke_api_monitor_v1_ClusterOverviewResult(ref common.ReferenceCallbac }, }, }, - Required: []string{"clusterCount", "clusterAbnormal", "projectCount", "projectAbnormal", "nodeCount", "nodeAbnormal", "workloadCount", "workloadAbnormal", "clusters"}, + Required: []string{"clusterCount", "clusterAbnormal", "projectCount", "projectAbnormal", "nodeCount", "nodeAbnormal", "workloadCount", "workloadAbnormal", "cpuCapacity", "cpuAllocatable", "memCapacity", "memAllocatable", "podCount", "clusters"}, }, }, Dependencies: []string{ @@ -41088,6 +41118,12 @@ func schema_tke_api_monitor_v1_ClusterStatistic(ref common.ReferenceCallback) co Format: "", }, }, + "tenantID": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, "clusterPhase": { SchemaProps: spec.SchemaProps{ Type: []string{"string"}, @@ -41220,6 +41256,12 @@ func schema_tke_api_monitor_v1_ClusterStatistic(ref common.ReferenceCallback) co Format: "", }, }, + "podCount": { + SchemaProps: spec.SchemaProps{ + Type: []string{"integer"}, + Format: "int32", + }, + }, "schedulerHealthy": { SchemaProps: spec.SchemaProps{ Type: []string{"boolean"}, @@ -41239,7 +41281,7 @@ func schema_tke_api_monitor_v1_ClusterStatistic(ref common.ReferenceCallback) co }, }, }, - Required: []string{"clusterID", "clusterPhase", "nodeCount", "nodeAbnormal", "workloadCount", "workloadAbnormal", "hasMetricServer", "cpuUsed", "cpuRequest", "cpuLimit", "cpuCapacity", "cpuAllocatable", "cpuRequestRate", "cpuAllocatableRate", "cpuUsage", "memUsed", "memRequest", "memLimit", "memCapacity", "memAllocatable", "memRequestRate", "memAllocatableRate", "memUsage", "schedulerHealthy", "controllerManagerHealthy", "etcdHealthy"}, + Required: []string{"clusterID", "tenantID", "clusterPhase", "nodeCount", "nodeAbnormal", "workloadCount", "workloadAbnormal", "hasMetricServer", "cpuUsed", "cpuRequest", "cpuLimit", "cpuCapacity", "cpuAllocatable", "cpuRequestRate", "cpuAllocatableRate", "cpuUsage", "memUsed", "memRequest", "memLimit", "memCapacity", "memAllocatable", "memRequestRate", "memAllocatableRate", "memUsage", "podCount", "schedulerHealthy", "controllerManagerHealthy", "etcdHealthy"}, }, }, } diff --git a/pkg/monitor/util/cache/cache.go b/pkg/monitor/util/cache/cache.go index 1c2061222..4b6f22f1c 100644 --- a/pkg/monitor/util/cache/cache.go +++ b/pkg/monitor/util/cache/cache.go @@ -209,6 +209,7 @@ func (c *cacher) getClusters() { MemRequestRate: transPercent(resourceCounter.MemRequestRate), MemAllocatableRate: transPercent(resourceCounter.MemAllocatableRate), MemUsage: transPercent(resourceCounter.MemUsage), + PodCount: int32(resourceCounter.PodCount), SchedulerHealthy: health.Scheduler, ControllerManagerHealthy: health.ControllerManager, EtcdHealthy: health.Etcd, @@ -264,6 +265,11 @@ func (c *cacher) GetClusterOverviewResult(clusterIDs []string) *monitor.ClusterO result.NodeAbnormal += clusterStatistic.NodeAbnormal result.WorkloadCount += clusterStatistic.WorkloadCount result.WorkloadAbnormal += clusterStatistic.WorkloadAbnormal + result.CPUCapacity += clusterStatistic.CPUCapacity + result.CPUAllocatable += clusterStatistic.CPUAllocatable + result.MemCapacity += clusterStatistic.MemCapacity + result.MemAllocatable += clusterStatistic.MemAllocatable + result.PodCount += clusterStatistic.PodCount clusterStatistics = append(clusterStatistics, clusterStatistic) } } @@ -407,6 +413,7 @@ func (c *cacher) getNodes(clusterID string, clientSet *kubernetes.Clientset, cou func (c *cacher) getPods(clusterID string, clientSet *kubernetes.Clientset, counter *util.ResourceCounter) { if pods, err := clientSet.CoreV1().Pods(AllNamespaces).List(context.Background(), metav1.ListOptions{}); err == nil { + counter.PodCount = len(pods.Items) for _, pod := range pods.Items { for _, ctn := range pod.Spec.Containers { counter.CPURequest += float64(ctn.Resources.Requests.Cpu().MilliValue()) / float64(1000) diff --git a/pkg/monitor/util/types.go b/pkg/monitor/util/types.go index 1f7dc5e27..3e226b0df 100644 --- a/pkg/monitor/util/types.go +++ b/pkg/monitor/util/types.go @@ -117,6 +117,7 @@ type ResourceCounter struct { MemRequestRate float64 MemAllocatableRate float64 MemUsage float64 + PodCount int } type ComponentHealth struct {