Added filtering to prevent duplicate alerts in a day for the same device

This commit is contained in:
paradizelost 2017-06-28 23:49:18 -05:00
parent 37c88a08d1
commit fe160206ff

View File

@ -10,6 +10,7 @@ EVT2="$(comm --nocheck-order -23 "$LOG2" "$LOG2.old" | wc -l)"
EVT3="$(comm --nocheck-order -23 "$LOG3" "$LOG3.old" | wc -l)" EVT3="$(comm --nocheck-order -23 "$LOG3" "$LOG3.old" | wc -l)"
function procaplog(){ function procaplog(){
while IFS=, read -r date mac; do while IFS=, read -r date mac; do
SENDALERT=$(checkdisconnects "$date" $mac)
echo "starting mac check" echo "starting mac check"
echo "starting mac check" >> /var/log/logwatch.log echo "starting mac check" >> /var/log/logwatch.log
HOSTNAME=$(checkmac $mac) HOSTNAME=$(checkmac $mac)
@ -19,13 +20,21 @@ function procaplog(){
case $HOSTNAME in case $HOSTNAME in
AMAZON_IOT_BUTTON) AMAZON_IOT_BUTTON)
/root/bin/sheet.py "$date" "Diaper Change" /root/bin/sheet.py "$date" "Diaper Change"
if [ $SENDALERT -eq 1 ]; then
alert_dan "$date The button was pushed" alert_dan "$date The button was pushed"
else
echo "Not alerting, Reconnection of $HOSTNAME" >> /var/log/logwatch.log
fi
python /root/bin/docast.py python /root/bin/docast.py
;; ;;
DAN_PIXEL) DAN_PIXEL)
if [ $SENDALERT -eq 1 ]; then
echo "Alerting Alli" echo "Alerting Alli"
echo "Alerting Alli" >> /var/log/logwatch.log echo "Alerting Alli" >> /var/log/logwatch.log
alert_alli "Dan is home at $date" alert_alli "Dan is home at $date"
else
echo "Not alerting, Reconnection of $HOSTNAME" >> /var/log/logwatch.log
fi
/root/bin/sheet.py "$date" $HOSTNAME /root/bin/sheet.py "$date" $HOSTNAME
;; ;;
*) *)
@ -36,11 +45,23 @@ function procaplog(){
esac esac
else else
echo "$mac" echo "$mac"
if [ $SENDALERT -eq 1 ]; then
alert_dan "$NOW - Unknown host $mac connected at $date" alert_dan "$NOW - Unknown host $mac connected at $date"
else
echo "Not alerting, Reconnection of $mac" >> /var/log/logwatch.log
fi
/root/bin/sheet.py "$date" $mac /root/bin/sheet.py "$date" $mac
fi fi
done done
}; };
function checkdisconnects(){
THISCHECK=$(date -d "$1" +%s)
if [ "$(tail -n 30 "$LOG2" "$LOG" | grep "$(date +"%b %e")" | grep "$2" | grep "disassociated")" ]; then
echo 0
else
echo 1
fi
}
function procswitchlog(){ function procswitchlog(){
echo "$1" >> /var/log/logwatch.log echo "$1" >> /var/log/logwatch.log
echo "$1" echo "$1"
@ -74,11 +95,11 @@ function alert_dan(){
if [ "$EVT" != "0" ]; then if [ "$EVT" != "0" ]; then
cp "$LOG" "$LOG.old" cp "$LOG" "$LOG.old"
tail -n "$EVT" "$LOG" | awk '/WPA: pairwise key handshake completed/ {print $1 " " $2 " " $3 ", " $9 }'|procaplog tail -n "$EVT" "$LOG" | awk '/IEEE 802.11: associated/ {print $1 " " $2 " " $3 ", " $9 }'|procaplog
fi fi
if [ "$EVT2" != "0" ]; then if [ "$EVT2" != "0" ]; then
cp "$LOG2" "$LOG2.old" cp "$LOG2" "$LOG2.old"
tail -n "$EVT2" "$LOG2" | awk '/WPA: pairwise key handshake completed/ {print $1 " " $2 " " $3 ", " $9 }'|procaplog tail -n "$EVT2" "$LOG2" | awk '/IEEE 802.11: associated/ {print $1 " " $2 " " $3 ", " $9 }'|procaplog
fi fi
if [ "$EVT3" != "0" ]; then if [ "$EVT3" != "0" ]; then
cp "$LOG3" "$LOG3.old" cp "$LOG3" "$LOG3.old"