Skip to content

Commit 80bb53a

Browse files
jokob-skjokob-sk
authored
Merge pull request #1624 from netalertx/main
sync
2 parents 6cd19b0 + a39190c commit 80bb53a

30 files changed

Lines changed: 450 additions & 224 deletions

‎docs/PERFORMANCE.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ Frequent scans increase resource usage, network traffic, and database read/write
8787
* **Increase scan intervals** (`<PLUGIN>_RUN_SCHD`) on busy networks or low-end hardware.
8888
* **Increase timeouts** (`<PLUGIN>_RUN_TIMEOUT`) to avoid plugin failures.
8989
* **Reduce subnet size** – e.g., use `/24` instead of `/16` to reduce scan load.
90+
* **Enable the deep sleep setting** (`DEEP_SLEEP`) – Lowers CPU usage by extending idle wait times between processing cycles. When enabled, scans may be delayed by up to 1 minute and the UI might become less responsive.
9091

9192
Some plugins also include options to limit which devices are scanned. If certain plugins consistently run long, consider narrowing their scope.
9293

‎front/css/app.css‎

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1413,15 +1413,48 @@ textarea[readonly],
14131413

14141414

14151415
#columnFilters {
1416-
display: flex;
1417-
flex-wrap: wrap;
1418-
gap: 10px; /* Add spacing between items */
1416+
display: grid;
1417+
grid-template-columns: repeat(auto-fit, minmax(125px, 1fr));
1418+
gap: 0.75em;
1419+
padding: 0.5em 0;
1420+
}
1421+
1422+
#columnFilters::before,
1423+
#columnFilters::after {
1424+
display: none !important;
14191425
}
14201426

14211427
.filter-group {
1422-
box-sizing: border-box; /* Ensure padding and borders are included in the width */
1423-
padding: 1em;
1424-
padding-top: 0;
1428+
box-sizing: border-box;
1429+
padding: 0.4em;
1430+
margin: 0;
1431+
border-radius: 3px;
1432+
display: flex;
1433+
flex-direction: column;
1434+
align-items: stretch;
1435+
gap: 0.15em;
1436+
white-space: normal;
1437+
}
1438+
1439+
.filter-group label {
1440+
box-sizing: border-box;
1441+
margin: 0;
1442+
border-radius: 3px;
1443+
display: flex;
1444+
flex-direction: column;
1445+
align-items: stretch;
1446+
gap: 0.15em;
1447+
white-space: normal;
1448+
padding-left: 15px;
1449+
padding-right: 0px;
1450+
}
1451+
1452+
.filter-dropdown {
1453+
width: 100%;
1454+
}
1455+
.filter-group select {
1456+
margin-left: 15px;
1457+
padding-right: 0px;
14251458
}
14261459

14271460
.filter-dropdown

‎front/php/templates/language/ar_ar.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
"CustProps_cant_remove": "لا يمكن إزالة الخاصية المخصصة",
6767
"DAYS_TO_KEEP_EVENTS_description": "عدد الأيام للاحتفاظ بسجلات الأحداث",
6868
"DAYS_TO_KEEP_EVENTS_name": "مدة الاحتفاظ بالأحداث",
69+
"DEEP_SLEEP_description": "",
70+
"DEEP_SLEEP_name": "",
6971
"DISCOVER_PLUGINS_description": "اكتشاف المكونات الإضافية المتاحة",
7072
"DISCOVER_PLUGINS_name": "اكتشاف المكونات الإضافية",
7173
"DevDetail_Children_Title": "علاقات الأطفال",
@@ -806,4 +808,4 @@
806808
"settings_system_label": "نظام",
807809
"settings_update_item_warning": "قم بتحديث القيمة أدناه. احرص على اتباع التنسيق السابق. <b>لم يتم إجراء التحقق.</b>",
808810
"test_event_tooltip": "احفظ التغييرات أولاً قبل اختبار الإعدادات."
809-
}
811+
}

‎front/php/templates/language/ca_ca.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
"CustProps_cant_remove": "No es pot eliminar, es necessita una propietat mínim.",
6767
"DAYS_TO_KEEP_EVENTS_description": "Això és una configuració de manteniment. Especifica el nombre de dies que es conservaran els esdeveniments. Els esdeveniments antics s'esborraran periòdicament. També aplica als esdeveniments dels Connectors (Plugins).",
6868
"DAYS_TO_KEEP_EVENTS_name": "Esborrar esdeveniments més vells de",
69+
"DEEP_SLEEP_description": "",
70+
"DEEP_SLEEP_name": "",
6971
"DISCOVER_PLUGINS_description": "Desactiva aquesta opció per accelerar la inicialització i l'estalvi de configuració. Quan està desactivat, els connectors no es descobreixen, i no podeu afegir nous connectors a la configuració <code>LOADED_PLUGINS</code>.",
7072
"DISCOVER_PLUGINS_name": "Descobreix els plugins",
7173
"DevDetail_Children_Title": "Relacions filles",
@@ -806,4 +808,4 @@
806808
"settings_system_label": "Sistema",
807809
"settings_update_item_warning": "Actualitza el valor sota. Sigues curós de seguir el format anterior. <b>No hi ha validació.</b>",
808810
"test_event_tooltip": "Deseu els canvis primer abans de comprovar la configuració."
809-
}
811+
}

‎front/php/templates/language/cs_cz.json‎

