Update procfs vendor (#1248)

Signed-off-by: Mark Knapp <mknapp@hudson-trading.com>

3 files changed, 102 insertions, 54 deletions

diff --git a/collector/cpu_linux.go b/collector/cpu_linux.go
index 640873f..50d8a3b 100644
--- a/collector/cpu_linux.go
+++ b/collector/cpu_linux.go
@@ -32,6 +32,9 @@ type cpuCollector struct {
         cpuFreq            *prometheus.Desc
         cpuFreqMin         *prometheus.Desc
         cpuFreqMax         *prometheus.Desc
+        scalingFreq        *prometheus.Desc
+        scalingFreqMin     *prometheus.Desc
+        scalingFreqMax     *prometheus.Desc
         cpuCoreThrottle    *prometheus.Desc
         cpuPackageThrottle *prometheus.Desc
 }
@@ -64,6 +67,21 @@ func NewCPUCollector() (Collector, error) {
                         "Maximum cpu thread frequency in hertz.",
                         []string{"cpu"}, nil,
                 ),
+                scalingFreq: prometheus.NewDesc(
+                        prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "scaling_frequency_hertz"),
+                        "Current scaled cpu thread frequency in hertz.",
+                        []string{"cpu"}, nil,
+                ),
+                scalingFreqMin: prometheus.NewDesc(
+                        prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "scaling_frequency_min_hrts"),
+                        "Minimum scaled cpu thread frequency in hertz.",
+                        []string{"cpu"}, nil,
+                ),
+                scalingFreqMax: prometheus.NewDesc(
+                        prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "scaling_frequency_max_hrts"),
+                        "Maximum scaled cpu thread frequency in hertz.",
+                        []string{"cpu"}, nil,
+                ),
                 cpuCoreThrottle: prometheus.NewDesc(
                         prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "core_throttles_total"),
                         "Number of times this cpu core has been throttled.",
@@ -106,24 +124,54 @@ func (c *cpuCollector) updateCPUfreq(ch chan<- prometheus.Metric) error {
         // sysfs cpufreq values are kHz, thus multiply by 1000 to export base units (hz).
         // See https://www.kernel.org/doc/Documentation/cpu-freq/user-guide.txt
         for _, stats := range cpuFreqs {
-                ch <- prometheus.MustNewConstMetric(
-                        c.cpuFreq,
-                        prometheus.GaugeValue,
-                        float64(stats.CurrentFrequency)*1000.0,
-                        stats.Name,
-                )
-                ch <- prometheus.MustNewConstMetric(
-                        c.cpuFreqMin,
-                        prometheus.GaugeValue,
-                        float64(stats.MinimumFrequency)*1000.0,
-                        stats.Name,
-                )
-                ch <- prometheus.MustNewConstMetric(
-                        c.cpuFreqMax,
-                        prometheus.GaugeValue,
-                        float64(stats.MaximumFrequency)*1000.0,
-                        stats.Name,
-                )
+                if stats.CpuinfoCurrentFrequency != nil {
+                        ch <- prometheus.MustNewConstMetric(
+                                c.cpuFreq,
+                                prometheus.GaugeValue,
+                                float64(*stats.CpuinfoCurrentFrequency)*1000.0,
+                                stats.Name,
+                        )
+                }
+                if stats.CpuinfoMinimumFrequency != nil {
+                        ch <- prometheus.MustNewConstMetric(
+                                c.cpuFreqMin,
+                                prometheus.GaugeValue,
+                                float64(*stats.CpuinfoMinimumFrequency)*1000.0,
+                                stats.Name,
+                        )
+                }
+                if stats.CpuinfoMaximumFrequency != nil {
+                        ch <- prometheus.MustNewConstMetric(
+                                c.cpuFreqMax,
+                                prometheus.GaugeValue,
+                                float64(*stats.CpuinfoMaximumFrequency)*1000.0,
+                                stats.Name,
+                        )
+                }
+                if stats.ScalingCurrentFrequency != nil {
+                        ch <- prometheus.MustNewConstMetric(
+                                c.scalingFreq,
+                                prometheus.GaugeValue,
+                                float64(*stats.ScalingCurrentFrequency)*1000.0,
+                                stats.Name,
+                        )
+                }
+                if stats.ScalingMinimumFrequency != nil {
+                        ch <- prometheus.MustNewConstMetric(
+                                c.scalingFreqMin,
+                                prometheus.GaugeValue,
+                                float64(*stats.ScalingMinimumFrequency)*1000.0,
+                                stats.Name,
+                        )
+                }
+                if stats.ScalingMaximumFrequency != nil {
+                        ch <- prometheus.MustNewConstMetric(
+                                c.scalingFreqMax,
+                                prometheus.GaugeValue,
+                                float64(*stats.ScalingMaximumFrequency)*1000.0,
+                                stats.Name,
+                        )
+                }
         }
         return nil
 }
