cphipps/NetAlertX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Notification Report page rewrite v0.2 + cleanup📩

Browse Source
This commit is contained in:
Jokob-sk
2023-10-26 20:30:51 +11:00
parent fd162ff98a
commit 536ef9ec46
10 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
front/plugins/README.md
View File

@@ -641,7 +641,8 @@ The UI will adjust how columns are displayed in the UI based on the resolvers de
| `url` | The value is considered to be a URL, so a link is generated. |
| `textbox_save` | Generates an editable and saveable text box that saves values in the database. Primarily intended for the `UserData` database column in the `Plugins_Objects` table. |
| `url_http_https` | Generates two links with the `https` and `http` prefix as lock icons. |
| `eval` | Evaluates as JavaScript. Use the variable `value` to use the given column value as input (e.g. ``<b>${value}<b>`` ) |
> [!NOTE]
> Supports chaining. You can chain multiple resolvers with `.`. For example `regex.url_http_https`. This will apply the `regex` resolver and then the `url_http_https` resolver.

2
front/plugins/_publisher_apprise/config.json
View File

@@ -132,7 +132,7 @@
"options": [
{
"type": "eval",
"param": "`<a href='/report?guid=${value}'>${value}</a>`"
"param": "`<a href='/report.php?guid=${value}'>${value}</a>`"
}
],
"localized": ["name"],

2
front/plugins/_publisher_email/config.json
View File

@@ -161,7 +161,7 @@
"options": [
{
"type": "eval",
"param": "`<a href='/report?guid=${value}'>${value}</a>`"
"param": "`<a href='/report.php?guid=${value}'>${value}</a>`"
}
],
"localized": [

2
front/plugins/_publisher_ntfy/config.json
View File

@@ -99,7 +99,7 @@
"options": [
{
"type": "eval",
"param": "`<a href='/report?guid=${value}'>${value}</a>`"
"param": "`<a href='/report.php?guid=${value}'>${value}</a>`"
}
],
"localized": ["name"],

2
front/plugins/_publisher_pushsafer/config.json
View File

@@ -99,7 +99,7 @@
"options": [
{
"type": "eval",
"param": "`<a href='/report?guid=${value}'>${value}</a>`"
"param": "`<a href='/report.php?guid=${value}'>${value}</a>`"
}
],
"localized": ["name"],

2
front/plugins/_publisher_webhook/config.json
View File

@@ -99,7 +99,7 @@
"options": [
{
"type": "eval",
"param": "`<a href='/report?guid=${value}'>${value}</a>`"
"param": "`<a href='/report.php?guid=${value}'>${value}</a>`"
}
],
"localized": ["name"],

17
front/plugins/db_cleanup/script.py
View File

@@ -92,6 +92,23 @@ def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP
cursor.execute(delete_query)
# Trim Notifications entries to less than DBCLNP_NOTIFI_HIST setting
mylog('verbose', [f'[DBCLNP] Plugins_History: Trim Notifications entries to less than {str(get_setting_value('DBCLNP_NOTIFI_HIST'))} )'])
# Build the SQL query to delete entries
delete_query = f"""DELETE FROM Notifications
WHERE "Index" NOT IN (
SELECT "Index"
FROM (
SELECT "Index",
ROW_NUMBER() OVER(PARTITION BY "Notifications" ORDER BY DateTimeCreated DESC) AS row_num
FROM Notifications
) AS ranked_objects
WHERE row_num <= {str(get_setting_value('DBCLNP_NOTIFI_HIST'))}
);"""
cursor.execute(delete_query)
# Cleanup Pholus_Scan
if PHOLUS_DAYS_DATA != 0:
mylog('verbose', ['[DBCLNP] Pholus_Scan: Delete all older than ' + str(PHOLUS_DAYS_DATA) + ' days (PHOLUS_DAYS_DATA setting)'])