From nobody Tue Apr 19 12:57:33 2022 X-Original-To: fs@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0293311D4874 for ; Tue, 19 Apr 2022 12:57:34 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KjP3K5z2Zz4ZMm for ; Tue, 19 Apr 2022 12:57:33 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AD917275C4 for ; Tue, 19 Apr 2022 12:57:33 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 23JCvXol036927 for ; Tue, 19 Apr 2022 12:57:33 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 23JCvXBC036926 for fs@FreeBSD.org; Tue, 19 Apr 2022 12:57:33 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: bugzilla set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: fs@FreeBSD.org Subject: [Bug 259607] prometheus_sysctl_exporter: Need better encoding support for sysctl OIDs Date: Tue, 19 Apr 2022 12:57:33 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: bin X-Bugzilla-Version: CURRENT X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: commit-hook@FreeBSD.org X-Bugzilla-Status: In Progress X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: delphij@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Filesystems List-Archive: https://lists.freebsd.org/archives/freebsd-fs List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-fs@freebsd.org MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650373053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kJd1Br4MhuaWH905l4v2zT3mOcM2pjQjjxxyqAheGs8=; b=YpqaKqPyO4Eme07nQr7kynT0BIpZWZPFvn8hg39MoHNE/l54SrbHi0847B/W73Vpl9/hYm 9Jip2j1PR/+GkWEPrWTbwGcQA3MzafuA9CujACgo9q/cZXfma2S25/3391j+JTUtf2D4LE 2gTKm60ktTOf6ToudmrbSjxfA7bUye4hnceaspqt2YyXKiP8WWOCgBWBqRIffFLOQ17N0H u+/FMqNaXEXBcFb/wDvaxE8z31zMY/tiZBpoac4O1oITQ9XTjKDKHos0T8kzzjw3rXZgDX Reay+E4vSy1IMQIA1XgFN/3ZhWgmW0440bhz+3/qXv4Byz2wE/OFpTDUE7iebQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650373053; a=rsa-sha256; cv=none; b=XuLz1yT2Xmtq46S+/UX4PVQ33UAhZNtXY0BaN/c89u/NVUZl24ddr/28ui8fTLCqiNwuQg bBjrvusJ0LlRt+U8ru58eG3Yh7AGdLeVA9VTX7MKeA4jaaZMx5dRScyq1gOfMxjofXMzYa tlbyZ004gp9jHXXND4V3vO2nEe31GP9OToOdcVc+FGgHRzh7WHhaweHTSKRNvr4VdV+VRG RBKUS0gnzdGvcjxYvUkPRhZEw2cZOVIWajOPCaqzZpZGzccLkPoIVS3k/e+QyyjmpLoatf hsCpY6Sf9pjM2b1IPv9OGA74NdQOpNORqYjD4q6Q185PopXjM37WEYe8RatROA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D259607 --- Comment #4 from commit-hook@FreeBSD.org --- A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3D8c47d8f53854825d8e8591ccd06e32b2c= 798f81c commit 8c47d8f53854825d8e8591ccd06e32b2c798f81c Author: Alan Somers AuthorDate: 2022-04-18 21:29:37 +0000 Commit: Alan Somers CommitDate: 2022-04-19 12:56:39 +0000 prometheus_sysctl_exporter: fix metric aliasing 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 Reviewed by: delphij,rew,thj Differential Revision: https://reviews.freebsd.org/D34952 sys/netinet/tcp_log_buf.c | 33 +++++++++++-------= ---- .../prometheus_sysctl_exporter.c | 11 ++++++-- 2 files changed, 26 insertions(+), 18 deletions(-) --=20 You are receiving this mail because: You are on the CC list for the bug.=