diff --git a/api/desc/core/pcm-core.api b/api/desc/core/pcm-core.api index d19f7f95..b6077ad1 100644 --- a/api/desc/core/pcm-core.api +++ b/api/desc/core/pcm-core.api @@ -187,7 +187,7 @@ type ( Name string `yaml:"name"` Description string `yaml:"description"` tenantId int64 `yaml:"tenantId"` - nsID string `form:"nsID"` + nsID string `yaml:"nsID"` tasks []TaskYaml `yaml:"tasks"` } TaskYaml { diff --git a/api/internal/types/types.go b/api/internal/types/types.go index 8c994266..ce8e2419 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -168,7 +168,7 @@ type ScheduleTaskByYamlReq struct { Name string `yaml:"name"` Description string `yaml:"description"` TenantId int64 `yaml:"tenantId"` - NsID string `form:"nsID"` + NsID string `yaml:"nsID"` Tasks []TaskYaml `yaml:"tasks"` } diff --git a/pkg/tracker/promql.go b/pkg/tracker/promql.go index 08649b8e..babc2dd8 100644 --- a/pkg/tracker/promql.go +++ b/pkg/tracker/promql.go @@ -60,8 +60,8 @@ var promQLTemplates = map[string]string{ "controller_memory_usage_rate": `round(sum by (owner_name) (sum by (owner_name, pod) (irate(container_memory_usage_bytes{job="kubelet", $1, image!=""}[5m]))/ sum by (owner_name,pod) (kube_pod_container_resource_limits{resource="memory"}))/count(kube_pod_info{$2}) by (owner_name),0.0001)`, // pod "pod_cpu_usage": `round(sum by (namespace, pod) (irate(container_cpu_usage_seconds_total{job="kubelet", pod!="", image!=""}[5m])) * on (namespace, pod) group_left(owner_kind,owner_name) kube_pod_owner{$1} * on (namespace, pod) group_left(node) kube_pod_info{$2}, 0.001)`, - "pod_cpu_usage_rate": `round(sum by ( pod) (irate(container_cpu_usage_seconds_total{job="kubelet", $1, image!=""}[5m]))/sum by (pod) (kube_pod_container_resource_limits{resource="cpu"}), 0.001)`, - "pod_memory_usage_rate": `round(sum by ( pod) (irate(container_memory_usage_bytes{job="kubelet", $1, image!=""}[5m]))/sum by (pod) (kube_pod_container_resource_limits{resource="memory"}), 0.001)`, + "pod_cpu_usage_rate": `round(sum by ( pod) (irate(container_cpu_usage_seconds_total{job="kubelet", $1, image!=""}[5m]))/sum by (pod) (kube_pod_container_resource_limits{resource="cpu"}), 0.0001)`, + "pod_memory_usage_rate": `round(sum by ( pod) (irate(container_memory_usage_bytes{job="kubelet", $1, image!=""}[5m]))/sum by (pod) (kube_pod_container_resource_limits{resource="memory"}), 0.0001)`, "pod_memory_usage": `sum by (namespace, pod) (container_memory_usage_bytes{job="kubelet", pod!="", image!=""}) * on (namespace, pod) group_left(owner_kind, owner_name) kube_pod_owner{$1} * on (namespace, pod) group_left(node) kube_pod_info{$2}`, "pod_memory_usage_wo_cache": `sum by (namespace, pod) (container_memory_working_set_bytes{job="kubelet", pod!="", image!=""}) * on (namespace, pod) group_left(owner_kind, owner_name) kube_pod_owner{$1} * on (namespace, pod) group_left(node) kube_pod_info{$2}`, "pod_net_bytes_transmitted": `sum by (namespace, pod) (irate(container_network_transmit_bytes_total{pod!="", interface!~"^(cali.+|tunl.+|dummy.+|kube.+|flannel.+|cni.+|docker.+|veth.+|lo.*)", job="kubelet"}[5m])) * on (namespace, pod) group_left(owner_kind, owner_name) kube_pod_owner{$1} * on (namespace, pod) group_left(node) kube_pod_info{$2}`,