From nobody Tue Apr 19 14:33:54 2022 X-Original-To: dev-commits-src-main@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 A036011CA50D; Tue, 19 Apr 2022 14:34:12 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-oa1-f45.google.com (mail-oa1-f45.google.com [209.85.160.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KjRBr41Xnz4n5J; Tue, 19 Apr 2022 14:34:12 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-oa1-f45.google.com with SMTP id 586e51a60fabf-e5bdd14b59so8169217fac.11; Tue, 19 Apr 2022 07:34:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=P2SwqLBeRG4hnxKczh5A+0Xs8vvalJCCwB+YyeB6Slo=; b=56gvF8cw/T5fRJBo5Wgg5IHBir5jCSIL2vhY53uW3LlVKKQ3zvA7WDzH7G6PrKqz6I wQFfkYOwvjn9n0HOJ+2gkKj+xFdh+z6ACc1RFhua6bZZeCKwba63qJ8w/2L824xECBpM 6l/COXLthtPP3phPx8X/OWLnkmcSoqpyQHwOPX4z4MvTs4TCbcCluBlYT0k9jQmTWmQz 0WrODwFGEntzyA8T5pi5mM40ayg2oQWJUOE15QULtm0kP0bIT4w6sEeqkpoRsvJ+WGe1 s3B97RWHi1wXFgoPBJLlFn0V8kAa69NfAM+FlbBR2aw1KSqJhuyb9k9ym56Uo7ZBChd7 5Ipw== X-Gm-Message-State: AOAM533juKNM5ZXszLLk7/0SpSAGduKWOzOQmH1ZKql6u+2/JJtWluYO Nf+Vkf+G8+chfJqJfUXJarNnKv+nWJG7Fi6aiv5NLfTI X-Google-Smtp-Source: ABdhPJzqENW2zHVNd6ATGOZXNq+eVn0TGM/3eXE01uSb6jJUBhRn2XyhnUOf41m4DvJMpbSk8brhejDoIkE745vJ2I4= X-Received: by 2002:a05:6870:a2d2:b0:d7:60ca:5065 with SMTP id w18-20020a056870a2d200b000d760ca5065mr8615384oak.72.1650378845326; Tue, 19 Apr 2022 07:34:05 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202204191256.23JCunGk043900@gitrepo.freebsd.org> In-Reply-To: From: Alan Somers Date: Tue, 19 Apr 2022 08:33:54 -0600 Message-ID: Subject: Re: git: 8c47d8f53854 - main - prometheus_sysctl_exporter: fix metric aliasing To: Mateusz Piotrowski <0mp@freebsd.org> Cc: src-committers , "" , dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4KjRBr41Xnz4n5J X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N On Tue, Apr 19, 2022 at 8:22 AM Mateusz Piotrowski <0mp@freebsd.org> wrote: > > On 19/04/2022 14:56, Alan Somers wrote: > > The branch main has been updated by asomers: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=8c47d8f53854825d8e8591ccd06e32b2c798f81c > > > > 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 > > This should definitely make it to release notes. > > Also, should we keep a log of these kind of changes in the history section of the manual pages? I > find the history logs that systemd folks publish in their manual pages to be quite informative, > e.g., https://www.man7.org/linux/man-pages//man7/systemd.net-naming-scheme.7.html > > Best, > > Mateusz Do you think that the uma zone rename is too disruptive to MFC?