mirror of
https://github.com/limosek/zaf.git
synced 2025-04-03 20:03:16 +02:00
Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
6913033874 | ||
|
|
8b81fea72c | ||
|
|
eaf83df311 | ||
|
|
52386a624f | ||
|
|
4489b9cafe | ||
|
|
80ee4b6903 | ||
|
|
8ad7841525 | ||
|
|
c4abfe9ea6 | ||
|
|
2977958dd5 | ||
|
|
211d2fca39 | ||
|
|
6174a043bc | ||
|
|
56763de3fc | ||
|
|
c1f5eddb5d | ||
|
|
e826283c85 | ||
|
|
e8be02436c | ||
|
|
7f774f409d | ||
|
|
6204eacd6a | ||
|
|
2b41fc57a5 | ||
|
|
a9a0ff9528 | ||
|
|
63b00e70aa | ||
|
|
2ffc186d68 | ||
|
|
cfa056065b | ||
|
|
38927897dc |
4
Makefile
4
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/*
|
||||
|
||||
|
||||
128
README.md
128
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 \
|
||||
Z_ServerActive=zabbix.server.local \
|
||||
Z_HostnameItem=system.hostname Z_RefreshActiveChecks=60 \
|
||||
ZAF_ZBXSRV_HOST=zabbix.server.local \
|
||||
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"
|
||||
sudo dpkg -i out/zaf-1.3master.deb
|
||||
&& 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.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.3master. Please use some of this commands:
|
||||
./zaf Version 1.4. 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:
|
||||
```
|
||||
./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
|
||||
```
|
||||
### Plugin operations
|
||||
|
||||
### 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
|
||||
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 parameters
|
||||
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.
|
||||
|
||||
|
||||
|
||||
|
||||
28
install.sh
28
install.sh
@ -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"
|
||||
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}"
|
||||
@ -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"
|
||||
@ -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"
|
||||
@ -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}
|
||||
@ -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
|
||||
|
||||
@ -195,7 +195,7 @@ zaf_ctrl_cron() {
|
||||
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"
|
||||
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_install "${ZAF_TMP_DIR}/$b" "$pdir"
|
||||
zaf_fetch_url "$1/$f" >"${ZAF_TMP_DIR}/$f"
|
||||
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,16 +243,20 @@ 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)
|
||||
zaf_ctrl_get_item_option $1 $i "Parameters" >$tmpfile
|
||||
echo >>$tmpfile
|
||||
zafparams="";
|
||||
if [ -s "$tmpfile" ]; then
|
||||
ikey="$2.$i[*]"
|
||||
args=""
|
||||
apos=1;
|
||||
while read pname pdefault pregex prest; do
|
||||
[ -z "$pname" ] && continue
|
||||
zaf_trc "Adding param $pname ($pdefault $pregex) to $i"
|
||||
zafparams="$zafparams value=\"\$$apos\"; zaf_agentparm $pname $pdefault $pregex; export $pname; "
|
||||
args="$args \$$apos"
|
||||
apos=$(expr $apos + 1)
|
||||
@ -269,9 +275,21 @@ zaf_ctrl_generate_items_cfg() {
|
||||
if [ -n "$cache" ]; then
|
||||
cache="${ZAF_LIB_DIR}/zafcache '$cache' "
|
||||
fi
|
||||
ret=$(zaf_ctrl_get_item_option $1 $i "Return")
|
||||
retnull=$(zaf_ctrl_get_item_option $1 $i "Return-null")
|
||||
reterr=$(zaf_ctrl_get_item_option $1 $i "Return-error")
|
||||
if [ -n "$ret" ] || [ -n "$reterr" ] || [ -n "$retnull" ]; then
|
||||
retscr=" 1>\${tmpf}o 2>\${tmpf}e; ${ZAF_LIB_DIR}/zafret \${tmpf}o \${tmpf}e \$? '$ret' '$retnull' '$retempty' ";
|
||||
else
|
||||
retscr="";
|
||||
fi
|
||||
if [ -z "$4" ]; then
|
||||
cmd=$(zaf_ctrl_get_item_option $1 $i "Cmd")
|
||||
else
|
||||
cmd="$4"
|
||||
fi
|
||||
if [ -n "$cmd" ]; then
|
||||
printf "%s" "UserParameter=$ikey,${env}${zafparams}${preload}${cache}${lock}${cmd}"; echo
|
||||
printf "%s" "UserParameter=$ikey,${env}${zafparams}${preload}${cache}${lock}${cmd}${retscr}"; echo
|
||||
continue
|
||||
fi
|
||||
cmd=$(zaf_ctrl_get_item_option $1 $i "Script")
|
||||
@ -281,14 +299,19 @@ zaf_ctrl_generate_items_cfg() {
|
||||
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/
|
||||
printf "%s" "UserParameter=$ikey,${env}${preload}${zafparams}${cache}${lock}${ZAF_PLUGINS_DIR}/$2/${iscript}.sh ${args}"; echo
|
||||
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,11 +332,11 @@ 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)
|
||||
zaf_ctrl_get_extitem_option $1 $i "Parameters" >$tmpfile
|
||||
(zaf_ctrl_get_extitem_option $1 $i "Parameters"; echo) >$tmpfile
|
||||
ikey="$2.$i"
|
||||
if [ -s "$tmpfile" ]; then
|
||||
args=""
|
||||
@ -336,18 +359,26 @@ zaf_ctrl_generate_extitems_cfg() {
|
||||
if [ -n "$cache" ]; then
|
||||
cache="${ZAF_LIB_DIR}/zafcache '$cache' "
|
||||
fi
|
||||
cmd=$(zaf_ctrl_get_extitem_option $1 $i "Cmd")
|
||||
ret=$(zaf_ctrl_get_extitem_option $1 $i "Return")
|
||||
retnull=$(zaf_ctrl_get_extitem_option $1 $i "Return-null")
|
||||
reterr=$(zaf_ctrl_get_extitem_option $1 $i "Return-error")
|
||||
if [ -n "$ret" ] || [ -n "$reterr" ] || [ -n "$retnull" ]; then
|
||||
retscr=" 1>\${tmpf}o 2>\${tmpf}e; ${ZAF_LIB_DIR}/zafret \${tmpf}o \${tmpf}e \$? '$ret' '$retnull' '$retempty' \$*";
|
||||
else
|
||||
retscr="";
|
||||
fi
|
||||
cmd=$(zaf_ctrl_get_extitem_option "$1" "$i" "Cmd")
|
||||
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
|
||||
echo "#!/bin/sh" >"${ZAF_SERVER_EXTSCRIPTS}/$ikey"
|
||||
chmod +x "${ZAF_SERVER_EXTSCRIPTS}/$ikey"
|
||||
(printf "%s" "${env}${zafparams}${preload}${cache}${lock}${cmd}${retscr}"; echo) >>"${ZAF_SERVER_EXTSCRIPTS}/$ikey"
|
||||
continue
|
||||
fi
|
||||
cmd=$(zaf_ctrl_get_extitem_option $1 $i "Script")
|
||||
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
|
||||
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!"
|
||||
|
||||
@ -140,15 +140,6 @@ zaf_uninstall(){
|
||||
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 install $ZAF_AGENT_PKG
|
||||
@ -158,7 +149,7 @@ zaf_install_agent_opkg() {
|
||||
# $* - 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
|
||||
}
|
||||
|
||||
|
||||
@ -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)
|
||||
pdescription=$(zaf_ctrl_get_global_block <"${control}" | zaf_block_get_moption Description)
|
||||
pmaintainer=$(zaf_ctrl_get_global_block <"${control}" | zaf_block_get_option Maintainer)
|
||||
pversion=$(zaf_ctrl_get_global_block <"${control}" | zaf_block_get_option Version)
|
||||
purl=$(zaf_ctrl_get_global_block <"${control}" | zaf_block_get_option Url)
|
||||
phome=$(zaf_ctrl_get_global_block <"${control}" | zaf_block_get_option Home)
|
||||
plugin=$(zaf_ctrl_get_global_option "${control}" Plugin)
|
||||
pdescription=$(zaf_ctrl_get_global_option "${control}" Description)
|
||||
pmaintainer=$(zaf_ctrl_get_global_option "${control}" Maintainer)
|
||||
pversion=$(zaf_ctrl_get_global_option "${control}" Version)
|
||||
purl=$(zaf_ctrl_get_global_option "${control}" Url)
|
||||
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
|
||||
zaf_err "prepare_plugin: Cannot install from itself!"
|
||||
if [ "$(zaf_url_info $1)" = "path" ] && [ "$url" = "$control" ]; then
|
||||
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}"
|
||||
@ -125,6 +158,24 @@ zaf_install_plugin() {
|
||||
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
|
||||
@ -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:"
|
||||
echo -n "Cache: "; zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Cache"; echo
|
||||
echo "Parameters:"
|
||||
zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Parameters" ; echo
|
||||
echo "Testparameters:"
|
||||
zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Testparameters"; echo
|
||||
echo "Precache:"
|
||||
zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Precache"; echo
|
||||
printf "%b" "Item $1\n\n"
|
||||
tmp=$(zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Cache")
|
||||
[ -n "$tmp" ] && printf "%b" "Cache: $tmp \n\n"
|
||||
tmp=$(zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Parameters")
|
||||
[ -n "$tmp" ] && printf "%b" "Parameters:\n$tmp\n\n"
|
||||
tmp=$(zaf_ctrl_get_item_option $ZAF_PLUGINS_DIR/$plugin/control.zaf "$item" "Return")
|
||||
[ -n "$tmp" ] && printf "%b" "Return: $tmp\n\n"
|
||||
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,6 +417,15 @@ 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/")
|
||||
zaf_wrn "Precaching item $item[$(echo $*| tr ' ' ',')] ($cmd)"
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
|
||||
@ -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"
|
||||
@ -78,8 +78,8 @@ zaf_agentparm(){
|
||||
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
|
||||
@ -146,6 +146,11 @@ zaf_far(){
|
||||
eval $sedcmd
|
||||
}
|
||||
|
||||
# Trim spaces and newlines from string
|
||||
zaf_trim(){
|
||||
tr -d '\n'
|
||||
}
|
||||
|
||||
# Limit concurrent processes or continue
|
||||
zaf_bglimit(){
|
||||
local maxbg
|
||||
@ -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
|
||||
}
|
||||
|
||||
|
||||
|
||||
52
lib/zafret
Executable file
52
lib/zafret
Executable file
@ -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
|
||||
|
||||
32
tgz.mk
Normal file
32
tgz.mk
Normal file
@ -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)
|
||||
|
||||
131
zaf
131
zaf
@ -25,6 +25,8 @@ ZAF_CFG_FILE="/etc/zaf.conf"
|
||||
[ -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"
|
||||
@ -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)
|
||||
@ -275,6 +382,7 @@ self-remove)
|
||||
echo "To continue, please do $0 self-remove force"
|
||||
fi
|
||||
;;
|
||||
|
||||
###### API related commands
|
||||
api)
|
||||
zaf_zbxapi_login
|
||||
@ -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"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user