From 487de0c20b2da0cf6f989c8ba7118ff9be2a4f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Fri, 29 Nov 2024 22:19:22 +0100 Subject: [PATCH] hyperv: Removed `% Guest Idle Time` performance counters (introduced in 0.30.0-beta.4) (#1785) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- .../hyperv/hyperv_hypervisor_root_virtual_processor.go | 10 ---------- .../hyperv/hyperv_hypervisor_virtual_processor.go | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/internal/collector/hyperv/hyperv_hypervisor_root_virtual_processor.go b/internal/collector/hyperv/hyperv_hypervisor_root_virtual_processor.go index 6c55521c..dbaf0168 100644 --- a/internal/collector/hyperv/hyperv_hypervisor_root_virtual_processor.go +++ b/internal/collector/hyperv/hyperv_hypervisor_root_virtual_processor.go @@ -28,7 +28,6 @@ import ( type collectorHypervisorRootVirtualProcessor struct { perfDataCollectorHypervisorRootVirtualProcessor *perfdata.Collector - // \Hyper-V Hypervisor Root Virtual Processor(*)\% Guest Idle Time // \Hyper-V Hypervisor Root Virtual Processor(*)\% Guest Run Time // \Hyper-V Hypervisor Root Virtual Processor(*)\% Hypervisor Run Time // \Hyper-V Hypervisor Root Virtual Processor(*)\% Remote Run Time @@ -39,7 +38,6 @@ type collectorHypervisorRootVirtualProcessor struct { } const ( - hypervisorRootVirtualProcessorGuestIdleTimePercent = "% Guest Idle Time" hypervisorRootVirtualProcessorGuestRunTimePercent = "% Guest Run Time" hypervisorRootVirtualProcessorHypervisorRunTimePercent = "% Hypervisor Run Time" hypervisorRootVirtualProcessorTotalRunTimePercent = "% Total Run Time" @@ -51,7 +49,6 @@ func (c *Collector) buildHypervisorRootVirtualProcessor() error { var err error c.perfDataCollectorHypervisorRootVirtualProcessor, err = perfdata.NewCollector("Hyper-V Hypervisor Root Virtual Processor", perfdata.InstancesAll, []string{ - hypervisorRootVirtualProcessorGuestIdleTimePercent, hypervisorRootVirtualProcessorGuestRunTimePercent, hypervisorRootVirtualProcessorHypervisorRunTimePercent, hypervisorRootVirtualProcessorTotalRunTimePercent, @@ -115,13 +112,6 @@ func (c *Collector) collectHypervisorRootVirtualProcessor(ch chan<- prometheus.M coreId, "hypervisor", ) - ch <- prometheus.MustNewConstMetric( - c.hypervisorRootVirtualProcessorTimeTotal, - prometheus.CounterValue, - coreData[hypervisorRootVirtualProcessorGuestIdleTimePercent].FirstValue, - coreId, "guest_idle", - ) - ch <- prometheus.MustNewConstMetric( c.hypervisorRootVirtualProcessorTimeTotal, prometheus.CounterValue, diff --git a/internal/collector/hyperv/hyperv_hypervisor_virtual_processor.go b/internal/collector/hyperv/hyperv_hypervisor_virtual_processor.go index 8a2478e9..383613fc 100644 --- a/internal/collector/hyperv/hyperv_hypervisor_virtual_processor.go +++ b/internal/collector/hyperv/hyperv_hypervisor_virtual_processor.go @@ -28,7 +28,6 @@ import ( type collectorHypervisorVirtualProcessor struct { perfDataCollectorHypervisorVirtualProcessor *perfdata.Collector - // \Hyper-V Hypervisor Virtual Processor(*)\% Guest Idle Time // \Hyper-V Hypervisor Virtual Processor(*)\% Guest Run Time // \Hyper-V Hypervisor Virtual Processor(*)\% Hypervisor Run Time // \Hyper-V Hypervisor Virtual Processor(*)\% Remote Run Time @@ -38,7 +37,6 @@ type collectorHypervisorVirtualProcessor struct { } const ( - hypervisorVirtualProcessorGuestRunTimePercent = "% Guest Run Time" hypervisorVirtualProcessorGuestIdleTimePercent = "% Guest Idle Time" hypervisorVirtualProcessorHypervisorRunTimePercent = "% Hypervisor Run Time" hypervisorVirtualProcessorTotalRunTimePercent = "% Total Run Time" @@ -50,7 +48,6 @@ func (c *Collector) buildHypervisorVirtualProcessor() error { var err error c.perfDataCollectorHypervisorVirtualProcessor, err = perfdata.NewCollector("Hyper-V Hypervisor Virtual Processor", perfdata.InstancesAll, []string{ - hypervisorVirtualProcessorGuestRunTimePercent, hypervisorVirtualProcessorGuestIdleTimePercent, hypervisorVirtualProcessorHypervisorRunTimePercent, hypervisorVirtualProcessorTotalRunTimePercent, @@ -104,13 +101,6 @@ func (c *Collector) collectHypervisorVirtualProcessor(ch chan<- prometheus.Metri vmName := parts[0] coreId := coreParts[2] - ch <- prometheus.MustNewConstMetric( - c.hypervisorVirtualProcessorTimeTotal, - prometheus.CounterValue, - coreData[hypervisorVirtualProcessorGuestRunTimePercent].FirstValue, - vmName, coreId, "guest_run", - ) - ch <- prometheus.MustNewConstMetric( c.hypervisorVirtualProcessorTimeTotal, prometheus.CounterValue,