Merge branch 'master' into gpu-clk

collector/cpu_aix.go

@@ -0,0 +1,76 @@
+// Copyright 2024 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 !nocpu
+// +build !nocpu
+
+package collector
+
+/*
+#include <unistd.h>  // Include the standard Unix header
+#include <errno.h>   // For errno
+*/
+import "C"
+import (
+	"fmt"
+	"log/slog"
+	"strconv"
+
+	"github.com/power-devops/perfstat"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+type cpuCollector struct {
+	cpu           typedDesc
+	logger        *slog.Logger
+	tickPerSecond int64
+}
+
+func init() {
+	registerCollector("cpu", defaultEnabled, NewCpuCollector)
+}
+
+func tickPerSecond() (int64, error) {
+	ticks, err := C.sysconf(C._SC_CLK_TCK)
+	if ticks == -1 || err != nil {
+		return 0, fmt.Errorf("failed to get clock ticks per second: %v", err)
+	}
+	return int64(ticks), nil
+}
+
+func NewCpuCollector(logger *slog.Logger) (Collector, error) {
+	ticks, err := tickPerSecond()
+	if err != nil {
+		return nil, err
+	}
+	return &cpuCollector{
+		cpu:           typedDesc{nodeCPUSecondsDesc, prometheus.CounterValue},
+		logger:        logger,
+		tickPerSecond: ticks,
+	}, nil
+}
+
+func (c *cpuCollector) Update(ch chan<- prometheus.Metric) error {
+	stats, err := perfstat.CpuStat()
+	if err != nil {
+		return err
+	}
+
+	for n, stat := range stats {
+		ch <- c.cpu.mustNewConstMetric(float64(stat.User/c.tickPerSecond), strconv.Itoa(n), "user")
+		ch <- c.cpu.mustNewConstMetric(float64(stat.Sys/c.tickPerSecond), strconv.Itoa(n), "system")
+		ch <- c.cpu.mustNewConstMetric(float64(stat.Idle/c.tickPerSecond), strconv.Itoa(n), "idle")
+		ch <- c.cpu.mustNewConstMetric(float64(stat.Wait/c.tickPerSecond), strconv.Itoa(n), "wait")
+	}
+	return nil
+}

collector/diskstats_aix.go

@@ -0,0 +1,82 @@
+// Copyright 2024 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 !nodiskstats
+// +build !nodiskstats
+
+package collector
+
+import (
+	"fmt"
+	"log/slog"
+
+	"github.com/power-devops/perfstat"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+const diskstatsDefaultIgnoredDevices = ""
+
+type diskstatsCollector struct {
+	rbytes typedDesc
+	wbytes typedDesc
+	time   typedDesc
+
+	deviceFilter deviceFilter
+	logger       *slog.Logger
+
+	tickPerSecond int64
+}
+
+func init() {
+	registerCollector("diskstats", defaultEnabled, NewDiskstatsCollector)
+}
+
+// NewDiskstatsCollector returns a new Collector exposing disk device stats.
+func NewDiskstatsCollector(logger *slog.Logger) (Collector, error) {
+	ticks, err := tickPerSecond()
+	if err != nil {
+		return nil, err
+	}
+	deviceFilter, err := newDiskstatsDeviceFilter(logger)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse device filter flags: %w", err)
+	}
+
+	return &diskstatsCollector{
+		rbytes: typedDesc{readBytesDesc, prometheus.CounterValue},
+		wbytes: typedDesc{writtenBytesDesc, prometheus.CounterValue},
+		time:   typedDesc{ioTimeSecondsDesc, prometheus.CounterValue},
+
+		deviceFilter: deviceFilter,
+		logger:       logger,
+
+		tickPerSecond: ticks,
+	}, nil
+}
+
+func (c *diskstatsCollector) Update(ch chan<- prometheus.Metric) error {
+	stats, err := perfstat.DiskStat()
+	if err != nil {
+		return err
+	}
+
+	for _, stat := range stats {
+		if c.deviceFilter.ignored(stat.Name) {
+			continue
+		}
+		ch <- c.rbytes.mustNewConstMetric(float64(stat.Rblks*512), stat.Name)
+		ch <- c.wbytes.mustNewConstMetric(float64(stat.Wblks*512), stat.Name)
+		ch <- c.time.mustNewConstMetric(float64(stat.Time/c.tickPerSecond), stat.Name)
+	}
+	return nil
+}

collector/diskstats_common.go

@@ -11,9 +11,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build !nodiskstats && (openbsd || linux || darwin)
+//go:build !nodiskstats && (openbsd || linux || darwin || aix)
 // +build !nodiskstats
-// +build openbsd linux darwin
+// +build openbsd linux darwin aix
 
 package collector
 

collector/filesystem_aix.go

@@ -0,0 +1,65 @@
+// Copyright 2024 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 !nofilesystem
+// +build !nofilesystem
+
+package collector
+
+import (
+	"github.com/power-devops/perfstat"
+)
+
+const (
+	defMountPointsExcluded = "^/(dev|aha)($|/)"
+	defFSTypesExcluded     = "^procfs$"
+)
+
+// Expose filesystem fullness.
+func (c *filesystemCollector) GetStats() (stats []filesystemStats, err error) {
+	fsStat, err := perfstat.FileSystemStat()
+	if err != nil {
+		return nil, err
+	}
+	for _, stat := range fsStat {
+		if c.excludedMountPointsPattern.MatchString(stat.MountPoint) {
+			c.logger.Debug("Ignoring mount point", "mountpoint", stat.MountPoint)
+			continue
+		}
+		fstype := stat.TypeString()
+		if c.excludedFSTypesPattern.MatchString(fstype) {
+			c.logger.Debug("Ignoring fs type", "type", fstype)
+			continue
+		}
+
+		ro := 0.0
+		if stat.Flags&perfstat.VFS_READONLY != 0 {
+			ro = 1.0
+		}
+
+		stats = append(stats, filesystemStats{
+			labels: filesystemLabels{
+				device:     stat.Device,
+				mountPoint: stat.MountPoint,
+				fsType:     fstype,
+			},
+			size:      float64(stat.TotalBlocks / 512.0),
+			free:      float64(stat.FreeBlocks / 512.0),
+			avail:     float64(stat.FreeBlocks / 512.0), // AIX doesn't distinguish between free and available blocks.
+			files:     float64(stat.TotalInodes),
+			filesFree: float64(stat.FreeInodes),
+			ro:        ro,
+		})
+	}
+	return stats, nil
+}

collector/filesystem_common.go

@@ -11,9 +11,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build !nofilesystem && (linux || freebsd || netbsd || openbsd || darwin || dragonfly)
+//go:build !nofilesystem && (linux || freebsd || netbsd || openbsd || darwin || dragonfly || aix)
 // +build !nofilesystem
-// +build linux freebsd netbsd openbsd darwin dragonfly
+// +build linux freebsd netbsd openbsd darwin dragonfly aix
 
 package collector
 

collector/hwmon_linux.go

@@ -18,6 +18,7 @@ package collector
 
 import (
 	"errors"
+	"fmt"
 	"log/slog"
 	"os"
 	"path/filepath"
@@ -107,6 +108,9 @@ func sysReadFile(file string) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
+	if n < 0 {
+		return nil, fmt.Errorf("failed to read file: %q, read returned negative bytes value: %d", file, n)
+	}
 
 	return b[:n], nil
 }

collector/loadavg.go

@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build (darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris) && !noloadavg
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build (darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || aix) && !noloadavg
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris aix
 // +build !noloadavg
 
 package collector

collector/loadavg_aix.go

@@ -0,0 +1,30 @@
+// Copyright 2024 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 !noloadavg
+// +build !noloadavg
+
+package collector
+
+import (
+	"github.com/power-devops/perfstat"
+)
+
+func getLoad() ([]float64, error) {
+	stat, err := perfstat.CpuTotalStat()
+	if err != nil {
+		return nil, err
+	}
+
+	return []float64{float64(stat.LoadAvg1), float64(stat.LoadAvg5), float64(stat.LoadAvg15)}, nil
+}

collector/meminfo.go

@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build (darwin || linux || openbsd || netbsd) && !nomeminfo
-// +build darwin linux openbsd netbsd
+//go:build (darwin || linux || openbsd || netbsd || aix) && !nomeminfo
+// +build darwin linux openbsd netbsd aix
 // +build !nomeminfo
 
 package collector

collector/meminfo_aix.go

@@ -0,0 +1,47 @@
+// Copyright 2024 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 (
+	"log/slog"
+
+	"github.com/power-devops/perfstat"
+)
+
+type meminfoCollector struct {
+	logger *slog.Logger
+}
+
+// NewMeminfoCollector returns a new Collector exposing memory stats.
+func NewMeminfoCollector(logger *slog.Logger) (Collector, error) {
+	return &meminfoCollector{
+		logger: logger,
+	}, nil
+}
+
+func (c *meminfoCollector) getMemInfo() (map[string]float64, error) {
+	stats, err := perfstat.MemoryTotalStat()
+	if err != nil {
+		return nil, err
+	}
+
+	return map[string]float64{
+		"total_bytes":     float64(stats.RealTotal * 4096),
+		"free_bytes":      float64(stats.RealFree * 4096),
+		"available_bytes": float64(stats.RealAvailable * 4096),
+	}, nil
+}