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

Add namespacedResourcesFilter field back in reqParams struct.

Browse Source 
Signed-off-by: Rao Yunkun <yunkunrao@yunify.com>
This commit is contained in:
Rao Yunkun
2021-04-07 15:21:09 +08:00
parent f382847fb7
commit 43eaf904f6
1 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kapis/monitoring/v1alpha3/helper.go
View File

@@ -71,6 +71,7 @@ type reqParams struct {
page string page string
limit string limit string
metricFilter string metricFilter string
namespacedResourcesFilter string
resourceFilter string resourceFilter string
nodeName string nodeName string
workspaceName string workspaceName string
@@ -130,6 +131,7 @@ func parseRequestParams(req *restful.Request) reqParams {
r.page = req.QueryParameter("page") r.page = req.QueryParameter("page")
r.limit = req.QueryParameter("limit") r.limit = req.QueryParameter("limit")
r.metricFilter = req.QueryParameter("metrics_filter") r.metricFilter = req.QueryParameter("metrics_filter")
r.namespacedResourcesFilter = req.QueryParameter("namespaced_resources_filter")
r.resourceFilter = req.QueryParameter("resources_filter") r.resourceFilter = req.QueryParameter("resources_filter")
r.workspaceName = req.PathParameter("workspace") r.workspaceName = req.PathParameter("workspace")
r.namespaceName = req.PathParameter("namespace") r.namespaceName = req.PathParameter("namespace")
@@ -285,6 +287,7 @@ func (h handler) makeQueryOptions(r reqParams, lvl monitoring.Level) (q queryOpt
case monitoring.LevelPod: case monitoring.LevelPod:
q.identifier = model.IdentifierPod q.identifier = model.IdentifierPod
q.option = monitoring.PodOption{ q.option = monitoring.PodOption{
NamespacedResourcesFilter: r.namespacedResourcesFilter,
ResourceFilter: r.resourceFilter, ResourceFilter: r.resourceFilter,
NodeName: r.nodeName, NodeName: r.nodeName,
NamespaceName: r.namespaceName, NamespaceName: r.namespaceName,