diff --git a/CHANGELOG.md b/CHANGELOG.md index 6444ac8..aaf97f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.5 - 2017-01-28 - + +* Add Zabbix Checks + ## 1.4 - 2017-11-17 - * Switch to Packages Postgres diff --git a/install/etc/s6/services/10-db-backup/run b/install/etc/s6/services/10-db-backup/run index 0e4db4a..05178c4 100755 --- a/install/etc/s6/services/10-db-backup/run +++ b/install/etc/s6/services/10-db-backup/run @@ -259,7 +259,12 @@ echo '** [db-backup] Initialized at at '$(date) ;; esac - +### Zabbix + if [ "$ENABLE_ZABBIX" = "TRUE" ] || [ "$ENABLE_ZABBIX" = "true" ]; then + zabbix_sender -c /etc/zabbix/zabbix_agentd.conf -k dbbackup.size -o `stat -c%s ${DB_DUMP_TARGET}/${TARGET}` + zabbix_sender -c /etc/zabbix/zabbix_agentd.conf -k dbbackup.datetime -o `date -r ${DB_DUMP_TARGET}/${TARGET} +'%s'` + fi + ### Automatic Cleanup if [[ -n "$DB_CLEANUP_TIME" ]]; then find $DB_DUMP_TARGET/ -mmin +$DB_CLEANUP_TIME -iname "$DBTYPE_$DBNAME_*.*" -exec rm {} \; @@ -269,4 +274,4 @@ echo '** [db-backup] Initialized at at '$(date) sleep $(($DB_DUMP_FREQ*60)) done -fi +fi \ No newline at end of file diff --git a/zabbix_templates/service_dbbackup.xml b/zabbix_templates/service_dbbackup.xml new file mode 100644 index 0000000..ee2dee8 --- /dev/null +++ b/zabbix_templates/service_dbbackup.xml @@ -0,0 +1,270 @@ + + + 3.4 + 2018-02-02T19:03:49Z + + + DB - Backup + + + Templates + + + + + + + + {Service - DB Backup:dbbackup.size.change()}>20 + 0 + + DB Backup is 20% Greater in Size + 0 + + + 0 + 2 + + 0 + 1 + + + + + {Service - DB Backup:dbbackup.size.change()}<20 + 0 + + DB Backup is 20% Smaller in Size + 0 + + + 0 + 2 + + 0 + 1 + + + + + {Service - DB Backup:dbbackup.size.last()}<1K + 0 + + DB Backup is empty + 0 + + + 0 + 4 + + 0 + 0 + + + + + {Service - DB Backup:dbbackup.datetime.fuzzytime(172800)}=0 and {Service - DB Backup:dbbackup.datetime.fuzzytime(259200)}<>0 and {Service - DB Backup:dbbackup.datetime.fuzzytime(345600)}<>0 and {Service - DB Backup:dbbackup.datetime.fuzzytime(432800)}<>0 + 0 + + No Backups occurred in 2 days + 0 + + + 0 + 3 + + 0 + 0 + + + + + {Service - DB Backup:dbbackup.datetime.fuzzytime(172800)}<>0 and {Service - DB Backup:dbbackup.datetime.fuzzytime(259200)}=0 and {Service - DB Backup:dbbackup.datetime.fuzzytime(345600)}<>0 and {Service - DB Backup:dbbackup.datetime.fuzzytime(432800)}<>0 + 0 + + No Backups occurred in 3 days + 0 + + + 0 + 3 + + 0 + 0 + + + + + {Service - DB Backup:dbbackup.datetime.fuzzytime(172800)}<>0 and {Service - DB Backup:dbbackup.datetime.fuzzytime(259200)}<>0 and {Service - DB Backup:dbbackup.datetime.fuzzytime(345600)}=0 and {Service - DB Backup:dbbackup.datetime.fuzzytime(432800)}<>0 + 0 + + No Backups occurred in 4 days + 0 + + + 0 + 3 + + 0 + 0 + + + + + {Service - DB Backup:dbbackup.datetime.fuzzytime(172800)}<>0 and {Service - DB Backup:dbbackup.datetime.fuzzytime(259200)}<>0 and {Service - DB Backup:dbbackup.datetime.fuzzytime(345600)}<>0 and {Service - DB Backup:dbbackup.datetime.fuzzytime(432800)}=0 + 0 + + No Backups occurred in 5 days or more + 0 + + + 0 + 4 + + 0 + 0 + + + + + + + Backup Size + 900 + 200 + 0.0000 + 100.0000 + 1 + 1 + 1 + 1 + 0 + 0.0000 + 0.0000 + 0 + 0 + 0 + 0 + + + 0 + 0 + 1A7C11 + 0 + 2 + 0 + + Service - DB Backup + dbbackup.size + + + + + + diff --git a/zabbix_templates/zabbix_agent_container.xml b/zabbix_templates/zabbix_agent_container.xml new file mode 100644 index 0000000..9532a0e --- /dev/null +++ b/zabbix_templates/zabbix_agent_container.xml @@ -0,0 +1,515 @@ + + + 3.4 + 2018-02-02T19:04:27Z + + + Discovered Containers + + + Templates + + + + + + + + + {Service - ICMP:icmpping.max(3m)}=3 + 0 + + Cannot be pinged + 0 + + + 0 + 5 + + 0 + 0 + + + + + {Service - ICMP:icmppingloss.min(10m)}>50 + 0 + + Ping loss is too high + 0 + + + 0 + 4 + + 0 + 0 + + + Cannot be pinged + {Service - ICMP:icmpping.max(3m)}=3 + + + + + + + {Service - ICMP:icmppingsec.avg(2m)}>100 + 0 + + Ping Response time is too high + 0 + + + 0 + 4 + + 1 + 0 + + + Cannot be pinged + {Service - ICMP:icmpping.max(3m)}=3 + + + + + + + {Zabbix - Container Agent:packages.upgradable.last()}>0 + 0 + + Upgraded Packages in Container Available + 0 + + + 0 + 1 + + 0 + 0 + + + + + {Zabbix - Container Agent:agent.ping.nodata(3m)}=1 + 0 + + Zabbix agent is unreachable + 0 + + + 0 + 5 + + 0 + 0 + + + + + + + Service state + + + 0 + Down + + + 1 + Up + + + + + Zabbix agent ping status + + + 1 + Up + + + + +