Added tgz package support

Makefile

@@ -12,6 +12,7 @@ include deb.mk
 include arch.mk
 include ipk.mk
 include rpm.mk
+include tgz.mk
 
 CONTROLFILES=$(foreach p,$(PLUGINS),$(p)/control.zaf)
 ZAF_EXPORT_OPTS=$(foreach o,$(ZAF_OPTIONS),$(shell echo $(o)|cut -d '=' -f 1))
@@ -35,6 +36,9 @@ rpm:	$(RPM_PKG)
 
 ipk:	$(IPK_PKG)
 
+tar:	tgz
+tgz:	$(TGZ_PKG)
+
 clean:
 	@rm -rf tmp/* out/*
 

README.md

@@ -24,8 +24,36 @@ So zaf is here for you :)
 * Zabbix agent autoinstallation and autoconfiguration suitable to use in puppet or another tool 
 * OS packaging support
 * Zabbix API support
+* Zabbix host autoregistration automation
+* Zabbix sender and agent glue (send results of agent checks to zabbix sender)
+* Zabbix backup support using [zaf](https://macura.cz/node/34)
+* Support for wireless neighbours, clients with autodiscovery [iwx module](https://github.com/limosek/zaf-plugins/tree/master/iwx)
+* Support for automated import of hosts and items from [CSV](https://github.com/limosek/zaf-plugins/tree/master/csv)
+* Support for fail2ban monitoring [fail2ban](https://github.com/limosek/zaf-plugins/tree/master/fail2ban)
+* Supoort for booked [booked](https://github.com/limosek/zaf-plugins/tree/master/booked)
+
+## Roadmap
+
+* External items support with automatic configuration of server
+
+## How it works
+Zaf installer will do most of actions needed to monitor some specific plugin items. Configuration of plugin is very simple and text readable. Anybody can write its own plugin or make its plugin "zafable". It is enough to create *control.zaf" file. For example, look into https://github.com/limosek/zaf-plugins repository. This is default repository for zaf. 
+
+## I want to make my own plugin!
+Great! Look into https://github.com/limosek/zaf-plugins repository, look to control files and try to create your own. It is easy! You can contact me for help.
+
+## I want to help with zaf!
+Great! I have no time for testing on systems and writing system specific hacks. Next to this, templates should be optimized and tested for basic plugins. 
+
+## I love this tool
+OK, great, if you love this tool, you can support new development on paypal account *lukas@macura.cz* or Bitcoin address **19Wbr729vei35gUQLcH2ZJGKb8oTVLz44K**. 
 
 ## Installing Zaf
+
+**Note**: this instructions are for *trunk* version of zaf. For *stable* version, see https://github.com/limosek/zaf/tree/1.3
+
+**Note**: You can find more examples on [my site](https://macura.cz/search/node?keys=zaf)
+
 You need to be root and you must have curl installed on your system. Depending on your system, github certificates may not be available so you have to use *-k* option for curl (insecure). Default installation type is silent. So there will be no questions and everything will be autodetected. This simple command should be used on most systems:
 ```
 curl -k https://raw.githubusercontent.com/limosek/zaf/master/install.sh | sh
@@ -36,7 +64,7 @@ wget --no-check-certificate -O - https://raw.githubusercontent.com/limosek/zaf/m
 ```
 If you do not have https support (like openwrt), I made small http mirror of github files which is synchronized each day:
 ```
-wget -O - http://github.macura.cz/zaf/install.sh| ZAF_RAW_URL=http://github.macura.cz/zaf/ ZAF_REPO_URL=http://github.macura.cz/zaf-plugins/ sh 
+wget -O - http://github.macura.cz/zaf/install.sh| ZAF_RAW_URL=http://github.macura.cz/zaf/ ZAF_URL=http://github.macura.cz/zaf/ ZAF_REPO_URL=http://github.macura.cz/zaf-plugins/ sh 
 ```
 
 ### Install options and autoconfiguration
@@ -90,18 +118,19 @@ ZAF_ZBXAPI_USER|Zabbix API user|zaf
 ZAF_ZBXAPI_PASS|Zabbix API password|empty
 ZAF_ZBXAPI_AUTHTYPE|Zabbix API authentication type|internal
 ZAF_PLUGINS|Plugins to autoinstall|empty
+ZAF_ZBXSRV_HOST|Zabbix server hostname|zabbix
+ZAF_ZBXSRV_PORT|Zabbix server port|10051
+ZAF_HOSTNAME|Hostname of this machine|automatic
 
 Installer will try to autoguess suitable config options for your system.
 Now everything was tested on Debian and OpenWrt. If somebody is interrested in, you can help and test with some rpm specific functions. Remember that on some systems, default zabbix agent config is empty so you *need to* enter essential config options as parameters.
 
 ### Example
 Suppose you want to autoinstall agent on clean system. You need only curl installed. Everything else is one-cmd process.
-This command will install zaf, install zabbix-agent if necessary and sets zabbix variables on agent to reach server. This command can be automatized by puppet or another deploying system.
+This command will install zaf, install zabbix-agent if necessary and sets zabbix variables on agent to reach server (Server and ServerActive to zabbix.server.local). This command can be automatized by puppet or another deploying system.
 ```
 curl -k https://raw.githubusercontent.com/limosek/zaf/master/install.sh | sh -s auto \
-  Z_Server=zabbix.server.local \
+  ZAF_ZBXSRV_HOST=zabbix.server.local \
-  Z_ServerActive=zabbix.server.local \
-  Z_HostnameItem=system.hostname Z_RefreshActiveChecks=60 \
   ZAF_REPO_GITURL="git://gitserver.local"
 ```
 
@@ -112,12 +141,12 @@ git clone https://github.com/limosek/zaf.git \
  && cd zaf \
  && git checkout master \
  && git clone https://github.com/limosek/zaf-plugins.git \
- && make deb PLUGINS="./zaf-plugins/fsx" ZAF_PLUGINS="zaf" ZAF_OPTIONS="ZAF_GIT=0" AGENT_OPTIONS="Z_Server=zabbix.server Z_ServerActive=zabbix.server Z_StartAgents=8"
+ && make deb PLUGINS="./zaf-plugins/fsx" ZAF_PLUGINS="zaf" ZAF_OPTIONS="ZAF_GIT=0 ZAF_ZBXSRV_HOST=zabbix.server.local" AGENT_OPTIONS="Z_StartAgents=8"
-sudo dpkg -i out/zaf-1.3master.deb
+sudo dpkg -i out/zaf-1.4master.deb
 ```
 General usage:
 ```
-make {deb|ipk|rpm} [ZAF_PLUGINS="plg1 [plg2]" [ZAF_OPTIONS="ZAF_cfg=val ..."] [AGENT_OPTIONS="Z_Server=host ..."]
+make {deb|ipk|rpm} [ZAF_PLUGINS="plg1 [plg2]" [ZAF_OPTIONS="ZAF_cfg=val ..."] [AGENT_OPTIONS="..."]
 ZAF_PLUGINS are embedded into package. Has to be local directories accessible during build.
 ```
 
@@ -151,10 +180,9 @@ Cmd: sudo fail2ban-client status $1 | grep "Currently banned:" | grep -o -E "[0-
 During plugin installation, zaf will check all dependencies, do install binaries and generates apropriate zabbix.conf.d entries.  Look into https://github.com/limosek/zaf-plugins repository for more examples.
 
 ## Zaf utility
-Zaf binary can be installed on any system from openwrt to big system. It has minimal dependencies and is shell based. Is has minimal size (up to 50kb of code). It can be used for installing, removing and testing zaf plugin items. Zaf should be run as root.
+Zaf binary can be installed on any system from openwrt to big system. It has minimal dependencies and is shell based. Is has minimal size (up to 50kb of code). It can be used for installing, removing and testing zaf plugin items. Zaf has to be configured and installed by root but it can be invoked as regular user.
 ```
-./zaf 
+./zaf Version 1.4. Please use some of this commands:
-./zaf Version 1.3master. Please use some of this commands:
 ./zaf Cmd [ZAF_OPTION=value] [ZAF_CTRL_Option=value] [ZAF_CTRLI_Item_Option=value] ...
 Plugin manipulation commands:
 ./zaf update                            To update repo (not plugins, similar to apt-get update)                         
@@ -170,39 +198,33 @@ Plugin info commands:
 Plugin diagnostic commands:
 ./zaf test [plugin[.item]]              To test [all] suported items by zabbix_agentd [for plugin]                      
 ./zaf get [plugin[.item]]               To test [all] suported items by zabbix_get [for plugin]                         
+./zaf run [plugin[.item]]               To test [all] suported items by directly runing command [for plugin]            
 ./zaf precache [plugin[.item]]          To precache [all] suported items                                                
+./zaf itemsh plugin.item                To spawn interactive shell in item context (same as UserParameter).             
 
 Zabbix API commands:
 ./zaf api                               To zabbix API functions. See ./zaf api for more info.                           
 
+Zabbix trapper commands:
+./zaf send plugin.item                  To send result of agent param directly to Zabbix server by zabbix_server.       
+Zabbix agent registration:
+./zaf register [hostname] [metadata]    To register hostname on Zabbix server (autoregistration).                       
+
 Agent config info commands:
 ./zaf userparms                         See userparms generated from zaf on stdout                                      
-./zaf agent-config                      Reconfigure zabbix userparms in /etc/zabbix/zabbix_agentd.d                     
+./zaf agent-config [force]              Reconfigure zabbix userparms in /etc/zabbix/zabbix_agentd.d                     
 
 Zaf related commands:
 ./zaf self-upgrade                      To self-upgrade zaf                                                             
 ./zaf self-remove                       To self-remove zaf and its config                                               
 ./zaf cache-clean                       To remove all entries from cache                                                
+./zaf cache-list                        To show all entries in cache                                                    
+
 ```
 
-Zaf can even communicate with zabbix server using its API.  If you set ZAF_ZBXAPI_URL, ZAF_ZBXAPI_USER and ZAF_ZBXAPI_PASS in /etc/zaf.conf, you can use it:
+### Plugin operations
-```
-./zaf api command [parameters]
-get-host-id host                        Get host id                                                                     
-get-byid-host id [property]             Get host property from id. Leave empty property for JSON                        
-get-template-id template                Get template id                                                                 
-get-byid-template id [property]         Get template property from id. Leave empty property for JSON                    
-get-map-id map                          Get map id                                                                      
-get-byid-map id [property]              Get map property from id. Leave empty property for JSON                         
-get-inventory host [fields]             Get inventory fields [or all fields]                                            
-export-hosts dir [hg]                   Backup all hosts [in group hg] (get their config from zabbix and save to dir/hostname.xml)
-export-host host                        Backup host (get config from zabbix to stdout)                                  
-import-template {plugin|file}           Import template for plugin or from file                                         
-export-template name                    Export template to stdout                                                       
-export-templates dir                    Export all templates to dir
-```
 
-### Installing plugin
+#### Installing plugin
 To install plugin from common repository. If git is available, local git repo is tried first. If not, remote https repo is tried second.
 ```
 zaf install zaf
@@ -217,14 +239,50 @@ zaf install /some/plugin
 ```
 Installer will look into control file, run setup task defined there, fetch binaries and scripts needed for specific plugin and test system dependencies for that plugin. If everything is OK, zaf_plugin.conf is created in zabbix_agentd.d conf directory and userparameters are automaticaly added.
 
-## How it works
+#### Plugin parameters
-Zaf installer will do most of actions needed to monitor some specific plugin items. Configuration of plugin is very simple and text readable. Anybody can write its own plugin or make its plugin "zafable". It is enough to create *control.zaf" file. For example, look into https://github.com/limosek/zaf-plugins repository. This is default repository for zaf. 
+Plugin can have some global parameters. For example url of local server to check. See booked plugin. In that case, you have to specify parameters before use.
+To set parameters by environment:
+```
+zaf install booked ZAF_booked_url=http://booked.server/api ZAF_booked_username=user
+```
+To set parameters later:
+```
+zaf plugin-set booked url http://booked.server/api
+zaf plugin-set booked username user
+```
+Plugin parameters are available as environment variables in shell script/binary run by agent. You can simulate this environment by
+```
+zaf itemsh booked.num_reservations
+```
+Interactive shell will be spawn and you can test your commands or scripts in same way how zabbix agent would do it. Use exit command or ctrl-D to get back.
+
+#### Run plugin subcommand
+If plugin is capable of runing subcommand (for example csv plugin), it can be called directly
+```
+zaf csv send
+```
+
+### Agent tests
+
+#### To test result of item (using zabbix_agent -t)
+
+```
+zaf test plugin.item[parameters]
+```
+
+#### To test result of item (using zabbix_get)
+
+```
+zaf test plugin.item[parameters]
+```
+
+#### To get result of item directly to stdout
+
+```
+zaf run plugin.item[parameters]
+```
 
-## I want to make my own plugin!
-Great! Look into https://github.com/limosek/zaf-plugins repository, look to control files and try to create your own. It is easy! You can contact me for help.
 
-## I want to help with zaf!
-Great! I have no time for testing on systems and writing system specific hacks. Next to this, templates should be optimized and tested for basic plugins. 
 
 
 

install.sh

@@ -16,7 +16,7 @@ fi
 # Lite version of zaf_fetch_url, full version will be loaded later
 zaf_fetch_url(){
 	if zaf_which curl >/dev/null 2>/dev/null; then
-		echo  curl -f -k -s -L -o - "$1" >&2;
+		echo	curl -f -k -s -L -o - "$1" >&2;
 		curl -f -k -s -L -o - "$1"
 	else
 		wget --no-check-certificate -O - "$1"
@@ -38,8 +38,8 @@ zaf_which() {
 # Lite version of zaf_err, full version will be loaded later
 zaf_err() {
 	logger ${ZAF_LOG_STDERR} -p user.err -t zaf-error -- $@
-        logger ${ZAF_LOG_STDERR} -p user.err -t zaf-error "Exiting with error!"
+	logger ${ZAF_LOG_STDERR} -p user.err -t zaf-error "Exiting with error!"
-        exit 1
+	exit 1
 }
 
 # Download tgz and extract to tmpdir
@@ -59,12 +59,12 @@ zaf_get_option(){
 	local opt
 
 	ZAF_HELP_OPTS="$ZAF_HELP_OPTS\n$1 $2 [$3]"
-        eval opt=\$C_$1
+	eval opt=\$C_$1
 	if [ -n "$opt" ]; then
-            eval "$1='$opt'"
+		eval "$1='$opt'"
-            zaf_dbg "Got '$2' <$1> from CLI: $opt"
+		zaf_dbg "Got '$2' <$1> from CLI: $opt"
-            return
+		return
-        fi
+	fi
 	eval opt=\$$1
 	if [ -n "$opt" ] && ! [ "$4" = "user" ]; then
 		eval "$1='$opt'"
@@ -111,7 +111,7 @@ zaf_set_zabbix_option() {
 	local option="$2"
 	local value="$3"
 	if grep -q ^$option\= $cfgfile; then
-		zaf_dbg "Setting option $option in $cfgfile to $3."
+		zaf_dbg "Setting Zabbix agent option $option in $cfgfile to $3."
 		sed -i "s/$option=\(.*\)/$option=$value/" $cfgfile
 	else
 		 zaf_move_zabbix_option "$1" "$2" "$3"
@@ -179,11 +179,23 @@ zaf_configure_agent() {
 	local value
 	local options
 	local changes
+	local aparams
 
-        zaf_install_dir "$ZAF_AGENT_CONFIGD"
+	zaf_install_dir "$ZAF_AGENT_CONFIGD"
 	echo -n >"$ZAF_AGENT_CONFIGD/zaf_options.conf" || zaf_err "Cannot access $ZAF_AGENT_CONFIGD/zaf_options.conf"
 	! [ -f "$ZAF_AGENT_CONFIG" ] && zaf_install "$ZAF_AGENT_CONFIG"
-	for pair in "$@"; do
+	if [ -n "$ZAF_ZBXSRV_HOST" ]; then
+		aparms="Z_Server=$ZAF_ZBXSRV_HOST,localhost Z_ServerActive=$ZAF_ZBXSRV_HOST"
+	else
+		aparms=""
+	fi
+	if [ -n "$ZAF_HOSTNAME" ]; then
+		aparms="$aparms Z_Hostname=$ZAF_HOSTNAME"
+	else
+		aparms="$aparms Z_HostnameItem=system.hostname Z_Hostname="
+		zaf_dbg "Using hostname as Hostname item for Zabbix"
+	fi
+	for pair in $aparms "$@"; do
 		echo $pair | grep -q '^Z\_' || continue # Skip non Z_ vars
 		option=$(echo $pair|cut -d '=' -f 1|cut -d '_' -f 2)
 		value=$(echo $pair|cut -d '=' -f 2-)
@@ -192,7 +204,7 @@ zaf_configure_agent() {
 		else
 			zaf_unset_zabbix_option "$ZAF_AGENT_CONFIG" "$option"
 		fi
-		options="$options Z_$option=$value"
+		echo $options |grep -vq "Z_$option=" && options="$options Z_$option=$value"
 		changes=1
 	done
 	zaf_set_option ZAF_AGENT_OPTIONS "${options}"
@@ -208,7 +220,7 @@ zaf_configure_server() {
 	local options
 	local changes
 
-        zaf_install_dir "$ZAF_SERVER_CONFIGD"
+	zaf_install_dir "$ZAF_SERVER_CONFIGD"
 	echo -n >"$ZAF_SERVER_CONFIGD/zaf_options.conf" || zaf_err "Cannot access $ZAF_SERVER_CONFIGD/zaf_options.conf"
 	for pair in "$@"; do
 		echo $pair | grep -q '^S\_' || continue # Skip non S_ vars
@@ -229,12 +241,12 @@ zaf_configure_server() {
 
 zaf_preconfigure(){
 	[ -z "$ZAF_OS" ] && zaf_detect_system 
-        zaf_os_specific zaf_preconfigure_os
+	zaf_os_specific zaf_preconfigure_os
 	if ! zaf_is_root; then
-            [ -z "$INSTALL_PREFIX" ] && zaf_err "We are not root. Use INSTALL_PREFIX or become root."
+		[ -z "$INSTALL_PREFIX" ] && zaf_err "We are not root. Use INSTALL_PREFIX or become root."
 	else
 		[ "$1" != "reconf" ] && zaf_os_specific zaf_check_deps zaf && zaf_err "Zaf is installed as system package. Cannot install."
-        fi
+	fi
 }
 
 zaf_configure(){
@@ -263,7 +275,7 @@ zaf_configure(){
 	zaf_get_option ZAF_TMP_DIR "Tmp directory" "/tmp/" "$INSTALL_MODE"
 	zaf_get_option ZAF_CACHE_DIR "Cache directory" "/tmp/zafc" "$INSTALL_MODE"
 	zaf_get_option ZAF_LIB_DIR "Libraries directory" "/usr/lib/zaf" "$INSTALL_MODE"
-        zaf_get_option ZAF_BIN_DIR "Directory to put binaries" "/usr/bin" "$INSTALL_MODE"
+	zaf_get_option ZAF_BIN_DIR "Directory to put binaries" "/usr/bin" "$INSTALL_MODE"
 	zaf_get_option ZAF_PLUGINS_DIR "Plugins directory" "${ZAF_LIB_DIR}/plugins" "$INSTALL_MODE"
 	[ "${ZAF_GIT}" = 1 ] && zaf_get_option ZAF_REPO_GITURL "Git plugins repository" "https://github.com/limosek/zaf-plugins.git" "$INSTALL_MODE"
 	zaf_get_option ZAF_PROXY "http proxy used by zaf" "" "$INSTALL_MODE"
@@ -275,11 +287,14 @@ zaf_configure(){
 	zaf_get_option ZAF_AGENT_CONFIGD "Zabbix agent config.d" "/etc/zabbix/zabbix_agentd.conf.d/" "$INSTALL_MODE"
 	zaf_get_option ZAF_AGENT_BIN "Zabbix agent binary" "/usr/sbin/zabbix_agentd" "$INSTALL_MODE"
 	zaf_get_option ZAF_AGENT_RESTART "Zabbix agent restart cmd" "service zabbix-agent restart" "$INSTALL_MODE"
+	zaf_get_option ZAF_ZBXSRV_HOST "Zabbix server hostname" "zabbix" "$INSTALL_MODE"
+	zaf_get_option ZAF_ZBXSRV_PORT "Zabbix server port" "10051" "$INSTALL_MODE"
 
 	zaf_get_option ZAF_SERVER_CONFIG "Zabbix server config" "/etc/zabbix/zabbix_server.conf" "$INSTALL_MODE"
 	[ -z "${ZAF_SERVER_CONFIGD}" ] && ! [ -d "${ZAF_SERVER_CONFIGD}" ] && [ -d "/etc/zabbix/zabbix_server.d" ] && ZAF_SERVER_CONFIGD="/etc/zabbix/zabbix_server.d"
 	zaf_get_option ZAF_SERVER_CONFIGD "Zabbix server config.d" "/etc/zabbix/zabbix_server.conf.d/" "$INSTALL_MODE"
 	zaf_get_option ZAF_SERVER_BIN "Zabbix server binary" "/usr/sbin/zabbix_server" "$INSTALL_MODE"
+	zaf_get_option ZAF_HOSTNAME "Hostname of this machine" "" "$INSTALL_MODE"
 	
 	zaf_get_option ZAF_SUDOERSD "Sudo sudoers.d directory" "/etc/sudoers.d" "$INSTALL_MODE"
 	zaf_get_option ZAF_CROND "Cron.d directory" "/etc/cron.d" "$INSTALL_MODE"
@@ -293,7 +308,7 @@ zaf_configure(){
 		zaf_err "Zabbix agent ($ZAF_AGENT_BIN) not installed? Use ZAF_AGENT_BIN env variable to specify location. Exiting."
 	fi
 
-        [ -n "$INSTALL_PREFIX" ] && zaf_install_dir "/etc"
+	[ -n "$INSTALL_PREFIX" ] && zaf_install_dir "/etc"
 	if ! [ -f "${ZAF_CFG_FILE}" ]; then
 		touch "${ZAF_CFG_FILE}" || zaf_err "No permissions to ${ZAF_CFG_FILE}"
 	fi
@@ -307,7 +322,7 @@ zaf_configure(){
 	zaf_set_option ZAF_TMP_DIR "$ZAF_TMP_DIR"
 	zaf_set_option ZAF_CACHE_DIR "$ZAF_CACHE_DIR"
 	zaf_set_option ZAF_LIB_DIR "$ZAF_LIB_DIR"
-        zaf_set_option ZAF_BIN_DIR "$ZAF_BIN_DIR"
+	zaf_set_option ZAF_BIN_DIR "$ZAF_BIN_DIR"
 	zaf_set_option ZAF_PLUGINS_DIR "$ZAF_PLUGINS_DIR"
 	zaf_set_option ZAF_REPO_URL "$ZAF_REPO_URL"
 	zaf_set_option ZAF_PROXY "$ZAF_PROXY"
@@ -320,6 +335,9 @@ zaf_configure(){
 	zaf_set_option ZAF_FILES_GID "$ZAF_FILES_GID"
 	zaf_set_option ZAF_FILES_UMASK "$ZAF_FILES_UMASK"
 	zaf_set_option ZAF_AGENT_RESTART "$ZAF_AGENT_RESTART"
+	zaf_set_option ZAF_ZBXSRV_HOST "$ZAF_ZBXSRV_HOST"
+	zaf_set_option ZAF_ZBXSRV_PORT "$ZAF_ZBXSRV_PORT"
+	zaf_set_option ZAF_HOSTNAME "$ZAF_HOSTNAME"
 	if [ -x "$ZAF_SERVER_BIN" ]; then
 		zaf_set_option ZAF_SERVER_CONFIG "$ZAF_SERVER_CONFIG"
 		zaf_set_option ZAF_SERVER_CONFIGD "$ZAF_SERVER_CONFIGD"
@@ -344,7 +362,7 @@ zaf_configure(){
 	fi
 
 	if zaf_is_root; then
-        	zaf_configure_agent $ZAF_AGENT_OPTIONS "$@"
+		zaf_configure_agent $ZAF_AGENT_OPTIONS "$@"
 		zaf_add_zabbix_option "$ZAF_AGENT_CONFIG" "Include" "$ZAF_AGENT_CONFIGD"
 		if [ -f "$ZAF_SERVER_BIN" ]; then
 			zaf_configure_server $ZAF_SERVER_OPTIONS "$@" && zaf_add_zabbix_option "$ZAF_SERVER_CONFIG" "Include" "$ZAF_SERVER_CONFIGD"
@@ -370,7 +388,7 @@ zaf_install_all() {
 	for i in lib/zaf.lib.sh lib/plugin.lib.sh lib/os.lib.sh lib/ctrl.lib.sh lib/cache.lib.sh lib/zbxapi.lib.sh lib/JSON.sh; do
 		zaf_install $i ${ZAF_LIB_DIR}/ 
 	done
-	for i in lib/zaflock lib/zafcache lib/preload.sh; do
+	for i in lib/zaflock lib/zafcache lib/preload.sh lib/zafret; do
 		zaf_install_bin $i ${ZAF_LIB_DIR}/ 
 	done
 	zaf_install_dir ${ZAF_BIN_DIR}
@@ -379,26 +397,26 @@ zaf_install_all() {
 	done
 	zaf_install_dir ${ZAF_PLUGINS_DIR}
 	zaf_install_dir ${ZAF_PLUGINS_DIR}
-        zaf_install_dir ${ZAF_BIN_DIR}
+	zaf_install_dir ${ZAF_BIN_DIR}
 }
 
 zaf_postconfigure() {
 	if zaf_is_root; then
-	    ${INSTALL_PREFIX}/${ZAF_BIN_DIR}/zaf cache-clean
+		 ${INSTALL_PREFIX}/${ZAF_BIN_DIR}/zaf cache-clean
-	    [ "${ZAF_GIT}" = 1 ] && ${INSTALL_PREFIX}/${ZAF_BIN_DIR}/zaf update
+		 [ "${ZAF_GIT}" = 1 ] && ${INSTALL_PREFIX}/${ZAF_BIN_DIR}/zaf update
-            ${INSTALL_PREFIX}/${ZAF_BIN_DIR}/zaf reinstall zaf || zaf_err "Error installing zaf plugin."
+		 ${INSTALL_PREFIX}/${ZAF_BIN_DIR}/zaf reinstall zaf || zaf_err "Error installing zaf plugin."
-	    ${INSTALL_PREFIX}/${ZAF_BIN_DIR}/zaf agent-config || zaf_err "Error configuring agent."
+		 ${INSTALL_PREFIX}/${ZAF_BIN_DIR}/zaf agent-config || zaf_err "Error configuring agent."
-	    zaf_os_specific zaf_postconfigure_os
+		 zaf_os_specific zaf_postconfigure_os
-            if zaf_is_root && ! zaf_test_item zaf.framework_version; then
+		 if zaf_is_root && ! zaf_test_item zaf.framework_version; then
 		echo "Something is wrong with zabbix agent config."
 		echo "Ensure that zabbix_agentd reads ${ZAF_AGENT_CONFIG}"
 		echo "and there is Include=${ZAF_AGENT_CONFIGD} directive inside."
 		echo "Does ${ZAF_AGENT_RESTART} work?"
 		exit 1
-            fi
+		 fi
 	else
-	    [ "${ZAF_GIT}" = 1 ] && [ -n  "${INSTALL_PREFIX}" ] && git clone "${ZAF_REPO_GITURL}" "${INSTALL_PREFIX}/${ZAF_REPO_DIR}"
+		 [ "${ZAF_GIT}" = 1 ] && [ -n	 "${INSTALL_PREFIX}" ] && git clone "${ZAF_REPO_GITURL}" "${INSTALL_PREFIX}/${ZAF_REPO_DIR}"
-        fi
+	fi
 	zaf_wrn "Install done. Use 'zaf' to get started."
 	true
 }
@@ -407,7 +425,7 @@ zaf_postconfigure() {
 
 if ! [ -f README.md ]; then
 	# Hardcoded variables
-	ZAF_VERSION="1.3"
+	ZAF_VERSION="1.4"
 	export ZAF_TMP_DIR="/tmp/zaf-installer"
 	export ZAF_DIR="$ZAF_TMP_DIR/zaf"
 	if [ -n "$ZAF_PROXY" ]; then
@@ -416,7 +434,7 @@ if ! [ -f README.md ]; then
 		export https_proxy="$ZAF_PROXY"
 	fi
 	mkdir -p $ZAF_TMP_DIR
-	if ! zaf_which curl >/dev/null &&  ! zaf_which wget >/dev/null;
+	if ! zaf_which curl >/dev/null && ! zaf_which wget >/dev/null;
 	then
 		zaf_err "Curl or wget not found. Cannot continue. Please install it."
 	fi
@@ -457,11 +475,11 @@ zaf_tmp_init
 
 # Read options as config for ZAF
 for pair in "$@"; do
-    echo $pair | grep -q '^ZAF\_' || continue
+	 echo $pair | grep -q '^ZAF\_' || continue
-    option=$(echo $pair|cut -d '=' -f 1)
+	 option=$(echo $pair|cut -d '=' -f 1)
-    value=$(echo $pair|cut -d '=' -f 2-)
+	 value=$(echo $pair|cut -d '=' -f 2-)
-    eval "C_${option}='$value'"
+	 eval "C_${option}='$value'"
-    zaf_wrn "Overriding $option from cmdline."
+	 zaf_wrn "Overriding $option from cmdline."
 done
 [ -z "$C_ZAF_TMP_DIR" ] && C_ZAF_TMP_DIR="/tmp/"
 if [ -n "$ZAF_PROXY" ]; then
@@ -470,7 +488,7 @@ fi
 
 case $1 in
 interactive)
-        shift
+	shift
 	INSTALL_MODE=interactive
 	zaf_preconfigure
 	zaf_configure "$@"
@@ -478,52 +496,52 @@ interactive)
 	zaf_postconfigure
 	;;
 auto)
-        shift
+	shift
 	INSTALL_MODE=auto
 	zaf_preconfigure
 	zaf_configure "$@"
-        zaf_install_all
+	zaf_install_all
 	zaf_postconfigure
-        ;;
+	;;
 debug-auto)
-        shift;
+	shift;
 	ZAF_DEBUG=4
 	INSTALL_MODE=auto
 	zaf_preconfigure
-        zaf_configure "$@"
+	zaf_configure "$@"
 	zaf_install_all
 	zaf_postconfigure
-        ;;
+	;;
 debug-interactive)
-        shift;
+	shift;
-        ZAF_DEBUG=4
+	ZAF_DEBUG=4
 	INSTALL_MODE=interactive
 	zaf_preconfigure
 	zaf_configure "$@"
 	zaf_install_all
 	zaf_postconfigure
-        ;;
+	;;
 debug)
-        shift;
+	shift;
-        ZAF_DEBUG=4
+	ZAF_DEBUG=4
 	INSTALL_MODE=auto
 	zaf_preconfigure
 	zaf_configure "$@"
 	zaf_install_all
 	zaf_postconfigure
-        ;;
+	;;
 reconf)
-        shift;
+	shift;
-        rm -f $ZAF_CFG_FILE
+	rm -f $ZAF_CFG_FILE
 	INSTALL_MODE=auto
 	zaf_preconfigure reconf
 	zaf_configure "$@"
 	zaf_postconfigure
-        ;;
+	;;
 install)
 	INSTALL_MODE=auto
 	zaf_preconfigure nor
-        zaf_configure "$@"
+	zaf_configure "$@"
 	zaf_install_all
 	zaf_postconfigure
 	;;
@@ -531,12 +549,12 @@ install)
 	echo
 	echo "Please specify how to install."
 	echo "install.sh {auto|interactive|debug-auto|debug-interactive|reconf} [Agent-Options] [Zaf-Options]"
-        echo "scratch means that config file will be created from scratch"
+	echo "scratch means that config file will be created from scratch"
-        echo " Agent-Options: Z_Option=value [...]"
+	echo " Agent-Options: Z_Option=value [...]"
 	echo " Server-Options: S_Option=value [...]"
-        echo " Zaf-Options: ZAF_OPT=value [...]"
+	echo " Zaf-Options: ZAF_OPT=value [...]"
 	echo " To unset Agent-Option use Z_Option=''"
-        echo 
+	echo 
 	echo "Example 1 (default install): install.sh auto"
 	echo 'Example 2 (preconfigure agent options): install.sh auto Z_Server=zabbix.server Z_ServerActive=zabbix.server Z_Hostname=$(hostname)'
 	echo 'Example 3 (preconfigure server options): install.sh auto S_StartPollers=10 S_ListenPort=10051'

lib/JSON.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 
 throw() {
-  echo "$*" >&2
+	echo "$*" >&2
-  exit 1
+	exit 1
 }
 
 BRIEF=0
@@ -12,197 +12,197 @@ NO_HEAD=0
 NORMALIZE_SOLIDUS=0
 
 usage() {
-  echo
+	echo
-  echo "Usage: JSON.sh [-b] [-l] [-p] [-s] [-h]"
+	echo "Usage: JSON.sh [-b] [-l] [-p] [-s] [-h]"
-  echo
+	echo
-  echo "-p - Prune empty. Exclude fields with empty values."
+	echo "-p - Prune empty. Exclude fields with empty values."
-  echo "-l - Leaf only. Only show leaf nodes, which stops data duplication."
+	echo "-l - Leaf only. Only show leaf nodes, which stops data duplication."
-  echo "-b - Brief. Combines 'Leaf only' and 'Prune empty' options."
+	echo "-b - Brief. Combines 'Leaf only' and 'Prune empty' options."
-  echo "-n - No-head. Do not show nodes that have no path (lines that start with [])."
+	echo "-n - No-head. Do not show nodes that have no path (lines that start with [])."
-  echo "-s - Remove escaping of the solidus symbol (stright slash)."
+	echo "-s - Remove escaping of the solidus symbol (stright slash)."
-  echo "-h - This help text."
+	echo "-h - This help text."
-  echo
+	echo
 }
 
 parse_options() {
-  set -- "$@"
+	set -- "$@"
-  local ARGN=$#
+	local ARGN=$#
-  while [ "$ARGN" -ne 0 ]
+	while [ "$ARGN" -ne 0 ]
-  do
+	do
-    case $1 in
+		case $1 in
-      -h) usage
+			-h) usage
-          exit 0
+					exit 0
-      ;;
+			;;
-      -b) BRIEF=1
+			-b) BRIEF=1
-          LEAFONLY=1
+					LEAFONLY=1
-          PRUNE=1
+					PRUNE=1
-      ;;
+			;;
-      -l) LEAFONLY=1
+			-l) LEAFONLY=1
-      ;;
+			;;
-      -p) PRUNE=1
+			-p) PRUNE=1
-      ;;
+			;;
-      -n) NO_HEAD=1
+			-n) NO_HEAD=1
-      ;;
+			;;
-      -s) NORMALIZE_SOLIDUS=1
+			-s) NORMALIZE_SOLIDUS=1
-      ;;
+			;;
-      ?*) echo "ERROR: Unknown option."
+			?*) echo "ERROR: Unknown option."
-          usage
+					usage
-          exit 0
+					exit 0
-      ;;
+			;;
-    esac
+		esac
-    shift 1
+		shift 1
-    ARGN=$((ARGN-1))
+		ARGN=$((ARGN-1))
-  done
+	done
 }
 
 awk_egrep () {
-  local pattern_string=$1
+	local pattern_string=$1
 
-  gawk '{
+	gawk '{
-    while ($0) {
+		while ($0) {
-      start=match($0, pattern);
+			start=match($0, pattern);
-      token=substr($0, start, RLENGTH);
+			token=substr($0, start, RLENGTH);
-      print token;
+			print token;
-      $0=substr($0, start+RLENGTH);
+			$0=substr($0, start+RLENGTH);
-    }
+		}
-  }' pattern="$pattern_string"
+	}' pattern="$pattern_string"
 }
 
 tokenize () {
-  local GREP
+	local GREP
-  local ESCAPE
+	local ESCAPE
-  local CHAR
+	local CHAR
 
-  if echo "test string" | egrep -ao --color=never "test" >/dev/null 2>&1
+	if echo "test string" | egrep -ao --color=never "test" >/dev/null 2>&1
-  then
+	then
-    GREP='egrep -ao --color=never'
+		GREP='egrep -ao --color=never'
-  else
+	else
-    GREP='egrep -ao'
+		GREP='egrep -ao'
-  fi
+	fi
 
-  if echo "test string" | egrep -o "test" >/dev/null 2>&1
+	if echo "test string" | egrep -o "test" >/dev/null 2>&1
-  then
+	then
-    ESCAPE='(\\[^u[:cntrl:]]|\\u[0-9a-fA-F]{4})'
+		ESCAPE='(\\[^u[:cntrl:]]|\\u[0-9a-fA-F]{4})'
-    CHAR='[^[:cntrl:]"\\]'
+		CHAR='[^[:cntrl:]"\\]'
-  else
+	else
-    GREP=awk_egrep
+		GREP=awk_egrep
-    ESCAPE='(\\\\[^u[:cntrl:]]|\\u[0-9a-fA-F]{4})'
+		ESCAPE='(\\\\[^u[:cntrl:]]|\\u[0-9a-fA-F]{4})'
-    CHAR='[^[:cntrl:]"\\\\]'
+		CHAR='[^[:cntrl:]"\\\\]'
-  fi
+	fi
 
-  local STRING="\"$CHAR*($ESCAPE$CHAR*)*\""
+	local STRING="\"$CHAR*($ESCAPE$CHAR*)*\""
-  local NUMBER='-?(0|[1-9][0-9]*)([.][0-9]*)?([eE][+-]?[0-9]*)?'
+	local NUMBER='-?(0|[1-9][0-9]*)([.][0-9]*)?([eE][+-]?[0-9]*)?'
-  local KEYWORD='null|false|true'
+	local KEYWORD='null|false|true'
-  local SPACE='[[:space:]]+'
+	local SPACE='[[:space:]]+'
 
-  # Force zsh to expand $A into multiple words
+	# Force zsh to expand $A into multiple words
-  local is_wordsplit_disabled=$(unsetopt 2>/dev/null | grep -c '^shwordsplit$')
+	local is_wordsplit_disabled=$(unsetopt 2>/dev/null | grep -c '^shwordsplit$')
-  if [ $is_wordsplit_disabled != 0 ]; then setopt shwordsplit; fi
+	if [ $is_wordsplit_disabled != 0 ]; then setopt shwordsplit; fi
-  $GREP "$STRING|$NUMBER|$KEYWORD|$SPACE|." | egrep -v "^$SPACE$"
+	$GREP "$STRING|$NUMBER|$KEYWORD|$SPACE|." | egrep -v "^$SPACE$"
-  if [ $is_wordsplit_disabled != 0 ]; then unsetopt shwordsplit; fi
+	if [ $is_wordsplit_disabled != 0 ]; then unsetopt shwordsplit; fi
 }
 
 parse_array () {
-  local index=0
+	local index=0
-  local ary=''
+	local ary=''
-  read -r token
+	read -r token
-  case "$token" in
+	case "$token" in
-    ']') ;;
+		']') ;;
-    *)
+		*)
-      while :
+			while :
-      do
+			do
-        parse_value "$1" "$index"
+				parse_value "$1" "$index"
-        index=$((index+1))
+				index=$((index+1))
-        ary="$ary""$value" 
+				ary="$ary""$value" 
-        read -r token
+				read -r token
-        case "$token" in
+				case "$token" in
-          ']') break ;;
+					']') break ;;
-          ',') ary="$ary," ;;
+					',') ary="$ary," ;;
-          *) throw "EXPECTED , or ] GOT ${token:-EOF}" ;;
+					*) throw "EXPECTED , or ] GOT ${token:-EOF}" ;;
-        esac
+				esac
-        read -r token
+				read -r token
-      done
+			done
-      ;;
+			;;
-  esac
+	esac
-  [ "$BRIEF" -eq 0 ] && value=$(printf '[%s]' "$ary") || value=
+	[ "$BRIEF" -eq 0 ] && value=$(printf '[%s]' "$ary") || value=
-  :
+	:
 }
 
 parse_object () {
-  local key
+	local key
-  local obj=''
+	local obj=''
-  read -r token
+	read -r token
-  case "$token" in
+	case "$token" in
-    '}') ;;
+		'}') ;;
-    *)
+		*)
-      while :
+			while :
-      do
+			do
-        case "$token" in
+				case "$token" in
-          '"'*'"') key=$token ;;
+					'"'*'"') key=$token ;;
-          *) throw "EXPECTED string GOT ${token:-EOF}" ;;
+					*) throw "EXPECTED string GOT ${token:-EOF}" ;;
-        esac
+				esac
-        read -r token
+				read -r token
-        case "$token" in
+				case "$token" in
-          ':') ;;
+					':') ;;
-          *) throw "EXPECTED : GOT ${token:-EOF}" ;;
+					*) throw "EXPECTED : GOT ${token:-EOF}" ;;
-        esac
+				esac
-        read -r token
+				read -r token
-        parse_value "$1" "$key"
+				parse_value "$1" "$key"
-        obj="$obj$key:$value"        
+				obj="$obj$key:$value"				 
-        read -r token
+				read -r token
-        case "$token" in
+				case "$token" in
-          '}') break ;;
+					'}') break ;;
-          ',') obj="$obj," ;;
+					',') obj="$obj," ;;
-          *) throw "EXPECTED , or } GOT ${token:-EOF}" ;;
+					*) throw "EXPECTED , or } GOT ${token:-EOF}" ;;
-        esac
+				esac
-        read -r token
+				read -r token
-      done
+			done
-    ;;
+		;;
-  esac
+	esac
-  [ "$BRIEF" -eq 0 ] && value=$(printf '{%s}' "$obj") || value=
+	[ "$BRIEF" -eq 0 ] && value=$(printf '{%s}' "$obj") || value=
-  :
+	:
 }
 
 parse_value () {
-  local jpath="${1:+$1,}$2" isleaf=0 isempty=0 print=0
+	local jpath="${1:+$1,}$2" isleaf=0 isempty=0 print=0
-  case "$token" in
+	case "$token" in
-    '{') parse_object "$jpath" ;;
+		'{') parse_object "$jpath" ;;
-    '[') parse_array  "$jpath" ;;
+		'[') parse_array	"$jpath" ;;
-    # At this point, the only valid single-character tokens are digits.
+		# At this point, the only valid single-character tokens are digits.
-    ''|[!0-9]) throw "EXPECTED value GOT ${token:-EOF}" ;;
+		''|[!0-9]) throw "EXPECTED value GOT ${token:-EOF}" ;;
-    *) value=$token
+		*) value=$token
-       # if asked, replace solidus ("\/") in json strings with normalized value: "/"
+			 # if asked, replace solidus ("\/") in json strings with normalized value: "/"
-       [ "$NORMALIZE_SOLIDUS" -eq 1 ] && value=$(echo "$value" | sed 's#\\/#/#g')
+			 [ "$NORMALIZE_SOLIDUS" -eq 1 ] && value=$(echo "$value" | sed 's#\\/#/#g')
-       isleaf=1
+			 isleaf=1
-       [ "$value" = '""' ] && isempty=1
+			 [ "$value" = '""' ] && isempty=1
-       ;;
+			 ;;
-  esac
+	esac
-  [ "$value" = '' ] && return
+	[ "$value" = '' ] && return
-  [ "$NO_HEAD" -eq 1 ] && [ -z "$jpath" ] && return
+	[ "$NO_HEAD" -eq 1 ] && [ -z "$jpath" ] && return
 
-  [ "$LEAFONLY" -eq 0 ] && [ "$PRUNE" -eq 0 ] && print=1
+	[ "$LEAFONLY" -eq 0 ] && [ "$PRUNE" -eq 0 ] && print=1
-  [ "$LEAFONLY" -eq 1 ] && [ "$isleaf" -eq 1 ] && [ $PRUNE -eq 0 ] && print=1
+	[ "$LEAFONLY" -eq 1 ] && [ "$isleaf" -eq 1 ] && [ $PRUNE -eq 0 ] && print=1
-  [ "$LEAFONLY" -eq 0 ] && [ "$PRUNE" -eq 1 ] && [ "$isempty" -eq 0 ] && print=1
+	[ "$LEAFONLY" -eq 0 ] && [ "$PRUNE" -eq 1 ] && [ "$isempty" -eq 0 ] && print=1
-  [ "$LEAFONLY" -eq 1 ] && [ "$isleaf" -eq 1 ] && \
+	[ "$LEAFONLY" -eq 1 ] && [ "$isleaf" -eq 1 ] && \
-    [ $PRUNE -eq 1 ] && [ $isempty -eq 0 ] && print=1
+		[ $PRUNE -eq 1 ] && [ $isempty -eq 0 ] && print=1
-  [ "$print" -eq 1 ] && printf "[%s]\t%s\n" "$jpath" "$value"
+	[ "$print" -eq 1 ] && printf "[%s]\t%s\n" "$jpath" "$value"
-  :
+	:
 }
 
 parse () {
-  read -r token
+	read -r token
-  parse_value
+	parse_value
-  read -r token
+	read -r token
-  case "$token" in
+	case "$token" in
-    '') ;;
+		'') ;;
-    *) throw "EXPECTED EOF GOT $token" ;;
+		*) throw "EXPECTED EOF GOT $token" ;;
-  esac
+	esac
 }
 
 if ([ "$0" = "$BASH_SOURCE" ] || ! [ -n "$BASH_SOURCE" ]);
 then
-  parse_options "$@"
+	parse_options "$@"
-  tokenize | parse
+	tokenize | parse
 fi
 
 # vi: expandtab sw=2 ts=2

lib/ctrl.lib.sh

@@ -104,7 +104,7 @@ zaf_ctrl_get_item_option() {
 	else
 		zaf_ctrl_get_item_block <$1 "$2" | zaf_block_get_moption "$3" \
 		|| zaf_ctrl_get_item_block <$1 "$2" | zaf_block_get_option "$3"
-	fi 
+	fi
 }
 
 # Get external item specific option (single or multiline)
@@ -162,7 +162,7 @@ zaf_ctrl_sudo() {
 	! [ -d "$ZAF_SUDOERSD" ] && { zaf_wrn "$ZAF_SUDOERSD nonexistent! Skipping sudo install!"; return 1; }
 	zaf_dbg "Installing sudoers entry $ZAF_SUDOERSD/zaf_$plugin"
 	
-	[ -z "$sudo" ] && return  # Nothing to install
+	[ -z "$sudo" ] && return	# Nothing to install
 	if ! zaf_which sudo >/dev/null; then
 		zaf_wrn "Sudo needed bud not installed?"
 	fi
@@ -188,14 +188,14 @@ zaf_ctrl_cron() {
 	pdir="$3"
 	plugin=$1
 	cron=$(zaf_ctrl_get_global_option $2 "Cron")
-	[ -z "$cron" ]  || [ -z "$ZAF_CROND" ] && return
+	[ -z "$cron" ]	|| [ -z "$ZAF_CROND" ] && return
 	! [ -d "$ZAF_CROND" ] && { zaf_wrn "$ZAF_CROND nonexistent! Skipping cron install!"; return 1; }
 	zaf_dbg "Installing cron entry $ZAF_CROND/zaf_$plugin"
 	[ -z "$cron" ] && return # Nothing to install
 	zaf_ctrl_get_global_option $2 "Cron" | zaf_far '{PLUGINDIR}' "${plugindir}" >$ZAF_CROND/zaf_$plugin || zaf_err "Error during zaf_ctrl_cron"
 }
 
-# Install files defined to be installed in control to plugun directory
+# Install files defined to be installed in control to plugin directory
 # $1 pluginurl
 # $2 control
 # $3 plugindir
@@ -209,15 +209,15 @@ zaf_ctrl_install() {
 
 	pdir="$3"
 	(set -e
-	binaries=$(zaf_ctrl_get_global_option $2 "Install-bin")
+	binaries=$(zaf_ctrl_get_global_option $2 "Install-bin")" "$(zaf_ctrl_get_global_option $2 "Install-cmd")
 	for b in $binaries; do
 		zaf_fetch_url "$1/$b" >"${ZAF_TMP_DIR}/$b"
-                zaf_install_bin "${ZAF_TMP_DIR}/$b" "$pdir"
+		zaf_install_bin "${ZAF_TMP_DIR}/$b" "$pdir"
 	done
 	files=$(zaf_ctrl_get_global_option $2 "Install-files")
 	for f in $files; do
-		zaf_fetch_url "$1/$b" >"${ZAF_TMP_DIR}/$b"
+		zaf_fetch_url "$1/$f" >"${ZAF_TMP_DIR}/$f"
-                zaf_install "${ZAF_TMP_DIR}/$b" "$pdir"
+		zaf_install "${ZAF_TMP_DIR}/$f" "$pdir"
 	done
 	true
 	) || zaf_err "Error during zaf_ctrl_install"
@@ -226,6 +226,8 @@ zaf_ctrl_install() {
 # Generates zabbix items cfg from control file
 # $1 control
 # $2 pluginname
+# $3 if set, no script will be created
+# $4 if set, cmd is set always to $4
 zaf_ctrl_generate_items_cfg() {
 	local items
 	local cmd
@@ -241,54 +243,75 @@ zaf_ctrl_generate_items_cfg() {
 	local zafparms
 
 	items=$(zaf_ctrl_get_items <"$1")
-	tmpfile=$ZAF_TMP_DIR/gencfg$$
+	tmpfile=$(zaf_tmpfile genparms)
 	(set -e
 	for i in $items; do
-            iscript=$(zaf_stripctrl $i)
+		iscript=$(zaf_stripctrl $i)
-	    zaf_ctrl_get_item_option $1 $i "Parameters" >$tmpfile
+		zaf_ctrl_get_item_option $1 $i "Parameters" >$tmpfile
-	    if [ -s "$tmpfile" ]; then
+		echo >>$tmpfile
-		ikey="$2.$i[*]"
+		zafparams="";
-		args=""
+		if [ -s "$tmpfile" ]; then
-		apos=1;
+			ikey="$2.$i[*]"
-		while read pname pdefault pregex prest; do
+			args=""
-			zafparams="$zafparams value=\"\$$apos\"; zaf_agentparm $pname $pdefault $pregex; export $pname; "
+			apos=1;
-			args="$args \$$apos"
+			while read pname pdefault pregex prest; do
-			apos=$(expr $apos + 1)
+				[ -z "$pname" ] && continue
-		done <$tmpfile
+				zaf_trc "Adding param $pname ($pdefault $pregex) to $i"
-	    else
+				zafparams="$zafparams value=\"\$$apos\"; zaf_agentparm $pname $pdefault $pregex; export $pname; "
-		ikey="$2.$i"
+				args="$args \$$apos"
-		zafparams=""
+				apos=$(expr $apos + 1)
-		args=""
+			done <$tmpfile
-	    fi
+		else
-	    env="export ITEM_KEY='$ikey'; export PLUGIN='$2'; export PATH=${ZAF_PLUGINS_DIR}/$2:$ZAF_LIB_DIR:\$PATH; cd ${ZAF_PLUGINS_DIR}/$2; . $ZAF_LIB_DIR/preload.sh; "
+			ikey="$2.$i"
-	    lock=$(zaf_ctrl_get_item_option $1 $i "Lock")
+			zafparams=""
-	    if [ -n "$lock" ]; then
+			args=""
-		lock="${ZAF_LIB_DIR}/zaflock $lock "
+		fi
-	    fi
+		env="export ITEM_KEY='$ikey'; export PLUGIN='$2'; export PATH=${ZAF_PLUGINS_DIR}/$2:$ZAF_LIB_DIR:\$PATH; cd ${ZAF_PLUGINS_DIR}/$2; . $ZAF_LIB_DIR/preload.sh; "
-	    cache=$(zaf_ctrl_get_item_option $1 $i "Cache")
+		lock=$(zaf_ctrl_get_item_option $1 $i "Lock")
-	    if [ -n "$cache" ]; then
+		if [ -n "$lock" ]; then
-		cache="${ZAF_LIB_DIR}/zafcache '$cache' "
+			lock="${ZAF_LIB_DIR}/zaflock $lock "
-	    fi
+		fi
-            cmd=$(zaf_ctrl_get_item_option $1 $i "Cmd")
+		cache=$(zaf_ctrl_get_item_option $1 $i "Cache")
-            if [ -n "$cmd" ]; then
+		if [ -n "$cache" ]; then
-                printf "%s" "UserParameter=$ikey,${env}${zafparams}${preload}${cache}${lock}${cmd}"; echo
+			cache="${ZAF_LIB_DIR}/zafcache '$cache' "
-                continue
+		fi
-            fi
+		ret=$(zaf_ctrl_get_item_option $1 $i "Return")
-            cmd=$(zaf_ctrl_get_item_option $1 $i "Script")
+		retnull=$(zaf_ctrl_get_item_option $1 $i "Return-null")
-            if [ -n "$cmd" ]; then
+		reterr=$(zaf_ctrl_get_item_option $1 $i "Return-error")
-                ( echo "#!/bin/sh"
+		if [ -n "$ret" ] || [ -n "$reterr" ] || [ -n "$retnull" ]; then
-		  echo ". $ZAF_LIB_DIR/preload.sh; "
+			retscr=" 1>\${tmpf}o 2>\${tmpf}e; ${ZAF_LIB_DIR}/zafret \${tmpf}o \${tmpf}e \$? '$ret' '$retnull' '$retempty' ";
-		  zaf_ctrl_get_item_option $1 $i "Script"
+		else
-		  ) >${ZAF_TMP_DIR}/${iscript}.sh;
+			retscr="";
-                [ -z "$3" ] && zaf_install_bin ${ZAF_TMP_DIR}/${iscript}.sh ${ZAF_PLUGINS_DIR}/$2/
+		fi
-                printf "%s" "UserParameter=$ikey,${env}${preload}${zafparams}${cache}${lock}${ZAF_PLUGINS_DIR}/$2/${iscript}.sh ${args}"; echo
+		if [ -z "$4" ]; then
-		rm -f ${ZAF_TMP_DIR}/${iscript}.sh
+			cmd=$(zaf_ctrl_get_item_option $1 $i "Cmd")
-                continue;
+		else
-            fi
+			cmd="$4"
-	    zaf_err "Item $i declared in control file but has no Cmd, Function or Script!"
+		fi
+		if [ -n "$cmd" ]; then
+			printf "%s" "UserParameter=$ikey,${env}${zafparams}${preload}${cache}${lock}${cmd}${retscr}"; echo
+			continue
+		fi
+		cmd=$(zaf_ctrl_get_item_option $1 $i "Script")
+		if [ -n "$cmd" ]; then
+			( echo "#!/bin/sh"
+			echo ". $ZAF_LIB_DIR/preload.sh; "
+			zaf_ctrl_get_item_option $1 $i "Script"
+			) >${ZAF_TMP_DIR}/${iscript}.sh;
+			[ -z "$3" ] && zaf_install_bin ${ZAF_TMP_DIR}/${iscript}.sh ${ZAF_PLUGINS_DIR}/$2/
+			if [ -z "$4" ]; then
+				script="${ZAF_PLUGINS_DIR}/$2/${iscript}.sh"
+			else
+				script="$4"
+			fi
+			printf "%s" "UserParameter=$ikey,${env}${preload}${zafparams}${cache}${lock}$script ${args}"; echo
+			rm -f ${ZAF_TMP_DIR}/${iscript}.sh
+			continue;
+		fi
+		zaf_err "Item $i declared in control file but has no Cmd, Function or Script!"
 	done
 	) || zaf_err "Error during zaf_ctrl_generate_items_cfg"
-	rm -f $tmpfile
+	[ "$ZAF_DEBUG" -lt 4 ] && rm -f $tmpfile
 }
 
 # Generates zabbix items cfg from control file
@@ -309,48 +332,56 @@ zaf_ctrl_generate_extitems_cfg() {
 	local zafparms
 
 	items=$(zaf_ctrl_get_extitems <"$1")
-	tmpfile=$ZAF_TMP_DIR/gencfg$$
+	tmpfile=$(zaf_tmpfile genparms)
 	(set -e
 	for i in $items; do
-            iscript=$(zaf_stripctrl $i)
+		iscript=$(zaf_stripctrl $i)
-	    zaf_ctrl_get_extitem_option $1 $i "Parameters" >$tmpfile
+		(zaf_ctrl_get_extitem_option $1 $i "Parameters"; echo) >$tmpfile
-	    ikey="$2.$i"
+		ikey="$2.$i"
-	    if [ -s "$tmpfile" ]; then
+		if [ -s "$tmpfile" ]; then
-		args=""
+			args=""
-		apos=1;
+			apos=1;
-		while read pname pdefault pregex prest; do
+			while read pname pdefault pregex prest; do
-			zafparams="$zafparams value=\"\$$apos\"; zaf_agentparm $pname $pdefault $pregex; export $pname; "
+				zafparams="$zafparams value=\"\$$apos\"; zaf_agentparm $pname $pdefault $pregex; export $pname; "
-			args="$args \$$apos"
+				args="$args \$$apos"
-			apos=$(expr $apos + 1)
+				apos=$(expr $apos + 1)
-		done <$tmpfile
+			done <$tmpfile
-	    else
+		else
-		zafparams=""
+			zafparams=""
-		args=""
+			args=""
-	    fi
+		fi
-	    env="export ITEM_KEY='$ikey'; export PLUGIN='$2'; export PATH=${ZAF_PLUGINS_DIR}/$2:$ZAF_LIB_DIR:\$PATH; cd ${ZAF_PLUGINS_DIR}/$2; . $ZAF_LIB_DIR/preload.sh; "
+		env="export ITEM_KEY='$ikey'; export PLUGIN='$2'; export PATH=${ZAF_PLUGINS_DIR}/$2:$ZAF_LIB_DIR:\$PATH; cd ${ZAF_PLUGINS_DIR}/$2; . $ZAF_LIB_DIR/preload.sh; "
-	    lock=$(zaf_ctrl_get_extitem_option $1 $i "Lock")
+		lock=$(zaf_ctrl_get_extitem_option $1 $i "Lock")
-	    if [ -n "$lock" ]; then
+		if [ -n "$lock" ]; then
-		lock="${ZAF_LIB_DIR}/zaflock $lock "
+			lock="${ZAF_LIB_DIR}/zaflock $lock "
-	    fi
+		fi
-	    cache=$(zaf_ctrl_get_extitem_option $1 $i "Cache")
+		cache=$(zaf_ctrl_get_extitem_option $1 $i "Cache")
-	    if [ -n "$cache" ]; then
+		if [ -n "$cache" ]; then
-		cache="${ZAF_LIB_DIR}/zafcache '$cache' "
+			cache="${ZAF_LIB_DIR}/zafcache '$cache' "
-	    fi
+		fi
-            cmd=$(zaf_ctrl_get_extitem_option $1 $i "Cmd")
+		ret=$(zaf_ctrl_get_extitem_option $1 $i "Return")
-            if [ -n "$cmd" ]; then
+		retnull=$(zaf_ctrl_get_extitem_option $1 $i "Return-null")
-		echo "#!/bin/sh" >${ZAF_SERVER_EXTSCRIPTS}/$ikey
+		reterr=$(zaf_ctrl_get_extitem_option $1 $i "Return-error")
-		chmod +x ${ZAF_SERVER_EXTSCRIPTS}/$ikey
+		if [ -n "$ret" ] || [ -n "$reterr" ] || [ -n "$retnull" ]; then
-                (printf "%s" "${env}${zafparams}${preload}${cache}${lock}${cmd}"; echo) >>${ZAF_SERVER_EXTSCRIPTS}/$ikey
+			retscr=" 1>\${tmpf}o 2>\${tmpf}e; ${ZAF_LIB_DIR}/zafret \${tmpf}o \${tmpf}e \$? '$ret' '$retnull' '$retempty' \$*";
-                continue
+		else
-            fi
+			retscr="";
-            cmd=$(zaf_ctrl_get_extitem_option $1 $i "Script")
+		fi
-            if [ -n "$cmd" ]; then
+		cmd=$(zaf_ctrl_get_extitem_option "$1" "$i" "Cmd")
-                echo "#!/bin/sh" >${ZAF_SERVER_EXTSCRIPTS}/$ikey
+		if [ -n "$cmd" ]; then
-		chmod +x ${ZAF_SERVER_EXTSCRIPTS}/$ikey
+			echo "#!/bin/sh" >"${ZAF_SERVER_EXTSCRIPTS}/$ikey"
-                (printf "%s" "${env}${zafparams}${preload}${cache}${lock}${cmd}"; echo) >>${ZAF_SERVER_EXTSCRIPTS}/$ikey
+			chmod +x "${ZAF_SERVER_EXTSCRIPTS}/$ikey"
-                continue;
+			(printf "%s" "${env}${zafparams}${preload}${cache}${lock}${cmd}${retscr}"; echo) >>"${ZAF_SERVER_EXTSCRIPTS}/$ikey"
-            fi
+			continue
-	    zaf_err "External item $i declared in control file but has no Cmd, Function or Script!"
+		fi
+		cmd=$(zaf_ctrl_get_extitem_option "$1" "$i" "Script")
+		if [ -n "$cmd" ]; then
+			echo "#!/bin/sh" >"${ZAF_SERVER_EXTSCRIPTS}/$ikey"
+			chmod +x "${ZAF_SERVER_EXTSCRIPTS}/$ikey"
+			(printf "%s" "${env}${zafparams}${preload}${cache}${lock}${cmd}"; echo) >>"${ZAF_SERVER_EXTSCRIPTS}/$ikey"
+			continue;
+		fi
+		zaf_err "External item $i declared in control file but has no Cmd, Function or Script!"
 	done
 	) || zaf_err "Error during zaf_ctrl_generate_extitems_cfg"
 	rm -f $tmpfile

lib/os.lib.sh

@@ -1,23 +1,23 @@
 # Os related functions
 
 zaf_preconfigure_os_openwrt() {
-    ZAF_AGENT_RESTART="/etc/init.d/zabbix_agentd restart"
+		ZAF_AGENT_RESTART="/etc/init.d/zabbix_agentd restart"
-    ZAF_AGENT_CONFIGD="/var/run/zabbix_agentd.conf.d/"
+		ZAF_AGENT_CONFIGD="/var/run/zabbix_agentd.conf.d/"
-    ZAF_AGENT_CONFIG="/etc/zabbix_agentd.conf"
+		ZAF_AGENT_CONFIG="/etc/zabbix_agentd.conf"
-    ZAF_AGENT_PKG="zabbix-agentd"
+		ZAF_AGENT_PKG="zabbix-agentd"
-    ZAF_CURL_INSECURE=1
+		ZAF_CURL_INSECURE=1
 }
 zaf_preconfigure_os_beesip() {
-   zaf_preconfigure_os_openwrt
+	 zaf_preconfigure_os_openwrt
 } 
 
 zaf_preconfigure_os_freebsd() {
-    ZAF_AGENT_PKG="zabbix3-agent"
+		ZAF_AGENT_PKG="zabbix3-agent"
-    ZAF_AGENT_CONFIG="/usr/local/etc/zabbix3/zabbix_agentd.conf"
+		ZAF_AGENT_CONFIG="/usr/local/etc/zabbix3/zabbix_agentd.conf"
-    ZAF_AGENT_CONFIGD="/usr/local/etc/zabbix3/zabbix_agentd.conf.d/"
+		ZAF_AGENT_CONFIGD="/usr/local/etc/zabbix3/zabbix_agentd.conf.d/"
-    ZAF_AGENT_BIN="/usr/local/sbin/zabbix_agentd"
+		ZAF_AGENT_BIN="/usr/local/sbin/zabbix_agentd"
-    ZAF_AGENT_RESTART="service zabbix_agentd restart"
+		ZAF_AGENT_RESTART="service zabbix_agentd restart"
-    ZAF_SUDOERSD="/usr/local/etc/sudoers.d"
+		ZAF_SUDOERSD="/usr/local/etc/sudoers.d"
 }
 
 zaf_postconfigure_os_openwrt() {
@@ -75,9 +75,9 @@ zaf_detect_system() {
 		ZAF_OS="unknown"
 		ZAF_OS_CODENAME="unknown"
 		ZAF_AGENT_PKG=""
-                return
+								return
-	   fi
+		 fi
-	  fi
+		fi
 	 fi
 	fi
 }
@@ -86,79 +86,70 @@ zaf_detect_system() {
 # $1 - name of the function.
 # all variants will be tested. (name_os_codename, name_os, name_{dpkg|opkg|rpm}, name )
 zaf_os_specific(){
-    local func="$1"
+		local func="$1"
-    
+		
-    if type "${func}_${ZAF_OS}_${ZAF_OS_CODENAME}" >/dev/null 2>/dev/null; then
+		if type "${func}_${ZAF_OS}_${ZAF_OS_CODENAME}" >/dev/null 2>/dev/null; then
-        eval "${func}_${ZAF_OS}_${ZAF_OS_CODENAME} $2 $3 $4 $5 $6"
+				eval "${func}_${ZAF_OS}_${ZAF_OS_CODENAME} $2 $3 $4 $5 $6"
-    else if type "${func}_${ZAF_OS}" >/dev/null 2>/dev/null; then
+		else if type "${func}_${ZAF_OS}" >/dev/null 2>/dev/null; then
-        eval "${func}_${ZAF_OS} $2 $3 $4 $5 $6" 
+				eval "${func}_${ZAF_OS} $2 $3 $4 $5 $6" 
-    else if type "${func}_${ZAF_PKG}" >/dev/null 2>/dev/null; then
+		else if type "${func}_${ZAF_PKG}" >/dev/null 2>/dev/null; then
-        eval "${func}_${ZAF_PKG} $2 $3 $4 $5 $6"
+				eval "${func}_${ZAF_PKG} $2 $3 $4 $5 $6"
-    else
+		else
-        zaf_dbg "No OS/packager specific implementation for $1"
+				zaf_dbg "No OS/packager specific implementation for $1"
-      fi
+			fi
-     fi
+		 fi
-    fi
+		fi
 }
 
 zaf_is_root(){
-    [ "$USER" = "root" ] || [ "$EUID" = "0" ] || [ -n "$ZAF_ISROOT" ]
+		[ "$USER" = "root" ] || [ "$EUID" = "0" ] || [ -n "$ZAF_ISROOT" ]
 }
 
 # Install file, bin or directory and respect install prefix 
 # $1 - src file
 # $2 - directory
 zaf_install(){
-    zaf_dbg "Install file $1 to $INSTALL_PREFIX/$2/$(basename $1)"
+		zaf_dbg "Install file $1 to $INSTALL_PREFIX/$2/$(basename $1)"
-    $ZAF_DO cp "$1" "$INSTALL_PREFIX/$2/$(basename $1)" || zaf_err "Cannot create file $INSTALL_PREFIX/$2/$(basename $1)!"
+		$ZAF_DO cp "$1" "$INSTALL_PREFIX/$2/$(basename $1)" || zaf_err "Cannot create file $INSTALL_PREFIX/$2/$(basename $1)!"
 }
 # $1 - src file
 # $2 - directory
 zaf_install_bin(){
-    zaf_dbg "Install binary $1 to $INSTALL_PREFIX/$2/$(basename $1)"
+		zaf_dbg "Install binary $1 to $INSTALL_PREFIX/$2/$(basename $1)"
-    $ZAF_DO cp "$1" "$INSTALL_PREFIX/$2/$(basename $1)" || zaf_err "Cannot create binary $INSTALL_PREFIX/$2/$(basename $1)!"
+		$ZAF_DO cp "$1" "$INSTALL_PREFIX/$2/$(basename $1)" || zaf_err "Cannot create binary $INSTALL_PREFIX/$2/$(basename $1)!"
-    $ZAF_DO chmod +x "$INSTALL_PREFIX/$2/$(basename $1)"
+		$ZAF_DO chmod +x "$INSTALL_PREFIX/$2/$(basename $1)"
 }
 # $1 - directory
 zaf_install_dir(){
-    zaf_dbg "Install directory $1 to $INSTALL_PREFIX/$1"
+		zaf_dbg "Install directory $1 to $INSTALL_PREFIX/$1"
-    $ZAF_DO mkdir -p "$INSTALL_PREFIX/$1" || zaf_err "Cannot create directory $INSTALL_PREFIX/$1!"
+		$ZAF_DO mkdir -p "$INSTALL_PREFIX/$1" || zaf_err "Cannot create directory $INSTALL_PREFIX/$1!"
 }
 # $1 - file
 zaf_touch(){
-    zaf_dbg "Touch $INSTALL_PREFIX/$1"
+		zaf_dbg "Touch $INSTALL_PREFIX/$1"
-    $ZAF_DO touch "$INSTALL_PREFIX/$1"
+		$ZAF_DO touch "$INSTALL_PREFIX/$1"
 }
 # $1 - directory
 zaf_uninstall(){
-    if [ -n "$INSTALL_PREFIX" ]; then
+		if [ -n "$INSTALL_PREFIX" ]; then
-    	zaf_dbg "Removing $INSTALL_PREFIX/$1"
+			zaf_dbg "Removing $INSTALL_PREFIX/$1"
 	$ZAF_DO rm -rf "$INSTALL_PREFIX/$1"
-    else
+		else
 	zaf_dbg "Removing $1"
 	$ZAF_DO rm -rf "$1"
-    fi
+		fi
-}
-
-# Automaticaly install agent on debian
-# For another os, create similar function (install_zabbix_centos)
-zaf_install_agent_debian() {
-    zaf_fetch_url "http://repo.zabbix.com/zabbix/3.0/debian/pool/main/z/zabbix-release/zabbix-release_3.0-1+${ZAF_OS_CODENAME}_all.deb" >"/tmp/zaf-installer/zabbix-release_3.0-1+${ZAF_OS_CODENAME}_all.deb" \
-	&& dpkg -i "/tmp/zaf-installer/zabbix-release_3.0-1+${ZAF_OS_CODENAME}_all.deb" \
-	&& apt-get update \
-	&& apt-get install -y -q $ZAF_AGENT_PKG
 }
 
 zaf_install_agent_opkg() {
-    opkg update && \
+		opkg update && \
-    opkg install $ZAF_AGENT_PKG
+		opkg install $ZAF_AGENT_PKG
 }
 
 # Check if dpkg dependency is met
 # $* - packages
 zaf_check_deps_dpkg() {
 	for i in $*; do
-		dpkg-query -f '${db:Status-Status},${Package}\n' -W $* 2>/dev/null | grep -q "^installed" 
+		dpkg-query -f '${db:Status-Status},${Package}\n' -W $* 2>/dev/null | grep -qE "^(installed|^,)" 
 	done
 }
 

lib/plugin.lib.sh

@@ -19,7 +19,7 @@ zaf_get_plugin_url() {
 	local url
 
 	if [ "$(zaf_url_info $1)" = "path" ]; then
-		url="$1" 		# plugin with path - from directory
+		url="$1"		# plugin with path - from directory
 	else
 		if [ "$(zaf_url_info $1)" = "url" ]; then
 			url="$1"	# plugin with http[s] url 
@@ -40,14 +40,15 @@ zaf_plugin_info() {
 	local items
 
 	! [ -f "$control" ] && zaf_err "Control file $control not found."
-	plugin=$(zaf_ctrl_get_global_block <"${control}" | zaf_block_get_option Plugin)
+	plugin=$(zaf_ctrl_get_global_option "${control}" Plugin)
-	pdescription=$(zaf_ctrl_get_global_block <"${control}" | zaf_block_get_moption Description)
+	pdescription=$(zaf_ctrl_get_global_option "${control}" Description)
-	pmaintainer=$(zaf_ctrl_get_global_block <"${control}" | zaf_block_get_option Maintainer)
+	pmaintainer=$(zaf_ctrl_get_global_option "${control}" Maintainer)
-	pversion=$(zaf_ctrl_get_global_block <"${control}" | zaf_block_get_option Version)
+	pversion=$(zaf_ctrl_get_global_option "${control}" Version)
-	purl=$(zaf_ctrl_get_global_block <"${control}" | zaf_block_get_option Url)
+	purl=$(zaf_ctrl_get_global_option "${control}" Url)
-	phome=$(zaf_ctrl_get_global_block <"${control}" | zaf_block_get_option Home)
+	phome=$(zaf_ctrl_get_global_option "${control}" Home)
 	pitems=$(zaf_ctrl_get_items <"${control}")
 	peitems=$(zaf_ctrl_get_extitems <"${control}")
+	params=$(zaf_ctrl_get_global_option "${control}" Parameters)
 	echo
 	echo -n "Plugin '$plugin' "; [ -n "$pversion" ] && echo -n "version ${pversion}"; echo ":"
 	echo "$pdescription"; echo
@@ -57,18 +58,47 @@ zaf_plugin_info() {
 	echo 
 	if zaf_is_plugin "$(basename $plugin)"; then
 		items=$(zaf_list_plugin_items $plugin)
+		if [ -n "$params" ]; then
+			printf "%b" "Plugin parameters: (name,default,actual value)\n"
+			zaf_ctrl_get_global_option "${control}" Parameters | while read param default ; do
+				printf "%b" "$param\t$default\t$(zaf_get_plugin_parameter $(dirname $1) $param)\n"
+			done
+			echo;
+		fi 
 		[ -n "$items" ] && { echo -n "Defined items: "; echo $items; }
 		items=$(zaf_list_plugin_items $plugin test)
 		[ -n "$items" ] && { echo -n "Test items: "; echo $items; }
 		items=$(zaf_list_plugin_items $plugin precache)
 		[ -n "$items" ] && { echo -n "Precache items: "; echo $items; }
 		[ -n "$peitems" ] && { echo -n "External check items: "; echo $peitems; }
+		
 	else
 		echo "Items: $pitems"
 	fi
 	echo
 }
 
+# Get global plugin parameters
+# $1 plugin
+zaf_get_plugin_parameters() {
+	zaf_ctrl_get_global_option "${ZAF_PLUGINS_DIR}/${p}/control.zaf" "Parameters" | while read param rest; do echo $param; done
+}
+
+# Set plugin global parameter
+# $1 plugindir
+# $2 parameter
+# $3 value
+zaf_set_plugin_parameter() {
+	printf "%s" "$3" >"${INSTALL_PREFIX}/${1}/${2}.value"
+}
+
+# Get plugin global parameter
+# $1 plugindir
+# $2 parameter
+zaf_get_plugin_parameter() {
+	[ -f "${1}/${2}.value" ] && cat "${1}/${2}.value"
+}
+
 # Prepare plugin into dir 
 # $1 is url, directory or plugin name (will be searched in default plugin dir). 
 # $2 is directory to prepare. 
@@ -81,8 +111,8 @@ zaf_prepare_plugin() {
 	url=$(zaf_get_plugin_url "$1")/control.zaf || exit $?
 	plugindir="$2"
 	control=${plugindir}/control.zaf
-	if [ "$(zaf_url_info $1)" = "path" ] && cmp -s "$url" "$control"; then
+	if [ "$(zaf_url_info $1)" = "path" ] &&  [ "$url" = "$control" ]; then
-		zaf_err "prepare_plugin: Cannot install from itself!"
+		zaf_err "prepare_plugin: Cannot install from itself ($url,$control)!"
 	fi
 	zaf_install_dir "$plugindir"
 	zaf_dbg "Fetching control file from $url ..."
@@ -104,6 +134,9 @@ zaf_install_plugin() {
 	local tmpplugindir
 	local control
 	local version
+	local eparam
+	local param
+	local default
 
 	plugin=$(basename "$1")
 	plugindir="${ZAF_PLUGINS_DIR}/${plugin}"
@@ -118,13 +151,31 @@ zaf_install_plugin() {
 			zaf_ctrl_sudo "$plugin" "${control}" "${plugindir}"
 			zaf_ctrl_cron "$plugin" "${control}" "${plugindir}"
 			zaf_ctrl_generate_items_cfg "${control}" "${plugin}" \
-			  | zaf_far '{PLUGINDIR}' "${plugindir}" >${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf
+				| zaf_far '{PLUGINDIR}' "${plugindir}" >${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf
 			zaf_dbg "Generated ${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf"
 			zaf_ctrl_generate_extitems_cfg "${control}" "${plugin}"
 		else
 			zaf_touch "${plugindir}/postinst.need"
 		fi
 		zaf_ctrl_install "$url" "${control}" "${plugindir}"
+		rm -f "${plugindir}/params"
+		zaf_touch "${plugindir}/params"
+		(zaf_ctrl_get_global_option "${control}" "Parameters"; echo) | \
+			while read param default; do
+				[ -z "$param" ] && continue
+				echo $param >>"${plugindir}/params"
+				eval eparam=\$ZAF_${plugin}_${param}
+				if [ -z "$eparam" ] && ! zaf_get_plugin_parameter "$plugindir" "$param" >/dev/null; then
+					zaf_wrn "Do not forget to set parameter $param. Use zaf plugin-set $plugin $param value. Default is $default."
+					zaf_set_plugin_parameter "$plugindir" "$param" "$default"
+				else
+					if [ -n "$eparam" ]; then
+						zaf_dbg "Setting $param to $eparam from env."
+						zaf_set_plugin_parameter "$plugindir" "$param" "$eparam"
+					fi
+				fi
+			done
+
 	else
 		zaf_err "Cannot install plugin '$plugin' to $plugindir!"
 	fi
@@ -146,7 +197,7 @@ zaf_postinstall_plugin() {
 	zaf_ctrl_sudo "$plugin" "${control}" "${plugindir}"
 	zaf_ctrl_cron "$plugin" "${control}" "${plugindir}"
 	zaf_ctrl_generate_items_cfg "${control}" "${plugin}" \
-	  | zaf_far '{PLUGINDIR}' "${plugindir}" >${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf
+		| zaf_far '{PLUGINDIR}' "${plugindir}" >${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf
 	zaf_dbg "Generated ${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf"
 	zaf_ctrl_generate_extitems_cfg "${control}" "${plugin}"
 }
@@ -167,6 +218,17 @@ zaf_is_plugin() {
 	false
 }
 
+zaf_is_item() {
+	local plugin
+	local item
+
+	plugin=$(echo $1|cut -d '.' -f 1)
+	item=$(echo $1|cut -d '.' -f 2- | cut -d '[' -f 1)
+	[ -z "$plugin" ] || [ -z "$item" ] && return 1
+	zaf_is_plugin "$plugin" && zaf_list_plugin_items "$plugin" | grep -qE "\.(${item}\$|${item}\[)"
+}
+
+
 zaf_discovery_plugins() {
 	zaf_list_plugins | zaf_discovery '{#PLUGIN}'
 }
@@ -252,23 +314,73 @@ zaf_list_plugin_items() {
 	echo
 }
 
+zaf_list_plugin_commands() {
+	local plugindir
+	local commands
+
+	if ! zaf_is_plugin "$1"; then
+		zaf_err "Missing plugin name or plugin $1 unknown. ";
+	fi
+	plugindir="${ZAF_PLUGINS_DIR}/$1"
+	commands=$(zaf_ctrl_get_global_option "${plugindir}/control.zaf" Install-cmd)
+	if [ -n "$commands" ]; then
+		echo $commands;
+	else
+		zaf_wrn "Plugin $1 has no commands."
+	fi
+}
+
+# $1 plugin 
+# $2 cmd
+# $3...$9 arguments
+zaf_plugin_run_command() {
+	local plugin
+	local cmd
+	local args
+
+	plugin=$1
+	cmd=$2
+	args="$3 $4 $5 $6 $7 $8 $9"
+	if ! zaf_is_plugin "$plugin"; then
+		zaf_err "Missing plugin name or plugin $olugin unknown. ";
+	fi
+	plugindir="${ZAF_PLUGINS_DIR}/$plugin"
+	commands=$(zaf_ctrl_get_global_option "${plugindir}/control.zaf" Install-cmd)
+	if echo $commands |grep -q $cmd; then
+		export PATH=$plugindir:$PATH
+		cd $plugindir
+		[ -f functions.sh ] && source functions.sh
+		exec $cmd $args;
+	else
+		zaf_err "Plugin $1 has no command $cmd"
+	fi
+}
+
 zaf_item_info() {
 	local plugin
 	local item
 	local param
+	local tmp
 
 	plugin=$(echo $1 | cut -d '.' -f 1)
 	item=$(echo $1 | cut -d '.' -f 2-)
 	if zaf_is_plugin $plugin; then
 		if zaf_ctrl_get_items <$ZAF_PLUGINS_DIR/$plugin/control.zaf | grep -wq "$item"; then
-			echo "Item $1:"
+			printf "%b" "Item $1\n\n"
-			echo -n "Cache: "; zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Cache"; echo
+			tmp=$(zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Cache")
-			echo "Parameters:"
+			[ -n "$tmp" ] && printf "%b" "Cache: $tmp \n\n"
-			zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Parameters" ; echo
+			tmp=$(zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Parameters")
-			echo "Testparameters:"
+			[ -n "$tmp" ] && printf "%b" "Parameters:\n$tmp\n\n"
-			zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Testparameters"; echo
+			tmp=$(zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Return")
-			echo "Precache:"
+			[ -n "$tmp" ] && printf "%b" "Return: $tmp\n\n"
-			zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Precache"; echo
+			tmp=$(zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Return-null")
+			[ -n "$tmp" ] && printf "%b" "Return-null: $tmp\n\n"
+			tmp=$(zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Return-empty")
+			[ -n "$tmp" ] && printf "%b" "Return-empty: $tmp\n\n"
+			tmp=$(zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Testparameters")
+			[ -n "$tmp" ] && printf "%b" "Testparameters: $tmp\n\n"
+			tmp=$(zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Precache")
+			[ -n "$tmp" ] && printf "%b" "Precache: $tmp\n\n"
 			grep "UserParameter=$1" $ZAF_AGENT_CONFIGD/zaf_${plugin}.conf
 		else
 			zaf_err "No such item $item."
@@ -305,8 +417,17 @@ zaf_test_item() {
 	fi
 }
 
+zaf_run_item() {
+	local item
+	item=$(echo $1| cut -d '[' -f 1)
+	params=$(echo $1| cut -d '[' -f 2- | tr ',' ' '| tr -d ']')
+	cmd=$(grep "^UserParameter=$item" $ZAF_AGENT_CONFIGD/zaf*.conf	| cut -d ',' -f 2-)
+	echo $cmd >/tmp/a 
+	sh /tmp/a $params
+}
+
 zaf_precache_item() {
-	cmd=$(grep "^UserParameter=$item" $ZAF_AGENT_CONFIGD/zaf*.conf  | cut -d ',' -f 2- | sed -e "s/_cache/_nocache/")
+	cmd=$(grep "^UserParameter=$item" $ZAF_AGENT_CONFIGD/zaf*.conf	| cut -d ',' -f 2- | sed -e "s/_cache/_nocache/")
 	zaf_wrn "Precaching item $item[$(echo $*| tr ' ' ',')] ($cmd)"
 	eval $cmd
 }

lib/preload.sh

@@ -9,17 +9,23 @@
 . ${ZAF_LIB_DIR}/zbxapi.lib.sh
 . ${ZAF_LIB_DIR}/cache.lib.sh
 
-# Plugin specific functions if exists
-[ -f ./functions.sh ] && . ./functions.sh
-
 if ! type zaf_version >/dev/null; then
 	echo "Problem loading libraries?"
 	exit 2
 fi
+
 zaf_debug_init
 zaf_tmp_init
 zaf_cache_init
 
+# Global plugin parameters
+[ -f ./params ] && for p in $(cat ./params); do
+	var=$p
+	value="$(cat ${p}.value)"
+	zaf_trc "Global $p parameter $var=$value"
+	eval export $var="$value"	
+done
+
 export ZAF_LIB_DIR
 export ZAF_TMP_DIR
 export ZAF_CACHE_DIR
@@ -28,10 +34,17 @@ export ZAF_DEBUG
 unset ZAF_LOG_STDERR
 export PATH
 
+# Plugin specific functions if exists
+[ -f ./functions.sh ] && . ./functions.sh
+
 if [ "$(basename $0)" = "preload.sh" ] && [ -n "$*" ]; then
 	tmpf=$(zaf_tmpfile preload)
+	export tmpf
 	$@ 2>$tmpf
 	[ -s $tmpf ] && zaf_wrn <$tmpf
+else
+	tmpf=$(zaf_tmpfile preload)
+	export tmpf	
 fi
 
 

lib/zaf.lib.sh

@@ -1,6 +1,6 @@
 
 # Hardcoded variables
-ZAF_VERSION="1.3"
+ZAF_VERSION="1.4"
 ZAF_GITBRANCH="master"
 ZAF_URL="https://github.com/limosek/zaf"
 ZAF_RAW_URL="https://raw.githubusercontent.com/limosek/zaf"
@@ -24,8 +24,8 @@ zaf_wrn() {
 }
 zaf_err() {
 	logger ${ZAF_LOG_STDERR} -p user.err -t zaf-error -- $@
-        logger ${ZAF_LOG_STDERR} -p user.err -t zaf-error "Exiting with error!"
+	logger ${ZAF_LOG_STDERR} -p user.err -t zaf-error "Exiting with error!"
-        exit 1
+	exit 1
 }
 # Help option
 # $1 - key
@@ -75,11 +75,11 @@ zaf_agentparm(){
 		value="$default"
 	else
 		if [ -n "$regexp" ]; then
-			echo "$value" | grep -qE "$regexp" ||  zaf_err "$ITEM_KEY: Bad parameter '$name' value '$value' (not in regexp '$regexp')."
+			echo "$value" | grep -qE "$regexp" ||	 zaf_err "$ITEM_KEY: Bad parameter '$name' value '$value' (not in regexp '$regexp')."
 		fi
 	fi
-	eval $name=$value
 	zaf_trc "$ITEM_KEY: Param $name set to $value"
+	eval $name=\"$value\"
 }
 
 # Fetch url to stdout 
@@ -116,7 +116,7 @@ zaf_fetch_url() {
 }
 
 # Get info about url
-# returns  path or url
+# returns	 path or url
 zaf_url_info() {
 	if echo "$1" | grep -q '^/'; then
 		echo "path"
@@ -131,41 +131,46 @@ zaf_url_info() {
 
 # Find and replace string
 zaf_far(){
-   local f
+	 local f
-   local t
+	 local t
-        local sedcmd="sed"
+				local sedcmd="sed"
-        i=1
+				i=1
-        while [ "$i" -lt "$#" ];
+				while [ "$i" -lt "$#" ];
-        do
+				do
-                eval f=\$${i}
+								eval f=\$${i}
-                i=$(expr $i + 1)
+								i=$(expr $i + 1)
-                eval t=\$${i}
+								eval t=\$${i}
-                i=$(expr $i + 1)
+								i=$(expr $i + 1)
-                sedcmd="$sedcmd -e 's~$f~$t~g'"
+								sedcmd="$sedcmd -e 's~$f~$t~g'"
-        done
+				done
-   eval $sedcmd
+	 eval $sedcmd
+}
+
+# Trim spaces and newlines from string
+zaf_trim(){
+	tr -d '\n'
 }
 
 # Limit concurrent processes or continue
 zaf_bglimit(){
-    local maxbg
+		local maxbg
-    local maxnumber
+		local maxnumber
-    local cnumber
+		local cnumber
-    [ -z "$BASH_VERSION" ] && { zaf_dbg "Job server not available. Use bash!"; return 1; }
+		[ -z "$BASH_VERSION" ] && { zaf_dbg "Job server not available. Use bash!"; return 1; }
-    if [ $# -eq 0 ] ; then
+		if [ $# -eq 0 ] ; then
-            maxbg=5
+						maxbg=5
-    else
+		else
-	    maxbg=$1
+			maxbg=$1
-    fi
+		fi
-    maxnumber=$((0 + ${1:-0}))
+		maxnumber=$((0 + ${1:-0}))
-    while true; do
+		while true; do
-            cnumber=$(jobs | wc -l)
+						cnumber=$(jobs | wc -l)
-            if [ $cnumber -lt $maxnumber ]; then
+						if [ $cnumber -lt $maxnumber ]; then
-                    break
+										break
-            fi
+						fi
-	    zaf_dbg "Limiting next job due to $maxbg limit of bg jobs"
+			zaf_dbg "Limiting next job due to $maxbg limit of bg jobs"
-            sleep 1
+						sleep 1
-    done
+		done
 }
 
 # Initialises discovery function
@@ -178,27 +183,27 @@ EOF
 
 # Add row(s) to discovery data
 zaf_discovery_add_row(){
-  local rows
+	local rows
-  local row
+	local row
 
-  rows=$1
+	rows=$1
-  row=$2
+	row=$2
-  shift;shift
+	shift;shift
-  echo " {"
+	echo " {"
-  while [ -n "$1" ]; do
+	while [ -n "$1" ]; do
-    echo -n '  "'$1'":"'$2'" '
+		echo -n '	 "'$1'":"'$2'" '
-    shift;shift
+		shift;shift
-    if [ -n "$1" ]; then
+		if [ -n "$1" ]; then
 	echo ","
-    else
+		else
 	echo ""
-    fi
+		fi
-  done
+	done
-  if [ "$row" -lt "$rows" ]; then
+	if [ "$row" -lt "$rows" ]; then
-  	echo " },"
+		echo " },"
-  else
+	else
 	echo " }"
-  fi
+	fi
 }
 
 # Dumps json object
@@ -213,22 +218,22 @@ EOF
 # Arguments are name of variables to discovery.
 # Dumps json to stdout
 zaf_discovery(){
-  local tmpfile
+	local tmpfile
-  local rows
+	local rows
-  local a b c d e f g h i j row
+	local a b c d e f g h i j row
 
-  tmpfile="${ZAF_TMP_DIR}/disc$$"
+	tmpfile="${ZAF_TMP_DIR}/disc$$"
-  cat >$tmpfile
+	cat >$tmpfile
-  rows=$(wc -l <$tmpfile)
+	rows=$(wc -l <$tmpfile)
-  local a b c d e f g h i j;
+	local a b c d e f g h i j;
-  zaf_discovery_begin
+	zaf_discovery_begin
-  row=1
+	row=1
-  while read a b c d e f g h i j; do
+	while read a b c d e f g h i j; do
-    zaf_discovery_add_row "$rows" "$row" "$1" "${1:+${a}}" "$2" "${2:+${b}}" "$3" "${3:+${c}}" "$4" "${4:+${d}}" "$5" "${5:+${e}}" "$6" "${6:+${f}}" "$7" "${7:+${g}}" "$8" "${8:+${h}}" "$9" "${9:+${i}}"
+		zaf_discovery_add_row "$rows" "$row" "$1" "${1:+${a}}" "$2" "${2:+${b}}" "$3" "${3:+${c}}" "$4" "${4:+${d}}" "$5" "${5:+${e}}" "$6" "${6:+${f}}" "$7" "${7:+${g}}" "$8" "${8:+${h}}" "$9" "${9:+${i}}"
-    row=$(expr $row + 1)
+		row=$(expr $row + 1)
-  done <$tmpfile
+	done <$tmpfile
-  zaf_discovery_end
+	zaf_discovery_end
-  rm -f $tmpfile
+	rm -f $tmpfile
 }
 
 ############################################ Zaf internal routines
@@ -255,7 +260,7 @@ zaf_toupper() {
 
 # Return simplified key with discarded special chars.
 zaf_stripctrl() {
-	echo $1 | tr '[]*&;:.-' '________'
+	echo $1 | tr '[]*&;:.-' '________' | tr -d '\n'
 }
 
 # Unescape string on stdin
@@ -279,7 +284,7 @@ zaf_date_add() {
 # Create temp file and return its name
 # $1 prefix or empty
 zaf_tmpfile() {
-	echo "$ZAF_TMP_DIR/tmp$1"
+	echo "$ZAF_TMP_DIR/tmp$1$(zaf_random)"
 }
 
 # return random number
@@ -296,3 +301,56 @@ zaf_sudo() {
 	fi
 }
 
+# Get item name from plugin.item[parms]
+zaf_get_plugin_name() {
+	echo $1|cut -d '.' -f 1
+}
+
+# Get item name from plugin.item[parms]
+zaf_get_item_name() {
+	echo $1|cut -d '.' -f 2-|cut -d '[' -f 1
+}
+
+# Get item params from plugin.item[parms]
+zaf_get_item_params() {
+	echo $1|cut -d '[' -f 2|cut -d ']' -f 1
+}
+
+# Convert Zabbix style parameters [param1,param2,..] into $1 $2 $3
+zaf_paramstosh() {
+	local parms
+	local IFS
+	parms=$(echo $*|cut -d '[' -f 2 | cut -d ']' -f 1| tr ',' '~')
+	IFS="~"; for i in $parms; do
+		if [ -n "$i" ]; then
+			printf "$i "
+		else
+			printf "'' "
+		fi
+	done
+}
+
+#Returns either actual hostname or configured one
+zaf_hostname() {
+	if [ -z "$ZAF_HOSTNAME" ]; then
+		hostname
+	else
+		echo $ZAF_HOSTNAME
+	fi
+}
+
+# Send active agent query (used for auto registration of host)
+# $1 hostname
+# $2 metadata
+zaf_register() {
+	local query
+	local result
+	zaf_dbg "zaf_register $1 $2"
+	query="{\"host\": \"$1\", \"host_metadata\": \"$2\", \"request\": \"active checks\"}"
+	result="$(echo $query| nc -q1 $ZAF_ZBXSRV_HOST $ZAF_ZBXSRV_PORT | tail -c +14)"
+	if echo $result |grep -q failed; then
+		zaf_wrn $result
+	fi
+}
+
+

lib/zafret

@@ -0,0 +1,52 @@
+#!/bin/sh
+
+. $(dirname $0)/preload.sh
+
+if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
+	zaf_err "zafret valuefile stderrfile retcode [return return_if_null return_if_error]"
+	exit 1
+fi
+
+value="$(cat $1)"
+rm -f $1
+shift
+
+stderr="$(cat $1)"
+rm -f $1
+shift
+
+retcode="$1"
+shift
+
+if [ -n "$1" ]; then
+	ret="$1"
+	shift
+fi
+
+if [ -n "$1" ]; then
+	retnull="$1"
+	shift
+fi
+
+if [ -n "$1" ]; then
+	reterr="$1"
+	shift
+fi
+
+if [ "$retcode" != 0 ]; then
+	echo "$reterr"
+	zaf_wrn "${ITEM_KEY}("$*"): Error code '$retcode', returning '$reterr' ($stderr)"
+	exit $retcode
+fi
+
+if [ -z "$value" ]; then
+	echo "$retnull"
+	zaf_wrn "${ITEM_KEY}("$*"): Got empty result, returning '$retnull' ($stderr)"
+	exit
+fi
+
+echo $value
+if [ -n "$stderr" ]; then
+	zaf_wrn "${ITEM_KEY}("$*"): $stderr"
+fi
+

lib/zbxapi.lib.sh

@@ -10,7 +10,7 @@ zaf_zbxapi_do() {
 	query="$1"
 	zaf_trc "Zabbix API: $query"
 	curl -s -f -L -X POST -H 'Content-Type: application/json-rpc' -d "$query" "$ZAF_ZBXAPI_URL" >$tmpfile
-	if [ $? = 0 ] &&  $ZAF_LIB_DIR/JSON.sh -b <$tmpfile | grep -q '"result"'; then
+	if [ $? = 0 ] &&	$ZAF_LIB_DIR/JSON.sh -b <$tmpfile | grep -q '"result"'; then
 		zaf_trc "API OK"
 		cat $tmpfile
 		rm -f $tmpfile
@@ -52,7 +52,7 @@ zaf_zbxapi_getstring() {
 # Extract value from JSON response result
 # $1 key
 zaf_zbxapi_getvalues() {
-	 $ZAF_LIB_DIR/JSON.sh -b | grep '\["result",.*,"'$1'"]'  | tr '\t' ' ' | cut -d ' ' -f 2- | sed -e 's/^"//' -e 's/"$//'
+	 $ZAF_LIB_DIR/JSON.sh -b | grep '\["result",.*,"'$1'"]'	 | tr '\t' ' ' | cut -d ' ' -f 2- | sed -e 's/^"//' -e 's/"$//'
 }
 
 # Zabbix API related functions
@@ -66,17 +66,17 @@ zaf_zbxapi_login(){
 
  [ -z "$ZAF_ZBXAPI_URL" ] || [ -z "$ZAF_ZBXAPI_USER" ] || [ -z "$ZAF_ZBXAPI_PASS" ] && zaf_err "Zabbix Api parameters not set! Set ZAF_ZBXAPI_URL, ZAF_ZBXAPI_USER and ZAF_ZBXAPI_PASS and try again."
  authstr='{
-   "method" : "user.login",
+	 "method" : "user.login",
-   "params" : {
+	 "params" : {
-      "password" : "'$ZAF_ZBXAPI_PASS'",
+			"password" : "'$ZAF_ZBXAPI_PASS'",
-      "user" : "'$ZAF_ZBXAPI_USER'"
+			"user" : "'$ZAF_ZBXAPI_USER'"
-   },
+	 },
-   "id" : 0,
+	 "id" : 0,
-   "jsonrpc" : "2.0"
+	 "jsonrpc" : "2.0"
  }'
  
  if [ "$ZAF_ZBXAPI_AUTHTYPE" = "http" ] ; then
-    ZAF_ZBXAPI_URL=$(echo $ZAF_ZBXAPI_URL | cut -d '/' -f 1)//$ZAF_ZBXAPI_USER:$ZAF_ZBXAPI_PASS@$(echo $ZAF_ZBXAPI_URL | cut -d '/' -f 3-)
+		ZAF_ZBXAPI_URL=$(echo $ZAF_ZBXAPI_URL | cut -d '/' -f 1)//$ZAF_ZBXAPI_USER:$ZAF_ZBXAPI_PASS@$(echo $ZAF_ZBXAPI_URL | cut -d '/' -f 3-)
  fi
  result=$(zaf_zbxapi_do_cache "$authstr")
  ZAF_ZBXAPI_AUTH=$(echo $result |zaf_zbxapi_getstring)
@@ -122,9 +122,9 @@ zaf_zbxapi_get_object() {
 zaf_zbxapi_gethostgroupid() {
 	local result
 
- 	result=$(zaf_zbxapi_get_object "hostgroup" '"name": ["'$1'"]')
+	result=$(zaf_zbxapi_get_object "hostgroup" '"name": ["'$1'"]')
- 	[ -z "$result" ] && zaf_err "HostGroup $1 not found!"
+	[ -z "$result" ] && zaf_err "HostGroup $1 not found!"
- 	echo $result |zaf_zbxapi_getvalues groupid
+	echo $result |zaf_zbxapi_getvalues groupid
 }
 
 # $1 hostid
@@ -132,10 +132,10 @@ zaf_zbxapi_gethostgroupid() {
 zaf_zbxapi_gethost() {
 	local result
 
- 	result=$(zaf_zbxapi_get_object "host" '' '"hostids": ["'$1'"]' 'extend')
+	result=$(zaf_zbxapi_get_object "host" '' '"hostids": ["'$1'"]' 'extend')
- 	[ -z "$result" ] && zaf_err "Hostid $1 not found!"
+	[ -z "$result" ] && zaf_err "Hostid $1 not found!"
- 	if [ -z "$2" ]; then
+	if [ -z "$2" ]; then
- 		echo $result
+		echo $result
 	else
 		echo $result |zaf_zbxapi_getvalues $2
 	fi
@@ -145,9 +145,9 @@ zaf_zbxapi_gethost() {
 zaf_zbxapi_gethostid() {
 	local result
 
- 	result=$(zaf_zbxapi_get_object "host" '"host": ["'$1'"]')
+	result=$(zaf_zbxapi_get_object "host" '"host": ["'$1'"]')
- 	[ -z "$result" ] && zaf_err "Host $1 not found!"
+	[ -z "$result" ] && zaf_err "Host $1 not found!"
- 	echo $result |zaf_zbxapi_getvalues hostid
+	echo $result |zaf_zbxapi_getvalues hostid
 }
 
 # $1 hostname
@@ -155,10 +155,10 @@ zaf_zbxapi_gethostid() {
 zaf_zbxapi_gethostinventory() {
 	local result
 
- 	result=$(zaf_zbxapi_get_object "host" '"host": ["'$1'"]' '"withInventory": "true", "selectInventory": "extend"')
+	result=$(zaf_zbxapi_get_object "host" '"host": ["'$1'"]' '"withInventory": "true", "selectInventory": "extend"')
- 	[ -z "$result" ] && zaf_err "Host $1 not found!"
+	[ -z "$result" ] && zaf_err "Host $1 not found!"
 	if [ -z "$2" ]; then
- 		echo $result 
+		echo $result 
 	else
 		echo $result |zaf_zbxapi_getvalues $2
 	fi
@@ -168,9 +168,9 @@ zaf_zbxapi_gethostinventory() {
 zaf_zbxapi_gettemplateid() {
 	local result
 
- 	result=$(zaf_zbxapi_get_object "template" '"host": ["'$1'"]')
+	result=$(zaf_zbxapi_get_object "template" '"host": ["'$1'"]')
- 	[ -z "$result" ] && zaf_err "Template $1 not found!"
+	[ -z "$result" ] && zaf_err "Template $1 not found!"
- 	echo $result |zaf_zbxapi_getvalues templateid
+	echo $result |zaf_zbxapi_getvalues templateid
 }
 
 # $1 templateid
@@ -178,10 +178,10 @@ zaf_zbxapi_gettemplateid() {
 zaf_zbxapi_gettemplate() {
 	local result
 
- 	result=$(zaf_zbxapi_get_object "template" '' '"templateids": ["'$1'"]' 'extend')
+	result=$(zaf_zbxapi_get_object "template" '' '"templateids": ["'$1'"]' 'extend')
- 	[ -z "$result" ] && zaf_err "Templateid $1 not found!"
+	[ -z "$result" ] && zaf_err "Templateid $1 not found!"
- 	if [ -z "$2" ]; then
+	if [ -z "$2" ]; then
- 		echo $result
+		echo $result
 	else
 		echo $result |zaf_zbxapi_getvalues $2
 	fi
@@ -191,34 +191,34 @@ zaf_zbxapi_gettemplate() {
 zaf_zbxapi_gethostsingroup() {
 	local result
 
- 	result=$(zaf_zbxapi_get_object "host" '' '"groupids": ["'$1'"]')
+	result=$(zaf_zbxapi_get_object "host" '' '"groupids": ["'$1'"]')
- 	[ -z "$result" ] && zaf_wrn "No hosts in groupid '$1'"
+	[ -z "$result" ] && zaf_wrn "No hosts in groupid '$1'"
- 	echo $result | zaf_zbxapi_getvalues "hostid"
+	echo $result | zaf_zbxapi_getvalues "hostid"
 }
 
 # Get all hostids in system
 zaf_zbxapi_gethostids() {
 	local result
 
- 	result=$(zaf_zbxapi_get_object "host")
+	result=$(zaf_zbxapi_get_object "host")
- 	echo $result | zaf_zbxapi_getvalues "hostid"
+	echo $result | zaf_zbxapi_getvalues "hostid"
 }
 
 # Get all templateids in system
 zaf_zbxapi_gettemplateids() {
 	local result
 
- 	result=$(zaf_zbxapi_get_object "template")
+	result=$(zaf_zbxapi_get_object "template")
- 	echo $result | zaf_zbxapi_getvalues "templateid"
+	echo $result | zaf_zbxapi_getvalues "templateid"
 }
 
 # $1 hostgroupid 
 zaf_zbxapi_gettemplatesingroup() {
 	local result
 
- 	result=$(zaf_zbxapi_get_object "template" '' '"groupids": ["'$1'"]')
+	result=$(zaf_zbxapi_get_object "template" '' '"groupids": ["'$1'"]')
- 	[ -z "$result" ] && zaf_wrn "No templates in groupid '$1'"
+	[ -z "$result" ] && zaf_wrn "No templates in groupid '$1'"
- 	echo $result | zaf_zbxapi_getvalues "templateid"
+	echo $result | zaf_zbxapi_getvalues "templateid"
 }
 
 # $1 map or null for all
@@ -226,12 +226,12 @@ zaf_zbxapi_getmapid() {
 	local result
 
 	if [ -n "$1" ]; then
- 		result=$(zaf_zbxapi_get_object "map" '"name": ["'$1'"]')
+		result=$(zaf_zbxapi_get_object "map" '"name": ["'$1'"]')
 	else
- 		result=$(zaf_zbxapi_get_object "map")
+		result=$(zaf_zbxapi_get_object "map")
 	fi
- 	[ -z "$result" ] && zaf_err "Map $1 not found"
+	[ -z "$result" ] && zaf_err "Map $1 not found"
- 	echo $result | zaf_zbxapi_getvalues "sysmapid"
+	echo $result | zaf_zbxapi_getvalues "sysmapid"
 }
 
 # $1 mapid
@@ -239,10 +239,10 @@ zaf_zbxapi_getmapid() {
 zaf_zbxapi_getmap() {
 	local result
 
- 	result=$(zaf_zbxapi_get_object "map" '' '"sysmapids": ["'$1'"]' 'extend')
+	result=$(zaf_zbxapi_get_object "map" '' '"sysmapids": ["'$1'"]' 'extend')
- 	[ -z "$result" ] && zaf_err "Mapid $1 not found"
+	[ -z "$result" ] && zaf_err "Mapid $1 not found"
- 	if [ -z "$2" ]; then
+	if [ -z "$2" ]; then
- 		echo $result
+		echo $result
 	else
 		echo $result |zaf_zbxapi_getvalues $2
 	fi
@@ -261,18 +261,18 @@ zaf_zbxapi_export_object(){
 
  bkpstr='
  {
-    "method": "configuration.export",
+		"method": "configuration.export",
-    "jsonrpc": "2.0",
+		"jsonrpc": "2.0",
-    "params": {
+		"params": {
-        "options": {
+				"options": {
-            "'$obj'": [
+						"'$obj'": [
-                "'$id'"
+								"'$id'"
-            ]
+						]
-        },
+				},
-        "format": "xml"
+				"format": "xml"
-    },
+		},
-    "auth": "'$ZAF_ZBXAPI_AUTH'",
+		"auth": "'$ZAF_ZBXAPI_AUTH'",
-    "id": 1
+		"id": 1
 }'
  zaf_zbxapi_do_cache "$bkpstr" | zaf_zbxapi_getxml
 }
@@ -303,67 +303,67 @@ zaf_zbxapi_import_config(){
  local impstr
 
  if [ -z "$1" ]; then
-   xmlstr=$(zaf_strescape '"')
+	 xmlstr=$(zaf_strescape '"')
  else
-   ! [ -f "$1" ] && return 1
+	 ! [ -f "$1" ] && return 1
-   xmlstr=$(zaf_strescape '"\n\r' <$1)
+	 xmlstr=$(zaf_strescape '"\n\r' <$1)
  fi
  impstr='
  {
-    "method": "configuration.import",
+		"method": "configuration.import",
-    "jsonrpc": "2.0",
+		"jsonrpc": "2.0",
-    "params": {
+		"params": {
-        "format": "xml",
+				"format": "xml",
-        "rules": {
+				"rules": {
-	    "applications": {
+			"applications": {
-                "createMissing": true,
+								"createMissing": true,
-                "updateExisting": true
+								"updateExisting": true
-            },
+						},
-            "discoveryRules": {
+						"discoveryRules": {
-                "createMissing": true,
+								"createMissing": true,
-                "updateExisting": true
+								"updateExisting": true
-            },
+						},
-	    "graphs": {
+			"graphs": {
-                "createMissing": true,
+								"createMissing": true,
-                "updateExisting": true
+								"updateExisting": true
-            },
+						},
-            "hosts": {
+						"hosts": {
-                "createMissing": true,
+								"createMissing": true,
-                "updateExisting": true
+								"updateExisting": true
-            },
+						},
-            "items": {
+						"items": {
-                "createMissing": true,
+								"createMissing": true,
-                "updateExisting": true
+								"updateExisting": true
-            },
+						},
-	    "templates": {
+			"templates": {
-                "createMissing": true,
+								"createMissing": true,
-                "updateExisting": true
+								"updateExisting": true
-            },
+						},
-            "triggers": {
+						"triggers": {
-                "createMissing": true,
+								"createMissing": true,
-                "updateExisting": true
+								"updateExisting": true
-            },
+						},
-	    "maps": {
+			"maps": {
-                "createMissing": true,
+								"createMissing": true,
-                "updateExisting": true
+								"updateExisting": true
-            },
+						},
-	    "screens": {
+			"screens": {
-                "createMissing": true,
+								"createMissing": true,
-                "updateExisting": true
+								"updateExisting": true
-            },
+						},
-            "items": {
+						"items": {
-                "createMissing": true,
+								"createMissing": true,
-                "updateExisting": true
+								"updateExisting": true
-            },
+						},
-	    "valueMaps": {
+			"valueMaps": {
-                "createMissing": true,
+								"createMissing": true,
-                "updateExisting": true
+								"updateExisting": true
-            }
+						}
-        },
+				},
 	"source": "'$xmlstr'"
-    },
+		},
-    "auth": "'$ZAF_ZBXAPI_AUTH'",
+		"auth": "'$ZAF_ZBXAPI_AUTH'",
-    "id": 3
+		"id": 3
 }'
  zaf_zbxapi_do "$impstr" | zaf_zbxapi_getresult | grep -q true
 }

tgz.mk

@@ -0,0 +1,32 @@
+
+TGZ_DIR=tmp/tgz
+
+ifeq ($(TGZ_PKG),)
+ TGZ_PKG=$(shell . lib/zaf.lib.sh; echo out/zaf-$$ZAF_VERSION.tgz)
+endif
+
+$(TGZ_PKG):	clean tgz-init tgz-deps tgz-control tgz-scripts tgz-cp tgz-package
+
+tgz-init:
+	@mkdir -p $(TGZ_DIR)
+
+tgz-deps: 
+tgz-control:
+tgz-scripts:
+tgz-cp:
+	@mkdir -p $(TGZ_DIR)
+	@set -e; INSTALL_PREFIX=$(TGZ_DIR) ZAF_tgzUG=$(ZAF_tgzUG) ./install.sh auto $(ZAF_OPTIONS) ZAF_PLUGINS="$(ZAF_PLUGINS)" $(AGENT_OPTIONS)
+	@cat lib/*lib.sh install.sh >$(TGZ_DIR)/usr/lib/zaf/install.sh
+	@chmod +x $(TGZ_DIR)/usr/lib/zaf/install.sh
+	@rm -rf $(TGZ_DIR)/tmp
+	@cp $(TGZ_DIR)/etc/zaf.conf tmp/zaf.conf
+	@grep -E "$$(echo $(ZAF_EXPORT_OPTS) | tr ' ' '|')=" tmp/zaf.conf  >$(TGZ_DIR)/etc/zaf.conf
+ifneq ($(AGENT_OPTIONS),)
+	@echo "ZAF_AGENT_OPTIONS=\"$(AGENT_OPTIONS)\"" >>$(TGZ_DIR)/etc/zaf.conf
+endif
+
+tgz-package:
+	@tar -czf $(TGZ_PKG) -C $(TGZ_DIR) . 
+	@echo PLUGINS embedded: $(ZAF_PLUGINS)
+	@echo Result: $(TGZ_PKG)
+

zaf

@@ -11,20 +11,22 @@ ZAF_CFG_FILE="/etc/zaf.conf"
 
 	# Read options as config for ZAF
 	for pair in "$@"; do
-    		if echo $pair | grep -qE '^ZAF\_(.*)='; then
+			if echo $pair | grep -qE '^ZAF\_(.*)='; then
-    			option=$(echo $pair|cut -d '=' -f 1)
+				option=$(echo $pair|cut -d '=' -f 1)
-    			value=$(echo $pair|cut -d '=' -f 2-)
+				value=$(echo $pair|cut -d '=' -f 2-)
-    			eval "${option}='$value'"
+				eval "${option}='$value'"
 			export secondstage=1
-    		else
+			else
 			params="$params $pair"
-    		fi
+			fi
 	done
 	export $(set |grep ^ZAF_ | cut -d '=' -f 1)
 	# If some variables in cmd were stripped, rerun only with right arguments and exported variables
 	[ -n "$secondstage" ] && exec $0 $params
 fi
 
+export ZAF_BIN=$(realpath $0)
+
 if [ -n "$ZAF_PROXY" ]; then
 	export ALL_PROXY="$ZAF_PROXY"
 	export http_proxy="$ZAF_PROXY"
@@ -86,7 +88,7 @@ userparms)
 		plugindir=$ZAF_PLUGINS_DIR/$plugin
 		control=$plugindir/control.zaf
 		zaf_ctrl_generate_items_cfg "${control}" "${plugin}" "noscripts" \
-			  | zaf_far '{PLUGINDIR}' "${plugindir}"
+		 | zaf_far '{PLUGINDIR}' "${plugindir}"
 	done
 	;;
 agent-config)
@@ -102,10 +104,10 @@ agent-config)
 	for plugin in $(zaf_list_plugins); do
 		plugindir=$ZAF_PLUGINS_DIR/$plugin
 		control=$plugindir/control.zaf
-		if ! [ -f  "${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf" ] || [ "$control" -nt "${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf" ] || [ -n "$force" ]; then
+		if ! [ -f "${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf" ] || [ "$control" -nt "${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf" ] || [ -n "$force" ]; then
 			zaf_dbg "Generating ${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf"
 			zaf_ctrl_generate_items_cfg "${control}" "${plugin}" \
-			  | zaf_far '{PLUGINDIR}' "${plugindir}" >${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf
+			 | zaf_far '{PLUGINDIR}' "${plugindir}" >${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf
 		fi
 	done
 	;;
@@ -175,9 +177,35 @@ test)
 		done
 	done
 	;;
+itemsh)
+	shift
+	if zaf_is_item "$1"; then
+		plugin=$(zaf_get_plugin_name "$1")
+		item=$(zaf_get_item_name "$1")
+		params=$(zaf_get_item_params "$1")
+		params2=$(zaf_paramstosh "[$params]")
+		script=$(zaf_ctrl_generate_items_cfg "${ZAF_PLUGINS_DIR}/${plugin}/control.zaf" "${plugin}" "" "sh -i #"| grep "UserParameter=$plugin.$item" | cut -d ',' -f 2-)
+		exec sh -c "$script" dummy $params2
+	else
+		zaf_err "No such plugin/item $1"
+	fi
+	;;
+run)
+	shift
+	if zaf_is_item "$1"; then
+		plugin=$(zaf_get_plugin_name "$1")
+		item=$(zaf_get_item_name "$1")
+		params=$(zaf_get_item_params "$1")
+		params2=$(zaf_paramstosh "[$params]")
+		script=$(zaf_ctrl_generate_items_cfg "${ZAF_PLUGINS_DIR}/${plugin}/control.zaf" "${plugin}" | grep "UserParameter=$plugin.$item" | cut -d ',' -f 2-)
+		exec sh -c "$script" dummy $params2
+	else
+		zaf_err "No such plugin/item $1"
+	fi
+	;;
 get)
 	shift
-	if echo $1|grep -q '\.'; then
+	if zaf_is_item "$1"; then
 		zaf_get_item "$1"
 		exit
 	fi
@@ -193,6 +221,65 @@ get)
 		done
 	done
 	;;
+send)
+	shift
+	if [ -z "$1" ]; then
+		# No parameters - pipe to zabbix_sender
+		zaf_dbg "Waiting for data on stdin (host item value) per line"
+		zscmd="zabbix_sender -z '$ZAF_ZBXSRV_HOST' -p '$ZAF_ZBXSRV_PORT' -i -"
+		zaf_dbg $zscmd
+		eval $zscmd
+		exit
+	else
+		if [ -n "$2" ]; then
+			# Hostname as parameter - rerun with right hostname set
+			exec $0 send "$2" "$3" ZAF_HOSTNAME="$1"
+		else
+			if echo "$1" | grep -q ':'; then
+				# Hostname:item - rerun with right hostname set
+				exec $0 send "$(echo $1 |cut -d ':' -f 2-)" "$3" ZAF_HOSTNAME="$(echo $1 |cut -d ':' -f 1)"
+			fi
+			if zaf_is_item "$1"; then
+				# Item supported by zaf
+				plugin=$(zaf_get_plugin_name "$1")
+				item=$(zaf_get_item_name "$1")
+				zscmd="zabbix_sender -z '$ZAF_ZBXSRV_HOST' -p '$ZAF_ZBXSRV_PORT' -s '$(zaf_hostname)' -k '$plugin.$item' -o '$(zaf_run_item $1)'"
+				zaf_dbg $zscmd
+				eval $zscmd
+				exit
+			else
+				if echo $1 | grep -q '='; then
+					item=$(echo $1 | cut -d '=' -f 1)
+					value=$(echo $1 | cut -d '=' -f 2-)
+				else
+					item=$1
+					zaf_dbg "Waiting for value of $(zaf_hostname):$1 on stdin"
+					value=$(cat)
+				fi
+				zscmd="zabbix_sender -z '$ZAF_ZBXSRV_HOST' -p '$ZAF_ZBXSRV_PORT' -s '$(zaf_hostname)' -k '$item' -o '$value'"
+				zaf_dbg $zscmd
+				eval $zscmd
+				exit
+			fi			
+		fi
+	fi
+	;;
+register)
+	shift
+	if [ -z "$1" ]; then
+		hostname=$(zaf_hostname)
+	else
+		hostname="$1"
+		if [ -z "$2" ]; then
+			metadata="ZAF"
+		else
+			metadata="$2"
+		fi
+
+	fi
+	zaf_register "$hostname" "$metadata"
+	exit;
+	;;
 precache)
 	shift
 	for i in $*; do
@@ -227,7 +314,12 @@ reinstall)
 	[ -z "$1" ] && echo "$0 reinstall plugin [plugin]..."
 	for p in $@; do
 		if zaf_is_plugin "$p"; then
-			zaf_remove_plugin "$(basename $p)"
+			params=$(zaf_get_plugin_parameters $p)
+			for param in $params; do 
+				eval export ZAF_${p}_${param}=$(zaf_get_plugin_parameter "${ZAF_PLUGINS_DIR}/${p}" $param)
+				zaf_dbg "Saving ZAF_${p}_${param}"
+			done
+			zaf_remove_plugin "$p"
 			reinstalled=1
 		fi
 		zaf_install_plugin "$p"
@@ -235,7 +327,7 @@ reinstall)
 	done
 	[ -n "$reinstalled" ] && zaf_is_root && zaf_restart_agent
 	;;
-remove)
+remove|uninstall)
 	shift
 	[ -z "$1" ] && echo "$0 remove plugin [plugin]..."
 	for p in $@; do
@@ -246,6 +338,21 @@ remove)
 	done
 	[ -n "$removed" ] && zaf_is_root && zaf_restart_agent
 	;;
+plugin-set)
+	plugin="$2"
+	param="$3"
+	value="$4"
+	if [ -z "$plugin" ] || [ -z "$param" ]; then
+		zaf_err "$0 plugin-set plugin parameter value"
+	else
+		if zaf_is_plugin "$plugin"; then
+			plugindir="${ZAF_PLUGINS_DIR}/${plugin}"
+			zaf_set_plugin_parameter "$plugindir" "$param" "$value"
+		else
+			zaf_err "Plugin $plugin is not installed."
+		fi
+	fi 
+	;;
 
 ###### Zaf related commands
 self-upgrade)
@@ -264,23 +371,24 @@ self-remove)
 	zaf_os_specific zaf_check_deps zaf && zaf_err "Zaf is installed as system package. Cannot self-remove."
 	. /etc/zaf.conf
 	if [ "$1" = "force" ]; then
-	  rm -rf /etc/zaf.conf ${ZAF_PLUGINS_DIR} ${ZAF_REPO_DIR} ${ZAF_LIB_DIR} \
+		rm -rf /etc/zaf.conf ${ZAF_PLUGINS_DIR} ${ZAF_REPO_DIR} ${ZAF_LIB_DIR} \
-		${ZAF_BIN_DIR}/zaf ${ZAF_AGENT_CONFIGD}/zaf_*
+		 ${ZAF_BIN_DIR}/zaf ${ZAF_AGENT_CONFIGD}/zaf_*
 	else
-	  echo "This will remove zaf from this computer and erase all configuration."
+		echo "This will remove zaf from this computer and erase all configuration."
-	  echo "This command will be executed:"
+		echo "This command will be executed:"
-	  echo "rm -rf /etc/zaf.conf ${ZAF_PLUGINS_DIR} ${ZAF_REPO_DIR} ${ZAF_LIB_DIR} \
+		echo "rm -rf /etc/zaf.conf ${ZAF_PLUGINS_DIR} ${ZAF_REPO_DIR} ${ZAF_LIB_DIR} \
 		${ZAF_BIN_DIR}/zaf ${ZAF_AGENT_CONFIGD}/zaf_*"
-	  echo 
+		echo 
-	  echo "To continue, please do $0 self-remove force"
+		echo "To continue, please do $0 self-remove force"
 	fi
-      	;;
+	;;
+
 ###### API related commands
 api)
 	zaf_zbxapi_login
 	case $2 in
 	get-*-id)
- 		obj=$(echo $2|cut -d '-' -f 2)
+		obj=$(echo $2|cut -d '-' -f 2)
 		[ -z "$3" ] && zaf_err "$0 $1 $2 <$obj>"
 		eval zaf_zbxapi_get${obj}id "$3"
 		;;
@@ -431,6 +539,14 @@ api)
 	;;
 
 *)
+	if zaf_is_plugin "$1"; then
+		if [ -z "$2" ]; then
+			zaf_list_plugin_commands "$1"
+		else
+			zaf_plugin_run_command "$@"
+		fi
+		exit
+	fi
 	echo "$0 Version ${ZAF_VERSION}. Please use some of this commands:"
 	echo "$0 Cmd [ZAF_OPTION=value] [ZAF_CTRL_Option=value] [ZAF_CTRLI_Item_Option=value] ..."
 	echo "Plugin manipulation commands:"
@@ -447,11 +563,20 @@ api)
 	echo "Plugin diagnostic commands:"
 	zaf_hlp "$0 test [plugin[.item]]" "To test [all] suported items by zabbix_agentd [for plugin]"
 	zaf_hlp "$0 get [plugin[.item]]" "To test [all] suported items by zabbix_get [for plugin]"
+	zaf_hlp "$0 run [plugin[.item]]" "To test [all] suported items by directly runing command [for plugin]"
 	zaf_hlp "$0 precache [plugin[.item]]" "To precache [all] suported items"
+	zaf_hlp "$0 itemsh plugin.item" "To spawn interactive shell in item context (same as UserParameter)."
 	echo
 	echo "Zabbix API commands:"
 	zaf_hlp "$0 api" "To zabbix API functions. See $0 api for more info."
 	echo
+	echo "Zabbix trapper commands:"
+	zaf_hlp "$0 send plugin.item" "To send result of agent param directly to Zabbix server by zabbix_server."
+	zaf_hlp "$0 send item" "To send value for any item from stdin."
+	zaf_hlp "$0 send host:item" "To send value for any host:item from stdin."
+	echo "Zabbix agent registration:"
+	zaf_hlp "$0 register [hostname] [metadata]" "To register hostname on Zabbix server (autoregistration)."
+	echo
 	echo "Agent config info commands:"
 	zaf_hlp "$0 userparms" "See userparms generated from zaf on stdout"
 	zaf_hlp "$0 agent-config [force]" "Reconfigure zabbix userparms in $ZAF_AGENT_CONFIGD"