Commit Graph

379 Commits

Author SHA1 Message Date
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
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
alejandro-campos 097661d82b implemented sort filter to event view custom fields 2018-08-03 10:38:53 +02:00
alejandro-campos 01656f2e76 conflict resolution on branch 2389-Ordenar-eventos-por-campo 2018-08-02 10:27:31 +02:00
manuel.montes 4b23824eb4 fix bug in metaconsole view events 2018-07-26 15:41:52 +02:00
manuel.montes b922066a72 Add items to the view events 2018-07-19 18:04:50 +02:00
alejandro-campos 6ec4787c38 added order filters to events table 2018-07-10 15:11:18 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
Fermin 0d6115726a [Rebranding] Open include root files (except networkmaps related sources) 2018-05-11 12:49:16 +02:00
Alejandro Gallardo Escobar 0b1546be22 Fixed a date 2018-04-30 15:35:41 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios
Conflicts:
	pandora_console/include/class/Tree.class.php
2018-04-10 09:29:14 +02:00
fermin831 c88e6e703a [Secondary groups] Fixed duplicated agents in group view and agent detail 2018-04-04 11:17:08 +02:00
fermin831 4d78b28d17 [Secondary Groups] Fixed grouped agents events in node 2018-03-27 17:53:11 +02:00