Align metric names with Prometheus naming conventions
Build Docker image on push / docker (push) Successful in 21s
Build and push Docker image on tag / docker (push) Successful in 22s

Use base units, export cumulative values as _total counters, update docs, dashboards and rules.
This commit is contained in:
2026-08-24 19:13:05 +02:00
parent 9b076d4353
commit 92e54418bc
16 changed files with 541 additions and 284 deletions
+19 -19
View File
@@ -266,7 +266,7 @@
"spec": {
"editorMode": "code",
"exemplar": false,
"expr": "sum(pve_node_cpu_count{cluster=\"$cluster\"})",
"expr": "sum(pve_node_cpus{cluster=\"$cluster\"})",
"instant": true,
"legendFormat": "__auto",
"range": false
@@ -456,7 +456,7 @@
"spec": {
"editorMode": "code",
"exemplar": false,
"expr": "sum(pve_node_load1{cluster=\"$cluster\"}) / (sum(pve_node_cpu_count{cluster=\"$cluster\"}) * 2)",
"expr": "sum(pve_node_load1{cluster=\"$cluster\"}) / (sum(pve_node_cpus{cluster=\"$cluster\"}) * 2)",
"instant": true,
"legendFormat": "__auto",
"range": false
@@ -654,7 +654,7 @@
"spec": {
"editorMode": "code",
"exemplar": false,
"expr": "pve_node_cpuinfo{cluster=~\"$cluster\"}",
"expr": "pve_node_cpu_info{cluster=~\"$cluster\"}",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -678,7 +678,7 @@
"spec": {
"editorMode": "code",
"exemplar": false,
"expr": "clamp_max(pve_node_load5{cluster=~\"$cluster\"} / pve_node_cpu_count{cluster=~\"$cluster\"} / 2, 1)",
"expr": "clamp_max(pve_node_load5{cluster=~\"$cluster\"} / pve_node_cpus{cluster=~\"$cluster\"} / 2, 1)",
"format": "table",
"instant": false,
"legendFormat": "__auto",
@@ -750,7 +750,7 @@
"spec": {
"editorMode": "code",
"exemplar": false,
"expr": "sum by (cluster,node) ((pve_ct_mem_total_bytes and pve_ct_state == 1) or (pve_vm_mem_total_bytes and pve_vm_state == 1)) / sum by (cluster,node) (pve_node_memory_total_bytes)",
"expr": "sum by (cluster,node) ((pve_ct_memory_total_bytes and pve_ct_state == 1) or (pve_vm_memory_total_bytes and pve_vm_state == 1)) / sum by (cluster,node) (pve_node_memory_total_bytes)",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -888,7 +888,7 @@
"node": "Node",
"pveversion": "PVE Version",
"sockets": "CPU Sockets",
"{__name__=\"pve_node_cpu_usage\", cluster=\"IMTM\", endpoint=\"9090\", instance=\"10.42.3.132:9090\", job=\"pve-exporter\", node=\"pve-hp1\", prometheus=\"monitoring/monitoring-prometheus\", service=\"pve-exporter\"}": "CPU Usage %"
"{__name__=\"pve_node_cpu_usage_ratio\", cluster=\"IMTM\", endpoint=\"9090\", instance=\"10.42.3.132:9090\", job=\"pve-exporter\", node=\"pve-hp1\", prometheus=\"monitoring/monitoring-prometheus\", service=\"pve-exporter\"}": "CPU Usage %"
}
}
}
@@ -1205,7 +1205,7 @@
"spec": {
"editorMode": "code",
"exemplar": false,
"expr": "sum(rate(pve_vm_network_in_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_network_in_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"expr": "sum(rate(pve_vm_network_receive_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_network_receive_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"instant": false,
"legendFormat": "__auto",
"range": true
@@ -1310,7 +1310,7 @@
"spec": {
"editorMode": "code",
"exemplar": false,
"expr": "sum(rate(pve_vm_network_out_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_network_out_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"expr": "sum(rate(pve_vm_network_transmit_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_network_transmit_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"instant": false,
"legendFormat": "__auto",
"range": true
@@ -1427,7 +1427,7 @@
"spec": {
"editorMode": "code",
"exemplar": false,
"expr": "sum(rate(pve_vm_disk_rd_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_disk_rd_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"expr": "sum(rate(pve_vm_disk_read_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_disk_read_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"instant": false,
"legendFormat": "__auto",
"range": true
@@ -1532,7 +1532,7 @@
"spec": {
"editorMode": "code",
"exemplar": false,
"expr": "sum(rate(pve_vm_disk_wr_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_disk_wr_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"expr": "sum(rate(pve_vm_disk_write_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_disk_write_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"instant": false,
"legendFormat": "__auto",
"range": true
@@ -1794,7 +1794,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "pve_node_load5{cluster=~\"$cluster\"} / pve_node_cpu_count{cluster=~\"$cluster\"}",
"expr": "pve_node_load5{cluster=~\"$cluster\"} / pve_node_cpus{cluster=~\"$cluster\"}",
"instant": false,
"legendFormat": "{{node}}",
"range": true
@@ -2052,7 +2052,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "sum(rate(pve_vm_network_in_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_network_in_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"expr": "sum(rate(pve_vm_network_receive_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_network_receive_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"instant": false,
"legendFormat": "Receive",
"range": true
@@ -2074,7 +2074,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "sum(rate(pve_vm_network_out_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_network_out_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"expr": "sum(rate(pve_vm_network_transmit_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_network_transmit_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"instant": false,
"legendFormat": "Transmit",
"range": true
@@ -2216,7 +2216,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "sum(rate(pve_vm_disk_rd_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_disk_rd_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"expr": "sum(rate(pve_vm_disk_read_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_disk_read_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"instant": false,
"legendFormat": "Read",
"range": true
@@ -2238,7 +2238,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "sum(rate(pve_vm_disk_wr_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_disk_wr_bytes{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"expr": "sum(rate(pve_vm_disk_write_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0)) + sum(rate(pve_ct_disk_write_bytes_total{cluster=\"$cluster\"}[$__rate_interval]) or vector(0))",
"instant": false,
"legendFormat": "Write",
"range": true
@@ -2381,7 +2381,7 @@
"spec": {
"editorMode": "code",
"exemplar": false,
"expr": "topk(20, pve_vm_mem_used_bytes{cluster=~\"$cluster\"})",
"expr": "topk(20, pve_vm_memory_used_bytes{cluster=~\"$cluster\"})",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -2582,7 +2582,7 @@
"spec": {
"editorMode": "code",
"exemplar": false,
"expr": "topk(20, \r\n (avg_over_time(pve_vm_cpu_usage{cluster=~\"$cluster\"}[1d]) * pve_vm_cpu_count{cluster=~\"$cluster\"} and pve_vm_state{cluster=~\"$cluster\"} == 1 or \r\n avg_over_time(pve_ct_cpu_usage{cluster=~\"$cluster\"}[1d]) * pve_ct_cpu_count{cluster=~\"$cluster\"} and pve_ct_state{cluster=~\"$cluster\"} == 1) \r\n / on (node) group_left(cluster) pve_node_cpu_count{cluster=~\"$cluster\"})",
"expr": "topk(20, \r\n (avg_over_time(pve_vm_cpu_usage_ratio{cluster=~\"$cluster\"}[1d]) * pve_vm_cpus{cluster=~\"$cluster\"} and pve_vm_state{cluster=~\"$cluster\"} == 1 or \r\n avg_over_time(pve_ct_cpu_usage_ratio{cluster=~\"$cluster\"}[1d]) * pve_ct_cpus{cluster=~\"$cluster\"} and pve_ct_state{cluster=~\"$cluster\"} == 1) \r\n / on (node) group_left(cluster) pve_node_cpus{cluster=~\"$cluster\"})",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -2972,7 +2972,7 @@
"node": "Node",
"pveversion": "PVE Version",
"sockets": "CPU Sockets",
"{__name__=\"pve_node_cpu_usage\", cluster=\"IMTM\", endpoint=\"9090\", instance=\"10.42.3.132:9090\", job=\"pve-exporter\", node=\"pve-hp1\", prometheus=\"monitoring/monitoring-prometheus\", service=\"pve-exporter\"}": "CPU Usage %"
"{__name__=\"pve_node_cpu_usage_ratio\", cluster=\"IMTM\", endpoint=\"9090\", instance=\"10.42.3.132:9090\", job=\"pve-exporter\", node=\"pve-hp1\", prometheus=\"monitoring/monitoring-prometheus\", service=\"pve-exporter\"}": "CPU Usage %"
}
}
}
@@ -3389,7 +3389,7 @@
"sockets": "CPU Sockets",
"storage": "Storage",
"type": "Type",
"{__name__=\"pve_node_cpu_usage\", cluster=\"IMTM\", endpoint=\"9090\", instance=\"10.42.3.132:9090\", job=\"pve-exporter\", node=\"pve-hp1\", prometheus=\"monitoring/monitoring-prometheus\", service=\"pve-exporter\"}": "CPU Usage %"
"{__name__=\"pve_node_cpu_usage_ratio\", cluster=\"IMTM\", endpoint=\"9090\", instance=\"10.42.3.132:9090\", job=\"pve-exporter\", node=\"pve-hp1\", prometheus=\"monitoring/monitoring-prometheus\", service=\"pve-exporter\"}": "CPU Usage %"
}
}
}