Skip to content

Add ZFS freebsd per dataset stats #2753

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

Merged
SuperQ merged 9 commits into from
Sep 11, 2023
Merged

Add ZFS freebsd per dataset stats #2753

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
896b8a1
Rename parsePoolObjsetFile to parseLinuxPoolObjsetFile to better reflect
conallob Jul 19, 2023
75d23aa
Create a new parseFreeBSDPoolObjsetStats function, to generate a list
conallob Jul 20, 2023
7e2a867
Add missing brace and correct slice variable to append to
conallob Jul 20, 2023
254d623
Evolve bsdSysctl struct to include a labels attribute of type
conallob Aug 14, 2023
055c4f0
Add labels attributes to bsdSysctl objects, set to nil for existing m…
conallob Aug 14, 2023
c33a116
Rename zfsPoolObjs to zfsDatasetsNames, to be self documenting.
conallob Aug 14, 2023
8c8f84f
Replace perPoolMetrics with just appending directly to c.sysctls
conallob Aug 14, 2023
e8a9810
Run gofmt
conallob Aug 14, 2023
b302e91
Merge branch 'prometheus:master' into zfs-freebsd-per-dataset-stats
conallob Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Rename parsePoolObjsetFile to parseLinuxPoolObjsetFile to better reflect 
it's scope

Signed-off-by: Conall O'Brien <[email protected]>
  • Loading branch information
@conallob
conallob committed Jul 19, 2023
commit 896b8a1ca706e406d6576af42caf93a3521c55b6
4 changes: 2 additions & 2 deletions collector/zfs_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func (c *zfsCollector) updatePoolStats(ch chan<- prometheus.Metric) error {
return errZFSNotAvailable
}

err = c.parsePoolObjsetFile(file, zpoolPath, func(poolName string, datasetName string, s zfsSysctl, v uint64) {
err = c.parseLinuxPoolObjsetFile(file, zpoolPath, func(poolName string, datasetName string, s zfsSysctl, v uint64) {
ch <- c.constPoolObjsetMetric(poolName, datasetName, s, v)
})
file.Close()
Expand Down Expand Up @@ -220,7 +220,7 @@ func (c *zfsCollector) parsePoolProcfsFile(reader io.Reader, zpoolPath string, h
return scanner.Err()
}

func (c *zfsCollector) parsePoolObjsetFile(reader io.Reader, zpoolPath string, handler func(string, string, zfsSysctl, uint64)) error {
func (c *zfsCollector) parseLinuxPoolObjsetFile(reader io.Reader, zpoolPath string, handler func(string, string, zfsSysctl, uint64)) error {
scanner := bufio.NewScanner(reader)

parseLine := false
Expand Down
2 changes: 1 addition & 1 deletion collector/zfs_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ func TestZpoolObjsetParsing(t *testing.T) {
t.Fatal(err)
}

err = c.parsePoolObjsetFile(file, zpoolPath, func(poolName string, datasetName string, s zfsSysctl, v uint64) {
err = c.parseLinuxPoolObjsetFile(file, zpoolPath, func(poolName string, datasetName string, s zfsSysctl, v uint64) {
if s != zfsSysctl("kstat.zfs.misc.objset.writes") {
return
}
Expand Down