From nobody Sat Aug 20 01:11:09 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 4M8gYW2VrFz4YjRs for ; Sat, 20 Aug 2022 01:11:11 +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 4M8gYW0vgCz47CS for ; Sat, 20 Aug 2022 01:11:11 +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 4M8gYV4d1nz1Cj1 for ; Sat, 20 Aug 2022 01:11:10 +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 27K1BAI3041844 for ; Sat, 20 Aug 2022 01:11:10 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 27K1BAnD041843 for fs@FreeBSD.org; Sat, 20 Aug 2022 01:11:10 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: Sat, 20 Aug 2022 01:11:09 +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: Closed X-Bugzilla-Resolution: FIXED X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: delphij@FreeBSD.org X-Bugzilla-Flags: mfc-stable13+ mfc-stable12- 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=1660957871; 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=qok5GLnKZoEUkbj9rpHLYmQu/c4sGA6SYxLKH+pBYtM=; b=mlyDqfMdEbRbpTck7brOrByM2Vf9CqM2T6wLfjLjkuKSUSZsRjWq1HPWhJnaNPUuE2ZFwc Uh7CabnIA0PVpNlBDu2o8Enrqvy7A6R1XDFBkE5w6Fq1flMVdFQF1IEntkKsiQLqs1hLsN YazXvrtG65Y3879ZRnxVCETYnhL6mr4mD+BhkvGpbuRUoJOO6OFs5DCc7TyrSVtg5LMcqY 3vbOj36hzsiEzXmjtQy5PeggTsLyka9XOOnKaATY6RNQT6mcLnhdW1HqirF/B6eKMFmSpo EAkJunP2VST2OqxTSR638I+0jDHfIGuay+Wih4oQ16SxXC0nsnlXA8HAhfRsVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660957871; a=rsa-sha256; cv=none; b=KcRiX3sBFwT1hrT4WrSkDlYTCOh0+3+pgd/+J585+OD/vavu+PtzLL1RvL6hOdReM61Tyr GA9dLAWwKHn0TG+0W/3Px4TUaj50jCN7tsSfwJi1LGSosUvH02P9im0zP1YO1KKQ9qOMDb hMrJqMnx+2oq6MHDJhkmNVtoVewDnYeRMaEcSgKjxBOTWDepaQThD65wr4apRKM5ora+JG D3qONd30newxBNMQqPAs4GavJB6rrPfyuu4p8vsP05WSXR7dZNOQfsPnE9xQnlILsAtyZd +cb5quqBHOAlhAx4afqTwy8Fr/uw/d8x8zrmqTWpzS1gEx2TjFXw0i0sCcVDEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D259607 --- Comment #6 from commit-hook@FreeBSD.org --- A commit in branch stable/12 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3Db524667411e93d1e828bbaca03d96bb86= 37a5357 commit b524667411e93d1e828bbaca03d96bb8637a5357 Author: Alan Somers AuthorDate: 2022-04-18 21:29:37 +0000 Commit: Alan Somers CommitDate: 2022-08-20 01:03:31 +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.=