From 7a8712bda1b0c2e8d415a4f90f7567a6a755d5ea Mon Sep 17 00:00:00 2001 From: "Roland.Ma" Date: Thu, 18 Nov 2021 03:49:44 +0000 Subject: [PATCH] Namespace should not be filterd for Cluster Gateway Signed-off-by: Roland.Ma --- pkg/simple/client/monitoring/prometheus/promql.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkg/simple/client/monitoring/prometheus/promql.go b/pkg/simple/client/monitoring/prometheus/promql.go index 58cb7bf6c..3c011c418 100644 --- a/pkg/simple/client/monitoring/prometheus/promql.go +++ b/pkg/simple/client/monitoring/prometheus/promql.go @@ -17,6 +17,7 @@ import ( "fmt" "strings" + "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/simple/client/monitoring" ) @@ -482,13 +483,20 @@ func makeIngressMetricExpr(tmpl string, o monitoring.QueryOptions) string { // For monitoring ingress in the specific namespace // GET /namespaces/{namespace}/ingress/{ingress} or // GET /namespaces/{namespace}/ingress - if o.NamespaceName != "" { + if o.NamespaceName != constants.KubeSphereNamespace { if o.Ingress != "" { ingressSelector = fmt.Sprintf(`exported_namespace="%s", ingress="%s"`, o.NamespaceName, o.Ingress) } else { ingressSelector = fmt.Sprintf(`exported_namespace="%s", ingress=~"%s"`, o.NamespaceName, o.ResourceFilter) } + } else { + if o.Ingress != "" { + ingressSelector = fmt.Sprintf(`ingress="%s"`, o.Ingress) + } else { + ingressSelector = fmt.Sprintf(`ingress=~"%s"`, o.ResourceFilter) + } } + // job is a reqiuried filter // GET /namespaces/{namespace}/ingress?job=xxx&pod=xxx if o.Job != "" {