From nobody Sat Feb 4 19:34:38 2023 X-Original-To: dev-commits-ports-all@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 4P8N5B56nHz3nmh4; Sat, 4 Feb 2023 19:34:38 +0000 (UTC) (envelope-from git@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 4P8N5B4WVGz3Nxn; Sat, 4 Feb 2023 19:34:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675539278; 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; bh=UP2rYxbrXNZkEmERd3Vy1Hz901zwTmKSpLFrkncilt4=; b=bKfwf8f+cE9w6tTDDA1Fa7z749/FMKrTon3MqvZsWC5qRdje7/Hfk20xqn6oBuQLWLZ5rC 5MLpzsF/sxmd8oH3ypFDiSNq1f9o+xvpEqqk+/+hFMnd1yMq5Z6dRACsF9PSfftwLd9RXp rEKsLxKdruihBf/FiTasrcQa4tkSr569vWljgpQ2dEKvakEWfV5lBPh9OJX8BfOUNBOvQw jgVngNwd3qWCvaFBHsBfMeaBU5yYG4TVx3xuu2e334LlXtNAkpmkOoyMKqnZ2VtN4EAQm+ yN00g1q2kWD/1QVnXVvVocAMsPQxZPOmWToNACbKtjIKjCIVdctTr8UlxwEyow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675539278; 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; bh=UP2rYxbrXNZkEmERd3Vy1Hz901zwTmKSpLFrkncilt4=; b=Dh8P3Rbb91VkXBUpxzFu3xtAr5TzpqkJf9PHnmZrttdVBzy5zYazcK2npi2P3y+AEefrEL +Q+pF1cLmm1EUVrWfaY6LH2H9jtvPsw87dmxn7q34nsMnPTDTHjXfO0uqwWIpw89nvQK43 2toIIyOx4yLodOhlELX37s+z/CPogSmA3JEKkbTd+h3DU19+URbjSa6XtSsu3ThoGphMBK skHunA9AuLgDi9XMeiA4YJD5/MiHw56vSBpGjvSFkekSMq7VjYjbYSSU/E/4mUczUOUU3s +mxPt9F//hkskQidcSJR36yu7SCWPHbXpBVZ19LVDptD5Xq6fY3bnR78OyRKBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675539278; a=rsa-sha256; cv=none; b=PTv8FPmelrFd7wBgVNmWhMG9IzoN6qmetcxkeuE8QLIFmTULKKZC+zqbYtSniXGzJ1Ay1v uiI8HhD/Itx5g4eG7zZfGzv2ChfzcPQkdp8UIepONEDSyPIVJDqVCMBOoLHD/C194BYBcg ScHOAIV5/cprhXgEsW+twwSysfYSYt2x30RjMjZiT2PsvHTiZbCR8unYNrs/+ehPVNph9+ edXXVm9t+TsFOq67qSxxFvMYCcpRQzMobhO1uDxWSdqTQNuZNToSZDQj0k8MLpRqqoX0X+ ZoiYgWx1KD4AzfngWpW7XtsSV0X3WJ/niwrnPav0efUT+FH2qu2zp6B337rODg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 4P8N5B3X7WzRcC; Sat, 4 Feb 2023 19:34:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 314JYcZS091011; Sat, 4 Feb 2023 19:34:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 314JYcT0091010; Sat, 4 Feb 2023 19:34:38 GMT (envelope-from git) Date: Sat, 4 Feb 2023 19:34:38 GMT Message-Id: <202302041934.314JYcT0091010@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: ede3d9baa55c - main - sysutils/node_exporter: fix meminfo collector List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ede3d9baa55c5670f9243191e390f1a8bfddcd4c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=ede3d9baa55c5670f9243191e390f1a8bfddcd4c commit ede3d9baa55c5670f9243191e390f1a8bfddcd4c Author: David O'Rourke AuthorDate: 2023-02-04 19:11:14 +0000 Commit: Fernando Apesteguía CommitDate: 2023-02-04 19:30:15 +0000 sysutils/node_exporter: fix meminfo collector meminfo collector failed with: node_exporter[29302]: ts=2023-02-04T09:06:27.328Z caller=collector.go:169 level=error msg="collector failed" name=meminfo duration_seconds=0.000127617 err="couldn't get memory: cannot allocate memory" This patch contains a fix for the meminfo collector, it has also been submitted upstream. PR: 269154 Reported by: David O'Rourke --- sysutils/node_exporter/Makefile | 1 + sysutils/node_exporter/files/patch-collector_memory__bsd.go | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/sysutils/node_exporter/Makefile b/sysutils/node_exporter/Makefile index cf7fa46387f3..9a8d35d38124 100644 --- a/sysutils/node_exporter/Makefile +++ b/sysutils/node_exporter/Makefile @@ -1,6 +1,7 @@ PORTNAME= node_exporter PORTVERSION= 1.5.0 DISTVERSIONPREFIX=v +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= dor.bsd@xm0.uk diff --git a/sysutils/node_exporter/files/patch-collector_memory__bsd.go b/sysutils/node_exporter/files/patch-collector_memory__bsd.go new file mode 100644 index 000000000000..3eed9cfab67e --- /dev/null +++ b/sysutils/node_exporter/files/patch-collector_memory__bsd.go @@ -0,0 +1,10 @@ +--- collector/memory_bsd.go.orig 2023-02-03 16:38:43 UTC ++++ collector/memory_bsd.go +@@ -87,6 +87,7 @@ func NewMemoryCollector(logger log.Logger) (Collector, + description: "Locked in memory by user, mlock, etc", + mib: "vm.stats.vm.v_user_wire_count", + conversion: fromPage, ++ dataType: bsdSysctlTypeCLong, + }, + { + name: "cache_bytes",