Commit Graph

412 Commits

Author SHA1 Message Date
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
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
fermin831 c96b883614 [Secondary groups] Fixed agent view to include secondary agents 2018-03-26 12:52:37 +02:00
enriquecd 078b370cbd Hide passwords fields data in treeview and events - #2030 2018-03-22 13:10:25 +01:00
fbsanchez 407fbf450f Fixed permission checks in event_acl
Added event response macro _group_custom_id_
2018-02-16 15:09:37 +01:00
enriquecd 5c0f0de1e4 Add module critical instructions when create an event - #1862 2018-02-06 16:01:32 +01:00
vgilc 60486c8a1e Merge branch '1659-Informe-de-eventos-de-módulos-en-plantillas-de-informes-de-la-metaconsola--Carrefour]-dev' into 'develop'
Fixed reporting_event_report_module in metaconsole

See merge request artica/pandorafms!1128
2017-12-21 09:53:47 +01:00
vgilc 45c642a6a0 Merge branch 'ent-1435-incluir-macros-en-event-responses' into 'develop'
Ent 1435 incluir macros en event responses

See merge request artica/pandorafms!1100
2017-12-21 09:46:55 +01:00
daniel e0b90f2be0 optimization view events 2017-11-30 14:00:08 +01:00
danielmaya a3e47fb977 Fixed reporting_event_report_module in metaconsole 2017-11-28 15:56:46 +01:00
fermin831 2ef9d884ee Added spanish event responses new macros documentation 2017-11-20 11:14:26 +01:00
fermin831 492b55a713 Added custom_data to events responeses macros 2017-11-17 15:17:08 +01:00
fermin831 7fb8406bc0 Added several macros to events responses 2017-11-17 14:50:23 +01:00
vgilc 3493b9c15c Revert "code backup"
This reverts commit b9851a3a71
2017-11-13 10:21:38 +01:00
Daniel Maya b9851a3a71 code backup 2017-10-31 11:51:19 +01:00
Daniel Maya 718a2dbaff Fixed in visual map 2017-10-30 17:57:47 +01:00
Daniel Maya 7a061edb66 group by id_agent in group events 2017-09-28 16:46:40 +02:00
fermin831 89fc3c457a Fixed no os_version on event agent view 2017-09-11 17:54:28 +02:00
vgilc ae0196f7b5 Merge branch '1169-Pandora-FMS-Aplicación-movil-Error-en-ordenacion-de-eventos' into 'develop'
Fix bad ordination in mobile pandora events list - #1169

See merge request !746
2017-09-11 09:41:56 +02:00
enriquecd 418906add5 Fix bad ordination in mobile pandora events list - #1169 2017-08-22 17:24:26 +02:00
enriquecd 031a70cc51 Add instructions,user and force_create_agent parameters to CLI event_creator - #309 2017-08-22 10:43:22 +02:00
Daniel Maya 06eadbaf81 Fixed urlencode in event popup 2017-07-19 10:52:01 +02:00
Arturo Gonzalez 9348562ee4 Added good match to tags list 2017-06-28 16:20:57 +02:00
daniel d3a0c4b52b fixed errors in pandora revent 2017-06-21 14:34:06 +02:00
enriquecd 131753cfba Inprove event title format and alias rather name - #523 2017-06-12 14:34:03 +02:00
enriquecd df715561d7 Format module inventary to show only changes on events - #523 2017-05-24 18:24:53 +02:00
m-lopez-f 22f7bae5ae Fixed problems with htmld tags in list events and other view that include list of events. Gitlab: #529 2017-03-15 12:17:01 +01:00
daniel 8f8a17bf24 fixed alias for name in reports 2017-02-27 16:48:28 +01:00
Alejandro Gallardo Escobar 3d521ec290 Changed the agent name by its alias in some sections 2017-02-22 12:51:55 +01:00
Alejandro Gallardo Escobar 550a00cec7 Changed the agent name by its alias 2017-02-20 15:32:49 +01:00
Daniel Maya d39b108c1f Merge branch 'develop' into feature/alias_freandly_name
Conflicts:
	pandora_agents/unix/pandora_agent
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/modificar_agente.php
	pandora_console/godmode/agentes/planned_downtime.editor.php
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/godmode/massive/massive_edit_modules.php
	pandora_console/include/class/Tree.class.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_treeview.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/pandoradb.sql
