From 424cf11752db61e6be28547753736733fdbc2ee8 Mon Sep 17 00:00:00 2001 From: pucherot Date: Mon, 11 Jan 2021 15:55:43 +0100 Subject: [PATCH] v2.52 Fix bug #2 --- back/pialert.conf | 2 +- back/pialert.py | 10 ++++++---- docs/report_sample_1.html | 6 +++--- docs/report_sample_2.html | 14 +++++++------- front/php/templates/footer.php | 2 +- install/create_tar.sh | 9 ++++++++- .../{pialert_2.50.tar => pialert_2.52.tar} | Bin 58542080 -> 58542080 bytes install/pialert_latest.tar | Bin 58542080 -> 58542080 bytes log/report_output.html | 4 ++-- log/report_output.txt | 4 ++-- 10 files changed, 30 insertions(+), 21 deletions(-) rename install/{pialert_2.50.tar => pialert_2.52.tar} (99%) diff --git a/back/pialert.conf b/back/pialert.conf index eeeb4131..a7ca413b 100644 --- a/back/pialert.conf +++ b/back/pialert.conf @@ -1,4 +1,4 @@ -VERSION = '2.51' +VERSION = '2.52' VERSION_YEAR = '2021' VERSION_DATE = '2021-01-11' diff --git a/back/pialert.py b/back/pialert.py index 29b971cc..b1fa855e 100644 --- a/back/pialert.py +++ b/back/pialert.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Pi.Alert v2.51 / 2021-01-11 +# Pi.Alert v2.52 / 2021-01-11 # Puche 2020 # GNU GPLv3 @@ -645,11 +645,12 @@ def create_new_devices (): # Pi-hole - Insert events for new devices # NOT STRICYLY NECESARY (Devices can be created through Current_Scan) + # Bugfix #2 - Pi-hole devices w/o IP print_log ('New devices - 3 Pi-hole Events') sql.execute ("""INSERT INTO Events (eve_MAC, eve_IP, eve_DateTime, eve_EventType, eve_AdditionalInfo, eve_PendingAlertEmail) - SELECT PH_MAC, PH_IP, ?, 'New Device', + SELECT PH_MAC, IFNULL (PH_IP,'-'), ?, 'New Device', '(Pi-Hole) ' || PH_Vendor, 1 FROM PiHole_Network WHERE NOT EXISTS (SELECT 1 FROM Devices @@ -657,13 +658,14 @@ def create_new_devices (): (startTime, ) ) # Pi-hole - Create New Devices + # Bugfix #2 - Pi-hole devices w/o IP print_log ('New devices - 4 Pi-hole Create devices') sql.execute ("""INSERT INTO Devices (dev_MAC, dev_name, dev_Vendor, dev_LastIP, dev_FirstConnection, dev_LastConnection, dev_ScanCycle, dev_AlertEvents, dev_AlertDeviceDown, dev_PresentLastScan) - SELECT PH_MAC, PH_Name, PH_Vendor, PH_IP, ?, ?, - 1, 1, 0, 1 + SELECT PH_MAC, PH_Name, PH_Vendor, IFNULL (PH_IP,'-'), + ?, ?, 1, 1, 0, 1 FROM PiHole_Network WHERE NOT EXISTS (SELECT 1 FROM Devices WHERE dev_MAC = PH_MAC) """, diff --git a/docs/report_sample_1.html b/docs/report_sample_1.html index afd1dc47..f9382d87 100644 --- a/docs/report_sample_1.html +++ b/docs/report_sample_1.html @@ -16,7 +16,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -59,7 +59,7 @@
Report Date: 2021-01-11 08:00 Report Date: 2021-01-01 08:00 Scan Cycle: Internet Server: pi4
Internet IP Changed 2021-01-02 08:20:00 2021-01-01 08:00:00 1.1.1.0 Previous Internet IP: 1.1.0.0
- +
Puche 2021 Pi.Alert 2.51   /   2021-01-11 Pi.Alert 2.50   /   2021-01-01 GNU GPLv3
diff --git a/docs/report_sample_2.html b/docs/report_sample_2.html index 52e1ceef..b4d3968b 100644 --- a/docs/report_sample_2.html +++ b/docs/report_sample_2.html @@ -16,7 +16,7 @@ - + @@ -43,13 +43,13 @@ - + - + @@ -72,7 +72,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -122,7 +122,7 @@
Report Date: 2021-01-11 08:00 Report Date: 2021-01-01 08:00 Scan Cycle: 1 Server: pi4
f8:d0:27:00:00:00 2021-01-02 08:20:00 2021-01-01 08:00:00 192.168.1.20 Seiko Epson Corporation
c8:6c:3d:00:00:00 2021-01-02 08:20:00 2021-01-01 08:00:00 192.168.1.181 Amazon Technologies Inc.
0c:ee:99:00:00:00 2021-01-02 08:20:00 2021-01-01 08:00:00 192.168.1.171 Alexa - Echo
94:0c:98:00:00:00 2021-01-02 08:20:00 2021-01-01 08:00:00 192.168.1.132 Connected Person 1 - iPhone 11
5c:41:5a:00:00:00 2021-01-02 08:20:00 2021-01-01 08:00:00 192.168.1.170 IP Changed Alexa Dot
- +
Puche 2021 Pi.Alert 2.51   /   2021-01-11 Pi.Alert 2.50   /   2021-01-01 GNU GPLv3
diff --git a/front/php/templates/footer.php b/front/php/templates/footer.php index ef963fb0..f5436d21 100644 --- a/front/php/templates/footer.php +++ b/front/php/templates/footer.php @@ -4,7 +4,7 @@ © 2021 Puche
- Pi.alert  2.51  (2021-01-11) + Pi.alert  2.52  (2021-01-11)
diff --git a/install/create_tar.sh b/install/create_tar.sh index a0f13be9..a0b0c02a 100644 --- a/install/create_tar.sh +++ b/install/create_tar.sh @@ -1,9 +1,16 @@ # -PIALERT_VERSION=2.50 +PIALERT_VERSION=2.52 PIALERT_DEV_PATH=/media/WD_4TB/dev cd $PIALERT_DEV_PATH + tar tvf pialert/install/pialert_$PIALERT_VERSION.tar | wc -l rm pialert/install/pialert_$PIALERT_VERSION.tar + tar cvf pialert/install/pialert_$PIALERT_VERSION.tar --exclude="pialert/install" --exclude="pialert/.git" pialert | wc -l +rm pialert/install/pialert_latest.tar +ln -s pialert_$PIALERT_VERSION.tar pialert/install/pialert_latest.tar + + + diff --git a/install/pialert_2.50.tar b/install/pialert_2.52.tar similarity index 99% rename from install/pialert_2.50.tar rename to install/pialert_2.52.tar index 8742a30628edaee62e18ae7c24bb2baebb1ca15b..fc6565901b30f0d63ac3fdddc5441d45b8e88ee5 100644 GIT binary patch delta 4969 zcma*rcTiN<0>^RhE+V2JHgqkxR&2=b!UAG%2#AQi7gRv7VDCgM(IgrR7*`V&O>8kH z7ECZrV(*C+dx@IFn%HBk`F))+^Pcl&@@DS$!+||}xO30U{o|z1eONYKZJ6y=B*g9r z3eIP<2M0TY@>y-J$sRrWXBx)K40m6{kzLAtu!kim$ezz06dD?8(`1K($#$ph_2kt? zp;RN&@TsQh)qT7>RjF)kIw~nKd91av!x~_XOAZ*2Iw--~KVfuozl0IiF@dSpsJLu< zqPtNnDk8RHOpLX9Tx9R4xZ3^!{x!1eC)GFpuN5-wi50Rl2E-daZ?2Lxx$|YCoL8gT zR$ca2mn}0r=|J|4l(i`tCaX2{N~D>en{r-+TXvY;?N(b@ zxGiT-LyOI1*jzU|SS)TfyVdH7Z({My9P01pvevVBx+XQY_~x`}VrgV(X|dLmF0!$%|FhMwIsjsMNe0Sc9xlMPCVGo z;`eX2>(cFRoM-h~U~29?!@HA3l~H9?IaOZysS3)fDymAVvZ|u0s%pw#RaZ4sO;t

