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

Add ZFS freebsd per dataset stats #2753

Merged
merged 9 commits into from
Sep 11, 2023
Merged

Add ZFS freebsd per dataset stats #2753

merged 9 commits into from
Sep 11, 2023

Commits on Jul 19, 2023

  1. Rename parsePoolObjsetFile to parseLinuxPoolObjsetFile to better reflect 

    it's scope

Signed-off-by: Conall O'Brien <conall@conall.net>
    @conallob
    conallob committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    896b8a1 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. Create a new parseFreeBSDPoolObjsetStats function, to generate a list 

    of per pool metrics to be queried via sysctl

Signed-off-by: Conall O'Brien <conall@conall.net>
    @conallob
    conallob committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    75d23aa View commit details
    Browse the repository at this point in the history

  2. Add missing brace and correct slice variable to append to 

    Signed-off-by: Conall O'Brien <conall@conall.net>
    @conallob
    conallob committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    7e2a867 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. Evolve bsdSysctl struct to include a labels attribute of type 

    prometheus.Labels. Update all references of bsdSysctl to set labels to nil

Signed-off-by: Conall O'Brien <conall@conall.net>
    @conallob
    conallob committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    254d623 View commit details
    Browse the repository at this point in the history

  2. Add labels attributes to bsdSysctl objects, set to nil for existing m… 

    …ibs.

Set zpool and dataset labels on the per ZFS dataset status, using
consistent label naming from
prometheus#2753

Signed-off-by: Conall O'Brien <conall@conall.net>
    @conallob
    conallob committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    055c4f0 View commit details
    Browse the repository at this point in the history

  3. Rename zfsPoolObjs to zfsDatasetsNames, to be self documenting. 

    Fix append() to perPoolMetrics to cast object as type bsdSysctl

Signed-off-by: Conall O'Brien <conall@conall.net>
    @conallob
    conallob committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    c33a116 View commit details
    Browse the repository at this point in the history

  4. Replace perPoolMetrics with just appending directly to c.sysctls 

    Signed-off-by: Conall O'Brien <conall@conall.net>
    @conallob
    conallob committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    8c8f84f View commit details
    Browse the repository at this point in the history

  5. Run gofmt 

    Signed-off-by: Conall O'Brien <conall@conall.net>
    @conallob
    conallob committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    e8a9810 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'prometheus:master' into zfs-freebsd-per-dataset-stats

    @conallob
    conallob authored Aug 14, 2023
    Configuration menu
    Copy the full SHA
    b302e91 View commit details
    Browse the repository at this point in the history