From 2b490d645e0e9773b644dfc3e3313e79eb565b27 Mon Sep 17 00:00:00 2001 From: Sergei Semenchuk Date: Mon, 27 Sep 2021 23:57:03 +0300 Subject: [PATCH] add path label to rapl collector (#2146) Signed-off-by: binjip978 --- collector/fixtures/e2e-output.txt | 4 ++-- collector/rapl_linux.go | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/collector/fixtures/e2e-output.txt b/collector/fixtures/e2e-output.txt index c24d6a7071..ac254b5c40 100644 --- a/collector/fixtures/e2e-output.txt +++ b/collector/fixtures/e2e-output.txt @@ -2747,10 +2747,10 @@ node_qdisc_requeues_total{device="eth0",kind="pfifo_fast"} 2 node_qdisc_requeues_total{device="wlan0",kind="fq"} 1 # HELP node_rapl_core_joules_total Current RAPL core value in joules # TYPE node_rapl_core_joules_total counter -node_rapl_core_joules_total{index="0"} 118821.284256 +node_rapl_core_joules_total{index="0",path="collector/fixtures/sys/class/powercap/intel-rapl:0:0"} 118821.284256 # HELP node_rapl_package_joules_total Current RAPL package value in joules # TYPE node_rapl_package_joules_total counter -node_rapl_package_joules_total{index="0"} 240422.366267 +node_rapl_package_joules_total{index="0",path="collector/fixtures/sys/class/powercap/intel-rapl:0"} 240422.366267 # HELP node_schedstat_running_seconds_total Number of seconds CPU spent running a process. # TYPE node_schedstat_running_seconds_total counter node_schedstat_running_seconds_total{cpu="0"} 2.045936778163039e+06 diff --git a/collector/rapl_linux.go b/collector/rapl_linux.go index b73c0dd83e..5ed343bbe8 100644 --- a/collector/rapl_linux.go +++ b/collector/rapl_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !norapl // +build !norapl package collector @@ -81,7 +82,7 @@ func (c *raplCollector) Update(ch chan<- prometheus.Metric) error { descriptor := prometheus.NewDesc( prometheus.BuildFQName(namespace, "rapl", rz.Name+"_joules_total"), "Current RAPL "+rz.Name+" value in joules", - []string{"index"}, nil, + []string{"index", "path"}, nil, ) ch <- prometheus.MustNewConstMetric( @@ -89,6 +90,7 @@ func (c *raplCollector) Update(ch chan<- prometheus.Metric) error { prometheus.CounterValue, float64(newMicrojoules)/1000000.0, index, + rz.Path, ) } return nil