mirror of
https://github.com/prometheus/node_exporter.git
synced 2024-11-12 16:44:18 -08:00
fdaa8fc00d
* ref!: convert linux meminfo implementation to use procfs lib Part of #2957 Prometheus' procfs lib supports collecting memory info and we're using a new enough version of the lib that has it available, so this converts the meminfo collector for Linux to use data from procfs lib instead. The bits I've touched for darwin/openbsd/netbsd are with intent to preserve the original struct implementation/backwards compatibility. Signed-off-by: TJ Hoplock <t.hoplock@gmail.com> * fix: meminfo debug log unsupported value Fixes: ``` ts=2024-06-11T19:04:55.591Z caller=meminfo.go:44 level=debug collector=meminfo msg="Set node_mem" memInfo="unsupported value type" ``` Signed-off-by: TJ Hoplock <t.hoplock@gmail.com> * fix: don't coerce nil Meminfo entries to 0, leave out if nil Nil entries in procfs.Meminfo fields indicate that the value isn't present on the system. Coercing those nil values to `0` introduces new metrics on systems that should not be present and can break some queries. Addresses PR feedback: https://github.com/prometheus/node_exporter/pull/3049#discussion_r1637581536 https://github.com/prometheus/node_exporter/pull/3049#discussion_r1637584482 Signed-off-by: TJ Hoplock <t.hoplock@gmail.com> --------- Signed-off-by: TJ Hoplock <t.hoplock@gmail.com>
48 lines
1.2 KiB
Go
48 lines
1.2 KiB
Go
// Copyright 2015 The Prometheus Authors
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
//go:build !nomeminfo
|
|
// +build !nomeminfo
|
|
|
|
package collector
|
|
|
|
import (
|
|
"os"
|
|
"testing"
|
|
|
|
"github.com/go-kit/log"
|
|
)
|
|
|
|
func TestMemInfo(t *testing.T) {
|
|
*procPath = "fixtures/proc"
|
|
logger := log.NewLogfmtLogger(os.Stderr)
|
|
|
|
collector, err := NewMeminfoCollector(logger)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
memInfo, err := collector.(*meminfoCollector).getMemInfo()
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
if want, got := 3831959552.0, memInfo["MemTotal_bytes"]; want != got {
|
|
t.Errorf("want memory total %f, got %f", want, got)
|
|
}
|
|
|
|
if want, got := 3787456512.0, memInfo["DirectMap2M_bytes"]; want != got {
|
|
t.Errorf("want memory directMap2M %f, got %f", want, got)
|
|
}
|
|
}
|