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

monitor: fix platform-level statistics

Browse Source 
Signed-off-by: huanggze <loganhuang@yunify.com>
This commit is contained in:
huanggze
2020-05-25 17:44:23 +08:00
parent c104516ce0
commit 0e83717914
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/models/monitoring/monitoring.go
View File

@@ -142,7 +142,7 @@ func (mo monitoringOperator) GetKubeSphereStats() Metrics {
}) })
} }
wkList, err := mo.ks.Tenant().V1alpha1().Workspaces().Lister().List(labels.Everything()) wkList, err := mo.ks.Tenant().V1alpha2().WorkspaceTemplates().Lister().List(labels.Everything())
if err != nil { if err != nil {
res.Results = append(res.Results, monitoring.Metric{ res.Results = append(res.Results, monitoring.Metric{
MetricName: KubeSphereWorkspaceCount, MetricName: KubeSphereWorkspaceCount,
@@ -182,7 +182,13 @@ func (mo monitoringOperator) GetKubeSphereStats() Metrics {
}) })
} }
tmpls, err := mo.op.ListApps(&params.Conditions{}, "", false, 0, 0) cond := &params.Conditions{
Match: map[string]string{
openpitrix.Status: openpitrix.StatusActive,
openpitrix.RepoId: openpitrix.BuiltinRepoId,
},
}
tmpls, err := mo.op.ListApps(cond, "", false, 0, 0)
if err != nil { if err != nil {
res.Results = append(res.Results, monitoring.Metric{ res.Results = append(res.Results, monitoring.Metric{
MetricName: KubeSphereAppTmplCount, MetricName: KubeSphereAppTmplCount,