2017-02-16 16:05:21 +01:00
daniel 5dad591b02 fixed errors in reports evnts 2017-02-02 10:13:58 +01:00
daniel 8006c1fc0b fixed pdf reports events 2017-01-18 10:37:08 +01:00
daniel 99aa41b32a fixed reports events 2017-01-13 14:09:56 +01:00
daniel 993bad314d fixed errors in events reports #135 2017-01-11 13:26:50 +01:00
daniel d44dc61758 fixed minor error order by desc event list
(cherry picked from commit 9a48e52208)
2017-01-04 14:34:35 +01:00
daniel 4afaf5190a fixed errors in reports alerts
(cherry picked from commit 85dddf0b56)
2017-01-03 19:33:11 +01:00
daniel 462ff97b0e fixed order by events reports
(cherry picked from commit bda0177ad2)
2017-01-02 16:09:07 +01:00
daniel 8aa1818f9a fixed errors in reports events for all groups 2016-12-30 13:14:19 +01:00
m-lopez-f 031ff4233a Feature: Add new filter in aget/group events report. Ticket: #4243 2016-12-01 16:18:37 +01:00
m-lopez-f dfda3bcda5 Fixed typo error
(cherry picked from commit 7c33532d68)
2016-11-25 10:37:52 +01:00
m-lopez-f 935b426a83 Add history search of events in reports, only when history event db is active. Ticket: #85 2016-11-24 15:28:21 +01:00
Daniel Maya 54dcadfe33 changed agent name by alias in visual console,custom reports,view events and csv files. 2016-09-29 13:09:50 +02:00
m-lopez-f 02388ff31f Add style css to image and fixed problems in metaconsole when grouped by agents in events. Internal ticket: #3079 2016-09-01 10:50:34 +02:00
m-lopez-f 051ee37696 Fixed problems with sql in metaconsole when used group agents in events list. Ticket: #3079 2016-08-31 14:43:40 +02:00
m-lopez-f 2217e9f908 Fixed problems with group agents. Tiquet: #3079 2016-07-22 16:08:45 +02:00
Alejandro Gallardo Escobar a87de02e0b Removed the tinyMCE from the agent description and custom fields. Removed the url injection feature from the agent description. Added the url injection feature to the agent custom fields of some sections
(cherry picked from commit c4bbe38b69e9b076b45871bc35b8c861b8ed2cc9)
2016-06-08 19:17:39 +02:00
m-lopez-f fe51e17511 Feature grouped by agent in event list. Supported to metaconsole. Tiquet: #3079 2016-05-23 09:45:42 +02:00
m-lopez-f 9f772e5091 Feature. new form of groped data in event list. Tiquet: #3079 2016-05-23 09:22:57 +02:00
mdtrooper ab46cde699 Cleaned source code. 2016-01-27 13:15:23 +01:00
mdtrooper fe8300655d Cleaned source code. 2016-01-27 13:08:11 +01:00
m-lopez-f 5e69d3a110 Fixed problem with Event report agent, when is metaconsole. Tiquet: #3045
(cherry picked from commit 59e0387069)
2015-12-09 12:44:53 +01:00
m-lopez-f a72f6e051b Fixed problems with show comment in events. Tiquet: #2820 2015-10-01 09:26:49 +02:00
m-lopez-f 4818b01e4f Add system to view instructions in details events. Tiquet: #2805 2015-09-25 15:43:34 +02:00
Arturo Gonzalez Diaz 8f5cfb877a Replaced the word that should never be named by "Severity" 2015-09-14 14:07:21 +02:00
Arturo Gonzalez Diaz bd432db9fd Fixed sql error in statistics (oracle). Ticket #2690 2015-09-08 10:40:12 +02:00
Alejandro Gallardo Escobar 37b55517e1 Error fixes 2015-07-02 18:23:13 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
m-lopez-f 866cdb908e No show count events group by status(validate,not validate) in statics events. Tiquet: #2306 2015-06-05 10:21:24 +02:00
Alejandro Gallardo Escobar 5906f6dd44 Re-fixed the agents filter 2015-05-26 12:07:13 +02:00
Alejandro Gallardo Escobar d7801c2933 Merge remote-tracking branch 'origin/develop' into features/oracle
Conflicts resolved:
	pandora_console/extensions/module_groups.php
	pandora_console/godmode/reporting/graph_builder.graph_editor.php
	pandora_console/operation/events/events_list.php
2015-05-26 10:29:38 +02:00
Alejandro Gallardo Escobar 23b199d7cd Fixed the function 'events_create_event' for oracle databases 2015-05-25 19:53:20 +02:00
mdtrooper 8107a78791 Added support to metaconsole in function 'events_get_group_events' 2015-05-22 17:04:23 +02:00
m-lopez-f a19e4cdbf5 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-22 14:33:56 +02:00
m-lopez-f 62ff5eaef4 Add new macro Events response, tiquet:#2253 2015-05-22 14:33:43 +02:00
mdtrooper f009758e93 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-22 12:31:49 +02:00
mdtrooper 2fe85510a7 Fixed PHP Warnings. 2015-05-22 12:31:33 +02:00