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

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

@@ -60,35 +60,36 @@ const (
) )
type reqParams struct { type reqParams struct {
metering bool metering bool
operation string operation string
time string time string
start string start string
end string end string
step string step string
target string target string
order string order string
page string page string
limit string limit string
metricFilter string metricFilter string
resourceFilter string namespacedResourcesFilter string
nodeName string resourceFilter string
workspaceName string nodeName string
namespaceName string workspaceName string
workloadKind string namespaceName string
workloadName string workloadKind string
podName string workloadName string
containerName string podName string
pvcName string containerName string
storageClassName string pvcName string
componentType string storageClassName string
expression string componentType string
metric string expression string
applications string metric string
openpitrixs string applications string
cluster string openpitrixs string
services string cluster string
pvcFilter string services string
pvcFilter string
} }
type queryOptions struct { type queryOptions struct {
@@ -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,12 +287,13 @@ 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{
ResourceFilter: r.resourceFilter, NamespacedResourcesFilter: r.namespacedResourcesFilter,
NodeName: r.nodeName, ResourceFilter: r.resourceFilter,
NamespaceName: r.namespaceName, NodeName: r.nodeName,
WorkloadKind: r.workloadKind, NamespaceName: r.namespaceName,
WorkloadName: r.workloadName, WorkloadKind: r.workloadKind,
PodName: r.podName, WorkloadName: r.workloadName,
PodName: r.podName,
} }
q.namedMetrics = model.PodMetrics q.namedMetrics = model.PodMetrics