From 2ad1e49dcc17aed74875300cae957cb609c67fda Mon Sep 17 00:00:00 2001 From: huanggze Date: Wed, 25 Sep 2019 15:55:26 +0800 Subject: [PATCH] monitor: filter out non-labeled workspace Signed-off-by: huanggze --- pkg/models/metrics/metrics.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/models/metrics/metrics.go b/pkg/models/metrics/metrics.go index e81dc7554..224c21fd6 100644 --- a/pkg/models/metrics/metrics.go +++ b/pkg/models/metrics/metrics.go @@ -518,7 +518,7 @@ func makePromqlForWorkspace(metricName string, params RequestParams) string { if params.WorkspaceName != "" { workspaceSelector = fmt.Sprintf(`label_kubesphere_io_workspace="%s"`, params.WorkspaceName) } else { - workspaceSelector = fmt.Sprintf(`label_kubesphere_io_workspace=~"%s"`, params.ResourcesFilter) + workspaceSelector = fmt.Sprintf(`label_kubesphere_io_workspace=~"%s", label_kubesphere_io_workspace!=""`, params.ResourcesFilter) } return strings.Replace(exp, "$1", workspaceSelector, -1)