From a372120527dd9e3f0038fce877fbf33f9c0d63d3 Mon Sep 17 00:00:00 2001 From: matt durham Date: Wed, 4 Oct 2023 10:17:16 -0400 Subject: [PATCH] I have no idea how the code in node_exporter prometheus compiles. --- collector/zfs_freebsd.go | 100 +-------------------------------------- 1 file changed, 2 insertions(+), 98 deletions(-) diff --git a/collector/zfs_freebsd.go b/collector/zfs_freebsd.go index eaa1af8a83..b9246153bc 100644 --- a/collector/zfs_freebsd.go +++ b/collector/zfs_freebsd.go @@ -18,13 +18,9 @@ package collector import ( "fmt" - "strings" "github.com/go-kit/log" - "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - - "golang.org/x/sys/unix" ) type zfsCollector struct { @@ -37,7 +33,7 @@ const ( ) func init() { - registerCollector(zfsCollectorSubsystem, defaultEnabled, NewZfsCollector) + registerCollector("zfs", defaultEnabled, NewZfsCollector) } func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, error) { @@ -49,7 +45,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.abdstats.linear_cnt", dataType: bsdSysctlTypeUint64, valueType: prometheus.CounterValue, - labels: nil, }, { name: "abdstats_linear_data_bytes", @@ -57,7 +52,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.abdstats.linear_data_size", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, { name: "abdstats_scatter_chunk_waste_bytes", @@ -65,7 +59,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.abdstats.scatter_chunk_waste", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, { name: "abdstats_scatter_count_total", @@ -73,7 +66,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.abdstats.scatter_cnt", dataType: bsdSysctlTypeUint64, valueType: prometheus.CounterValue, - labels: nil, }, { name: "abdstats_scatter_data_bytes", @@ -81,7 +73,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.abdstats.scatter_data_size", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, { name: "abdstats_struct_bytes", @@ -89,7 +80,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.abdstats.struct_size", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, { name: "arcstats_anon_bytes", @@ -97,7 +87,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.anon_size", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, { name: "arcstats_c_bytes", @@ -105,7 +94,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.c", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, { name: "arcstats_c_max_bytes", @@ -113,7 +101,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.c_max", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, { name: "arcstats_c_min_bytes", @@ -121,7 +108,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.c_min", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, { name: "arcstats_data_bytes", @@ -129,7 +115,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.data_size", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, { name: "arcstats_demand_data_hits_total", @@ -137,7 +122,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.demand_data_hits", dataType: bsdSysctlTypeUint64, valueType: prometheus.CounterValue, - labels: nil, }, { name: "arcstats_demand_data_misses_total", @@ -145,7 +129,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.demand_data_misses", dataType: bsdSysctlTypeUint64, valueType: prometheus.CounterValue, - labels: nil, }, { name: "arcstats_demand_metadata_hits_total", @@ -153,7 +136,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.demand_metadata_hits", dataType: bsdSysctlTypeUint64, valueType: prometheus.CounterValue, - labels: nil, }, { name: "arcstats_demand_metadata_misses_total", @@ -161,7 +143,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.demand_metadata_misses", dataType: bsdSysctlTypeUint64, valueType: prometheus.CounterValue, - labels: nil, }, { name: "arcstats_hdr_bytes", @@ -169,7 +150,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.hdr_size", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, { name: "arcstats_hits_total", @@ -177,7 +157,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.hits", dataType: bsdSysctlTypeUint64, valueType: prometheus.CounterValue, - labels: nil, }, { name: "arcstats_misses_total", @@ -185,7 +164,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.misses", dataType: bsdSysctlTypeUint64, valueType: prometheus.CounterValue, - labels: nil, }, { name: "arcstats_mfu_ghost_hits_total", @@ -193,7 +171,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.mfu_ghost_hits", dataType: bsdSysctlTypeUint64, valueType: prometheus.CounterValue, - labels: nil, }, { name: "arcstats_mfu_ghost_size", @@ -201,7 +178,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.mfu_ghost_size", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, { name: "arcstats_mfu_bytes", @@ -209,7 +185,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.mfu_size", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, { name: "arcstats_mru_ghost_hits_total", @@ -217,7 +192,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.mru_ghost_hits", dataType: bsdSysctlTypeUint64, valueType: prometheus.CounterValue, - labels: nil, }, { name: "arcstats_mru_ghost_bytes", @@ -225,7 +199,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.mru_ghost_size", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, { name: "arcstats_mru_bytes", @@ -233,7 +206,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.mru_size", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, { name: "arcstats_other_bytes", @@ -241,37 +213,13 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.other_size", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, - // when FreeBSD 14.0+, `meta/pm/pd` install of `p`. { name: "arcstats_p_bytes", description: "ZFS ARC MRU target size", mib: "kstat.zfs.misc.arcstats.p", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, - }, - { - name: "arcstats_meta_bytes", - description: "ZFS ARC metadata target frac ", - mib: "kstat.zfs.misc.arcstats.meta", - dataType: bsdSysctlTypeUint64, - valueType: prometheus.GaugeValue, - }, - { - name: "arcstats_pd_bytes", - description: "ZFS ARC data MRU target frac", - mib: "kstat.zfs.misc.arcstats.pd", - dataType: bsdSysctlTypeUint64, - valueType: prometheus.GaugeValue, - }, - { - name: "arcstats_pm_bytes", - description: "ZFS ARC meta MRU target frac", - mib: "kstat.zfs.misc.arcstats.pm", - dataType: bsdSysctlTypeUint64, - valueType: prometheus.GaugeValue, }, { name: "arcstats_size_bytes", @@ -279,7 +227,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.arcstats.size", dataType: bsdSysctlTypeUint64, valueType: prometheus.GaugeValue, - labels: nil, }, { name: "zfetchstats_hits_total", @@ -287,7 +234,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.zfetchstats.hits", dataType: bsdSysctlTypeUint64, valueType: prometheus.CounterValue, - labels: nil, }, { name: "zfetchstats_misses_total", @@ -295,7 +241,6 @@ func NewZfsCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, mib: "kstat.zfs.misc.zfetchstats.misses", dataType: bsdSysctlTypeUint64, valueType: prometheus.CounterValue, - labels: nil, }, }, logger: logger, @@ -306,9 +251,7 @@ func (c *zfsCollector) Update(ch chan<- prometheus.Metric) error { for _, m := range c.sysctls { v, err := m.Value() if err != nil { - // debug logging - level.Debug(c.logger).Log("name", m.name, "couldn't get sysctl:", err) - continue + return fmt.Errorf("couldn't get sysctl: %w", err) } ch <- prometheus.MustNewConstMetric( @@ -321,42 +264,3 @@ func (c *zfsCollector) Update(ch chan<- prometheus.Metric) error { return nil } - -func (c *zfsCollector) parseFreeBSDPoolObjsetStats() error { - - sysCtlMetrics := []string{ - "nunlinked", "nunlinks", "nread", "reads", "nwritten", "writes", - } - zfsPoolMibPrefix := "kstat.zfs.pool.dataset" - zfsDatasetsNames := []string{} - - zfsDatasets, err := unix.Sysctl(zfsPoolMibPrefix) - if err != nil { - return fmt.Errorf("couldn't get sysctl: %w", err) - } - - for dataset, _ := range zfsDatasets { - if strings.HasSuffix(dataset, ".dataset_name") { - zfsDatasetsNames = append(zfsDatasetsNames, strings.SplitAfter(dataset, ".")[3]) - } - } - - 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, - }) - } - } - - return nil -}