git: 804a06089158 - stable/13 - zfs: attach zpool_influxdb to build

[Martin Matuska]

The branch stable/13 has been updated by mm:

URL: https://cgit.FreeBSD.org/src/commit/?id=804a0608915837eeb3f235a05f93324750770d19

commit 804a0608915837eeb3f235a05f93324750770d19
Author:     Martin Matuska <mm at FreeBSD.org>
AuthorDate: 2021-07-07 17:45:52 +0000
Commit:     Martin Matuska <mm at FreeBSD.org>
CommitDate: 2021-07-10 10:26:42 +0000

    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 48b4fe0503282f03d25e23f44109c5cb6d450f7c)
---
 cddl/Makefile                                   |  2 +-
 cddl/usr.libexec/Makefile                       | 13 +++++++++++
 cddl/usr.libexec/zpool_influxdb/Makefile        | 28 ++++++++++++++++++++++
 cddl/usr.libexec/zpool_influxdb/Makefile.depend | 31 +++++++++++++++++++++++++
 etc/mtree/BSD.debug.dist                        |  2 ++
 etc/mtree/BSD.usr.dist                          |  2 ++
 6 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/cddl/Makefile b/cddl/Makefile
index 7b9d13146afa..284a370c0167 100644
--- a/cddl/Makefile
+++ b/cddl/Makefile
@@ -3,7 +3,7 @@
 .include <src.opts.mk>
 
 SUBDIR=	lib .WAIT \
-	sbin share usr.bin usr.sbin
+	sbin share usr.bin usr.libexec usr.sbin
 
 SUBDIR.${MK_TESTS}+= tests
 
diff --git a/cddl/usr.libexec/Makefile b/cddl/usr.libexec/Makefile
new file mode 100644
index 000000000000..6280cbab5766
--- /dev/null
+++ b/cddl/usr.libexec/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+SUBDIR=	${_zpool_influxdb}
+
+.if ${MK_ZFS} != "no"
+_zpool_influxdb= zpool_influxdb
+.endif
+
+SUBDIR_PARALLEL=
+
+.include <bsd.subdir.mk>
diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile b/cddl/usr.libexec/zpool_influxdb/Makefile
new file mode 100644
index 000000000000..2fb22f02ef32
--- /dev/null
+++ b/cddl/usr.libexec/zpool_influxdb/Makefile
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+ZFSTOP=	${SRCTOP}/sys/contrib/openzfs
+
+.PATH: ${ZFSTOP}/cmd/zpool_influxdb
+.PATH: ${ZFSTOP}/man/man8
+
+PROG=	zpool_influxdb
+MAN=	zpool_influxdb.8
+BINDIR?=	/usr/libexec/zfs
+
+WARNS?=	0
+CSTD=	c99
+
+CFLAGS+= \
+	-DIN_BASE \
+	-I${ZFSTOP}/include \
+	-I${ZFSTOP}/lib/libspl/include \
+	-I${ZFSTOP}/lib/libspl/include/os/freebsd \
+	-include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
+	-DHAVE_ISSETUGID \
+	-include ${SRCTOP}/sys/modules/zfs/zfs_config.h \
+	-DSYSCONFDIR=\"/etc\" \
+	-DPKGDATADIR=\"/usr/share/zfs\"
+
+LIBADD=	nvpair spl zfs
+
+.include <bsd.prog.mk>
diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile.depend b/cddl/usr.libexec/zpool_influxdb/Makefile.depend
new file mode 100644
index 000000000000..53090da6e2fc
--- /dev/null
+++ b/cddl/usr.libexec/zpool_influxdb/Makefile.depend
@@ -0,0 +1,31 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	cddl/lib/libavl \
+	cddl/lib/libnvpair \
+	cddl/lib/libumem \
+	cddl/lib/libuutil \
+	cddl/lib/libzfs \
+	cddl/lib/libzfs_core \
+	gnu/lib/csu \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	lib/libexpat \
+	lib/libgeom \
+	lib/libmd \
+	lib/libsbuf \
+	lib/libthr \
+	lib/libutil \
+	lib/libz \
+	lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
index 3ccdf50188c8..7df3113b183b 100644
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -54,6 +54,8 @@
                 ..
                 sm.bin
                 ..
+                zfs
+                ..
             ..
             sbin
             ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 9ae3acbe6eba..797bc06ab7df 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -156,6 +156,8 @@
         ..
         sm.bin
         ..
+        zfs
+        ..
     ..
     local
     ..