Skip to content

Fix invalid metric name panic reading powercap dir #1800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chicknsoup wants to merge 8 commits into from
Closed

Fix invalid metric name panic reading powercap dir #1800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d0e7535
Fix invalid metric name panic reading powercap dir
chicknsoup Jul 27, 2020
d3cc495
Fixed imports
chicknsoup Jul 27, 2020
d99586b
Replace strings.Replace w/ strutil.SanitizeLabelName
chicknsoup Jul 27, 2020
3d51b99
Put rz.Name as value of name label
chicknsoup Jul 27, 2020
4c1ae90
Update rapl_linux.go
chicknsoup Jul 27, 2020
a679e54
Update e2e-output.txt
chicknsoup Jul 29, 2020
7a400fd
Update e2e-output.txt
chicknsoup Jul 29, 2020
48256b0
Update e2e-output.txt
chicknsoup Jul 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions collector/fixtures/e2e-output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2606,12 +2606,9 @@ node_qdisc_packets_total{device="wlan0",kind="fq"} 42
# TYPE node_qdisc_requeues_total counter
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
# 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
# HELP node_rapl_joules_total Current RAPL package value in joules
# TYPE node_rapl_joules_total counter
node_rapl_joules_total{index="0",name="package"} 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
Expand Down
8 changes: 4 additions & 4 deletions collector/rapl_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@
package collector

import (
"strconv"

"github.com/go-kit/kit/log"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/procfs/sysfs"
"strconv"
)

type raplCollector struct {
Expand Down Expand Up @@ -61,15 +60,16 @@ func (c *raplCollector) Update(ch chan<- prometheus.Metric) error {
index := strconv.Itoa(rz.Index)

descriptor := prometheus.NewDesc(
prometheus.BuildFQName(namespace, "rapl", rz.Name+"_joules_total"),
prometheus.BuildFQName(namespace, "rapl", "joules_total"),
"Current RAPL "+rz.Name+" value in joules",
[]string{"index"}, nil,
[]string{"name", "index"}, nil,
)

ch <- prometheus.MustNewConstMetric(
descriptor,
prometheus.CounterValue,
float64(newMicrojoules)/1000000.0,
rz.Name,
index,
)
}
Expand Down