From 19ac4bc2b045225a5c3c24bb09396f7c42970200 Mon Sep 17 00:00:00 2001 From: "Roland.Ma" Date: Wed, 15 Sep 2021 09:01:59 +0000 Subject: [PATCH] cpu and memory matric Signed-off-by: Roland.Ma --- pkg/models/monitoring/named_metrics.go | 2 ++ pkg/simple/client/monitoring/prometheus/promql.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkg/models/monitoring/named_metrics.go b/pkg/models/monitoring/named_metrics.go index 3fb075ae4..39338f48a 100644 --- a/pkg/models/monitoring/named_metrics.go +++ b/pkg/models/monitoring/named_metrics.go @@ -288,6 +288,8 @@ var IngressMetrics = []string{ "ingress_request_volume_by_ingress", "ingress_request_network_sent", "ingress_request_network_received", + "ingress_request_memory_bytes", + "ingress_request_cpu_usage", } var EtcdMetrics = []string{ diff --git a/pkg/simple/client/monitoring/prometheus/promql.go b/pkg/simple/client/monitoring/prometheus/promql.go index fe89f9252..88b8908b7 100644 --- a/pkg/simple/client/monitoring/prometheus/promql.go +++ b/pkg/simple/client/monitoring/prometheus/promql.go @@ -179,6 +179,8 @@ var promQLTemplates = map[string]string{ "ingress_request_volume_by_ingress": `round(sum(irate(nginx_ingress_controller_requests{$1,$2}[$3])) by (ingress), 0.001)`, "ingress_request_network_sent": `sum(irate(nginx_ingress_controller_response_size_sum{$1,$2}[$3]))`, "ingress_request_network_received": `sum(irate(nginx_ingress_controller_request_size_sum{$1,$2}[$3]))`, + "ingress_request_memory_bytes": `avg(nginx_ingress_controller_nginx_process_resident_memory_bytes{$2})`, + "ingress_request_cpu_usage": `avg(rate(nginx_ingress_controller_nginx_process_cpu_seconds_total{$2}[5m]))`, // workload "workload_cpu_usage": `round(namespace:workload_cpu_usage:sum{$1}, 0.001)`,