vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Report plugins fix

Browse Source
This commit is contained in:
Jokob-sk
2023-08-21 07:24:25 +10:00
parent b6a9c788bf
commit 645e779d7c
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pialert/plugin.py
View File

@@ -570,6 +570,7 @@ def process_plugin_events(db, plugin, pluginsState, plugEventsArr):
if tmpObjFromEvent.idsHash not in plugin_objects_ids_hash: if tmpObjFromEvent.idsHash not in plugin_objects_ids_hash:
for x in pluginObjects: for x in pluginObjects:
if x.primaryId == tmpObjFromEvent.primaryId and x.secondaryId == tmpObjFromEvent.secondaryId: if x.primaryId == tmpObjFromEvent.primaryId and x.secondaryId == tmpObjFromEvent.secondaryId:
mylog('debug', ['[Plugins] Missing from last scan: ', x.primaryId , x.secondaryId])
x.status = "missing-in-last-scan" x.status = "missing-in-last-scan"
x.changed = datetime.now(timeZone).strftime("%Y-%m-%d %H:%M:%S") x.changed = datetime.now(timeZone).strftime("%Y-%m-%d %H:%M:%S")
break break
@@ -599,6 +600,7 @@ def process_plugin_events(db, plugin, pluginsState, plugEventsArr):
# Create lists to hold the data for bulk insertion # Create lists to hold the data for bulk insertion
objects_to_insert = [] objects_to_insert = []
events_to_insert = [] events_to_insert = []
objects_to_update = []
statuses_to_report_on = get_plugin_setting_value(plugin, "REPORT_ON") statuses_to_report_on = get_plugin_setting_value(plugin, "REPORT_ON")
@@ -607,7 +609,7 @@ def process_plugin_events(db, plugin, pluginsState, plugEventsArr):
for plugObj in pluginObjects: for plugObj in pluginObjects:
# keep old createdTime time if the plugObj already was created before # keep old createdTime time if the plugObj already was created before
createdTime = plugObj.changed if plugObj.status == 'new' else plugObj.created createdTime = plugObj.changed if plugObj.status == 'new' else plugObj.created
# 13 values without Index
values = ( values = (
plugObj.pluginPref, plugObj.primaryId, plugObj.secondaryId, createdTime, plugObj.pluginPref, plugObj.primaryId, plugObj.secondaryId, createdTime,
plugObj.changed, plugObj.watched1, plugObj.watched2, plugObj.watched3, plugObj.changed, plugObj.watched1, plugObj.watched2, plugObj.watched3,
@@ -618,7 +620,7 @@ def process_plugin_events(db, plugin, pluginsState, plugEventsArr):
if plugObj.status == 'new': if plugObj.status == 'new':
objects_to_insert.append(values) objects_to_insert.append(values)
else: else:
objects_to_insert.append(values + (plugObj.index,)) # Include index for UPDATE objects_to_update.append(values + (plugObj.index,)) # Include index for UPDATE
# only generate events that we want to be notified on # only generate events that we want to be notified on
if plugObj.status in statuses_to_report_on: if plugObj.status in statuses_to_report_on:
@@ -630,29 +632,31 @@ def process_plugin_events(db, plugin, pluginsState, plugEventsArr):
mylog('debug', ['[Plugins] pluginObjects count: ', len(pluginObjects)]) mylog('debug', ['[Plugins] pluginObjects count: ', len(pluginObjects)])
logEventStatusCounts(pluginObjects) logEventStatusCounts(pluginObjects)
# Bulk insert/update objects # Bulk insert objects
if objects_to_insert: if objects_to_insert:
sql.executemany( sql.executemany(
""" """
INSERT INTO Plugins_Objects INSERT INTO Plugins_Objects
("Plugin", "Object_PrimaryID", "Object_SecondaryID", "DateTimeCreated", ("Plugin", "Object_PrimaryID", "Object_SecondaryID", "DateTimeCreated",
"DateTimeChanged", "Watched_Value1", "Watched_Value2", "Watched_Value3", "DateTimeChanged", "Watched_Value1", "Watched_Value2", "Watched_Value3",
"Watched_Value4", "Status", "Extra", "UserData", "ForeignKey", "Index") "Watched_Value4", "Status", "Extra", "UserData", "ForeignKey")
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
ON CONFLICT("Index") DO UPDATE
SET "Plugin" = excluded.Plugin,
"DateTimeChanged" = excluded.DateTimeChanged,
"Watched_Value1" = excluded.Watched_Value1,
"Watched_Value2" = excluded.Watched_Value2,
"Watched_Value3" = excluded.Watched_Value3,
"Watched_Value4" = excluded.Watched_Value4,
"Status" = excluded.Status,
"Extra" = excluded.Extra,
"ForeignKey" = excluded.ForeignKey
""", objects_to_insert """, objects_to_insert
) )
# Bulk insert events (insert only events if they are to be reported on) # Bulk update objects
if objects_to_update:
sql.executemany(
"""
UPDATE Plugins_Objects
SET "Plugin" = ?, "Object_PrimaryID" = ?, "Object_SecondaryID" = ?, "DateTimeCreated" = ?,
"DateTimeChanged" = ?, "Watched_Value1" = ?, "Watched_Value2" = ?, "Watched_Value3" = ?,
"Watched_Value4" = ?, "Status" = ?, "Extra" = ?, "UserData" = ?, "ForeignKey" = ?
WHERE "Index" = ?
""", objects_to_update
)
# Bulk insert events
if events_to_insert: if events_to_insert:
sql.executemany( sql.executemany(
""" """
@@ -668,6 +672,7 @@ def process_plugin_events(db, plugin, pluginsState, plugEventsArr):
db.commitDB() db.commitDB()
except Exception as e: except Exception as e:
# Rollback the transaction in case of an error # Rollback the transaction in case of an error
conn.rollback() conn.rollback()