Skip to content

feat(devbox): Adjust the monitoring metrics to adapt to version 2.5 #6345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bearslyricattack wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat(devbox): Adjust the monitoring metrics to adapt to version 2.5 #6345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11eb793
fix bug.
bearslyricattack Dec 16, 2025
f2f31c3
fix bug.
bearslyricattack Dec 17, 2025
745ad7e
fix bug.
bearslyricattack Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion service/launchpad/request/req.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func GetQuery(query *api.VMRequest) (string, error) {
case "cpu":
result = "round(sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{namespace=~\"$namespace\",pod=~\"$pod.*\"}) by (pod) / sum(cluster:namespace:pod_cpu:active:kube_pod_container_resource_limits{namespace=~\"$namespace\",pod=~\"$pod.*\"}) by (pod) * 100,0.01)"
case "memory":
result = "round(sum(container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\",namespace=~\"$namespace\",pod=~\"$pod.*\"}) by(pod) / sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_limits{namespace=~\"$namespace\",pod=~\"$pod.*\"}) by (pod)* 100, 0.01)"
result = "round(sum(container_memory_working_set_bytes{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\",namespace=~\"$namespace\",pod=~\"$pod.*\",container!=\"\",container!=\"POD\"}) by(pod) / sum(cluster:namespace:pod_memory:active:kube_pod_container_resource_limits{namespace=~\"$namespace\",pod=~\"$pod.*\"}) by (pod)* 100, 0.01)"
case "average_cpu":
result = "avg(round(sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{namespace=~\"$namespace\",pod=~\"$pod.*\"}) by (pod) / sum(cluster:namespace:pod_cpu:active:kube_pod_container_resource_limits{namespace=~\"$namespace\",pod=~\"$pod.*\"}) by (pod) * 100,0.01))"
case "average_memory":
Expand All @@ -58,6 +58,9 @@ func GetQuery(query *api.VMRequest) (string, error) {

func getPodName(str string) string {
index := strings.LastIndex(str, "-")
if index == -1 {
return str
}
firstPart := str[:index]
return firstPart
}
Expand Down
1 change: 1 addition & 0 deletions service/vlogs/server/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ func (vl *VLogsServer) verifyParams(req *http.Request) (*api.VlogsLaunchpadReque
}

func (vl *VLogsServer) queryDBLogs(rw http.ResponseWriter, req *http.Request) error {
fmt.Printf("database query: %s\n", req.URL)
resp, err := vl.executeDBQuery(req)
if err != nil {
return err
Expand Down
Loading
⚡