Lines changed: 191 additions & 189 deletions
Large diffs are not rendered by default.

‎front/php/templates/language/de_de.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@
7070
"CustProps_cant_remove": "Kann nicht entfernt werden, es wird mindestens eine Eigenschaft benötigt.",
7171
"DAYS_TO_KEEP_EVENTS_description": "Dies ist eine Wartungseinstellung. Spezifiziert wie viele Tage Events gespeichert bleiben. Alle älteren Events werden periodisch gelöscht. Wird auch auf die Plugins History angewendet.",
7272
"DAYS_TO_KEEP_EVENTS_name": "Ereignisse löschen, die älter sind als",
73+
"DEEP_SLEEP_description": "",
74+
"DEEP_SLEEP_name": "",
7375
"DISCOVER_PLUGINS_description": "Deaktiviere diese Option, um Initialisierung und Speichern der Einstellungen zu beschleunigen. Wenn es deaktiviert ist, werden keine neuen Plugins gefunden und es können keine manuell hinzugefügt werden.",
7476
"DISCOVER_PLUGINS_name": "Entdecke Erweiterungen",
7577
"DevDetail_Children_Title": "",
@@ -879,4 +881,4 @@
879881
"settings_system_label": "System",
880882
"settings_update_item_warning": "",
881883
"test_event_tooltip": "Speichere die Änderungen, bevor Sie die Einstellungen testen."
882-
}
884+
}

‎front/php/templates/language/en_us.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
"CustProps_cant_remove": "Can't remove, at least one property is needed.",
6767
"DAYS_TO_KEEP_EVENTS_description": "This is a maintenance setting. This specifies the number of days worth of event entries that will be kept. All older events will be deleted periodically. Also applies on Plugin Events History.",
6868
"DAYS_TO_KEEP_EVENTS_name": "Delete events older than",
69+
"DEEP_SLEEP_description": "Lowers CPU usage by extending idle wait times between processing cycles. When enabled, scans may be delayed by up to 1 minute and the UI might become less responsive.",
70+
"DEEP_SLEEP_name": "Deep sleep",
6971
"DISCOVER_PLUGINS_description": "Disable this option to speed up initialization and settings saving. When disabled, plugins are not discovered, and you cannot add new plugins to the <code>LOADED_PLUGINS</code> setting.",
7072
"DISCOVER_PLUGINS_name": "Discover plugins",
7173
"DevDetail_Children_Title": "Children Relationships",
@@ -247,7 +249,7 @@
247249
"Device_TableHead_Name": "Name",
248250
"Device_TableHead_NetworkSite": "Network Site",
249251
"Device_TableHead_Owner": "Owner",
250-
"Device_TableHead_ParentRelType": "Relationship Type",
252+
"Device_TableHead_ParentRelType": "Relationship",
251253
"Device_TableHead_Parent_MAC": "Parent node",
252254
"Device_TableHead_Port": "Port",
253255
"Device_TableHead_PresentLastScan": "Presence",

‎front/php/templates/language/es_es.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868
"CustProps_cant_remove": "No se puede eliminar, al menos una propiedad es requerida.",
6969
"DAYS_TO_KEEP_EVENTS_description": "Esta es una configuración de mantenimiento. Esto especifica el número de días de entradas de eventos que se guardarán. Todos los eventos anteriores se eliminarán periódicamente.",
7070
"DAYS_TO_KEEP_EVENTS_name": "Eliminar eventos anteriores a",
71+
"DEEP_SLEEP_description": "",
72+
"DEEP_SLEEP_name": "",
7173
"DISCOVER_PLUGINS_description": "Desactive esta opción para acelerar la inicialización y el ahorro de ajustes. Cuando está desactivado, los plugins no se descubren y no puede añadir nuevos plugins a la configuración <code>LOADED_PLUGINS</code>.",
7274
"DISCOVER_PLUGINS_name": "Descubrir plugins",
7375
"DevDetail_Children_Title": "Relaciones hijo",
@@ -877,4 +879,4 @@
877879
"settings_system_label": "Sistema",
878880
"settings_update_item_warning": "Actualice el valor a continuación. Tenga cuidado de seguir el formato anterior. <b>O la validación no se realiza.</b>",
879881
"test_event_tooltip": "Guarda tus cambios antes de probar nuevos ajustes."
880-
}
882+
}

‎front/php/templates/language/fa_fa.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
"CustProps_cant_remove": "",
6767
"DAYS_TO_KEEP_EVENTS_description": "",
6868
"DAYS_TO_KEEP_EVENTS_name": "",
69+
"DEEP_SLEEP_description": "",
70+
"DEEP_SLEEP_name": "",
6971
"DISCOVER_PLUGINS_description": "",
7072
"DISCOVER_PLUGINS_name": "",
7173
"DevDetail_Children_Title": "",

‎front/php/templates/language/fi_fi.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
"CustProps_cant_remove": "",
6767
"DAYS_TO_KEEP_EVENTS_description": "",
6868
"DAYS_TO_KEEP_EVENTS_name": "",
69+
"DEEP_SLEEP_description": "",
70+
"DEEP_SLEEP_name": "",
6971
"DISCOVER_PLUGINS_description": "",
7072
"DISCOVER_PLUGINS_name": "",
7173
"DevDetail_Children_Title": "",

0 commit comments

Comments
 (0)