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

Merge pull request #789 from huanggze/metrics

Browse Source 
monitor: filter out non-labeled workspace
This commit is contained in:
KubeSphere CI Bot
2019-09-25 17:02:11 +08:00
committed by GitHub
parent f8531ec2ba 2ad1e49dcc
commit d54a8a4675
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/models/metrics/metrics.go
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)