José González
bdc4d0a8b1
Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
...
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
Jose Gonzalez
8696d21a42
Fixed any minor bugs
2021-09-29 17:03:13 +02:00
fbsanchez
34b02982e1
Ensure valid values (alert correlation) for compat mode for criticity, id_group and id_tag
2021-04-30 15:01:43 +02:00
fbsanchez
366e9a08d5
minor fix
2021-04-30 14:36:47 +02:00
fbsanchez
6b83deacdd
Migrate old rules
2021-04-30 14:34:10 +02:00
Daniel Maya
8ef21d9b15
Ent 7395 filtro de eventos en metaconsola server
2021-04-28 10:50:04 +00:00
fbsanchez
50f580c112
Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas
2021-04-19 14:35:59 +02:00
fbsanchez
2e45e0bde4
Fixes in table tevent_rule definition
2021-04-15 10:35:21 +02:00
fbsanchez
21d72f41f9
Revert "Revert "Update tevent_rule schema""
...
This reverts commit 2b05cde214c4cd3ebbdf4192aea0358f1a0d6528.
Changes to be committed:
modified: pandora_console/extras/mr/46.sql
modified: pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
modified: pandora_console/pandoradb.sql
2021-04-15 00:20:42 +02:00
fbsanchez
2b05cde214
Revert "Update tevent_rule schema"
...
This reverts commit a80e50b7301858ff5e98a3a5c5e705a30731a8a8.
Changes to be committed:
modified: pandora_console/extras/mr/46.sql
modified: pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
modified: pandora_console/pandoradb.sql
2021-04-14 21:42:19 +02:00
fbsanchez
a80e50b730
Update tevent_rule schema
2021-04-14 21:39:58 +02:00
Jose Gonzalez
3d359dab36
Fixed merge with 7161
2021-04-13 12:55:35 +02:00
Daniel Rodriguez
751d7ec3cf
Merge branch 'ent-7161-Cambiar-opciones-de-skin-en-usuarios-y-grupos' into 'develop'
...
Ent 7161 cambiar opciones de skin en usuarios y grupos
See merge request artica/pandorafms!3972
2021-04-13 09:26:50 +00:00
Daniel Maya
9bbac06771
Ent 7161 cambiar opciones de skin en usuarios y grupos
2021-04-13 09:26:50 +00:00
José González
4a028b2ee3
Merge branch 'develop' into 'ent-6387-limitar-agentes-por-grupo'
...
# Conflicts:
# pandora_console/extras/mr/46.sql
2021-04-13 07:52:48 +00:00
Daniel Maya
8a27517cc5
Ent 7281 aumentar carácteres de la caja de consulta sql en informes
2021-04-12 14:44:33 +00:00
Jose Gonzalez
f8d4039314
Fixed merges
2021-04-09 10:34:25 +02:00
fbsanchez
1ac6ed35cf
Merge remote-tracking branch 'origin/develop' into ent-6924-cambiar-label-event-text-por-event-name
...
Conflicts:
pandora_console/extras/mr/46.sql
2021-04-07 10:23:33 +02:00
Luis
4b9f8ce202
Added custom fields combo larger params
2021-04-06 16:51:14 +00:00
Jose Gonzalez
26a788b2e9
Added control for max agents in groups
2021-01-26 12:35:08 +01:00
fbsanchez
3f61d97e0f
Event text to Event name in alert_actions Monitoring event
2021-01-12 13:39:03 +01:00
