修改查询

main
陈博文 4 months ago
parent c849f39566
commit 035f5d5f32

@ -106,7 +106,7 @@ export const rangeConfigInit = [
},
{
name: 'CPU',
query: `sum(hami_core_used) / sum(hami_core_size) * 100`,
query: `sum(sum by (instance) (rate(node_cpu_seconds_total{mode!="idle"}[5m]))/count by (instance) (node_cpu_seconds_total{mode="idle"})) *100`,
data: [],
type: 'line',
areaStyle: {
@ -140,7 +140,7 @@ export const rangeConfigInit = [
},
{
name: '内存',
query: `sum(hami_memory_used) / sum(hami_memory_size) * 100`,
query: `sum(sum(kube_pod_container_resource_requests{resource="memory"}) by (node) / sum(kube_node_status_capacity{resource="memory"}) by (node)) * 100`,
data: [],
type: 'line',
areaStyle: {

@ -170,8 +170,8 @@ const gaugeConfig = useInstantVector(
{
title: 'CPU 使用率',
percent: 0,
query: `count(node_cpu_seconds_total{mode="idle", instance=~"$node"}) by (instance)*(1 - avg(rate(node_cpu_seconds_total{mode="idle", instance=~"$node"}[5m])) by (instance))`,
totalQuery: `count(node_cpu_seconds_total{mode="idle", instance=~"$node"}) by (instance)`,
query: `(sum(rate(node_cpu_seconds_total{mode!="idle", instance=~"$node"}[5m])) / sum(rate(node_cpu_seconds_total{instance=~"$node"}[5m]))) * 100`,
totalQuery: `sum(count(node_cpu_seconds_total{mode="idle", instance=~"$node"}) by (instance))`,
percentQuery: `100 * (1 - avg by(instance)(irate(node_cpu_seconds_total{mode="idle", instance=~"$node"}[1m])))`,
total: 0,
used: 0,
@ -180,8 +180,8 @@ const gaugeConfig = useInstantVector(
{
title: '内存 使用率',
percent: 0,
query: `avg(node_memory_MemTotal_bytes{instance=~"$node"} - node_memory_MemAvailable_bytes{instance=~"$node"}) by (instance) / 1024 / 1024 / 1024`,
totalQuery: `avg(node_memory_MemTotal_bytes{instance=~"$node"}) by (instance) / 1024 / 1024 / 1024`,
query: `sum(avg(node_memory_MemTotal_bytes{instance=~"$node"} - node_memory_MemAvailable_bytes{instance=~"$node"}) by (instance) / 1024 / 1024 / 1024)`,
totalQuery: `sum(avg(node_memory_MemTotal_bytes{instance=~"$node"}) by (instance) / 1024 / 1024 / 1024)`,
percentQuery: `100 * (1 - node_memory_MemAvailable_bytes{instance=~"$node"} / node_memory_MemTotal_bytes{instance=~"$node"})`,
total: 0,
used: 0,
@ -190,8 +190,8 @@ const gaugeConfig = useInstantVector(
{
title: '磁盘 使用率',
percent: 0,
query: `sum(node_filesystem_size_bytes{instance=~"$node", fstype=~"ext4|xfs", mountpoint!~"/var/lib/kubelet/pods.*"} - node_filesystem_free_bytes{instance=~"$node", fstype=~"ext4|xfs", mountpoint!~"/var/lib/kubelet/pods.*"}) by (instance) / 1024 / 1024 / 1024`,
totalQuery: `sum(node_filesystem_size_bytes{instance=~"$node", fstype=~"ext4|xfs", mountpoint!~"/var/lib/kubelet/pods.*"}) by (instance) / 1024 / 1024 / 1024`,
query: `sum(sum(node_filesystem_size_bytes{instance=~"$node", fstype=~"ext4|xfs", mountpoint!~"/var/lib/kubelet/pods.*"} - node_filesystem_free_bytes{instance=~"$node", fstype=~"ext4|xfs", mountpoint!~"/var/lib/kubelet/pods.*"}) by (instance) / 1024 / 1024 / 1024)`,
totalQuery: `sum(sum(node_filesystem_size_bytes{instance=~"$node", fstype=~"ext4|xfs", mountpoint!~"/var/lib/kubelet/pods.*"}) by (instance) / 1024 / 1024 / 1024)`,
percentQuery: ``,
total: 0,
used: 0,
@ -242,7 +242,7 @@ const gaugeConfig = useInstantVector(
percent: 0,
query: ``,
totalQuery: ``,
percentQuery: `avg(sum(hami_core_used{node=~"$node"}) by (instance) / sum(hami_core_size{node=~"$node"}) by (instance) * 100)`,
percentQuery: `sum(sum by (instance) (rate(node_cpu_seconds_total{mode!="idle", instance=~"$node"}[5m]))/count by (instance) (node_cpu_seconds_total{mode="idle"})) *100`,
total: 0,
used: 0,
unit: '核',
@ -252,7 +252,7 @@ const gaugeConfig = useInstantVector(
percent: 0,
query: ``,
totalQuery: ``,
percentQuery: `avg(sum(hami_memory_used{node=~"$node"}) by (instance) / sum(hami_memory_size{node=~"$node"}) by (instance) * 100)`,
percentQuery: `sum(sum(kube_pod_container_resource_requests{resource="memory",node=~"$node"}) by (node) / sum(kube_node_status_capacity{resource="memory",node=~"$node"}) by (node)) * 100`,
total: 0,
used: 0,
unit: 'GiB',

@ -78,8 +78,8 @@ const gaugeConfig = useInstantVector(
{
title: 'CPU 使用率',
percent: 0,
query: `count(node_cpu_seconds_total{mode="idle", instance=~"$node"}) by (instance)*(1 - avg(rate(node_cpu_seconds_total{mode="idle", instance=~"$node"}[5m])) by (instance))`,
totalQuery: `count(node_cpu_seconds_total{mode="idle", instance=~"$node"}) by (instance)`,
query: `(sum(rate(node_cpu_seconds_total{mode!="idle", instance=~"$node"}[5m])) / sum(rate(node_cpu_seconds_total{instance=~"$node"}[5m]))) * 100`,
totalQuery: `sum(count(node_cpu_seconds_total{mode="idle", instance=~"$node"}) by (instance))`,
percentQuery: `100 * (1 - avg by(instance)(irate(node_cpu_seconds_total{mode="idle", instance=~"$node"}[1m])))`,
total: 0,
used: 0,
@ -88,8 +88,8 @@ const gaugeConfig = useInstantVector(
{
title: '内存 使用率',
percent: 0,
query: `avg(node_memory_MemTotal_bytes{instance=~"$node"} - node_memory_MemAvailable_bytes{instance=~"$node"}) by (instance) / 1024 / 1024 / 1024`,
totalQuery: `avg(node_memory_MemTotal_bytes{instance=~"$node"}) by (instance) / 1024 / 1024 / 1024`,
query: `sum(avg(node_memory_MemTotal_bytes{instance=~"$node"} - node_memory_MemAvailable_bytes{instance=~"$node"}) by (instance) / 1024 / 1024 / 1024)`,
totalQuery: `sum(avg(node_memory_MemTotal_bytes{instance=~"$node"}) by (instance) / 1024 / 1024 / 1024)`,
percentQuery: `100 * (1 - node_memory_MemAvailable_bytes{instance=~"$node"} / node_memory_MemTotal_bytes{instance=~"$node"})`,
total: 0,
used: 0,
@ -98,8 +98,8 @@ const gaugeConfig = useInstantVector(
{
title: '磁盘 使用率',
percent: 0,
query: `sum(node_filesystem_size_bytes{instance=~"$node", fstype=~"ext4|xfs", mountpoint!~"/var/lib/kubelet/pods.*"} - node_filesystem_free_bytes{instance=~"$node", fstype=~"ext4|xfs", mountpoint!~"/var/lib/kubelet/pods.*"}) by (instance) / 1024 / 1024 / 1024`,
totalQuery: `sum(node_filesystem_size_bytes{instance=~"$node", fstype=~"ext4|xfs", mountpoint!~"/var/lib/kubelet/pods.*"}) by (instance) / 1024 / 1024 / 1024`,
query: `sum(sum(node_filesystem_size_bytes{instance=~"$node", fstype=~"ext4|xfs", mountpoint!~"/var/lib/kubelet/pods.*"} - node_filesystem_free_bytes{instance=~"$node", fstype=~"ext4|xfs", mountpoint!~"/var/lib/kubelet/pods.*"}) by (instance) / 1024 / 1024 / 1024)`,
totalQuery: `sum(sum(node_filesystem_size_bytes{instance=~"$node", fstype=~"ext4|xfs", mountpoint!~"/var/lib/kubelet/pods.*"}) by (instance) / 1024 / 1024 / 1024)`,
percentQuery: ``,
total: 0,
used: 0,
@ -150,7 +150,7 @@ const gaugeConfig = useInstantVector(
percent: 0,
query: ``,
totalQuery: ``,
percentQuery: `avg(sum(hami_container_vcore_allocated{node=~"$node"}) by (instance) / sum(hami_core_size{node=~"$node"}) by (instance) * 100)`,
percentQuery: `sum(sum by (instance) (rate(node_cpu_seconds_total{mode!="idle", instance=~"$node"}[5m]))/count by (instance) (node_cpu_seconds_total{mode="idle"})) *100`,
total: 0,
used: 0,
unit: '核',
@ -160,7 +160,7 @@ const gaugeConfig = useInstantVector(
percent: 0,
query: ``,
totalQuery: ``,
percentQuery: `avg(sum(hami_container_vmemory_allocated{node=~"$node"}) by (instance) / sum(hami_memory_size{node=~"$node"}) by (instance) * 100)`,
percentQuery: `sum(sum(kube_pod_container_resource_requests{resource="memory",node=~"$node"}) by (node) / sum(kube_node_status_capacity{resource="memory",node=~"$node"}) by (node)) * 100`,
total: 0,
used: 0,
unit: 'GiB',

Loading…
Cancel
Save