zpool_influxdb: move to libexec dir

Move zpool_influxdb to libexec dir, as per following discussions: openzfs#11156 openzfs#11160 Signed-off-by: Pavel Snajdr <[email protected]>
vpsfreecz · Nov 27, 2020 · 4d9f519 · 4d9f519
1 parent 04a82e0
commit 4d9f519
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 7 deletions.
diff --git a/cmd/zpool_influxdb/Makefile.am b/cmd/zpool_influxdb/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/Rules.am
 
-bin_PROGRAMS = zpool_influxdb
+libexec_PROGRAMS = zpool_influxdb
 
 zpool_influxdb_SOURCES = \
 	zpool_influxdb.c

diff --git a/cmd/zpool_influxdb/README.md b/cmd/zpool_influxdb/README.md
@@ -237,7 +237,7 @@ be restarted to read the config-directory files.
 # # Read metrics from zpool_influxdb
 [[inputs.execd]]
 #   ## default installation location for zpool_influxdb command
-  command = ["/usr/bin/zpool_influxdb", "--execd"]
+  command = ["/usr/libexec/zpool_influxdb", "--execd"]
 
     ## Define how the process is signaled on each collection interval.
     ## Valid values are:
@@ -264,7 +264,7 @@ be restarted to read the config-directory files.
 # # Read metrics from zpool_influxdb
 [[inputs.exec]]
 #   ## default installation location for zpool_influxdb command
-  commands = ["/usr/bin/zpool_influxdb"]
+  commands = ["/usr/libexec/zpool_influxdb"]
   data_format = "influx"
 ```
 

diff --git a/cmd/zpool_influxdb/telegraf.d/exec_zpool_influxdb.conf b/cmd/zpool_influxdb/telegraf.d/exec_zpool_influxdb.conf
@@ -1,7 +1,7 @@
 # # Read metrics from zpool_influxdb
 [[inputs.exec]]
 #   ## default installation location for zpool_influxdb command
-  commands = ["/usr/local/bin/zpool_influxdb"]
+  commands = ["/usr/local/libexec/zpool_influxdb"]
 #   ## Timeout for each command to complete.
 #   timeout = "5s"
 #

diff --git a/cmd/zpool_influxdb/telegraf.d/execd_zpool_influxdb.conf b/cmd/zpool_influxdb/telegraf.d/execd_zpool_influxdb.conf
@@ -1,7 +1,7 @@
 # # Read metrics from zpool_influxdb
 [[inputs.execd]]
 #   ## default installation location for zpool_influxdb command
-  command = ["/usr/local/bin/zpool_influxdb", "--execd"]
+  command = ["/usr/local/libexec/zpool_influxdb", "--execd"]
 
     ## Define how the process is signaled on each collection interval.
     ## Valid values are:

diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
@@ -444,11 +444,12 @@ systemctl --system daemon-reload >/dev/null || true
 %{_bindir}/raidz_test
 %{_bindir}/zgenhostid
 %{_bindir}/zvol_wait
-%{_bindir}/zpool_influxdb
 # Optional Python 2/3 scripts
 %{_bindir}/arc_summary
 %{_bindir}/arcstat
 %{_bindir}/dbufstat
+# Auxiliary executables
+%{_libexecdir}/zpool_influxdb
 # Man pages
 %{_mandir}/man1/*
 %{_mandir}/man5/*

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
@@ -61,6 +61,7 @@ export EXTRA_ENVIRONMENT
 all-local:
 	-$(SED) -e '\|^export BIN_DIR=|s|$$|@abs_top_builddir@/bin|' \
 		-e '\|^export SBIN_DIR=|s|$$|@abs_top_builddir@/bin|' \
+		-e '\|^export LIBEXEC_DIR=|s|$$|@abs_top_builddir@/bin|' \
 		-e '\|^export ZTS_DIR=|s|$$|@abs_top_srcdir@/tests|' \
 		-e '\|^export SCRIPT_DIR=|s|$$|@abs_top_srcdir@/scripts|' \
 		$(abs_top_srcdir)/scripts/common.sh.in >common.sh
@@ -72,6 +73,7 @@ clean-local:
 install-data-hook:
 	-$(SED) -e '\|^export BIN_DIR=|s|$$|@bindir@|' \
 		-e '\|^export SBIN_DIR=|s|$$|@sbindir@|' \
+		-e '\|^export LIBEXEC_DIR=|s|$$|@libexecdir@|' \
 		-e '\|^export ZTS_DIR=|s|$$|@datadir@/@PACKAGE@|' \
 		-e '\|^export SCRIPT_DIR=|s|$$|@datadir@/@PACKAGE@|' \
 		$(abs_top_srcdir)/scripts/common.sh.in \

diff --git a/scripts/common.sh.in b/scripts/common.sh.in
@@ -5,6 +5,7 @@ export BIN_DIR=
 export SBIN_DIR=
 export ZTS_DIR=
 export SCRIPT_DIR=
+export LIBEXEC_DIR=
 
 # General commands
 export ZDB=${ZDB:-$SBIN_DIR/zdb}

diff --git a/tests/zfs-tests/tests/functional/zpool_influxdb/zpool_influxdb.ksh b/tests/zfs-tests/tests/functional/zpool_influxdb/zpool_influxdb.ksh
@@ -50,7 +50,7 @@ function check_for
 }
 
 # by default, all stats and histograms for all pools
-log_must zpool_influxdb > $tmpfile
+log_must $LIBEXEC_DIR/zpool_influxdb > $tmpfile
 
 STATS="
 zpool_io_size