Commit graph

3 commits

Author SHA1 Message Date
Martin Matuska b9c2c366db zfs: merge openzfs/zfs@fb6d53206 (zfs-2.1-release) into stable/13
Notable upstream pull request merges:
 #13976 3ad882658 Avoid calling rw_destroy() on uninitialized rwlock
 #15243 11574a793 Add zfs_prepare_disk script for disk firmware install
 #15331 e1bc32f71 Report ashift of L2ARC devices in zdb
 #15675 12a031a3f spa: make read/write queues configurable
 #15719 b4481996b spa: Fix FreeBSD sysctl handlers
 #15719 8e5298f0a spa: Let spa_taskq_param_get()'s addition of a newline
                       be optional
 #15769 dfece78a4 Add 'zpool status -e' flag to see unhealthy vdevs
 #15847 d1ee3d611 LUA: Backport CVE-2020-24370's patch

Obtained from:	OpenZFS
OpenZFS commit:	fb6d532066
OpenZFS tag:	zfs-2.1.15
2024-03-01 15:16:06 +01:00
Warner Losh 023fc80ee3 Remove $FreeBSD$: one-line sh pattern
Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/

Similar commit in main:
(cherry picked from commit d0b2dbfa0e)
2023-08-23 11:43:30 -06:00
Martin Matuska 804a060891 zfs: attach zpool_influxdb to build
From the zpool_influxdb.8 manual page:
  zpool_influxdb produces InfluxDB-line-protocol-compatible metrics from
  zpools.  Like the zpool command, zpool_influxdb reads the current pool
  status and statistics.  Unlike the zpool command which is intended for
  humans, zpool_influxdb formats the output in the InfluxDB line protocol.
  The expected use is as a plugin to a metrics collector or aggregator,
  such as Telegraf.

zpool_influxdb is installed into /usr/libexec/zfs/

Differential revision:	https://reviews.freebsd.org/D31094

(cherry picked from commit 48b4fe0503)
2021-07-10 12:26:42 +02:00