Skip to content

Commit

Permalink
feat(monitor): add not ready data in cacher (#935)
Browse files Browse the repository at this point in the history 
* style(monitor): add the ctx parameter to cacher

* feat(monitor): change the timing of locking in cacher

* feat(monitor): add not ready data of nodes in cluster overview
  • Loading branch information
@wangao1236
wangao1236 committed Nov 26, 2020
1 parent 688fe23 commit c7338fc
Show file tree
Hide file tree
Showing 8 changed files with 704 additions and 331 deletions.
36 changes: 22 additions & 14 deletions api/monitor/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,20 +210,24 @@ type ClusterOverview struct {
}

type ClusterOverviewResult struct {
ClusterCount int32
ClusterAbnormal int32
ProjectCount int32
ProjectAbnormal int32
NodeCount int32
NodeAbnormal int32
WorkloadCount int32
WorkloadAbnormal int32
CPUCapacity float64
CPUAllocatable float64
MemCapacity int64
MemAllocatable int64
PodCount int32
Clusters []*ClusterStatistic
ClusterCount int32
ClusterAbnormal int32
ProjectCount int32
ProjectAbnormal int32
NodeCount int32
NodeAbnormal int32
WorkloadCount int32
WorkloadAbnormal int32
CPUCapacity float64
CPUAllocatable float64
CPUNotReadyCapacity float64
CPUNotReadyAllocatable float64
MemCapacity int64
MemAllocatable int64
MemNotReadyCapacity int64
MemNotReadyAllocatable int64
PodCount int32
Clusters []*ClusterStatistic
}

type ClusterStatistic struct {
Expand All @@ -241,6 +245,8 @@ type ClusterStatistic struct {
CPULimit float64
CPUCapacity float64
CPUAllocatable float64
CPUNotReadyCapacity float64
CPUNotReadyAllocatable float64
CPURequestRate string
CPUAllocatableRate string
CPUUsage string
Expand All @@ -249,6 +255,8 @@ type ClusterStatistic struct {
MemLimit int64
MemCapacity int64
MemAllocatable int64
MemNotReadyCapacity int64
MemNotReadyAllocatable int64
MemRequestRate string
MemAllocatableRate string
MemUsage string
Expand Down
538 changes: 361 additions & 177 deletions api/monitor/v1/generated.pb.go
View file

Large diffs are not rendered by default.

54 changes: 35 additions & 19 deletions api/monitor/v1/generated.proto
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

66 changes: 37 additions & 29 deletions api/monitor/v1/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,20 +209,24 @@ type ClusterOverview struct {
}

type ClusterOverviewResult struct {
ClusterCount int32 `json:"clusterCount" protobuf:"bytes,1,opt,name=clusterCount"`
ClusterAbnormal int32 `json:"clusterAbnormal" protobuf:"bytes,2,opt,name=clusterAbnormal"`
ProjectCount int32 `json:"projectCount" protobuf:"bytes,3,opt,name=projectCount"`
ProjectAbnormal int32 `json:"projectAbnormal" protobuf:"bytes,4,opt,name=projectAbnormal"`
NodeCount int32 `json:"nodeCount" protobuf:"bytes,5,opt,name=nodeCount"`
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"`
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"`
ClusterCount int32 `json:"clusterCount" protobuf:"bytes,1,opt,name=clusterCount"`
ClusterAbnormal int32 `json:"clusterAbnormal" protobuf:"bytes,2,opt,name=clusterAbnormal"`
ProjectCount int32 `json:"projectCount" protobuf:"bytes,3,opt,name=projectCount"`
ProjectAbnormal int32 `json:"projectAbnormal" protobuf:"bytes,4,opt,name=projectAbnormal"`
NodeCount int32 `json:"nodeCount" protobuf:"bytes,5,opt,name=nodeCount"`
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"`
CPUCapacity float64 `json:"cpuCapacity" protobuf:"bytes,9,opt,name=cpuCapacity"`
CPUAllocatable float64 `json:"cpuAllocatable" protobuf:"bytes,10,opt,name=cpuAllocatable"`
CPUNotReadyCapacity float64 `json:"cpuNotReadyCapacity" protobuf:"bytes,11,opt,name=cpuNotReadyCapacity"`
CPUNotReadyAllocatable float64 `json:"cpuNotReadyAllocatable" protobuf:"bytes,12,opt,name=cpuNotReadyAllocatable"`
MemCapacity int64 `json:"memCapacity" protobuf:"bytes,13,opt,name=memCapacity"`
MemAllocatable int64 `json:"memAllocatable" protobuf:"bytes,14,opt,name=memAllocatable"`
MemNotReadyCapacity int64 `json:"memNotReadyCapacity" protobuf:"bytes,15,opt,name=memNotReadyCapacity"`
MemNotReadyAllocatable int64 `json:"memNotReadyAllocatable" protobuf:"bytes,16,opt,name=memNotReadyAllocatable"`
PodCount int32 `json:"podCount" protobuf:"bytes,17,opt,name=podCount"`
Clusters []*ClusterStatistic `json:"clusters" protobuf:"bytes,18,opt,name=clusters"`
}

type ClusterStatistic struct {
Expand All @@ -240,21 +244,25 @@ type ClusterStatistic struct {
CPULimit float64 `json:"cpuLimit" protobuf:"bytes,12,opt,name=cpuLimit"`
CPUCapacity float64 `json:"cpuCapacity" protobuf:"bytes,13,opt,name=cpuCapacity"`
CPUAllocatable float64 `json:"cpuAllocatable" protobuf:"bytes,14,opt,name=cpuAllocatable"`
CPURequestRate string `json:"cpuRequestRate" protobuf:"bytes,15,opt,name=cpuRequestRate"`
CPUAllocatableRate string `json:"cpuAllocatableRate" protobuf:"bytes,16,opt,name=cpuAllocatableRate"`
CPUUsage string `json:"cpuUsage" protobuf:"bytes,17,opt,name=cpuUsage"`
MemUsed int64 `json:"memUsed" protobuf:"bytes,18,opt,name=memUsed"`
MemRequest int64 `json:"memRequest" protobuf:"bytes,19,opt,name=memRequest"`
MemLimit int64 `json:"memLimit" protobuf:"bytes,20,opt,name=memLimit"`
MemCapacity int64 `json:"memCapacity" protobuf:"bytes,21,opt,name=memCapacity"`
MemAllocatable int64 `json:"memAllocatable" protobuf:"bytes,22,opt,name=memAllocatable"`
MemRequestRate string `json:"memRequestRate" protobuf:"bytes,23,opt,name=memRequestRate"`
MemAllocatableRate string `json:"memAllocatableRate" protobuf:"bytes,24,opt,name=memAllocatableRate"`
MemUsage string `json:"memUsage" protobuf:"bytes,25,opt,name=memUsage"`
PodCount int32 `json:"podCount" protobuf:"bytes,26,opt,name=podCount"`
SchedulerHealthy bool `json:"schedulerHealthy" protobuf:"bytes,27,opt,name=schedulerHealthy"`
ControllerManagerHealthy bool `json:"controllerManagerHealthy" protobuf:"bytes,28,opt,name=controllerManagerHealthy"`
EtcdHealthy bool `json:"etcdHealthy" protobuf:"bytes,29,opt,name=etcdHealthy"`
CPUNotReadyCapacity float64 `json:"cpuNotReadyCapacity" protobuf:"bytes,15,opt,name=cpuNotReadyCapacity"`
CPUNotReadyAllocatable float64 `json:"cpuNotReadyAllocatable" protobuf:"bytes,16,opt,name=cpuNotReadyAllocatable"`
CPURequestRate string `json:"cpuRequestRate" protobuf:"bytes,17,opt,name=cpuRequestRate"`
CPUAllocatableRate string `json:"cpuAllocatableRate" protobuf:"bytes,18,opt,name=cpuAllocatableRate"`
CPUUsage string `json:"cpuUsage" protobuf:"bytes,19,opt,name=cpuUsage"`
MemUsed int64 `json:"memUsed" protobuf:"bytes,20,opt,name=memUsed"`
MemRequest int64 `json:"memRequest" protobuf:"bytes,21,opt,name=memRequest"`
MemLimit int64 `json:"memLimit" protobuf:"bytes,22,opt,name=memLimit"`
MemCapacity int64 `json:"memCapacity" protobuf:"bytes,23,opt,name=memCapacity"`
MemAllocatable int64 `json:"memAllocatable" protobuf:"bytes,24,opt,name=memAllocatable"`
MemNotReadyCapacity int64 `json:"memNotReadyCapacity" protobuf:"bytes,25,opt,name=memNotReadyCapacity"`
MemNotReadyAllocatable int64 `json:"memNotReadyAllocatable" protobuf:"bytes,26,opt,name=memNotReadyAllocatable"`
MemRequestRate string `json:"memRequestRate" protobuf:"bytes,27,opt,name=memRequestRate"`
MemAllocatableRate string `json:"memAllocatableRate" protobuf:"bytes,28,opt,name=memAllocatableRate"`
MemUsage string `json:"memUsage" protobuf:"bytes,29,opt,name=memUsage"`
PodCount int32 `json:"podCount" protobuf:"bytes,30,opt,name=podCount"`
SchedulerHealthy bool `json:"schedulerHealthy" protobuf:"bytes,31,opt,name=schedulerHealthy"`
ControllerManagerHealthy bool `json:"controllerManagerHealthy" protobuf:"bytes,32,opt,name=controllerManagerHealthy"`
EtcdHealthy bool `json:"etcdHealthy" protobuf:"bytes,33,opt,name=etcdHealthy"`
}

// +genclient
Expand Down
16 changes: 16 additions & 0 deletions api/monitor/v1/zz_generated.conversion.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 50 additions & 2 deletions api/openapi/zz_generated.openapi.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c7338fc

Please sign in to comment.