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

Bug 1915032: make filesystem queries compatible with both RHCOS and RHEL nodes #7796

Merged
merged 1 commit into from Mar 12, 2021
Merged

Bug 1915032: make filesystem queries compatible with both RHCOS and RHEL nodes #7796

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
4 changes: 2 additions & 2 deletions frontend/packages/console-app/src/components/nodes/NodesPage.tsx
View file
Open in desktop
Expand Up @@ -231,11 +231,11 @@ const fetchNodeMetrics = (): Promise<NodeMetrics> => {
{
key: 'usedStorage',
query:
'sum by (instance) (node_filesystem_size_bytes{mountpoint="/var"} - node_filesystem_free_bytes{mountpoint="/var"})',
'sum by (instance) (node_filesystem_size_bytes{mountpoint="/"} - node_filesystem_free_bytes{mountpoint="/"})',
},
{
key: 'totalStorage',
query: 'sum by (instance) (node_filesystem_size_bytes{mountpoint="/var"})',
query: 'sum by (instance) (node_filesystem_size_bytes{mountpoint="/"})',
},
{
key: 'cpu',
Expand Down
4 changes: 2 additions & 2 deletions frontend/packages/console-app/src/components/nodes/node-dashboard/queries.ts
View file
Open in desktop
Expand Up @@ -37,10 +37,10 @@ const queries = {
[NodeQueries.MEMORY_TOTAL]: _.template(`node_memory_MemTotal_bytes{instance='<%= node %>'}`),
[NodeQueries.POD_COUNT]: _.template(`kubelet_running_pod_count{instance=~'<%= ipAddress %>:.*'}`),
[NodeQueries.FILESYSTEM_USAGE]: _.template(
`sum(node_filesystem_size_bytes{instance="<%= node %>",mountpoint="/var"} - node_filesystem_avail_bytes{instance="<%= node %>",mountpoint="/var"})`,
`sum(node_filesystem_size_bytes{instance="<%= node %>",mountpoint="/"} - node_filesystem_avail_bytes{instance="<%= node %>",mountpoint="/"})`,
),
[NodeQueries.FILESYSTEM_TOTAL]: _.template(
`sum(node_filesystem_size_bytes{instance='<%= node %>',mountpoint="/var"})`,
`sum(node_filesystem_size_bytes{instance='<%= node %>',mountpoint="/"})`,
),
[NodeQueries.NETWORK_IN_UTILIZATION]: _.template(
`instance:node_network_receive_bytes:rate:sum{instance='<%= node %>'}`,
Expand Down
4 changes: 2 additions & 2 deletions frontend/packages/metal3-plugin/src/components/baremetal-hosts/dashboard/queries.ts
View file
Open in desktop
Expand Up @@ -28,10 +28,10 @@ const nodeQueriesByNodeName = {
[HostQuery.MEMORY_UTILIZATION]: _.template(`node_memory_Active_bytes{instance=~'<%= node %>'}`),
[HostQuery.MEMORY_TOTAL]: _.template(`node_memory_MemTotal_bytes{instance=~'<%= node %>'}`),
[HostQuery.STORAGE_UTILIZATION]: _.template(
`sum(node_filesystem_size_bytes{instance="<%= node %>",mountpoint="/var"} - node_filesystem_avail_bytes{instance="<%= node %>",mountpoint="/var"})`,
`sum(node_filesystem_size_bytes{instance="<%= node %>",mountpoint="/"} - node_filesystem_avail_bytes{instance="<%= node %>",mountpoint="/"})`,
),
[HostQuery.STORAGE_TOTAL]: _.template(
`sum(node_filesystem_size_bytes{instance='<%= node %>',mountpoint="/var"})`,
`sum(node_filesystem_size_bytes{instance='<%= node %>',mountpoint="/"})`,
),
[HostQuery.NETWORK_IN_UTILIZATION]: _.template(
`instance:node_network_receive_bytes:rate:sum{instance=~'<%= node %>'}`,
Expand Down
6 changes: 3 additions & 3 deletions frontend/public/components/dashboard/dashboards-page/cluster-dashboard/queries.ts
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ const top25Queries = {
[OverviewQuery.NODES_BY_MEMORY]:
'topk(25, sort_desc(node_memory_MemTotal_bytes - node_memory_MemAvailable_bytes))',
[OverviewQuery.NODES_BY_STORAGE]:
'topk(25, sort_desc(sum(node_filesystem_size_bytes{mountpoint="/var"} - node_filesystem_avail_bytes{instance=~".*",mountpoint="/var"}) BY (instance)))',
'topk(25, sort_desc(sum(node_filesystem_size_bytes{mountpoint="/"} - node_filesystem_avail_bytes{instance=~".*",mountpoint="/"}) BY (instance)))',
[OverviewQuery.NODES_BY_PODS]:
'topk(25, sort_desc(sum(avg_over_time(kube_pod_info[5m])) BY (node)))',
[OverviewQuery.NODES_BY_NETWORK_IN]:
Expand Down Expand Up @@ -74,8 +74,8 @@ const overviewQueries = {
[OverviewQuery.CPU_UTILIZATION]: 'cluster:cpu_usage_cores:sum',
[OverviewQuery.CPU_TOTAL]: 'sum(cluster:capacity_cpu_cores:sum)',
[OverviewQuery.STORAGE_UTILIZATION]:
'(sum(node_filesystem_size_bytes{mountpoint="/var"}) - sum(node_filesystem_free_bytes{mountpoint="/var"}))',
[OverviewQuery.STORAGE_TOTAL]: 'sum(node_filesystem_size_bytes{mountpoint="/var"})',
'(sum(node_filesystem_size_bytes{mountpoint="/"}) - sum(node_filesystem_free_bytes{mountpoint="/"}))',
[OverviewQuery.STORAGE_TOTAL]: 'sum(node_filesystem_size_bytes{mountpoint="/"})',
[OverviewQuery.POD_UTILIZATION]: 'count(kube_pod_info)',
[OverviewQuery.NETWORK_IN_UTILIZATION]:
'sum(instance:node_network_receive_bytes_excluding_lo:rate1m)',
Expand Down