diff --git a/collector/fixtures/e2e-64k-page-output.txt b/collector/fixtures/e2e-64k-page-output.txt
index feb6b37..7e61462 100644
--- a/collector/fixtures/e2e-64k-page-output.txt
+++ b/collector/fixtures/e2e-64k-page-output.txt
@@ -184,24 +184,6 @@ node_cpu_core_throttles_total{core="0",package="0"} 5
 node_cpu_core_throttles_total{core="0",package="1"} 0
 node_cpu_core_throttles_total{core="1",package="0"} 0
 node_cpu_core_throttles_total{core="1",package="1"} 9
-# HELP node_cpu_frequency_hertz Current cpu thread frequency in hertz.
-# TYPE node_cpu_frequency_hertz gauge
-node_cpu_frequency_hertz{cpu="0"} 1.699981e+09
-node_cpu_frequency_hertz{cpu="1"} 1.699981e+09
-node_cpu_frequency_hertz{cpu="2"} 8e+06
-node_cpu_frequency_hertz{cpu="3"} 8e+06
-# HELP node_cpu_frequency_max_hertz Maximum cpu thread frequency in hertz.
-# TYPE node_cpu_frequency_max_hertz gauge
-node_cpu_frequency_max_hertz{cpu="0"} 3.7e+09
-node_cpu_frequency_max_hertz{cpu="1"} 3.7e+09
-node_cpu_frequency_max_hertz{cpu="2"} 4.2e+09
-node_cpu_frequency_max_hertz{cpu="3"} 4.2e+09
-# HELP node_cpu_frequency_min_hertz Minimum cpu thread frequency in hertz.
-# TYPE node_cpu_frequency_min_hertz gauge
-node_cpu_frequency_min_hertz{cpu="0"} 8e+08
-node_cpu_frequency_min_hertz{cpu="1"} 8e+08
-node_cpu_frequency_min_hertz{cpu="2"} 1e+06
-node_cpu_frequency_min_hertz{cpu="3"} 1e+06
 # HELP node_cpu_guest_seconds_total Seconds the cpus spent in guests (VMs) for each mode.
 # TYPE node_cpu_guest_seconds_total counter
 node_cpu_guest_seconds_total{cpu="0",mode="nice"} 0.01
@@ -224,6 +206,24 @@ node_cpu_guest_seconds_total{cpu="7",mode="user"} 0.09
 # TYPE node_cpu_package_throttles_total counter
 node_cpu_package_throttles_total{package="0"} 30
 node_cpu_package_throttles_total{package="1"} 6
+# HELP node_cpu_scaling_frequency_hertz Current scaled cpu thread frequency in hertz.
+# TYPE node_cpu_scaling_frequency_hertz gauge
+node_cpu_scaling_frequency_hertz{cpu="0"} 1.699981e+09
+node_cpu_scaling_frequency_hertz{cpu="1"} 1.699981e+09
+node_cpu_scaling_frequency_hertz{cpu="2"} 8e+06
+node_cpu_scaling_frequency_hertz{cpu="3"} 8e+06
+# HELP node_cpu_scaling_frequency_max_hrts Maximum scaled cpu thread frequency in hertz.
+# TYPE node_cpu_scaling_frequency_max_hrts gauge
+node_cpu_scaling_frequency_max_hrts{cpu="0"} 3.7e+09
+node_cpu_scaling_frequency_max_hrts{cpu="1"} 3.7e+09
+node_cpu_scaling_frequency_max_hrts{cpu="2"} 4.2e+09
+node_cpu_scaling_frequency_max_hrts{cpu="3"} 4.2e+09
+# HELP node_cpu_scaling_frequency_min_hrts Minimum scaled cpu thread frequency in hertz.
+# TYPE node_cpu_scaling_frequency_min_hrts gauge
+node_cpu_scaling_frequency_min_hrts{cpu="0"} 8e+08
+node_cpu_scaling_frequency_min_hrts{cpu="1"} 8e+08
+node_cpu_scaling_frequency_min_hrts{cpu="2"} 1e+06
+node_cpu_scaling_frequency_min_hrts{cpu="3"} 1e+06
 # HELP node_cpu_seconds_total Seconds the cpus spent in each mode.
 # TYPE node_cpu_seconds_total counter
 node_cpu_seconds_total{cpu="0",mode="idle"} 10870.69
