zabbix/limosek-zaf
1
0
Fork 0
mirror of https://github.com/limosek/zaf.git synced 2024-11-24 03:19:05 +01:00
Code Issues Releases Wiki Activity

Diagnostic changes

Browse Source 
Added support for detecting beesip os
This commit is contained in:
Lukas Macura 2016-04-19 11:09:22 +02:00
parent ddbdff55d9
commit 79b98bf661
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/os.lib.sh
View File

@ -1,12 +1,15 @@
# Os related functions # Os related functions
zaf_configure_os_openwrt() { zaf_configure_os_openwrt() {
ZAF_AGENT_RESTART="/etc/init.d/zabbix_agentd restart" ZAF_AGENT_RESTART="zaf agent-config; /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_configure_os_beesip() {
zaf_configure_os_openwrt
}
zaf_configure_os_freebsd() { zaf_configure_os_freebsd() {
ZAF_AGENT_PKG="zabbix3-agent" ZAF_AGENT_PKG="zabbix3-agent"

10
lib/zaf.lib.sh
View File

@ -11,17 +11,17 @@ zaf_msg() {
echo $@ echo $@
} }
zaf_trc() { zaf_trc() {
[ "$ZAF_DEBUG" -ge "3" ] && logger -s -t zaf -- $@ [ "$ZAF_DEBUG" -ge "3" ] && logger -p user.info -s -t zaf-trace -- $@
} }
zaf_dbg() { zaf_dbg() {
[ "$ZAF_DEBUG" -ge "2" ] && logger -s -t zaf -- $@ [ "$ZAF_DEBUG" -ge "2" ] && logger -p user.debug -s -t zaf-debug -- $@
} }
zaf_wrn() { zaf_wrn() {
[ "$ZAF_DEBUG" -ge "1" ] && logger -s -t zaf -- $@ [ "$ZAF_DEBUG" -ge "1" ] && logger -p user.warn -s -t zaf-warning -- $@
} }
zaf_err() { zaf_err() {
logger -s -t zaf -- $@ logger -s -p user.err -t zaf-error -- $@
logger -s -t zaf "Exiting with error!" logger -s -p user.err -t zaf-error "Exiting with error!"
exit 1 exit 1
} }
# Help option # Help option

2
zaf
View File

@ -83,9 +83,11 @@ userparms)
;; ;;
agent-config) agent-config)
zaf_wrn "Generating config files in $ZAF_AGENT_CONFIGD ..."
for plugin in $(zaf_list_plugins); do for plugin in $(zaf_list_plugins); do
plugindir=$ZAF_PLUGINS_DIR/$plugin plugindir=$ZAF_PLUGINS_DIR/$plugin
control=$plugindir/control.zaf control=$plugindir/control.zaf
zaf_dbg "Generating ${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf"
zaf_ctrl_generate_cfg "${control}" "${plugin}" \ zaf_ctrl_generate_cfg "${control}" "${plugin}" \
| zaf_far '{PLUGINDIR}' "${plugindir}" >${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf | zaf_far '{PLUGINDIR}' "${plugindir}" >${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf
done done