Skip to content

patch#001 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

patch#001 #11

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1e6d25
Update zbxtg.sh
rauhmaru Dec 19, 2015
54dc596
Update zbxtg.sh
rauhmaru Dec 19, 2015
5327e28
Update zbxtg.sh
rauhmaru Dec 19, 2015
0b3f08c
Merge pull request #2 from rauhmaru/rauhmaru-patch-2
rauhmaru Dec 19, 2015
5ca935b
Update zbxtg.sh
rauhmaru Dec 22, 2015
f4f52ad
Update zbxtg.sh
rauhmaru Dec 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 7 additions & 19 deletions zbxtg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,14 @@ METHOD="txt" # sendMessage (simple text) or sendPhoto (attached image)
echo "${BODY}" | grep -q "${ZBX_TG_PREFIX};graphs" && METHOD="image"
echo "${BODY}" | grep -q "${ZBX_TG_PREFIX};chat" && TG_CHAT=1

if [ "${TG_CHAT}" -eq 1 ]
then
TG_CONTACT_TYPE="chat"
else
TG_CONTACT_TYPE="user"
fi

TG_CHAT_ID=$(cat ${TMP_UIDS} | awk -F ';' '{if ($1 == "'${TO}'" && $2 == "'${TG_CONTACT_TYPE}'") print $3}' | tail -1)
TG_CHAT_ID=$(cat ${TMP_UIDS} | awk -F ';' END'{ print $NF}')

if [ -z "${TG_CHAT_ID}" ]
then
TG_UPDATES=$(${CURL_TG}/getUpdates)
if [ "${TG_CHAT}" -eq 1 ]
then
TG_CHAT_ID=$(echo "${TG_UPDATES}" | sed -e 's/["}{]//g' | awk -F ',' '{if ($8 == "type:group" && $7 == "title:'${TO}'") {gsub("chat:id:", "", $6); print $6}}' | tail -1)
else
TG_CHAT_ID=$(echo "${TG_UPDATES}" | sed -e 's/["}{]//g' | awk -F ',' '{if ($10 == "type:private" && $5 == "username:'${TO}'") {gsub("chat:id:", "", $6); print $6}}' | tail -1)
fi
echo "${TO};${TG_CONTACT_TYPE};${TG_CHAT_ID}" >> ${TMP_UIDS}
TG_CHAT_ID=$(echo "${TG_UPDATES}" | awk -F ',' END'{print $6}' | sed 's/"chat":{"id"://g;/^$/d'

echo "${TO};${TG_CHAT_ID}" >> ${TMP_UIDS}
fi

TG_TEXT=$(echo "${BODY}" | grep -vE "^${ZBX_TG_PREFIX};"; echo "--")
Expand All @@ -62,10 +51,9 @@ ${TG_TEXT}" 2>/dev/null
;;

"image")
PERIOD=3600 # default period
echo "${BODY}" | grep -q "^${ZBX_TG_PREFIX};graphs_period" && PERIOD=$(echo "${BODY}" | awk -F 'zbxtg;graphs_period=' '{if ($2 != "") print $2}' | tail -1 | grep -Eo '[0-9]+' || echo 3600)
ZBX_ITEMID=$(echo "${BODY}" | awk -F 'zbxtg;itemid:' '{if ($2 != "") print $2}' | tail -1 | grep -Eo '[0-9]+')
ZBX_TITLE=$(echo "${BODY}" | awk -F 'zbxtg;title:' '{if ($2 != "") print $2}' | tail -1)
PERIOD=$(echo "${BODY}" | awk -F '=' /graphs_period/'{print $NF}') && [ -z $PERIOD ] && PERIOD=3600
ZBX_ITEMID=$(echo "${BODY}" | awk -F ':' /itemid/'{print $NF}')
ZBX_TITLE=$(echo "${BODY}" | awk -F ':' /title/'{print $NF}')
URL="${ZBX_SERVER}/chart3.php?period=${PERIOD}&name=${ZBX_TITLE}&width=900&height=200&graphtype=0&legend=1&items[0][itemid]=${ZBX_ITEMID}&items[0][sortorder]=0&items[0][drawtype]=5&items[0][color]=00CC00"
login
CACHE_IMAGE="${TMP_DIR}/graph.${ZBX_ITEMID}.png"
Expand Down