diff --git a/gmc_api_gateway/app/controller/callListModel.go b/gmc_api_gateway/app/controller/callListModel.go index af9fa27..0d33304 100644 --- a/gmc_api_gateway/app/controller/callListModel.go +++ b/gmc_api_gateway/app/controller/callListModel.go @@ -85,7 +85,7 @@ func GetModelList(params model.PARAMS) (DataList []string, err error) { } return DataList, err } else if params.Project != "" && params.Workspace != "" { - // log.Println("#################Project List") + log.Println("#################Project List") project := GetDBProject(params) Clusters := project.Selectcluster for c, _ := range Clusters { diff --git a/gmc_api_gateway/app/controller/monitoring.go b/gmc_api_gateway/app/controller/monitoring.go index e04e06b..553317c 100644 --- a/gmc_api_gateway/app/controller/monitoring.go +++ b/gmc_api_gateway/app/controller/monitoring.go @@ -67,7 +67,8 @@ var namespaceMetric = map[string]string{ "namespace_cpu": "round(sum(sum(irate(container_cpu_usage_seconds_total{job='kubelet',pod!='',image!='', $1}[5m]))by(namespace,pod,cluster))by(namespace,cluster),0.001)", "namespace_memory": "round(sum(sum(container_memory_rss{job='kubelet',pod!='',image!='', $1})by(namespace,pod,cluster))by(namespace,cluster)/1024/1024/1024,0.1)", "namespace_pod_count": "count(count(container_spec_memory_reservation_limit_bytes{pod!='', $1})by(pod,cluster,namespace))by(cluster,namespace)", - "namespace_check": "kube_namespace_labels{$1} OR vector(0)", + "namespace_check" : "kube_namespace_status_phase{phase='Active',$1} OR vector(0)", + // "namespace_check": "kube_namespace_labels{$1} OR vector(0)", } var podMetric = map[string]string{