zabbix/limosek-zaf
1
0
Fork 0
mirror of https://github.com/limosek/zaf.git synced 2024-11-21 18:09:06 +01:00
Code Issues Releases Wiki Activity

Sync master branch

Browse Source
This commit is contained in:
Lukas Macura 2016-04-14 10:44:50 +02:00
parent df7c5f56dd
commit fef2bf5ac0
4 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -82,7 +82,7 @@ git clone https://github.com/limosek/zaf.git \
&& git checkout master \ && git checkout master \
&& git clone https://github.com/limosek/zaf-plugins.git \ && git clone https://github.com/limosek/zaf-plugins.git \
&& make deb PLUGINS="./zaf-plugins/fsx" IPLUGINS="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" IPLUGINS="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.1master.deb sudo dpkg -i out/zaf-1.2master.deb
``` ```
General usage: General usage:
``` ```
@ -124,7 +124,7 @@ During plugin installation, zaf will check all dependencies, do install binaries
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 should be run as root.
``` ```
zaf zaf
zaf Version 1.1master. Please use some of this commands: zaf Version 1.2master. Please use some of this commands:
zaf update To update repo zaf update To update repo
zaf plugins To list installed plugins zaf plugins To list installed plugins
zaf show [plugin] To show installed plugins or plugin info zaf show [plugin] To show installed plugins or plugin info

18
lib/ctrl.lib.sh
View File

@ -55,11 +55,13 @@ zaf_block_get_option() {
# $1 - control file # $1 - control file
# $2 - option name # $2 - option name
zaf_ctrl_get_global_option() { zaf_ctrl_get_global_option() {
local ctrlvar
local ctrlopt local ctrlopt
eval ctrlopt=\$ZAF_CTRL_$(echo $2| tr '-' '_') ctrlopt="ZAF_CTRL_$(zaf_stripctrl $2)"
if [ -n "$ctrlopt" ]; then eval ctrlvar=\$$ctrlopt
zaf_wrn "Overriding $2 from env" if [ -n "$ctrlvar" ]; then
zaf_dbg "Overriding control field $2 from env $ctrlopt($ctrlvar)"
echo $ctrlopt echo $ctrlopt
else else
zaf_ctrl_get_global_block <$1 | zaf_block_get_moption "$2" \ zaf_ctrl_get_global_block <$1 | zaf_block_get_moption "$2" \
@ -71,11 +73,13 @@ zaf_ctrl_get_global_option() {
# $2 - item name # $2 - item name
# $3 - option name # $3 - option name
zaf_ctrl_get_item_option() { zaf_ctrl_get_item_option() {
local ctrlvar
local ctrlopt local ctrlopt
eval ctrlopt=\$ZAF_CTRL_$2_$(echo $3| tr '-' '_') ctrlopt="ZAF_CTRLI_$(zaf_stripctrl $2)_$(zaf_stripctrl $3)"
if [ -n "$ctrlopt" ]; then eval ctrlvar=\$$ctrlopt
zaf_wrn "Overriding item $2 option $3 from env" if [ -n "$ctrlvar" ]; then
zaf_dbg "Overriding item control field $2/$3 from env $ctrlopt($ctrlvar)"
echo $ctrlopt echo $ctrlopt
else else
zaf_ctrl_get_item_block <$1 "$2" | zaf_block_get_moption "$3" \ zaf_ctrl_get_item_block <$1 "$2" | zaf_block_get_moption "$3" \
@ -188,7 +192,7 @@ zaf_ctrl_generate_cfg() {
items=$(zaf_ctrl_get_items <"$1") items=$(zaf_ctrl_get_items <"$1")
(set -e (set -e
for i in $items; do for i in $items; do
iscript=$(echo $i | tr -d '[]*&;:') iscript=$(zaf_stripctrl $i)
params=$(zaf_ctrl_get_item_option $1 $i "Parameters") params=$(zaf_ctrl_get_item_option $1 $i "Parameters")
if [ -n "$params" ]; then if [ -n "$params" ]; then
ikey="$2.$i[*]" ikey="$2.$i[*]"

8
lib/zaf.lib.sh
View File

@ -1,6 +1,6 @@
# Hardcoded variables # Hardcoded variables
ZAF_VERSION="1.1" ZAF_VERSION="1.2"
ZAF_GITBRANCH="master" ZAF_GITBRANCH="master"
ZAF_URL="https://github.com/limosek/zaf" ZAF_URL="https://github.com/limosek/zaf"
ZAF_RAW_URL="https://raw.githubusercontent.com/limosek/zaf" ZAF_RAW_URL="https://raw.githubusercontent.com/limosek/zaf"
@ -426,3 +426,9 @@ zaf_toupper() {
tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
} }
# Return simplified key with discarded special chars.
zaf_stripctrl() {
echo $1 | tr '[]*&;:.-' '________'
}

2
zaf
View File

@ -312,7 +312,7 @@ api)
*) *)
echo "$0 Version ${ZAF_VERSION}. Please use some of this commands:" echo "$0 Version ${ZAF_VERSION}. Please use some of this commands:"
echo "$0 Cmd [ZAF_OPTION=value] [ZAF_CTRL_Option=value] ..." echo "$0 Cmd [ZAF_OPTION=value] [ZAF_CTRL_Option=value] [ZAF_CTRLI_Item_Option=value] ..."
echo "Commands:" echo "Commands:"
echo "$0 update To update repo (not plugins, similar to apt-get update)" echo "$0 update To update repo (not plugins, similar to apt-get update)"
echo "$0 upgrade To upgrade installed plugins from repo" echo "$0 upgrade To upgrade installed plugins from repo"