Z)*6Pt{iqR72HBHC9bjQ`Jm0S1nY8YN;Ysl!{iZ zRE%n^VpSUzr`oD^s=exY;k7UaGh1qvBOx)lcPPjHI;@VUqw1JCu1=^tbyA&Dr_~vCR-IGl)dh7? zT~a@*%j$}{s(w+ws^8Q#bzR+1H`Oh5Tm7#7POwfwgZj__ z8bTvz3{9XZG=t{Q0wSO#L_!oqLo0}Z)({JAAP(9>J7^Cbpd-B6t9k>hk;66Nnhwupggvam~Jb|b1 z44%UacxmYMXVSm`6PUpb@`F1R01qe#o=^x1gBN&15%7VcPz;Jg2`CA^Pzp+e1f(*Ccs2U zgSTK3q{C#G0#jicybaS~2D}6B!h0|iX2JU~8|J`VmKR3di6$oPazy38&yRoPo1& z4$i{`xCocvXSfVk;41tAzrt^D4X(otxCyu5HvA5Mz#X^?_uxJ}fQRr1{)ETy7d(Nd z@C=^A3wUYL>(8u#0VXhm8{`LfC;%Q%5Ims}6b3Kwh9cktMWGlJhZ0Z{e4!MS1`Cvd zvQQ4ngCA4?D^!F^P#LN~Rj3C3P#tPOO{fL6Apq(?AlSeT4hVu^a6$-#LKxJAaHt3M zp#e06M$j0VKvQT2&7lQEKud^(D2Rqu5Cg3t7TQ1@w1sxi9y&lrc(q%d8FhiK&<(mn z59kTKpf~h^c<2lLpg$x)A|$~8NQM*`2!miS41rV_3d3MHjDV3a3P!^i7z^WIJWMd> z>h)(%kJJH1u-&EujL`o$z{oW&UNsCO%d~8wdB5SvJ*1yohLsL-{&Vu=3=Y+IoFPv8 z|2*_?y@;^v&AfBEbmpD2(Mz_LG79GOYHyik{L7ijt3!&M4a1j(8yO~#ERS+&=IPv^ zlQS`=(;oWzpK&I()K8!0*XfKcENiC5SG;Z3K&!*%um{+pTtY39fN Fe*?xI)=~ff delta 4830 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 diff --git a/install/pialert_latest.tar b/install/pialert_latest.tar index 8742a30628edaee62e18ae7c24bb2baebb1ca15b..fc6565901b30f0d63ac3fdddc5441d45b8e88ee5 100644 GIT binary patch delta 4969 zcma*rcTiN<0>^RhE+V2JHgqkxR&2=b!UAG%2#AQi7gRv7VDCgM(IgrR7*`V&O>8kH z7ECZrV(*C+dx@IFn%HBk`F))+^Pcl&@@DS$!+||}xO30U{o|z1eONYKZJ6y=B*g9r z3eIP<2M0TY@>y-J$sRrWXBx)K40m6{kzLAtu!kim$ezz06dD?8(`1K($#$ph_2kt? zp;RN&@TsQh)qT7>RjF)kIw~nKd91av!x~_XOAZ*2Iw--~KVfuozl0IiF@dSpsJLu< zqPtNnDk8RHOpLX9Tx9R4xZ3^!{x!1eC)GFpuN5-wi50Rl2E-daZ?2Lxx$|YCoL8gT zR$ca2mn}0r=|J|4l(i`tCaX2{N~D>en{r-+TXvY;?N(b@ zxGiT-LyOI1*jzU|SS)TfyVdH7Z({My9P01pvevVBx+XQY_~x`}VrgV(X|dLmF0!$%|FhMwIsjsMNe0Sc9xlMPCVGo z;`eX2>(cFRoM-h~U~29?!@HA3l~H9?IaOZysS3)fDymAVvZ|u0s%pw#RaZ4sO;t

Z)*6Pt{iqR72HBHC9bjQ`Jm0S1nY8YN;Ysl!{iZ zRE%n^VpSUzr`oD^s=exY;k7UaGh1qvBOx)lcPPjHI;@VUqw1JCu1=^tbyA&Dr_~vCR-IGl)dh7? zT~a@*%j$}{s(w+ws^8Q#bzR+1H`Oh5Tm7#7POwfwgZj__ z8bTvz3{9XZG=t{Q0wSO#L_!oqLo0}Z)({JAAP(9>J7^Cbpd-B6t9k>hk;66Nnhwupggvam~Jb|b1 z44%UacxmYMXVSm`6PUpb@`F1R01qe#o=^x1gBN&15%7VcPz;Jg2`CA^Pzp+e1f(*Ccs2U zgSTK3q{C#G0#jicybaS~2D}6B!h0|iX2JU~8|J`VmKR3di6$oPazy38&yRoPo1& z4$i{`xCocvXSfVk;41tAzrt^D4X(otxCyu5HvA5Mz#X^?_uxJ}fQRr1{)ETy7d(Nd z@C=^A3wUYL>(8u#0VXhm8{`LfC;%Q%5Ims}6b3Kwh9cktMWGlJhZ0Z{e4!MS1`Cvd zvQQ4ngCA4?D^!F^P#LN~Rj3C3P#tPOO{fL6Apq(?AlSeT4hVu^a6$-#LKxJAaHt3M zp#e06M$j0VKvQT2&7lQEKud^(D2Rqu5Cg3t7TQ1@w1sxi9y&lrc(q%d8FhiK&<(mn z59kTKpf~h^c<2lLpg$x)A|$~8NQM*`2!miS41rV_3d3MHjDV3a3P!^i7z^WIJWMd> z>h)(%kJJH1u-&EujL`o$z{oW&UNsCO%d~8wdB5SvJ*1yohLsL-{&Vu=3=Y+IoFPv8 z|2*_?y@;^v&AfBEbmpD2(Mz_LG79GOYHyik{L7ijt3!&M4a1j(8yO~#ERS+&=IPv^ zlQS`=(;oWzpK&I()K8!0*XfKcENiC5SG;Z3K&!*%um{+pTtY39fN Fe*?xI)=~ff delta 4830 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 diff --git a/log/report_output.html b/log/report_output.html index 509aba0e..6c3fcd82 100644 --- a/log/report_output.html +++ b/log/report_output.html @@ -16,7 +16,7 @@ - + @@ -35,7 +35,7 @@
Report Date: 2021-01-04 18:08 Report Date: 2021-01-01 08:00 Scan Cycle: 1 Server: pi4
- +
Puche 2021 Pi.Alert DEV 2.51   /   2021-01-11 Pi.Alert 2.50   /   2021-01-01 GNU GPLv3
diff --git a/log/report_output.txt b/log/report_output.txt index f0cbd7a9..f403733a 100644 --- a/log/report_output.txt +++ b/log/report_output.txt @@ -2,7 +2,7 @@ Pi.Alert Report ======================================== - Report Date: 2021-01-11 00:00 + Report Date: 2021-01-01 08:00 Scan Cycle: 1 Server: pi4 @@ -12,4 +12,4 @@ Events ---------------------------------------------------------------------- -Puche 2021 Pi.Alert 2.51 / 2021-01-11 GNU GPLv3 +Puche 2021 Pi.Alert 2.50 / 2021-01-01 GNU GPLv3