Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorAndrejs Kozlovs <andrejs.kozlovs@zabbix.com>2020-09-25 15:51:52 +0300
committerAndrejs Kozlovs <andrejs.kozlovs@zabbix.com>2020-09-25 15:51:52 +0300
commit2f85d3f57adfae61fd64b025a6266ff6a490b676 (patch)
tree67956dac1fdb5ba44466275b6bc2038cc253b950 /conf
parentf5961ff75dea3345cae875a71282cc1af3d966e3 (diff)
parentfdf2f857c9e28075d6edefe10a16dde9b17f7ab5 (diff)
...G...... [ZBXNEXT-2943] update from master
Diffstat (limited to 'conf')
-rw-r--r--conf/zabbix_agentd.conf10
-rw-r--r--conf/zabbix_agentd.win.conf10
2 files changed, 20 insertions, 0 deletions
diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf
index 3580996bc99..12afc725ed0 100644
--- a/conf/zabbix_agentd.conf
+++ b/conf/zabbix_agentd.conf
@@ -330,6 +330,16 @@ Hostname=Zabbix server
# Default:
# UserParameter=
+### Option: UserParameterDir
+# Directory to execute UserParameter commands from. Only one entry is allowed.
+# When executing UserParameter commands the agent will change the working directory to the one
+# specified in the UserParameterDir option.
+# This way UserParameter commands can be specified using the relative ./ prefix.
+#
+# Mandatory: no
+# Default:
+# UserParameterDir=
+
####### LOADABLE MODULES #######
### Option: LoadModulePath
diff --git a/conf/zabbix_agentd.win.conf b/conf/zabbix_agentd.win.conf
index a768697fb72..9b5a18539c6 100644
--- a/conf/zabbix_agentd.win.conf
+++ b/conf/zabbix_agentd.win.conf
@@ -314,6 +314,16 @@ Hostname=Windows host
# Default:
# UserParameter=
+### Option: UserParameterDir
+# Directory to execute UserParameter commands from. Only one entry is allowed.
+# When executing UserParameter commands the agent will change the working directory to the one
+# specified in the UserParameterDir option.
+# This way UserParameter commands can be specified using the relative ./ prefix.
+#
+# Mandatory: no
+# Default:
+# UserParameterDir=
+
####### TLS-RELATED PARAMETERS #######
### Option: TLSConnect