git: ede3d9baa55c - main - sysutils/node_exporter: fix meminfo collector
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 04 Feb 2023 19:34:38 UTC
The branch main has been updated by fernape:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ede3d9baa55c5670f9243191e390f1a8bfddcd4c
commit ede3d9baa55c5670f9243191e390f1a8bfddcd4c
Author: David O'Rourke <dor.bsd@xm0.uk>
AuthorDate: 2023-02-04 19:11:14 +0000
Commit: Fernando Apesteguía <fernape@FreeBSD.org>
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 <dor.bsd@xm0.uk>
---
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",