From nobody Tue Apr 19 14:22:09 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 A8D2E11E7AFC; Tue, 19 Apr 2022 14:22:12 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 4KjQwz6qXYz4lhR; Tue, 19 Apr 2022 14:22:11 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: by mail-ej1-f43.google.com with SMTP id r13so33282249ejd.5; Tue, 19 Apr 2022 07:22:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent :content-language:to:references:from:subject:in-reply-to :content-transfer-encoding; bh=ROFhp6GHi/4jR4+rksEPP/mNT0ivuinRc2loJox9Am4=; b=uJDTxreZPjx+s3x+bETH2OWRsrHA/+pOCzuO7fIxljT4Hggsl7Mz4J8b6nboQsPNMh dEXQye26uelA0K9JYPkyvKO6/0qtifMqMa/chqurDq3tQ5lRwYiYusoNFtAfVYDKVPUe 4hqPqRmB+OwWT15lu6c726r6tJrJXKnn76wBrKVRfWgLOb0J/MeXqIASN4H52eGjDlPJ bf/AWNrVSUt70HDdCxNXX2jlEnt4PpV3V4DTXuCPIBb2jDNGFImVjw1EN/GvSeQpm22d 00JUS3s6stok3y+RLr+CQbFhFREOWbAfYJ09X0mCltA28bhoctsMFmizpjdT9YXRjARh DUgw== X-Gm-Message-State: AOAM531i8NviczyFQEREK3ocV2LE39gIQ5pisS16ikvngHqgAdSbLqVV m4U+RotgcJnVkPaH4Qg3fRXxpkPjj+utqA== X-Google-Smtp-Source: ABdhPJxZYjijbaJK9WFHmllwQWr6FU1n19wKJZyvgvkOKDXSrgETjBOEycoh7nv3ENvvE+cAm+YHBg== X-Received: by 2002:a17:906:4783:b0:6d0:9b6e:b5a5 with SMTP id cw3-20020a170906478300b006d09b6eb5a5mr14393962ejc.526.1650378124586; Tue, 19 Apr 2022 07:22:04 -0700 (PDT) Received: from [192.168.0.193] (dynamic-089-204-139-216.89.204.139.pool.telefonica.de. [89.204.139.216]) by smtp.gmail.com with ESMTPSA id e11-20020a17090681cb00b006e86b594e1fsm5643443ejx.207.2022.04.19.07.22.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 19 Apr 2022 07:22:03 -0700 (PDT) Message-ID: Date: Tue, 19 Apr 2022 16:22:09 +0200 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 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Content-Language: en-US To: Alan Somers , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202204191256.23JCunGk043900@gitrepo.freebsd.org> From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: Re: git: 8c47d8f53854 - main - prometheus_sysctl_exporter: fix metric aliasing In-Reply-To: <202204191256.23JCunGk043900@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4KjQwz6qXYz4lhR X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of mpp302@gmail.com designates 209.85.218.43 as permitted sender) smtp.mailfrom=mpp302@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_HAM_LONG(-1.00)[-0.998]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[209.85.218.43:from]; MLMMJ_DEST(0.00)[dev-commits-src-all,dev-commits-src-main]; FORGED_SENDER(0.30)[0mp@FreeBSD.org,mpp302@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.218.43:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[0mp@FreeBSD.org,mpp302@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RECEIVED_SPAMHAUS_PBL(0.00)[89.204.139.216:received] X-ThisMailContainsUnwantedMimeParts: N 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