admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Namespace should not be filterd for Cluster Gateway

Browse Source 
Signed-off-by: Roland.Ma <rolandma@kubesphere.io>
This commit is contained in:
Roland.Ma
2021-11-18 03:49:44 +00:00
parent a41a942819
commit 3364551b03
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/simple/client/monitoring/prometheus/promql.go
View File

@@ -17,6 +17,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"kubesphere.io/kubesphere/pkg/constants"
"kubesphere.io/kubesphere/pkg/simple/client/monitoring" "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 // For monitoring ingress in the specific namespace
// GET /namespaces/{namespace}/ingress/{ingress} or // GET /namespaces/{namespace}/ingress/{ingress} or
// GET /namespaces/{namespace}/ingress // GET /namespaces/{namespace}/ingress
if o.NamespaceName != "" { if o.NamespaceName != constants.KubeSphereNamespace {
if o.Ingress != "" { if o.Ingress != "" {
ingressSelector = fmt.Sprintf(`exported_namespace="%s", ingress="%s"`, o.NamespaceName, o.Ingress) ingressSelector = fmt.Sprintf(`exported_namespace="%s", ingress="%s"`, o.NamespaceName, o.Ingress)
} else { } else {
ingressSelector = fmt.Sprintf(`exported_namespace="%s", ingress=~"%s"`, o.NamespaceName, o.ResourceFilter) 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 // job is a reqiuried filter
// GET /namespaces/{namespace}/ingress?job=xxx&pod=xxx // GET /namespaces/{namespace}/ingress?job=xxx&pod=xxx
if o.Job != "" { if o.Job != "" {