Commit Graph

692 Commits

Author SHA1 Message Date
fbsanchez 9ff3c8eee1 wip ncm2 2021-11-15 18:58:57 +01:00
Daniel Rodriguez 8b258f9b5c Merge branch 'ent-8044-Inconsistencia-en-ID-de-eventos-agrupados' into 'develop'
fix wrong event id in grouped events

See merge request artica/pandorafms!4461
2021-11-15 12:24:47 +00:00
Jose Gonzalez 3f28a98744 Added feature for read comments in grouped events 2021-10-13 14:58:31 +02:00
Jose Gonzalez eaaab1e250 Added visual tab Custom data in events 2021-10-08 14:59:18 +02:00
alejandro.campos@artica.es 088193438f fix wrong event id in grouped events 2021-10-08 11:59:29 +02:00
Daniel Rodriguez ce40b36923 Merge branch 'ent-7582-anadir-selector-horas-eventos' into 'develop'
Ent 7582 anadir selector horas eventos

Closes pandora_enterprise#7582

See merge request artica/pandorafms!4266
2021-09-21 13:17:30 +00:00
Daniel Rodriguez d701e50b9f Merge branch 'ent-7684-mostrar-campo-con-el-nombre-de-nodo-que-viene-en-metaconsola-en-la-vista-de-detalle-del-evento' into 'develop'
add node name on event details

See merge request artica/pandorafms!4274
2021-08-25 13:01:02 +00:00
Daniel Rodriguez 22587a0dde Merge branch 'ent-7036-11346-Introducir-el-campo-de-IP-del-agente-en-la-vista-de-eventos' into 'develop'
Ent 7036 11346 introducir el campo de ip del agente en la vista de eventos

See merge request artica/pandorafms!4275
2021-08-25 13:00:42 +00:00
Daniel Rodriguez 3f4e0ee0f4 Merge branch 'ent-7692-selector-de-cambio-de-propietario-muy-estrecho-en-modal-de-eventos-metaconsola' into 'develop'
more size for select owner modal events

See merge request artica/pandorafms!4222
2021-08-11 07:11:18 +00:00
Daniel Rodriguez 66ebc14dca Merge branch 'ent-7532-11853-Cambio-comportamiento-tags-en-Widget-de-eventos-en-dashboards' into 'develop'
Ent 7532 11853 cambio comportamiento tags en widget de eventos en dashboards

See merge request artica/pandorafms!4233
2021-08-04 12:04:57 +00:00
Daniel Maya 66e9539818 Added agent ip in custom events 2021-07-07 16:07:08 +02:00
marcos 46bfa151a0 add node name on event details 2021-07-07 14:54:29 +02:00
José González 47b6e40799 Added controls for filter with hours 2021-07-05 17:42:45 +02:00
José González 498a353a29 Improve code for get secondary groups 2021-07-02 12:20:53 +02:00
Daniel Maya 76d996a966 Fixed tags in events 2021-06-24 12:51:14 +02:00
marcos 5aeab363e9 more size for select owner modal events 2021-06-21 11:25:19 +02:00
José González 11d1b785b2 Fixed issue with group events in reports 2021-05-20 14:44:40 +02:00
Daniel Rodriguez dcbeaa1b3e Merge branch 'ent-7295-bug-visual-en-modal-eventos' into 'develop'
Fixed visual bug on event modal event responses

See merge request artica/pandorafms!4022
2021-05-11 13:49:40 +00:00
Luis b9398604f6 Fixed visual bug on event modal event responses 2021-05-11 13:49:40 +00:00
Marcos Alconada 8f324b942b fixed visual error black theme event modal 2021-05-10 09:16:19 +00:00
Daniel Rodriguez 599a38fbd1 Merge branch 'ent-7404-Respuestas-de-eventos-en-usuario-solo-lectura' into 'develop'
Ent 7404 respuestas de eventos en usuario solo lectura

See merge request artica/pandorafms!4077
2021-04-28 14:18:35 +00:00
Daniel Rodriguez e117fd8fd0 Merge branch 'ent-7411-Error-SQL-en-items-Module-event-report-y-Agent-event-report-metaconsola' into 'develop'
Fixed errors SQL metaconsole events

See merge request artica/pandorafms!4076
2021-04-28 08:44:26 +00:00
Daniel Rodriguez c54f542b45 Merge branch 'ent-7376-11735-varios-problemas-de-visualizacion-modo-en-tema-oscuro' into 'develop'
fixed minnor error black theme 7376

