From nobody Thu May 12 20:41:04 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 4D0A51ACA073 for ; Thu, 12 May 2022 20:41:05 +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 4KzkFX38xXz4hmH for ; Thu, 12 May 2022 20:41:03 +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 BB123152F6 for ; Thu, 12 May 2022 20:41:03 +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 24CKf3Lv034321 for ; Thu, 12 May 2022 20:41:03 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 24CKf3an034320 for fs@FreeBSD.org; Thu, 12 May 2022 20:41:03 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: Thu, 12 May 2022 20:41:04 +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=1652388064; 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=dkudV58nMdomAET0UDxCFOzX4eEtqko4+27JHxRSGO4=; b=oT354P9Jo0lXsQNpzKY4P70Gtiane+s+RHYjuc8OeFBaZ3fqYky6+1uljrB824ikGspU/2 uNiQu+JuuRF5y5a1fxWKD2uIB8S2dIl9OZnD4RixE5eueBkluvIfxbxY43YRcNFVPrlvIp Pqpo/sxKfW7FYbddfUpD1Vz7k25tEl2CQvLeqbdAZzEXMaadhDtVzUzM6p3M2hKcjXm3tm IObY90kyfL4sw/HFJQeQTb1P6wUnjMM29k2AHMRCW1EKSmu/HUZXO+aIomyi5kXVB8rqNC 1I3tqM0i42aJnxHYmhwe4b35SPe+2puX3FyDyAQRKMvGHxyKN0u+Eq97j0AEJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652388064; a=rsa-sha256; cv=none; b=MHx+O61SOZ+hwpjiXFeZnw+o21f4p1vtTVypiMg6L/Z/r5pV0iWBCB2O8OomTF/pBtq+lN b+PMaMFAidSZJvm3f/Xa8WqzwkFdRvwcpygclpxRHxLA0sAJomDbqyEZUszn7WZe0ggmNa Ys5C9kN7OeN9Wtik2H4R/kAXF2W9fQI3XPZ9oK6EG8oS6oAs4WWx6BtGO1RF7+IllSyAoI 7NRcig7ExT525q0BfC5Rf+ZsE4A1QWzLp9AZHZBg/NDOQT6Lj/fz+RiPTlXvROLQa92izh AZJhU6Rolb5BREJRItt5PhuS4Tj1MDcRryRWUlfqVyLOv/NJRqAeo2CJRI0C3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D259607 --- Comment #5 from commit-hook@FreeBSD.org --- A commit in branch stable/13 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3De4f508d5a211e99dd6179794b51fefa32= 9886be3 commit e4f508d5a211e99dd6179794b51fefa329886be3 Author: Alan Somers AuthorDate: 2022-04-18 21:29:37 +0000 Commit: Alan Somers CommitDate: 2022-05-12 20:40:05 +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 Sponsored by: Axcient Reviewed by: delphij,rew,thj Differential Revision: https://reviews.freebsd.org/D34952 (cherry picked from commit 8c47d8f53854825d8e8591ccd06e32b2c798f81c) 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.=