diff --git a/pialert/mac_vendor.py b/pialert/mac_vendor.py index 3d3fc83e..35359ba8 100644 --- a/pialert/mac_vendor.py +++ b/pialert/mac_vendor.py @@ -88,7 +88,7 @@ def query_MAC_vendor (pMAC): grep_output = subprocess.check_output (grep_args) except subprocess.CalledProcessError as e: # An error occured, handle it - mylog('none', [e.output]) + mylog('none', ["[Mac Vendor Check] Error: ", e.output]) grep_output = " There was an error, check logs for details" # Return Vendor diff --git a/pialert/scanners/pihole.py b/pialert/scanners/pihole.py index 31ce2bdc..c28fa164 100644 --- a/pialert/scanners/pihole.py +++ b/pialert/scanners/pihole.py @@ -27,6 +27,19 @@ def copy_pihole_network (db): try: sql.execute ("DELETE FROM PiHole_Network") + # just for reporting + new_devices = [] + sql.execute ( """SELECT hwaddr, macVendor, lastQuery, + (SELECT name FROM PH.network_addresses + WHERE network_id = id ORDER BY lastseen DESC, ip), + (SELECT ip FROM PH.network_addresses + WHERE network_id = id ORDER BY lastseen DESC, ip) + FROM PH.network + WHERE hwaddr NOT LIKE 'ip-%' + AND hwaddr <> '00:00:00:00:00:00' """) + new_devices = sql.fetchall() + + # insert into PiAlert DB sql.execute ("""INSERT INTO PiHole_Network (PH_MAC, PH_Vendor, PH_LastQuery, PH_Name, PH_IP) SELECT hwaddr, macVendor, lastQuery, @@ -47,7 +60,7 @@ def copy_pihole_network (db): db.commitDB() - mylog('debug',[ '[PiHole Network] - completed - found ',sql.rowcount, ' devices']) + mylog('debug',[ '[PiHole Network] - completed - found ', len(new_devices), ' devices']) return str(sql.rowcount) != "0"