See merge request artica/pandorafms!4064
2021-04-27 14:05:08 +00:00
Marcos Alconada 177be1f1a4 fixed error with special charact filter in user commens 2021-04-27 11:46:16 +00:00
Daniel Maya 49d2e9a437 #7404 fixed acl in event response 2021-04-27 10:19:05 +02:00
Daniel Barbero Martin 8324655aab Fixed errors SQL metaconsole events 2021-04-27 10:03:34 +02:00
marcos f818b86827 fixed minnor error black theme 7376 2021-04-23 09:56:06 +02:00
Daniel Rodriguez 79b11a6b30 Merge branch 'ent-4264-cambios-vista-de-eventos' into 'develop'
Ent 4264 cambios vista de eventos

See merge request artica/pandorafms!3893
2021-04-12 08:47:13 +00:00
Daniel Rodriguez ed6fa1a803 Merge branch 'ent-2685-7938-aadcm-dashboards-en-metaconsola' into 'develop'
dashboards meta

See merge request artica/pandorafms!3840
2021-04-07 10:53:31 +00:00
Daniel Rodriguez 859c174c1b Merge branch 'ent-7093-Item-group-event-report-chequea-tabla-incorrecta' into 'develop'
fixed error events reports

See merge request artica/pandorafms!3902
2021-04-06 16:59:42 +00:00
Marcos Alconada 654a4ebbd0 remove entities when add comment 2021-04-06 16:58:05 +00:00
fbsanchez 700817acaf Merge branch 'develop' into 'ent-2685-7938-aadcm-dashboards-en-metaconsola'
Conflicts:
   pandora_console/include/functions_html.php
2021-03-31 10:12:36 +00:00
Marcos Alconada 9e1bacb66e fixed visual error 2021-03-29 07:23:03 +00:00
fbsanchez c3232b0f2a Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
2021-03-24 09:55:31 +01:00
Daniel Barbero Martin bf4710ba93 fixed error events reports 2021-03-15 13:26:29 +01:00
Daniel Maya 2f7d0f1795 fixed permissions on response 2021-03-11 16:11:06 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Rodriguez 4996be48dc Merge branch 'ent-6966-No-se-ve-fecha-validacion' into 'develop'
Fixed issue with date

Closes pandora_enterprise#6966

See merge request artica/pandorafms!3818
2021-03-09 16:37:34 +00:00
Jose Gonzalez c235cfb01a Fixed 2021-03-08 08:21:45 +01:00
Daniel Rodriguez 23cddae261 Merge branch 'ent-5229-filtro-event-report' into 'develop'
Added string exclude filter to events reports

See merge request artica/pandorafms!3748
2021-03-01 15:28:18 +00:00
fbsanchez ef16ef4281 Dashboards in metaconsole 2021-02-18 12:47:42 +01:00
fbsanchez 0be3e0ab90 Event widget and some notices fixed 2021-02-10 15:00:23 +01:00
Jose Gonzalez aee474e43c Fixed issue with date 2021-02-04 14:54:11 +01:00
fbsanchez d171e805b5 alerts criticity in event response to retrieve event_instructions 2021-02-03 14:26:45 +01:00
fbsanchez 93908626a0 Merge remote-tracking branch 'origin/develop' into ent-6665-axa-datos-heredados-en-evento-alert-fired 2021-02-03 13:32:54 +01:00
fbsanchez 3b0319cecc event responses including alerts 2021-02-03 11:16:20 +01:00
fbsanchez 0b15f27699 minor CDE 2021-02-02 16:22:17 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
Luis Calvo df9bc6198d Added string exclude filter to events reports 2020-12-29 12:04:09 +01:00
fbsanchez 6461f029ee Added macros to event response 2020-12-10 17:53:49 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Jose Gonzalez fe7ad1471a Fix 2020-11-26 16:46:27 +01:00
Jose Gonzalez 86d2290961 Solve issue 2020-11-13 14:53:31 +01:00
daniel c4e7c6b5f1 fix events acknowledge-by 2020-10-30 14:42:10 +01:00
daniel b3043c2e01 Fixed template events 2020-10-30 13:29:50 +01:00
Daniel Rodriguez a047ca8181 Merge branch 'ent-6576-macros-de-respuestas-de-eventos-que-no-funcionan' into 'develop'
fixes in event macros (responses)

See merge request artica/pandorafms!3560
2020-10-30 11:32:09 +01:00
fbsanchez 2376ef408b Update functions_events.php resolve entities for group_name in event responses 2020-10-30 11:22:39 +01:00
Daniel Rodriguez fe90008d17 Merge branch 'ent-6587-bug-historico-comentarios-eventos' into 'develop'
Handled comments for validated comments

Closes pandora_enterprise#6587

See merge request artica/pandorafms!3564
2020-10-30 10:46:52 +01:00
Daniel Rodriguez e0b0ab8b42 Merge branch 'ent-6579-Faltan-macros-de-agente-en-respuestas-de-eventos' into 'develop'
Ent 6579 faltan macros de agente en respuestas de eventos

See merge request artica/pandorafms!3562
2020-10-29 18:17:22 +01:00
fbsanchez c4d9c0851a safe output in _event_date_ (custom responses) 2020-10-29 18:08:02 +01:00
fbsanchez b92cfc6c10 Merge remote-tracking branch 'origin/develop' into ent-6576-macros-de-respuestas-de-eventos-que-no-funcionan 2020-10-29 18:00:17 +01:00
Daniel Maya 43ca5e4972 Ent 6482 fallo en la agrupación de eventos 2020-10-29 12:53:09 +01:00
fbsanchez 8b4bcc77ab Update functions_events.php (io_safe_output over _event_date_) 2020-10-27 13:56:38 +01:00
Jose Gonzalez 765d7938f9 Handled comments for validated comments 2020-10-23 12:20:20 +02:00
alejandro-campos 5d812d5859 added new macros 2020-10-23 09:20:23 +02:00
fbsanchez 75bb4338b7 fixes in event macros (responses) 2020-10-22 18:10:46 +02:00
alejandro-campos def59508ae changed behavior of all group acl check and fixed acl vulnerabilities 2020-10-22 12:00:44 +02:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
fbsanchez 0deff70f8b Alert report (group) Group + secondary groups + recursion 2020-10-07 14:07:17 +02:00
fbsanchez ff8aaf18fe Group event reports (with secondary groups) 2020-10-06 15:48:12 +02:00
fbsanchez cc3189196c Fix secondary groups match while group filtering 2020-10-05 12:45:26 +02:00
Daniel Rodriguez 1cdb91a02d Merge branch 'ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos' into 'develop'
Custom id improvements

See merge request artica/pandorafms!3464
2020-10-02 13:07:59 +02:00
daniel 0db539c444 fix visual windows charts 2020-10-01 15:29:54 +02:00
fbsanchez b07d24ed25 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
Conflicts:
	pandora_console/include/functions_api.php
	pandora_console/operation/events/events.php
2020-09-30 18:38:27 +02:00
fbsanchez ca8683dd22 removed traces 2020-09-18 11:51:31 +02:00
fbsanchez 696b58544c fixes 2020-09-18 11:47:50 +02:00
fbsanchez 92da78496b Added module custom id to general tab in event details 2020-09-17 16:54:40 +02:00
fbsanchez bc166dfba2 module custom id in event list + minor fixes 2020-09-17 16:51:23 +02:00
Jose Gonzalez aecbab5c36 Fix variable type for array_flip instruction 2020-09-07 14:13:53 +02:00
Daniel Rodriguez 50cba7936a Revert "Merge branch 'ent-5992-XSS-Vuln-en-los-eventos-metaconsola' into 'develop'"
This reverts merge request !3311
2020-07-21 14:03:17 +02:00
Daniel Rodriguez 3ad555048f Merge branch 'ent-5992-XSS-Vuln-en-los-eventos-metaconsola' into 'develop'
fix vulnerability

See merge request artica/pandorafms!3311
2020-07-21 14:00:07 +02:00
Daniel Rodriguez d6fc3a6195 Merge branch 'ent-5967-botones-de-events-responses-no-son-iguales' into 'develop'
fixed visual style repsonse buttons

See merge request artica/pandorafms!3319
2020-07-16 12:16:57 +02:00
Daniel Rodriguez 47686f2f51 Merge branch 'ent-5618-bug-en-nombres-de-los-usuarios-en-el-owner-de-eventos' into 'develop'
Change owner event responses

See merge request artica/pandorafms!3294
2020-07-13 11:12:02 +02:00
Luis Calvo 9a8c42f4ac Fixed xss event comments vulnerabiluty and some acls on event ajax 2020-06-26 15:36:51 +02:00
marcos 1b0d40f88a fixed visual style repsonse buttons 2020-06-18 16:16:37 +02:00
alejandro-campos 98b358e7ad fix vulnerability 2020-06-16 17:27:53 +02:00
marcos ea6578f534 Change owner event responses 2020-06-09 17:42:44 +02:00
alejandro-campos f22cc5b22b add owner when validate event 2020-06-09 11:54:02 +02:00
alejandro-campos d6ac646046 fixed bug: update owner_user when validating an event 2020-04-21 17:57:36 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Daniel Maya 11324af76a Fixed tags_without 2020-03-23 13:13:45 +01:00
Tatiana Llorente 6dd1ee24e5 Merge remote-tracking branch 'origin/develop' into ent-4771-Revision-llamada-API-create-event-en-metaconsola 2020-02-10 16:48:38 +01:00
Daniel Rodriguez 97adbca5cd Merge branch 'ent-4768-error-macro-agent-address-event-responses' into 'develop'
Fixed macro agent address empty ip

