c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 10:37:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

zpool_influxdb: move to libexec dir

Browse Source 
Move the zpool_influxdb command to /usr/libexec/zfs,
and include the /usr/libexec/zfs path in the system search
directory when running the test suite.

Reviewed-by: Richard Elling <Richard.Elling@RichardElling.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Pavel Snajdr <snajpa@snajpa.net>
Closes #11156
Closes #11160
Closes #11224
This commit is contained in:
Pavel Snajdr
2020-11-28 20:15:57 +01:00
committed by GitHub
parent b2a54a28b5
commit 52c8537513
8 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/zpool_influxdb/Makefile.am
+1 -1
View File
@@ -1,6 +1,6 @@
include $(top_srcdir)/config/Rules.am
bin_PROGRAMS = zpool_influxdb
zfsexec_PROGRAMS = zpool_influxdb
zpool_influxdb_SOURCES = \
zpool_influxdb.c
cmd/zpool_influxdb/README.md
+2 -2
View File
@@ -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/zfs/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/zfs/zpool_influxdb"]
data_format = "influx"
```
cmd/zpool_influxdb/telegraf.d/exec_zpool_influxdb.conf
+1 -1
View File
@@ -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/zfs/zpool_influxdb"]
# ## Timeout for each command to complete.
# timeout = "5s"
#
cmd/zpool_influxdb/telegraf.d/execd_zpool_influxdb.conf
+1 -1
View File
@@ -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/zfs/zpool_influxdb", "--execd"]
## Define how the process is signaled on each collection interval.
## Valid values are: