monitor: filter out non-labeled workspace

Signed-off-by: huanggze <loganhuang@yunify.com>
This commit is contained in:
huanggze
2019-09-25 15:55:26 +08:00
parent 468f7eddca
commit 2ad1e49dcc

View File

@@ -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)