See merge request artica/pandorafms!2823
2020-02-05 12:56:13 +01:00
alejandro-campos 5913f815d1 Added possibility to display comments with line breaks in event detail 2020-01-27 13:37:34 +01:00
Daniel Rodriguez 587e53dbd0 Merge branch 'ent-5259-Cambiar-estado-In-process-de-evento-no-añade-comentario' into 'develop'
Ent 5259 cambiar estado in process de evento no añade comentario

See merge request artica/pandorafms!3009
2020-01-14 08:36:43 +01:00
Daniel Maya 7204e7c0f2 Ent 4862 mas opciones en los filtros de severidad 2020-01-13 18:24:29 +01:00
Tatiana Llorente 40a86384c2 Add comment in events when status is changed 2020-01-13 13:00:43 +01:00
Daniel Rodriguez 1cef8aa62f Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop'
Changed the mode of obtain the title

See merge request artica/pandorafms!2743
2020-01-09 16:46:58 +01:00
Alejandro Fraguas f0848d4feb Merge branch 'ent-4993-Diferentes-bugs-tiempos' into 'develop'
Changed date format to last remote contact

See merge request artica/pandorafms!2898
2019-12-24 11:48:25 +01:00
Daniel Maya bb4fce07a1 Added secondary groups in event details 2019-12-11 12:35:27 +01:00
Jose Gonzalez 3652f31a18 Code reset and solved other issues with comments 2019-12-05 17:06:58 +01:00
marcos 21bf49c218 update id_source_event 2019-11-22 13:38:08 +01:00
marcos ab1a64a2e6 Merge remote-tracking branch 'origin/develop' into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este 2019-11-22 10:56:36 +01:00
marcos de3f8b2a0f updates 2019-11-22 10:56:30 +01:00
Marcos Alconada 34cdcdfd6e Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
# Conflicts:
#   pandora_console/extras/mr/29.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
#   pandora_console/include/functions_events.php
2019-11-21 10:13:00 +01:00
Daniel Maya fad70cfdc0 fixed secondary group in events 2019-11-20 16:34:56 +01:00
Tatiana Llorente bae61d4225 Changed date format to last remote contact 2019-11-20 10:30:22 +01:00
Jose Gonzalez 62fbdd36a0 Solution for lost comments in the events section modal window 2019-11-13 15:36:52 +01:00
Luis Calvo 5676872f0a Fixed macro agent address empty ip 2019-10-18 15:44:05 +02:00
Alejandro Fraguas 78610b127c Merge branch 'ent-4682-Comentarios-en-eventos-no-se-ven-en-metaconsola' into 'develop'
Ent 4682 comentarios en eventos no se ven en metaconsola

See merge request artica/pandorafms!2775
2019-10-15 11:42:00 +02:00
Tatiana Llorente 7b862429af Change defined metaconsole to is_metaconsole function in api - #4771 2019-10-08 15:28:35 +02:00
Daniel Rodriguez debbbdc4e5 Merge branch 'ent-4726-truncado-eventos-texto-muy-largo' into 'develop'
Improved truncate system and solved issue

See merge request artica/pandorafms!2774
2019-10-07 13:49:57 +02:00
Jose Gonzalez 7ac12e45ef Solved visual issue 2019-10-07 13:33:18 +02:00
marcos.alconada a7b66e6365 revert changes 2019-10-07 12:07:31 +02:00
marcos.alconada a9e8b1113e add default comments when change owner or status on events 2019-10-07 11:15:25 +02:00
Kike b25c9ca793 Merge remote-tracking branch 'origin/develop' into 4689-mostrar-instrucciones-en-la-vista-de-eventos
Conflicts:
	pandora_console/include/functions_events.php
2019-10-03 15:59:15 +02:00
marcos.alconada a44e1feeb4 fixed error comments events 2019-10-01 16:24:02 +02:00
Kike dfea704154 Show instructions on mouse over 2019-09-27 14:48:45 +02:00
alejandro-campos a5ea095734 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria 2019-09-24 15:16:22 +02:00
Kike 4ae14e0888 Fixed issue with instructions in events view 2019-09-24 15:14:17 +02:00
manuel b7ff7bc121 Fixed bug in report items 2019-09-23 15:27:06 +02:00
alejandro-campos 0df2447770 added comment management and fixed some errors in incident edition 2019-09-20 12:37:47 +02:00
Jose Gonzalez d7ca703c99 Cleaned the javascript call 2019-09-20 10:53:09 +02:00
Tatiana Llorente ca6fe42298 Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria 2019-09-13 12:00:04 +02:00
alejandro-campos 11cb53582c backup changes 2019-09-02 17:01:41 +02:00
Daniel Rodriguez c47b24d84c Merge branch 'ent-4278-Bug-ACL-al-cargar-o-gestionar-filtros-de-eventos' into 'develop'
Fixed bug permissions on filter events- 4278

See merge request artica/pandorafms!2671
2019-08-30 16:07:45 +02:00
manuel 3901a1abb6 Fixed bug in metaconsole filter events 2019-08-27 15:46:22 +02:00
Daniel Barbero Martin 31da17db03 fixed event view metaconsole 2019-08-22 14:27:45 +02:00
Alejandro Fraguas 4c3d705340 Merge branch 'ent-4352-Evento-con-intructions-no-las-muestra-como-enlaces' into 'develop'
Ent 4352 evento con intructions no las muestra como enlaces

See merge request artica/pandorafms!2630
2019-08-20 14:29:47 +02:00
Tatiana Llorente 38547052fb Fixed bug permissions on filter events- 4278 2019-08-20 13:42:04 +02:00
Tatiana Llorente c591dd4260 Show html tags in instructions - #4352 2019-08-01 13:11:50 +02:00
alejandro-campos b4bd7f0f63 fixed problems in event view and event view custom fields 2019-07-30 16:10:34 +02:00
Jose Gonzalez ca19e25f74 SQL Query modified for solve duplicate events issue 2019-07-24 16:00:25 +02:00
Alejandro Fraguas e3e187b122 Merge branch 'ent-4308-error-sql-en-la-vista-de-reprotes-en-html-de-groups-event-report-metaconsola' into 'develop'
Resolved error query

See merge request artica/pandorafms!2566
2019-07-15 15:44:39 +02:00
Daniel Rodriguez 244c00e96f Merge branch 'ent-3428-error-grafica-events-per-agent-en-item-event-report-group-en-meta' into 'develop'
fixed errors with graphs in meta

See merge request artica/pandorafms!2594
2019-07-15 13:10:55 +02:00
Daniel Rodriguez ac3de84bda Merge branch 'ent-4309-Falta-mensaje-de-Successfull-al-cambiar-el-owner-de-un-evento' into 'develop'
Added success and error messages when change the event owner - #4309

See merge request artica/pandorafms!2590
2019-07-11 11:36:03 +02:00
marcos.alconada 6382cb2abe fixed errors with graphs in meta 2019-07-10 14:18:23 +02:00
Tatiana Llorente bfb7897149 Added success and error messages when change the event status - #4309 2019-07-10 12:15:41 +02:00
Daniel Rodriguez 207bcceb5f Merge branch 'ent-3685-7702-al-poner-evento-en-in-progress-no-se-muestra-el-campo-user' into 'develop'
Resolved

See merge request artica/pandorafms!2253
2019-07-09 18:00:13 +02:00
Tatiana Llorente 084d1a229e Added success and error messages when change the event owner - #4309 2019-07-09 16:41:00 +02:00
marcos.alconada 4430f18ac5 Resolved error query 2019-07-02 12:21:58 +02:00
fbsanchez c1ac6b7ed6 mini_severity virtual column added 2019-06-24 19:23:41 +02:00
fbsanchez c85965d793 SQLerror tasg reference 2019-06-24 19:05:46 +02:00
fbsanchez 0ea8904e0a SQLerror tasg reference 2019-06-24 18:52:38 +02:00
marcos.alconada 31ec8933a2 changed duplicated code with id_souce_event field 2019-06-21 12:37:32 +02:00
Marcos Alconada f1110c6d56 Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
# Conflicts:
#   pandora_console/extras/mr/29.sql
2019-06-21 11:31:01 +02:00
fbsanchez 7a425e7e96 qa event viewer latest fixes 2019-06-20 21:33:38 +02:00
fbsanchez 526ebdebd9 ajax comments 2019-06-20 21:11:56 +02:00
fbsanchez 8671c7c88c events qa adjustments 2019-06-20 19:23:13 +02:00
fbsanchez cfe16ee8c3 minor fixes 2019-06-20 11:46:01 +02:00
fbsanchez 44d8b977cb event advanced filter fixes 2019-06-19 16:52:14 +02:00
fbsanchez 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
fbsanchez d290b91b28 RC1 event viewer v2 2019-06-18 16:07:53 +02:00
fbsanchez a1f004fdec minor fixes 2019-06-18 15:03:49 +02:00
fbsanchez 22272225b8 massive operations over events 2019-06-18 14:26:55 +02:00
fbsanchez d8a331bf77 event filters tags, date, module name 2019-06-18 12:48:28 +02:00
fbsanchez dc81d168e0 event filters group selectors 2019-06-18 11:00:48 +02:00
fbsanchez f7cf6e1e8b wip events 2019-06-18 10:32:04 +02:00
fbsanchez a8a206fa10 events 2019-06-17 19:12:45 +02:00
fbsanchez 457c1c9edf wip event view 2019-06-17 18:33:39 +02:00
fbsanchez ab7d72a1c9 wip event vwr ui-box close tick 2019-06-17 17:02:33 +02:00
fbsanchez 36a1387632 WIP event show info 2019-06-14 19:23:04 +02:00
fbsanchez 20257edadd event ACL with tags 2019-06-14 18:30:09 +02:00
fbsanchez 129c24c287 minor fix 2019-06-14 13:22:04 +02:00
fbsanchez 132076198d minor fixes and event ACL - groups 2019-06-14 13:20:34 +02:00
fbsanchez b08e8b595d multiple fixes 2019-06-13 19:41:21 +02:00
fbsanchez 0df48675f3 event deletion 2019-06-13 16:28:26 +02:00
fbsanchez 029d3b073f Avoid double validation, avoid redraw 2019-06-13 13:52:38 +02:00
fbsanchez 9740275388 dyn redraw 2019-06-13 13:07:11 +02:00
fbsanchez ecc2fef8f6 event validation/in process 2019-06-13 12:30:09 +02:00
fbsanchez f3a0f37a1c Events agent grouped 2019-06-12 18:19:39 +02:00
Alejandro Fraguas d0e7a03926 Merge branch 'ent-3809-error-sql-eventos-de-grupos-de-agentes' into 'develop'
Changed sql error

See merge request artica/pandorafms!2321
2019-06-12 16:00:58 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
fbsanchez b615b50920 wip event grouped 2019-06-12 13:17:18 +02:00
fbsanchez 48e6fef0b7 Event filters 2019-06-11 12:58:18 +02:00
fbsanchez ef3d299d58 wip event view 2019-06-10 15:18:35 +02:00
fbsanchez bb552226a6 minor fix 2019-06-07 22:58:49 +02:00
fbsanchez f67bf8c2b7 wip event list filters 2019-06-07 22:44:02 +02:00
fbsanchez d4d4509266 wip event view 2019-06-07 21:22:07 +02:00
fbsanchez 419a90d69c wip event list 2019-06-07 17:35:13 +02:00
fbsanchez 23e6711f09 WIP Events 2019-06-06 17:50:47 +02:00
fbsanchez a1be1e7332 styles review 2019-06-04 22:16:58 +02:00
Daniel Rodriguez b2b3d748c1 Merge branch 'ent-3901-Macro-event-id-no-funciona-en-meta-si-el-evento-tiene-server-id-0' into 'develop'
allow fetching of event id in metaconsole event table when getting target of an…

See merge request artica/pandorafms!2437
2019-06-04 12:45:26 +02:00
fbsanchez 88b0802472 style review 2019-06-03 10:46:52 +02:00
fbsanchez f58d1bc6ee Styling review 2019-05-29 15:14:13 +02:00
fbsanchez c8649a8dc4 Styles 2019-05-29 11:21:57 +02:00
fbsanchez 22de7964c2 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 08:52:34 +02:00
fbsanchez 70469c4909 Event list agent view 2019-05-28 18:03:01 +02:00
fbsanchez f57915285f review styles agent view 2019-05-27 22:36:55 +02:00
Tatiana Llorente 1eb1120c6e Rename class events_show_more_table to table_modal_alternate - #4102 2019-05-27 16:18:10 +02:00
Tatiana Llorente 016a5b3745 Changed image for severity in modal events window - #4102 2019-05-27 15:51:03 +02:00
Tatiana Llorente 0b4a076798 Changed image for severity in modal events window - #4102 2019-05-27 15:49:10 +02:00
marcos.alconada 36afbea8b7 Add new search for id source event in metaconsole 2019-05-22 11:53:57 +02:00
alejandro-campos e82916001b allow fetching of event id in metaconsole event table when getting target of an event response in metaconsole having server_id=0 2019-05-22 10:18:44 +02:00
Alejandro Fraguas 81f7cf699b Merge branch 'ent-3768-no-funciona-selector-de-nodo-event-group-report-meta' into 'develop'
Ternary condition is added

See merge request artica/pandorafms!2311

Former-commit-id: c7e9365d322c9f2bf7b52a58c4e6f077f3e68288
2019-05-13 18:36:34 +02:00
Daniel Rodriguez 8f6c8a9932 Merge branch 'ent-3613-Ventana-modal-de-vista-de-Eventos' into 'develop'
Ent 3613 ventana modal de vista de eventos

See merge request artica/pandorafms!2387
2019-05-08 19:07:39 +02:00
Tatiana Llorente 77941953a2 New style for modal window Show More. Tabs: Responses, Related, Custom data. - #3613
Former-commit-id: 48ed0a69416232a9016b6aaff76378954ddacdc1
2019-04-26 11:57:41 +02:00
manuel 569c84ad05 Show contact in events information
Former-commit-id: 5fd33a7b3abbcef12d8d26ff5d2e6ea14f17a44e
2019-04-23 16:10:51 +02:00
Tatiana Llorente a930d15d44 New style for modal window Show More - #3613
Former-commit-id: 3855d8463e3ba6709ec111c867d0534c704db1a7
2019-04-15 13:15:11 +02:00
Tatiana Llorente 0b352860cf New style for modal window Show More - #3613
Former-commit-id: 61cb4c99ef4f586cfdf07df5262c789cdee75915
2019-04-15 13:11:58 +02:00
Daniel Rodriguez 1c4765f4f5 Merge branch 'ent-3688-7704-no-cambia-el-propietario-del-evento-en-event-response' into 'develop'
Resolved

See merge request artica/pandorafms!2251

Former-commit-id: dc092a97b35022dd846775568df9fca1e332022a
2019-04-03 18:47:52 +02:00
marcos.alconada ba251e8731 Changed sql error
Former-commit-id: 44e44ac87e446b8ce1753a64e790a5d957938a11
2019-04-02 10:18:56 +02:00
marcos.alconada 82bfd624ba Ternary condition is added
Former-commit-id: 35b1b34d83ffa89fed34529a58cef6e586f086b1
2019-03-28 15:40:26 +01:00
marcos.alconada c45d5f2f70 Ternary condition is added
Former-commit-id: 345cfb2ef1e211234a5fc4cc35f0faaaab3360c8
2019-03-28 15:37:52 +01:00
Daniel Maya 96d6e12546 disable cache for events_comment
Former-commit-id: 4a3477e1911d7d5cc02ac5207ccc30cb43e7f220
2019-03-12 16:12:58 +01:00
daniel 15ca89068d Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7
Conflicts:
	pandora_console/godmode/servers/manage_recontask_form.php
	pandora_console/include/functions_events.php


Former-commit-id: 7ea5c9dcc8efe112ea64e2fcb6eef9670c9af613
2019-03-12 13:07:12 +01:00
marcos.alconada f9d123603b Resolved
Former-commit-id: f5628a1fd34771329b2b06664b552beaacf4c369
2019-03-11 18:03:05 +01:00
marcos.alconada a21f2fc96d Resolved
Former-commit-id: 4d15a55f166cdc9b111379b0b2302ac74e836bdb
2019-03-11 13:43:37 +01:00
Alejandro Gallardo Escobar 42d8e72400 Recovered the lost code for the current user macro at the event responses.
(cherry picked from commit d554dcc7db [formerly 1a5860bc7a62efecba44d467df9eb9cf7e25070b])


Former-commit-id: de201ec04f1dc211c56db3fc0dbf8ae66a549ddf
2019-03-01 09:40:36 +01:00
daniel 504a8e9d1a fixed warnings php
Former-commit-id: d21cb02113c65a7f50a5e29f7f536e85ba5cb945
2019-02-25 13:02:39 +01:00
fbsanchez b1aa0fe2f2 Merge from develop
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
Daniel Rodriguez d4cc0f6952 Merge branch 'ent-3497-event-responses-current-user-macro' into 'develop'
Added the _current_user_ macro to the event responses

See merge request artica/pandorafms!2179

Former-commit-id: c468e43ec3add15487109c2c961630361bd9bdaf
2019-02-20 13:50:19 +01:00
Daniel Rodriguez 33ed8a2cc1 Merge branch '3219-Vista-de-custom-fields-diferente-nodo-meta2' into 'develop'
Fixed bug in metaconsole custom fields2

See merge request artica/pandorafms!2070

Former-commit-id: cb36006bed0259c9e7c70c420d5e46129d64457a
2019-02-20 11:00:42 +01:00
Alejandro Gallardo Escobar d554dcc7db Added the _current_user_ macro to the event responses
Former-commit-id: 1a5860bc7a62efecba44d467df9eb9cf7e25070b
2019-02-19 11:37:44 +01:00
fbsanchez 3e9e668e00 Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices
Former-commit-id: e20038920481419abfaeddc665b3369f90b49fef
2019-02-14 10:59:27 +01:00
fbsanchez 7f4353c4bc optimized. events_has_extended_info
Former-commit-id: 2435badcea24fd5777bde358658409bf947a2d4b
2019-02-13 15:55:03 +01:00
fbsanchez 453c639c53 optimized. events_has_extended_info
Former-commit-id: 805b80f1a9e09425b0e5710906886ae39e791753
2019-02-13 15:54:40 +01:00
Daniel Maya 4c809ba8d2 event query optimization
Former-commit-id: 322868d281ddeac4006480bac6dbf03434ffefa1
2019-02-13 15:41:34 +01:00
fbsanchez ed63ef47fa Moved ReconServer to DiscoveryServer
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
2019-02-13 14:56:10 +01:00
manuel bf0fc07533 Merge branch 'develop' into 3219-Vista-de-custom-fields-diferente-nodo-meta2
Conflicts:
pandora_console/include/functions_events.php


Former-commit-id: 00b8cb47f7294fa6cd3c3fe257e18a1e56759580
2019-02-13 14:38:56 +01:00
fbsanchez 332c53b098 change behaviour to avoid mr slow updates. Event extended
Former-commit-id: c5a6d5448a14b10b6851f59c5f688f360d747606
2019-02-11 19:46:46 +01:00
fbsanchez 49cf9d5db0 Extended events
Former-commit-id: f2e0925ce58042dc9c9505a0d0fcf1a424c8a0bb
2019-02-08 19:07:49 +01:00
fbsanchez 091f6ace96 minor fixes and revised code style
Former-commit-id: aad587c578de99432dd759d6c82b622f6cd6c6e7
2019-02-08 17:30:47 +01:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
samucarc 6e8e5d0dd6 Fixed Event reports pie graphs in metaconsole
Former-commit-id: 6fe0eb4035200dc4e22736098b810f31194e1a45
2019-01-16 19:44:29 +01:00
manuel.montes dd6c8ca870 Fixed bug in metaconsole custom fields2
Former-commit-id: f96e08279f779d5d64d1ce88f23787f15ac3d144
2018-12-11 16:43:52 +01:00
danielmaya 05a06146ef Fixed sql error with secondary groups in agent view
Former-commit-id: 45ddc8329c0ca417c8499cf54d3526acd28eae0a
2018-12-07 11:37:23 +01:00
vgilc b88e584e85 Merge branch '2938-Problema-con-tags-en-el-wizard-y-la-vista-de-informes-dev' into 'develop'
Added check of tags in report wizard

See merge request artica/pandorafms!2007
2018-11-30 13:07:22 +01:00
Alejandro Gallardo Escobar de08451c84 Bugfix 2018-11-23 12:21:35 +01:00
danielmaya 62ad6b9a35 Added check of tags in report wizard 2018-11-22 10:39:48 +01:00
daniel 78a1c72eac fixed warnings php7 2018-10-30 17:38:46 +01:00
vgilc 2bd6b0c688 Merge branch '1863-Error-en-tipo-de-evento-going-up-critical' into 'develop'
1863 error en tipo de evento going up critical

See merge request artica/pandorafms!1736
2018-10-25 13:25:22 +02:00
vgilc d71257ea1c Merge branch 'ent-2540-Macro-de-IP-del-agente-no-funciona-event-responses-EUComm' into 'develop'
Fixed macro _agent_adress_ on events responses

See merge request artica/pandorafms!1872
2018-10-25 13:03:44 +02:00
vgilc de0c81b7fa Merge branch '2724-Fallo-en-una-parte-de-replicación-de-eventos3' into 'develop'
Fixed bug in events replication

See merge request artica/pandorafms!1804
2018-10-25 12:09:58 +02:00
fermin831 4d3c74ed37 Minor typo fix in events responses 2018-10-18 19:20:37 +02:00
fermin831 40ceec6561 Fixed macro _agent_adress_ on events responses 2018-10-18 18:45:11 +02:00
fermin831 41d104ae2c Improve performance on tactical view with a lot of events 2018-10-15 12:23:51 +02:00
danielmaya 4558c909ef Changed source filter in event list 2018-10-10 16:57:04 +02:00
Fermin 441458843f [Tags performance] Fixed check acl tags by module and removed unused code 2018-10-08 17:19:46 +02:00
danielmaya e8621e54e5 Updated tags optimization 2018-10-05 09:40:08 +02:00
danielmaya 453fb3f67b TODO List 2018-09-27 13:30:32 +02:00
manuel.montes c77bc2328f Fixed bug in events replication 2018-09-25 12:04:18 +02:00
manuel.montes 9a56754384 Revert "Fixed bug in events replication"
This reverts commit e59c40d687.
2018-09-25 11:59:37 +02:00
manuel.montes e59c40d687 Fixed bug in events replication 2018-09-24 14:01:17 +02:00
alejandro-campos 481582f628 Changed event type 'Going down to critical' to 'Going up to critical' 2018-09-06 16:42:52 +02:00
danielmaya 5b30aa5560 Added source, comment and id_extra in event filter 2018-08-31 16:25:12 +02:00
fermin831 6372f44212 Added some docs 2018-08-14 17:08:00 +02:00
fermin831 05a0eb0db6 Fixed events secondary groups filter in metaconsole 2018-08-14 17:06:15 +02:00
fermin831 d3c3304976 Fixed pagination and added filter to All events 2018-08-14 10:40:56 +02:00
fermin831 62617e609c [Secondary groups] Fixed group agents and group events in events filter 2018-08-08 13:17:03 +02:00