d8dcdb5af4
Wip command center, alerts SNMP source in mr file
2021-06-07 10:32:59 +02:00
a1ca4abe8f
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-27 08:22:43 +02:00
8d847bb071
Merge branch 'ent-7544-11866-bug-en-datos-inc-con-18-digitos' into 'develop'
...
Enlarge numeric data fields
See merge request artica/pandorafms!4151
2021-05-26 13:35:50 +00:00
d91e7f6aba
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-26 08:28:42 +02:00
e6713c2f2c
#6917 metaconsole config changes
2021-05-25 09:58:18 +00:00
d95eec0188
Enlarge numeric data fields
2021-05-25 09:57:23 +02:00
337450a1f8
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/ajax.php
pandora_console/extras/delete_files/delete_files.txt
2021-05-24 17:41:28 +02:00
8c0a9859a8
remove synch old and check api
2021-05-19 17:08:13 +02:00
09ccaf254e
Fixed public access and added PublicLogin interface, including code style fixex
2021-05-19 11:31:52 +02:00
a0982cd260
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/users/profile_list.php
2021-05-18 08:39:06 +02:00
818186ff28
DB updates - syncqueue
2021-05-17 12:57:15 +02:00
caaa9c407e
Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'
...
# Conflicts:
# pandora_console/extras/mr/47.sql
# pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
2021-05-13 11:39:24 +00:00
9cde8c345f
removed deprecated incident permissions
2021-05-13 13:33:45 +02:00
5b376568a4
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/47.sql
2021-05-13 08:25:59 +02:00
13fa1159ce
Merge branch 'ent-6858-Goliat-opensource' into 'develop'
...
Backup upload
See merge request artica/pandorafms!3936
2021-05-12 13:10:48 +00:00
3758c80019
Fixed delete_files entries.
2021-05-12 13:07:45 +00:00
7d56552e72
Added missing fields to alert snmp actions
2021-05-12 12:54:36 +00:00
9e9ea4d00a
Merge with last develop
2021-05-12 09:17:32 +02:00
fdeaf52912
implemented user level authentication for integria ims integration
2021-05-07 14:29:29 +02:00
55a1ea6f2a
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-04 17:19:35 +02:00
34b02982e1
Ensure valid values (alert correlation) for compat mode for criticity, id_group and id_tag
2021-04-30 15:01:43 +02:00
366e9a08d5
minor fix
2021-04-30 14:36:47 +02:00
6b83deacdd
Migrate old rules
2021-04-30 14:34:10 +02:00
2ca981b03e
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-29 08:34:41 +02:00
8ef21d9b15
Ent 7395 filtro de eventos en metaconsola server
2021-04-28 10:50:04 +00:00
78487fa4e5
Auto-synchronizer MC
2021-04-22 15:37:59 +02:00
100ae705f8
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-20 13:33:40 +02:00
b8b9fa561f
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-20 08:07:21 +02:00
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
2e45e0bde4
Fixes in table tevent_rule definition
2021-04-15 10:35:21 +02:00
21d72f41f9
Revert "Revert "Update tevent_rule schema""
...
This reverts commit 2b05cde214
2021-04-15 00:20:42 +02:00
2b05cde214
Revert "Update tevent_rule schema"
...
This reverts commit a80e50b730
2021-04-14 21:42:19 +02:00
a80e50b730
Update tevent_rule schema
2021-04-14 21:39:58 +02:00
1b21652ed2
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-14 08:35:02 +02:00
3d359dab36
Fixed merge with 7161
2021-04-13 12:55:35 +02:00
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
9bbac06771
Ent 7161 cambiar opciones de skin en usuarios y grupos
2021-04-13 09:26:50 +00:00
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
aa31ed8f58
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-13 08:34:05 +02:00
8a27517cc5
Ent 7281 aumentar carácteres de la caja de consulta sql en informes
2021-04-12 14:44:33 +00:00
37fe9bfafb
WIP command center
2021-04-09 14:27:12 +02:00
f8d4039314
Fixed merges
2021-04-09 10:34:25 +02:00
2a6dffd0f8
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-08 17:32:32 +02:00
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
e5b2a27631
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/46.sql
2021-04-07 08:26:38 +02:00
4b9f8ce202
Added custom fields combo larger params
2021-04-06 16:51:14 +00:00
cc222faddc
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/include/functions_api.php
2021-03-25 17:00:27 +01:00
fdc4133eaa
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
2021-03-25 10:20:02 +01:00
0bfe060c50
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-03-24 17:30:47 +01:00
79914082e9
Ent 6850 quitar nta
2021-03-24 15:16:13 +00:00
Daniel Barbero Martin
Daniel Rodriguez
Daniel Maya
fbsanchez
Alejandro Campos
José González
Luis
José González
Jose Gonzalez