Skip to content
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

Jump to bottom

Improve default metrics #296

Merged
merged 1 commit into from Jan 6, 2021
Merged

Improve default metrics #296

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/components/overview/OverviewPage.tsx
View file
Open in desktop
Expand Up @@ -102,7 +102,7 @@ const OverviewPage: React.FunctionComponent = () => {
queries: [
{
label: 'Current',
query: `sum(irate(container_cpu_usage_seconds_total{image!="", container!="", container!="POD"}[4m]))`,
query: `sum(max(rate(container_cpu_usage_seconds_total{id="/"}[2m])) by (node))`,
},
{
label: 'Requested',
Expand Down Expand Up @@ -132,7 +132,7 @@ const OverviewPage: React.FunctionComponent = () => {
queries: [
{
label: 'Current',
query: `sum(container_memory_usage_bytes{container!="", container!="POD"}) / 1024 / 1024 / 1024`,
query: `sum(max(container_memory_working_set_bytes{id="/"}) by (node)) / 1024 / 1024 / 1024`,
},
{
label: 'Requested',
Expand All @@ -142,10 +142,6 @@ const OverviewPage: React.FunctionComponent = () => {
label: 'Limit',
query: `sum(kube_pod_container_resource_limits{resource="memory", container!=""}) / 1024 / 1024 / 1024`,
},
{
label: 'Cache',
query: `sum(container_memory_cache{container!="", container!="POD"}) / 1024 / 1024 / 1024`,
},
{
label: 'Allocatable',
query: `sum(kube_node_status_allocatable_memory_bytes) / 1024 / 1024 / 1024`,
Expand Down
14 changes: 4 additions & 10 deletions src/components/resources/cluster/namespaces/NamespaceDetails.tsx
View file
Open in desktop
Expand Up @@ -61,9 +61,9 @@ const NamespaceDetails: React.FunctionComponent<INamespaceDetailsProps> = ({ ite
queries: [
{
label: 'Current',
query: `sum(irate(container_cpu_usage_seconds_total{namespace="${
query: `sum(max(rate(container_cpu_usage_seconds_total{namespace="${
item.metadata ? item.metadata.name : ''
}", image!="", container!="", container!="POD"}[4m]))`,
}", image!="", container!="POD", container!=""}[2m])) by (pod, container))`,
},
{
label: 'Requested',
Expand Down Expand Up @@ -93,9 +93,9 @@ const NamespaceDetails: React.FunctionComponent<INamespaceDetailsProps> = ({ ite
queries: [
{
label: 'Current',
query: `sum(container_memory_usage_bytes{namespace="${
query: `sum(max(container_memory_working_set_bytes{namespace="${
item.metadata ? item.metadata.name : ''
}", container!="", container!="POD"}) / 1024 / 1024`,
}", container!="POD", container!=""}) by (pod, container)) / 1024 / 1024`,
},
{
label: 'Requested',
Expand All @@ -109,12 +109,6 @@ const NamespaceDetails: React.FunctionComponent<INamespaceDetailsProps> = ({ ite
item.metadata ? item.metadata.name : ''
}", resource="memory", container!=""}) / 1024 / 1024`,
},
{
label: 'Cache',
query: `sum(container_memory_cache{namespace="${
item.metadata ? item.metadata.name : ''
}", container!="", container!="POD"}) / 1024 / 1024`,
},
],
},
]}
Expand Down
14 changes: 4 additions & 10 deletions src/components/resources/cluster/nodes/NodeDetails.tsx
View file
Open in desktop
Expand Up @@ -197,9 +197,9 @@ const NodeDetails: React.FunctionComponent<INodeDetailsProps> = ({ item, type }:
queries: [
{
label: 'Current',
query: `sum(irate(container_cpu_usage_seconds_total{node="${
query: `sum(max(rate(container_cpu_usage_seconds_total{id="/", node="${
item.metadata ? item.metadata.name : ''
}", image!="", container!="", container!="POD"}[4m]))`,
}"}[2m])))`,
},
{
label: 'Requested',
Expand Down Expand Up @@ -235,9 +235,9 @@ const NodeDetails: React.FunctionComponent<INodeDetailsProps> = ({ item, type }:
queries: [
{
label: 'Current',
query: `sum(container_memory_usage_bytes{node="${
query: `sum(max(container_memory_working_set_bytes{id="/", node="${
item.metadata ? item.metadata.name : ''
}", container!="", container!="POD"}) / 1024 / 1024 / 1024`,
}"})) / 1024 / 1024 / 1024`,
},
{
label: 'Requested',
Expand All @@ -251,12 +251,6 @@ const NodeDetails: React.FunctionComponent<INodeDetailsProps> = ({ item, type }:
item.metadata ? item.metadata.name : ''
}", resource="memory", container!=""}) / 1024 / 1024 / 1024`,
},
{
label: 'Cache',
query: `sum(container_memory_cache{node="${
item.metadata ? item.metadata.name : ''
}", container!="", container!="POD"}) / 1024 / 1024 / 1024`,
},
{
label: 'Allocatable',
query: `sum(kube_node_status_allocatable_memory_bytes{node="${
Expand Down
28 changes: 10 additions & 18 deletions src/components/resources/workloads/pods/PodDetails.tsx
View file
Open in desktop
Expand Up @@ -216,11 +216,11 @@ const PodDetails: React.FunctionComponent<IPodDetailsProps> = ({ item, type }: I
queries: [
{
label: 'Current',
query: `sum(irate(container_cpu_usage_seconds_total{namespace="${
query: `sum(max(rate(container_cpu_usage_seconds_total{namespace="${
item.metadata ? item.metadata.namespace : ''
}", image!="", pod="${
item.metadata ? item.metadata.name : ''
}", container=~"{{ .Container }}", container!="POD"}[4m]))`,
}", container=~"{{ .Container }}", container!="POD", container!=""}[2m])) by (container))`,
},
{
label: 'Requested',
Expand Down Expand Up @@ -254,11 +254,11 @@ const PodDetails: React.FunctionComponent<IPodDetailsProps> = ({ item, type }: I
queries: [
{
label: 'Current',
query: `sum(container_memory_usage_bytes{namespace="${
query: `sum(max(container_memory_working_set_bytes{namespace="${
item.metadata ? item.metadata.namespace : ''
}", pod="${
item.metadata ? item.metadata.name : ''
}", container=~"{{ .Container }}", container!="POD"}) / 1024 / 1024`,
}", container=~"{{ .Container }}", container!="POD", container!=""}) by (container)) / 1024 / 1024`,
},
{
label: 'Requested',
Expand All @@ -276,14 +276,6 @@ const PodDetails: React.FunctionComponent<IPodDetailsProps> = ({ item, type }: I
item.metadata ? item.metadata.name : ''
}", container=~"{{ .Container }}"}) / 1024 / 1024`,
},
{
label: 'Cache',
query: `sum(container_memory_cache{namespace="${
item.metadata ? item.metadata.namespace : ''
}", pod="${
item.metadata ? item.metadata.name : ''
}", container=~"{{ .Container }}", container!="POD"}) / 1024 / 1024`,
},
],
},
{
Expand All @@ -299,16 +291,16 @@ const PodDetails: React.FunctionComponent<IPodDetailsProps> = ({ item, type }: I
type: 'area',
queries: [
{
label: 'RX',
query: `sort_desc(sum by (pod) (irate(container_network_receive_bytes_total{namespace="${
label: 'Receive',
query: `sum(rate(container_network_receive_bytes_total{namespace="${
item.metadata ? item.metadata.namespace : ''
}", pod="${item.metadata ? item.metadata.name : ''}"}[4m]))) / 1024 / 1024`,
}", pod="${item.metadata ? item.metadata.name : ''}"}[2m])) by (pod) / 1024 / 1024`,
},
{
label: 'TX',
query: `sort_desc(sum by (pod) (irate(container_network_transmit_bytes_total{namespace="${
label: 'Transmit',
query: `-sum(rate(container_network_transmit_bytes_total{namespace="${
item.metadata ? item.metadata.namespace : ''
}", pod="${item.metadata ? item.metadata.name : ''}"}[4m]))) / 1024 / 1024`,
}", pod="${item.metadata ? item.metadata.name : ''}"}[2m])) by (pod) / 1024 / 1024`,
},
],
},
Expand Down