Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix freebsd build error #2882

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix freebsd build error #2882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ae66b4
fix FreeBSD typo & change parseFreeBSDPoolObjsetStats, use zfs cmd li…
Dec 22, 2023
565fc2f
comments parseFreeBSDPoolObjsetStats function, just for a demo, if so…
Dec 22, 2023
1cbc4f1
fix FreeBSD typo & change parseFreeBSDPoolObjsetStats, use zfs cmd li…
Dec 22, 2023
3f08c62
comments parseFreeBSDPoolObjsetStats function, just for a demo, if so…
Dec 22, 2023
e68d2cf
Merge branch 'fix_freebsd_build_error' of https://github.com/mingjuny…
Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion collector/exec_bsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ func NewExecCollector(logger log.Logger) (Collector, error) {
description: "System calls since system boot. Resets at architecture unsigned integer.",
mib: "vm.stats.sys.v_syscall",
},
labels: nil,
{
name: "exec_device_interrupts_total",
description: "Device interrupts since system boot. Resets at architecture unsigned integer.",
Expand Down
117 changes: 79 additions & 38 deletions collector/zfs_freebsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@
package collector

import (
"fmt"
// "fmt"
// "os/exec"
// "regexp"
// "strconv"
// "strings"

"github.com/go-kit/log"
"github.com/go-kit/log/level"
"github.com/prometheus/client_golang/prometheus"

"golang.org/x/sys/unix"
// "golang.org/x/sys/unix"
)

type zfsCollector struct {
Expand All @@ -40,7 +43,7 @@ func init() {
}

func NewZfsCollector(logger log.Logger) (Collector, error) {
return &zfsCollector{
c := zfsCollector{
sysctls: []bsdSysctl{
{
name: "abdstats_linear_count_total",
Expand Down Expand Up @@ -298,7 +301,9 @@ func NewZfsCollector(logger log.Logger) (Collector, error) {
},
},
logger: logger,
}, nil
}
// c.parseFreeBSDPoolObjsetStats()
return &c, nil
}

func (c *zfsCollector) Update(ch chan<- prometheus.Metric) error {
Expand All @@ -321,41 +326,77 @@ func (c *zfsCollector) Update(ch chan<- prometheus.Metric) error {
return nil
}

func (c *zfsCollector) parseFreeBSDPoolObjsetStats() error {
// type DataSets struct {
// dataSetName string
// objSetID uint64
// zPoolName string
// }

sysCtlMetrics := []string{
"nunlinked", "nunlinks", "nread", "reads", "nwritten", "writes",
}
zfsPoolMibPrefix := "kstat.zfs.pool.dataset"
zfsDatasetNames := []string{}
// func (c *zfsCollector) parseFreeBSDPoolObjsetStats() error {
// nameRe := regexp.MustCompile(`^(?P<dataset>\S+)`)
// numRe := regexp.MustCompile(`(?P<setid>\d+)\s*$`)
// sysCtlMetrics := []string{
// "nunlinked", "nunlinks", "nread", "reads", "nwritten", "writes",
// }

zfsDatasets, err := unix.Sysctl(zfsPoolMibPrefix)
if err != nil {
return fmt.Errorf("couldn't get sysctl: %w", err)
}
// cmdOut, err := exec.Command("zfs", "list", "-tfilesystem", "-oname,objsetid").Output()
// if err != nil {
// return fmt.Errorf("zfs cmd err, %w", err)
// }
// t := string(cmdOut[:])
// dataSets := []DataSets{}

for dataset, _ := range zfsDatasets {
if strings.HasSuffix(dataset, ".dataset_name") {
zfsDatasetNames = append(zfsDatasetNames, strings.SplitAfter(dataset, ".")[3])
}
}
// zfsListStrs := strings.Split(t, "\n")
// // default pool name is zroot
// zPoolName := "zroot"
// for idx := range zfsListStrs {
// tmpStr := zfsListStrs[idx]
// name := nameRe.FindAllString(tmpStr, -1)
// num := numRe.FindAllString(tmpStr, -1)
// if len(name) == 1 && len(num) == 1 {
// objSetId, err := strconv.ParseUint(num[0], 10, 64)
// if err != nil {
// // warn error info
// continue
// }
// if objSetId == 0x36 {
// zPoolName = name[0]
// }
// temp := DataSets{
// name[0], objSetId, zPoolName,
// }
// dataSets = append(dataSets, temp)
// }
// }

for zpoolDataset := range zfsDatasetsNames {
zfsDatasetLabels := map[string]string{
"dataset": zpoolDataset,
"zpool": strings.SplitAfter(zpoolDataset, "/")[0],
}
for metric := range sysCtlMetrics {
c.sysctls = append(c.sysctls, bsdSysctl{
name: fmt.SprintF("node_zfs_zpool_dataset_%s", metric),
description: fmt.SprintF("node_zfs_zpool_dataset_%s", metric),
mib: fmt.Sprintf("%s.%s.%s", zfsPoolMibPrefix, poolObj, metric),
dataType: bsdSysctlTypeUint64,
valueType: prometheus.CounterValue,
labels: zfsDatasetLabels,
})
}
}
// for datasetIdx := range dataSets {
// dataSetName := dataSets[datasetIdx].dataSetName
// zPoolName := dataSets[datasetIdx].zPoolName
// objSetID := dataSets[datasetIdx].objSetID

return nil
}
// for sysCtlMetricID := range sysCtlMetrics {
// metric := sysCtlMetrics[sysCtlMetricID]
// metricItem := fmt.Sprintf("kstat.zfs.%s.dataset.objset-0x%x.%s", zPoolName, objSetID, metric)
// _, err := unix.SysctlUint64(metricItem)
// if err != nil {
// // warn, some metricData no such file or directory
// continue
// }
// zfsDatasetLabels := map[string]string{
// "dataset": dataSetName,
// "zpool": zPoolName,
// }
// t := strings.Replace(dataSetName, "/", "_", -1)
// c.sysctls = append(c.sysctls, bsdSysctl{
// name: fmt.Sprintf("node_zfs_%s_dataset_%s", t, metric),
// description: fmt.Sprintf("node_zfs_%s_dataset_%s", t, metric),
// mib: metricItem,
// dataType: bsdSysctlTypeUint64,
// valueType: prometheus.CounterValue,
// labels: zfsDatasetLabels,
// })
// }
// }

// return nil
// }