From aaf4d0b2e74a31a5c3ec60aac3ba4916e56060b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lo=C5=A1=C5=A5=C3=A1k?= Date: Tue, 4 Mar 2025 12:05:05 +0100 Subject: [PATCH] Increased ttl of metrics to 5 minutes --- metrics/pve_cluster_state_collector.go | 4 +- metrics/pve_node_container_collector.go | 26 ++++++------ metrics/pve_node_disk_collector.go | 6 +-- metrics/pve_node_sdn_collector.go | 2 +- metrics/pve_node_status_collector.go | 40 +++++++++---------- metrics/pve_node_storage_collector.go | 8 ++-- metrics/pve_node_subscription_collector.go | 10 ++--- metrics/pve_node_virtual_machine_collector.go | 38 +++++++++--------- 8 files changed, 67 insertions(+), 67 deletions(-) diff --git a/metrics/pve_cluster_state_collector.go b/metrics/pve_cluster_state_collector.go index 4320ee0..ee0fb92 100644 --- a/metrics/pve_cluster_state_collector.go +++ b/metrics/pve_cluster_state_collector.go @@ -28,7 +28,7 @@ func NewPveClusterStateCollector(apiClient *proxmox.PveApiClient, registry *TTLR Help: "Cluster nodes count.", }, []string{"cluster"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.nodes) @@ -39,7 +39,7 @@ func NewPveClusterStateCollector(apiClient *proxmox.PveApiClient, registry *TTLR Help: "Cluster quorum state.", }, []string{"cluster"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.quorate) c.registry.StartCleanupLoop(5 * time.Second) diff --git a/metrics/pve_node_container_collector.go b/metrics/pve_node_container_collector.go index 08da477..e0fcce8 100644 --- a/metrics/pve_node_container_collector.go +++ b/metrics/pve_node_container_collector.go @@ -44,7 +44,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi Help: "Container state.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.state) @@ -55,7 +55,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi Help: "Container uptime.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.uptime) @@ -66,7 +66,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi Help: "Container CPU count.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.cpu) @@ -77,7 +77,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi Help: "Container CPU usage.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.cpuUsage) @@ -88,7 +88,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi Help: "Container total memory in bytes.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.memBytes) @@ -99,7 +99,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi Help: "Container used memory in bytes.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.memBytesUsed) @@ -110,7 +110,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi Help: "Container network RX bytes.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.netReceive) @@ -121,7 +121,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi Help: "Container network TX bytes.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.netTransmit) @@ -132,7 +132,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi Help: "Container disk written bytes.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.diskWrite) @@ -143,7 +143,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi Help: "Container disk read bytes.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.diskRead) @@ -154,7 +154,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi Help: "Container disk read bytes.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.disk) @@ -165,7 +165,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi Help: "Container disk size bytes.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.diskMax) @@ -176,7 +176,7 @@ func NewPveContainerCollector(apiClient *proxmox.PveApiClient, registry *TTLRegi Help: "Container swap usage bytes.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.swap) diff --git a/metrics/pve_node_disk_collector.go b/metrics/pve_node_disk_collector.go index 6af06d8..9011d2f 100644 --- a/metrics/pve_node_disk_collector.go +++ b/metrics/pve_node_disk_collector.go @@ -31,7 +31,7 @@ func NewPveNodeDiskCollector(apiClient *proxmox.PveApiClient, registry *TTLRegis Help: "Node disk healthy state.", }, []string{"cluster", "node", "wwn", "type", "model", "serial", "vendor", "used", "osd_id"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.healthy) @@ -42,7 +42,7 @@ func NewPveNodeDiskCollector(apiClient *proxmox.PveApiClient, registry *TTLRegis Help: "Node disk wearout percent.", }, []string{"cluster", "node", "wwn", "type", "model", "serial", "vendor", "used", "osd_id"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.healthy) @@ -53,7 +53,7 @@ func NewPveNodeDiskCollector(apiClient *proxmox.PveApiClient, registry *TTLRegis Help: "Node disk size in bytes.", }, []string{"cluster", "node", "wwn", "type", "model", "serial", "vendor", "used", "osd_id"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.sizeBytes) diff --git a/metrics/pve_node_sdn_collector.go b/metrics/pve_node_sdn_collector.go index 291beaa..4f5da40 100644 --- a/metrics/pve_node_sdn_collector.go +++ b/metrics/pve_node_sdn_collector.go @@ -27,7 +27,7 @@ func NewPveSdnCollector(apiClient *proxmox.PveApiClient, registry *TTLRegistry) Help: "Node software defined network state.", }, []string{"cluster", "node", "sdn", "sdn_id"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.state) diff --git a/metrics/pve_node_status_collector.go b/metrics/pve_node_status_collector.go index 1deb504..11b77e2 100644 --- a/metrics/pve_node_status_collector.go +++ b/metrics/pve_node_status_collector.go @@ -48,7 +48,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node state.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.state) @@ -59,7 +59,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node uptime.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.uptime) @@ -70,7 +70,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node CPU count.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.cpus) @@ -81,7 +81,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Cluster node CPU usage %.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.cpuUsage) @@ -92,7 +92,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node total memory in bytes.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.memBytes) @@ -103,7 +103,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node used memory in bytes.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.memBytesUsed) @@ -114,7 +114,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node free memory in bytes.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.memBytesFree) @@ -125,7 +125,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node kernel samepage shares in bytes.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.ksmShared) @@ -136,7 +136,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node cgroup mode.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.cgroupMode) @@ -147,7 +147,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node CPU load 1 minute average.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.load1) @@ -158,7 +158,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node CPU load 5 minutes average.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.load5) @@ -169,7 +169,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node CPU load 15 minutes average.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.load15) @@ -180,7 +180,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node RootFS free bytes.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.fSFree) @@ -191,7 +191,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node root filesystem used bytes.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.fSUsed) @@ -202,7 +202,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node root filesystem total bytes.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.fSTotal) @@ -213,7 +213,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node root filesystem avail bytes.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.fSAvail) @@ -224,7 +224,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node CPU info.", }, []string{"cluster", "node", "flags", "cores", "model", "sockets", "cpus", "hvm"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.cpuInfo) @@ -235,7 +235,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node system info.", }, []string{"cluster", "node", "kversion", "pveversion", "machine", "sysname", "release"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.systemInfo) @@ -246,7 +246,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node time.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.time) @@ -257,7 +257,7 @@ func NewPveNodeStatusCollector(apiClient *proxmox.PveApiClient, registry *TTLReg Help: "Node localtime.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.localTime) diff --git a/metrics/pve_node_storage_collector.go b/metrics/pve_node_storage_collector.go index 068ade2..a9fcb86 100644 --- a/metrics/pve_node_storage_collector.go +++ b/metrics/pve_node_storage_collector.go @@ -31,7 +31,7 @@ func NewPveStorageCollector(apiClient *proxmox.PveApiClient, registry *TTLRegist Help: "Node storage UP state.", }, []string{"cluster", "node", "storage", "type", "content", "shared"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.state) @@ -42,7 +42,7 @@ func NewPveStorageCollector(apiClient *proxmox.PveApiClient, registry *TTLRegist Help: "Node storage total capacity in bytes.", }, []string{"cluster", "node", "storage", "type", "content", "shared"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.total) @@ -53,7 +53,7 @@ func NewPveStorageCollector(apiClient *proxmox.PveApiClient, registry *TTLRegist Help: "Node storage available capacity in bytes.", }, []string{"cluster", "node", "storage", "type", "content", "shared"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.avail) @@ -64,7 +64,7 @@ func NewPveStorageCollector(apiClient *proxmox.PveApiClient, registry *TTLRegist Help: "Node storage used capacity in bytes.", }, []string{"cluster", "node", "storage", "type", "content", "shared"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.used) diff --git a/metrics/pve_node_subscription_collector.go b/metrics/pve_node_subscription_collector.go index 2c57034..025a2e1 100644 --- a/metrics/pve_node_subscription_collector.go +++ b/metrics/pve_node_subscription_collector.go @@ -31,7 +31,7 @@ func NewPveSubscriptionCollector(apiClient *proxmox.PveApiClient, registry *TTLR Help: "Node subscription info.", }, []string{"cluster", "node", "productname", "serverid"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.info) @@ -42,7 +42,7 @@ func NewPveSubscriptionCollector(apiClient *proxmox.PveApiClient, registry *TTLR Help: "Node subscription status.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.status) @@ -53,7 +53,7 @@ func NewPveSubscriptionCollector(apiClient *proxmox.PveApiClient, registry *TTLR Help: "Node subscription registration date.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.regDate) @@ -64,7 +64,7 @@ func NewPveSubscriptionCollector(apiClient *proxmox.PveApiClient, registry *TTLR Help: "Node subscription next due date.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.nextDueDate) @@ -75,7 +75,7 @@ func NewPveSubscriptionCollector(apiClient *proxmox.PveApiClient, registry *TTLR Help: "Node subscription count of sockets.", }, []string{"cluster", "node"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.sockets) diff --git a/metrics/pve_node_virtual_machine_collector.go b/metrics/pve_node_virtual_machine_collector.go index e7a0bec..90c34e4 100644 --- a/metrics/pve_node_virtual_machine_collector.go +++ b/metrics/pve_node_virtual_machine_collector.go @@ -56,7 +56,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine state.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.state) @@ -67,7 +67,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine uptime.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.uptime) @@ -78,7 +78,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine agent state.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.agent) @@ -89,7 +89,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine CPU count.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.cpu) @@ -100,7 +100,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine CPU usage.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.cpuUsage) @@ -111,7 +111,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine total memory in bytes.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.memBytes) @@ -122,7 +122,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine used memory in bytes.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.memBytesUsed) @@ -133,7 +133,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine disk read bytes.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.disk) @@ -144,7 +144,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine disk size bytes.", }, []string{"cluster", "node", "vmid", "name"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.diskMax) @@ -155,7 +155,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine network receive in bytes.", }, []string{"cluster", "node", "vmid", "name", "interface"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.netReceive) @@ -166,7 +166,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine network transmit in bytes.", }, []string{"cluster", "node", "vmid", "name", "interface"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.netTransmit) @@ -177,7 +177,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine disk read ops.", }, []string{"cluster", "node", "vmid", "name", "device"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.diskReadOps) @@ -188,7 +188,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine disk write ops.", }, []string{"cluster", "node", "vmid", "name", "device"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.diskWriteOps) @@ -199,7 +199,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine disk read bytes.", }, []string{"cluster", "node", "vmid", "name", "device"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.diskReadBytes) @@ -210,7 +210,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine disk write bytes.", }, []string{"cluster", "node", "vmid", "name", "device"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.diskWriteBytes) @@ -221,7 +221,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine failed disk read ops.", }, []string{"cluster", "node", "vmid", "name", "device"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.diskFailedReadOps) @@ -232,7 +232,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine failed disk write ops.", }, []string{"cluster", "node", "vmid", "name", "device"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.diskFailedWriteOps) @@ -243,7 +243,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine disk read time total in nanoseconds.", }, []string{"cluster", "node", "vmid", "name", "device"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.diskReadTimeNs) @@ -254,7 +254,7 @@ func NewPveVirtualMachineCollector(apiClient *proxmox.PveApiClient, registry *TT Help: "Virtual machine disk write time total in nanoseconds.", }, []string{"cluster", "node", "vmid", "name", "device"}, - 1*time.Minute, + 5*time.Minute, ) c.registry.Register(c.diskWriteTimeNs)