Skip to content

Bug 1918785: Use kube_pod_resource_(request|limit) metric #7894

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

Merged
openshift-merge-robot merged 1 commit into from
Jan 22, 2021
Merged

Bug 1918785: Use kube_pod_resource_(request|limit) metric #7894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 4 additions & 28 deletions frontend/packages/console-app/src/components/nodes/node-dashboard/queries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,40 +85,16 @@ const top25Queries = {

const resourceQuotaQueries = {
[NodeQueries.POD_RESOURCE_LIMIT_CPU]: _.template(
`sum(
max by (namespace, pod, container) (
kube_pod_container_resource_limits_cpu_cores{node='<%= node %>', job="kube-state-metrics"}
) * on(namespace, pod) group_left() max by (namespace, pod) (
kube_pod_status_phase{phase=~"Pending|Running"} == 1
)
)`,
`sum(kube_pod_resource_limit{node='<%= node %>',resource='cpu'})`,
),
[NodeQueries.POD_RESOURCE_LIMIT_MEMORY]: _.template(
`sum(
max by (namespace, pod, container) (
kube_pod_container_resource_limits_memory_bytes{node='<%= node %>', job="kube-state-metrics"}
) * on(namespace, pod) group_left() max by (namespace, pod) (
kube_pod_status_phase{phase=~"Pending|Running"} == 1
)
)`,
`sum(kube_pod_resource_limit{node='<%= node %>',resource='memory'})`,
),
[NodeQueries.POD_RESOURCE_REQUEST_CPU]: _.template(
`sum(
max by (namespace, pod, container) (
kube_pod_container_resource_requests_cpu_cores{node='<%= node %>', job="kube-state-metrics"}
) * on(namespace, pod) group_left() max by (namespace, pod) (
kube_pod_status_phase{phase=~"Pending|Running"} == 1
)
)`,
`sum(kube_pod_resource_request{node='<%= node %>',resource='cpu'})`,
),
[NodeQueries.POD_RESOURCE_REQUEST_MEMORY]: _.template(
`sum(
max by (namespace, pod, container) (
kube_pod_container_resource_requests_memory_bytes{node='<%= node %>', job="kube-state-metrics"}
) * on(namespace, pod) group_left() max by (namespace, pod) (
kube_pod_status_phase{phase=~"Pending|Running"} == 1
)
)`,
`sum(kube_pod_resource_request{node='<%= node %>',resource='memory'})`,
),
};

Expand Down
8 changes: 4 additions & 4 deletions frontend/public/components/pod.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,8 +514,8 @@ const PodGraphs = requirePrometheus(({ pod }) => {
byteDataType={ByteDataTypes.BinaryBytes}
namespace={pod.metadata.namespace}
query={`sum(container_memory_working_set_bytes{pod='${pod.metadata.name}',namespace='${pod.metadata.namespace}',container='',}) BY (pod, namespace)`}
limitQuery={`sum(kube_pod_container_resource_limits_memory_bytes{pod='${pod.metadata.name}',namespace='${pod.metadata.namespace}'}) BY (pod, namespace)`}
requestedQuery={`sum(kube_pod_container_resource_requests_memory_bytes{pod='${pod.metadata.name}',namespace='${pod.metadata.namespace}'}) BY (pod, namespace)`}
limitQuery={`sum(label_replace(label_replace(kube_pod_resource_limit{resource='cpu',exported_pod='${pod.metadata.name}',exported_namespace='${pod.metadata.namespace}'},'pod','$1','exported_pod','(.+)'),'namespace','$1','exported_namespace','(.+)'))`}
requestedQuery={`sum(label_replace(label_replace(kube_pod_resource_request{resource='memory',exported_pod='${pod.metadata.name}',exported_namespace='${pod.metadata.namespace}'},'pod','$1','exported_pod','(.+)'),'namespace','$1','exported_namespace','(.+)')) BY (pod, namespace)`}
/>
</div>
<div className="col-md-12 col-lg-4">
Expand All @@ -524,8 +524,8 @@ const PodGraphs = requirePrometheus(({ pod }) => {
humanize={humanizeCpuCores}
namespace={pod.metadata.namespace}
query={`pod:container_cpu_usage:sum{pod='${pod.metadata.name}',namespace='${pod.metadata.namespace}'}`}
limitQuery={`sum(kube_pod_container_resource_limits_cpu_cores{pod='${pod.metadata.name}',namespace='${pod.metadata.namespace}'}) BY (pod, namespace)`}
requestedQuery={`sum(kube_pod_container_resource_requests_cpu_cores{pod='${pod.metadata.name}',namespace='${pod.metadata.namespace}'}) BY (pod, namespace)`}
limitQuery={`sum(label_replace(label_replace(kube_pod_resource_limit{resource='cpu',exported_pod='${pod.metadata.name}',exported_namespace='${pod.metadata.namespace}'},'pod','$1','exported_pod','(.+)'),'namespace','$1','exported_namespace','(.+)'))`}
requestedQuery={`sum(label_replace(label_replace(kube_pod_resource_request{resource='cpu',exported_pod='${pod.metadata.name}',exported_namespace='${pod.metadata.namespace}'},'pod','$1','exported_pod','(.+)'),'namespace','$1','exported_namespace','(.+)')) BY (pod, namespace)`}
/>
</div>
<div className="col-md-12 col-lg-4">
Expand Down