diff --git a/collector/fixtures/e2e-output.txt b/collector/fixtures/e2e-output.txt
index 588a587..ba11e23 100644
--- a/collector/fixtures/e2e-output.txt
+++ b/collector/fixtures/e2e-output.txt
@@ -184,24 +184,6 @@ node_cpu_core_throttles_total{core="0",package="0"} 5
 node_cpu_core_throttles_total{core="0",package="1"} 0
 node_cpu_core_throttles_total{core="1",package="0"} 0
 node_cpu_core_throttles_total{core="1",package="1"} 9
-# HELP node_cpu_frequency_hertz Current cpu thread frequency in hertz.
-# TYPE node_cpu_frequency_hertz gauge
-node_cpu_frequency_hertz{cpu="0"} 1.699981e+09
-node_cpu_frequency_hertz{cpu="1"} 1.699981e+09
-node_cpu_frequency_hertz{cpu="2"} 8e+06
-node_cpu_frequency_hertz{cpu="3"} 8e+06
-# HELP node_cpu_frequency_max_hertz Maximum cpu thread frequency in hertz.
-# TYPE node_cpu_frequency_max_hertz gauge
-node_cpu_frequency_max_hertz{cpu="0"} 3.7e+09
-node_cpu_frequency_max_hertz{cpu="1"} 3.7e+09
-node_cpu_frequency_max_hertz{cpu="2"} 4.2e+09
-node_cpu_frequency_max_hertz{cpu="3"} 4.2e+09
-# HELP node_cpu_frequency_min_hertz Minimum cpu thread frequency in hertz.
-# TYPE node_cpu_frequency_min_hertz gauge
-node_cpu_frequency_min_hertz{cpu="0"} 8e+08
-node_cpu_frequency_min_hertz{cpu="1"} 8e+08
-node_cpu_frequency_min_hertz{cpu="2"} 1e+06
-node_cpu_frequency_min_hertz{cpu="3"} 1e+06
 # HELP node_cpu_guest_seconds_total Seconds the cpus spent in guests (VMs) for each mode.
 # TYPE node_cpu_guest_seconds_total counter
 node_cpu_guest_seconds_total{cpu="0",mode="nice"} 0.01
@@ -224,6 +206,24 @@ node_cpu_guest_seconds_total{cpu="7",mode="user"} 0.09
 # TYPE node_cpu_package_throttles_total counter
 node_cpu_package_throttles_total{package="0"} 30
 node_cpu_package_throttles_total{package="1"} 6
+# HELP node_cpu_scaling_frequency_hertz Current scaled cpu thread frequency in hertz.
+# TYPE node_cpu_scaling_frequency_hertz gauge
+node_cpu_scaling_frequency_hertz{cpu="0"} 1.699981e+09
+node_cpu_scaling_frequency_hertz{cpu="1"} 1.699981e+09
+node_cpu_scaling_frequency_hertz{cpu="2"} 8e+06
+node_cpu_scaling_frequency_hertz{cpu="3"} 8e+06
+# HELP node_cpu_scaling_frequency_max_hrts Maximum scaled cpu thread frequency in hertz.
+# TYPE node_cpu_scaling_frequency_max_hrts gauge
+node_cpu_scaling_frequency_max_hrts{cpu="0"} 3.7e+09
+node_cpu_scaling_frequency_max_hrts{cpu="1"} 3.7e+09
+node_cpu_scaling_frequency_max_hrts{cpu="2"} 4.2e+09
+node_cpu_scaling_frequency_max_hrts{cpu="3"} 4.2e+09
+# HELP node_cpu_scaling_frequency_min_hrts Minimum scaled cpu thread frequency in hertz.
+# TYPE node_cpu_scaling_frequency_min_hrts gauge
+node_cpu_scaling_frequency_min_hrts{cpu="0"} 8e+08
+node_cpu_scaling_frequency_min_hrts{cpu="1"} 8e+08
+node_cpu_scaling_frequency_min_hrts{cpu="2"} 1e+06
+node_cpu_scaling_frequency_min_hrts{cpu="3"} 1e+06
 # HELP node_cpu_seconds_total Seconds the cpus spent in each mode.
 # TYPE node_cpu_seconds_total counter
 node_cpu_seconds_total{cpu="0",mode="idle"} 10870.69