Page MenuHomeFreeBSD
Differential D34952

prometheus_sysctl_exporter: fix metric aliasing
ClosedPublic
Actions

Authored by asomers on Apr 18 2022, 9:37 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Aug 31, 2:02 AM
Unknown Object (File)
Mon, Aug 24, 11:19 PM
Unknown Object (File)
Sat, Aug 22, 8:49 AM
Unknown Object (File)
Fri, Aug 21, 8:00 PM
Unknown Object (File)
Fri, Aug 21, 5:48 AM
Unknown Object (File)
Thu, Aug 20, 5:21 PM
Unknown Object (File)
Wed, Aug 19, 6:34 AM
Unknown Object (File)
Tue, Aug 18, 12:12 PM
View All Files
Subscribers
emaste
glebius
imp
melifaro

Details

Reviewers
delphij
rew
thj
Group Reviewers
transport
Commits
rGb524667411e9: prometheus_sysctl_exporter: fix metric aliasing
rGe4f508d5a211: prometheus_sysctl_exporter: fix metric aliasing
rG8c47d8f53854: prometheus_sysctl_exporter: fix metric aliasing
Summary

When exporting sysctls to Prometheus, the exporter replaces "." with
"_". This caused several metrics to alias, confusing the Prometheus
server. Fix it by:

  • Renaming the "tcp_log_bucket" UMA zone to "tcp_log_id_bucket". Also, rename "tcp_log_node" to "tcp_log_id_node" for consistency.
  • Not exporting sysctls with "(LEGACY)" in the description. That is used by ZFS sysctls that have been replaced by others, many of which alias to the same Prometheus metric name (like "vfs.zfs.arc_max" and "vfs.zfs.arc.max").

PR: 259607
Reported by: delphij
MFC after: 2 weeks
Sponsored by: Axcient

Test Plan

manually tested with prometheus_sysctl_exporter | sort | awk '{print $1}' | uniq -c | grep -v '^ *1'

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 45216
Build 42104: arc lint + arc unit

Event Timeline

asomers created this revision.Apr 18 2022, 9:37 PM
Herald added a reviewer: transport. · View Herald TranscriptApr 18 2022, 9:37 PM
Herald added subscribers: glebius, melifaro, imp. · View Herald Transcript
asomers requested review of this revision.Apr 18 2022, 9:37 PM
Harbormaster completed remote builds in B45216: Diff 105138.Apr 18 2022, 9:37 PM
asomers mentioned this in D32886: prometheus_sysctl_exporter: Improve sysctl OID names rewriting..Apr 18 2022, 9:38 PM
delphij accepted this revision.Apr 18 2022, 11:01 PM
rew accepted this revision.Apr 19 2022, 5:53 AM

looks good, thanks

thj accepted this revision.Apr 19 2022, 7:38 AM
This revision is now accepted and ready to land.Apr 19 2022, 7:38 AM
Closed by commit rG8c47d8f53854: prometheus_sysctl_exporter: fix metric aliasing (authored by asomers). · Explain WhyApr 19 2022, 12:57 PM
This revision was automatically updated to reflect the committed changes.
asomers added a commit: rG8c47d8f53854: prometheus_sysctl_exporter: fix metric aliasing.
asomers added a commit: rGe4f508d5a211: prometheus_sysctl_exporter: fix metric aliasing.May 12 2022, 8:41 PM
asomers added a commit: rGb524667411e9: prometheus_sysctl_exporter: fix metric aliasing.Aug 20 2022, 1:12 AM

Revision Contents
Changeset List

PathSize
sys/
netinet/
33 lines
usr.sbin/
prometheus_sysctl_exporter/
11 lines

Diff 105138

View Options

sys/netinet/tcp_log_buf.c

Loading...
View Options

usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c

Loading...