Align metric names with Prometheus naming conventions
Use base units, export cumulative values as _total counters, update docs, dashboards and rules.
This commit is contained in:
@@ -21,11 +21,11 @@ type PveContainerCollector struct {
|
||||
memBytes *TTLGaugeVec // Container memory in bytes prometheus gauge.
|
||||
memBytesUsed *TTLGaugeVec // Container memory usage in bytes prometheus gauge.
|
||||
|
||||
netReceive *TTLGaugeVec // Container network RX in bytes prometheus gauge.
|
||||
netTransmit *TTLGaugeVec // Container network TX in bytes prometheus gauge.
|
||||
netReceive *TTLCounterVec // Container received network traffic in bytes prometheus counter.
|
||||
netTransmit *TTLCounterVec // Container transmitted network traffic in bytes prometheus counter.
|
||||
|
||||
diskWrite *TTLGaugeVec // Container disk written in bytes prometheus gauge.
|
||||
diskRead *TTLGaugeVec // Container disk read in bytes prometheus gauge.
|
||||
diskWrite *TTLCounterVec // Container disk written in bytes prometheus counter.
|
||||
diskRead *TTLCounterVec // Container disk read in bytes prometheus counter.
|
||||
|
||||
disk *TTLGaugeVec // Container disk space usage in bytes prometheus gauge.
|
||||
diskMax *TTLGaugeVec // Container disk size in bytes prometheus gauge.
|
||||
@@ -51,8 +51,8 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi
|
||||
// Container uptime.
|
||||
c.uptime = NewTTLGaugeVec(
|
||||
prometheus.GaugeOpts{
|
||||
Name: "pve_ct_uptime",
|
||||
Help: "Container uptime.",
|
||||
Name: "pve_ct_uptime_seconds",
|
||||
Help: "Container uptime in seconds.",
|
||||
},
|
||||
[]string{"cluster", "node", "vmid", "name"},
|
||||
5*time.Minute,
|
||||
@@ -62,7 +62,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi
|
||||
// Container CPU count.
|
||||
c.cpu = NewTTLGaugeVec(
|
||||
prometheus.GaugeOpts{
|
||||
Name: "pve_ct_cpu_count",
|
||||
Name: "pve_ct_cpus",
|
||||
Help: "Container CPU count.",
|
||||
},
|
||||
[]string{"cluster", "node", "vmid", "name"},
|
||||
@@ -73,8 +73,8 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi
|
||||
// Container CPU usage.
|
||||
c.cpuUsage = NewTTLGaugeVec(
|
||||
prometheus.GaugeOpts{
|
||||
Name: "pve_ct_cpu_usage",
|
||||
Help: "Container CPU usage.",
|
||||
Name: "pve_ct_cpu_usage_ratio",
|
||||
Help: "Container CPU usage ratio (0-1).",
|
||||
},
|
||||
[]string{"cluster", "node", "vmid", "name"},
|
||||
5*time.Minute,
|
||||
@@ -84,7 +84,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi
|
||||
// Container memory total.
|
||||
c.memBytes = NewTTLGaugeVec(
|
||||
prometheus.GaugeOpts{
|
||||
Name: "pve_ct_mem_total_bytes",
|
||||
Name: "pve_ct_memory_total_bytes",
|
||||
Help: "Container total memory in bytes.",
|
||||
},
|
||||
[]string{"cluster", "node", "vmid", "name"},
|
||||
@@ -95,7 +95,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi
|
||||
// Container memory usage.
|
||||
c.memBytesUsed = NewTTLGaugeVec(
|
||||
prometheus.GaugeOpts{
|
||||
Name: "pve_ct_mem_used_bytes",
|
||||
Name: "pve_ct_memory_used_bytes",
|
||||
Help: "Container used memory in bytes.",
|
||||
},
|
||||
[]string{"cluster", "node", "vmid", "name"},
|
||||
@@ -104,10 +104,10 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi
|
||||
c.registry.Register(c.memBytesUsed)
|
||||
|
||||
// Container network RX.
|
||||
c.netReceive = NewTTLGaugeVec(
|
||||
prometheus.GaugeOpts{
|
||||
Name: "pve_ct_network_in_bytes",
|
||||
Help: "Container network RX bytes.",
|
||||
c.netReceive = NewTTLCounterVec(
|
||||
prometheus.CounterOpts{
|
||||
Name: "pve_ct_network_receive_bytes_total",
|
||||
Help: "Container received network traffic in bytes.",
|
||||
},
|
||||
[]string{"cluster", "node", "vmid", "name"},
|
||||
5*time.Minute,
|
||||
@@ -115,10 +115,10 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi
|
||||
c.registry.Register(c.netReceive)
|
||||
|
||||
// Container network TX.
|
||||
c.netTransmit = NewTTLGaugeVec(
|
||||
prometheus.GaugeOpts{
|
||||
Name: "pve_ct_network_out_bytes",
|
||||
Help: "Container network TX bytes.",
|
||||
c.netTransmit = NewTTLCounterVec(
|
||||
prometheus.CounterOpts{
|
||||
Name: "pve_ct_network_transmit_bytes_total",
|
||||
Help: "Container transmitted network traffic in bytes.",
|
||||
},
|
||||
[]string{"cluster", "node", "vmid", "name"},
|
||||
5*time.Minute,
|
||||
@@ -126,10 +126,10 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi
|
||||
c.registry.Register(c.netTransmit)
|
||||
|
||||
// Container disk written.
|
||||
c.diskWrite = NewTTLGaugeVec(
|
||||
prometheus.GaugeOpts{
|
||||
Name: "pve_ct_disk_wr_bytes",
|
||||
Help: "Container disk written bytes.",
|
||||
c.diskWrite = NewTTLCounterVec(
|
||||
prometheus.CounterOpts{
|
||||
Name: "pve_ct_disk_write_bytes_total",
|
||||
Help: "Container written bytes to disk.",
|
||||
},
|
||||
[]string{"cluster", "node", "vmid", "name"},
|
||||
5*time.Minute,
|
||||
@@ -137,10 +137,10 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi
|
||||
c.registry.Register(c.diskWrite)
|
||||
|
||||
// Container disk read.
|
||||
c.diskRead = NewTTLGaugeVec(
|
||||
prometheus.GaugeOpts{
|
||||
Name: "pve_ct_disk_rd_bytes",
|
||||
Help: "Container disk read bytes.",
|
||||
c.diskRead = NewTTLCounterVec(
|
||||
prometheus.CounterOpts{
|
||||
Name: "pve_ct_disk_read_bytes_total",
|
||||
Help: "Container read bytes from disk.",
|
||||
},
|
||||
[]string{"cluster", "node", "vmid", "name"},
|
||||
5*time.Minute,
|
||||
@@ -150,8 +150,8 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi
|
||||
// Container disk size.
|
||||
c.disk = NewTTLGaugeVec(
|
||||
prometheus.GaugeOpts{
|
||||
Name: "pve_ct_disk_usage_bytes",
|
||||
Help: "Container disk read bytes.",
|
||||
Name: "pve_ct_disk_used_bytes",
|
||||
Help: "Container used disk space in bytes.",
|
||||
},
|
||||
[]string{"cluster", "node", "vmid", "name"},
|
||||
5*time.Minute,
|
||||
|
||||
Reference in New Issue
Block a user