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
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
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
569c84ad05
Show contact in events information
...
Former-commit-id: 5fd33a7b3abbcef12d8d26ff5d2e6ea14f17a44e
2019-04-23 16:10:51 +02:00
a930d15d44
New style for modal window Show More - #3613
...
Former-commit-id: 3855d8463e3ba6709ec111c867d0534c704db1a7
2019-04-15 13:15:11 +02:00
0b352860cf
New style for modal window Show More - #3613
...
Former-commit-id: 61cb4c99ef4f586cfdf07df5262c789cdee75915
2019-04-15 13:11:58 +02:00
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
ba251e8731
Changed sql error
...
Former-commit-id: 44e44ac87e446b8ce1753a64e790a5d957938a11
2019-04-02 10:18:56 +02:00
82bfd624ba
Ternary condition is added
...
Former-commit-id: 35b1b34d83ffa89fed34529a58cef6e586f086b1
2019-03-28 15:40:26 +01:00
c45d5f2f70
Ternary condition is added
...
Former-commit-id: 345cfb2ef1e211234a5fc4cc35f0faaaab3360c8
2019-03-28 15:37:52 +01:00
96d6e12546
disable cache for events_comment
...
Former-commit-id: 4a3477e1911d7d5cc02ac5207ccc30cb43e7f220
2019-03-12 16:12:58 +01:00
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
a21f2fc96d
Resolved
...
Former-commit-id: 4d15a55f166cdc9b111379b0b2302ac74e836bdb
2019-03-11 13:43:37 +01:00
42d8e72400
Recovered the lost code for the current user macro at the event responses.
...
(cherry picked from commit d554dcc7db
2019-03-01 09:40:36 +01:00
504a8e9d1a
fixed warnings php
...
Former-commit-id: d21cb02113c65a7f50a5e29f7f536e85ba5cb945
2019-02-25 13:02:39 +01:00
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
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
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
d554dcc7db
Added the _current_user_ macro to the event responses
...
Former-commit-id: 1a5860bc7a62efecba44d467df9eb9cf7e25070b
2019-02-19 11:37:44 +01:00
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
7f4353c4bc
optimized. events_has_extended_info
...
Former-commit-id: 2435badcea24fd5777bde358658409bf947a2d4b
2019-02-13 15:55:03 +01:00
453c639c53
optimized. events_has_extended_info
...
Former-commit-id: 805b80f1a9e09425b0e5710906886ae39e791753
2019-02-13 15:54:40 +01:00
4c809ba8d2
event query optimization
...
Former-commit-id: 322868d281ddeac4006480bac6dbf03434ffefa1
2019-02-13 15:41:34 +01:00
ed63ef47fa
Moved ReconServer to DiscoveryServer
...
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
2019-02-13 14:56:10 +01:00
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
332c53b098
change behaviour to avoid mr slow updates. Event extended
...
Former-commit-id: c5a6d5448a14b10b6851f59c5f688f360d747606
2019-02-11 19:46:46 +01:00
49cf9d5db0
Extended events
...
Former-commit-id: f2e0925ce58042dc9c9505a0d0fcf1a424c8a0bb
2019-02-08 19:07:49 +01:00
091f6ace96
minor fixes and revised code style
...
Former-commit-id: aad587c578de99432dd759d6c82b622f6cd6c6e7
2019-02-08 17:30:47 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
6e8e5d0dd6
Fixed Event reports pie graphs in metaconsole
...
Former-commit-id: 6fe0eb4035200dc4e22736098b810f31194e1a45
2019-01-16 19:44:29 +01:00
dd6c8ca870
Fixed bug in metaconsole custom fields2
...
Former-commit-id: f96e08279f779d5d64d1ce88f23787f15ac3d144
2018-12-11 16:43:52 +01:00
05a06146ef
Fixed sql error with secondary groups in agent view
...
Former-commit-id: 45ddc8329c0ca417c8499cf54d3526acd28eae0a
2018-12-07 11:37:23 +01:00
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
de08451c84
Bugfix
2018-11-23 12:21:35 +01:00
62ad6b9a35
Added check of tags in report wizard
2018-11-22 10:39:48 +01:00
78a1c72eac
fixed warnings php7
2018-10-30 17:38:46 +01:00
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
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
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
4d3c74ed37
Minor typo fix in events responses
2018-10-18 19:20:37 +02:00
40ceec6561
Fixed macro _agent_adress_ on events responses
2018-10-18 18:45:11 +02:00
41d104ae2c
Improve performance on tactical view with a lot of events
2018-10-15 12:23:51 +02:00
4558c909ef
Changed source filter in event list
2018-10-10 16:57:04 +02:00
441458843f
[Tags performance] Fixed check acl tags by module and removed unused code
2018-10-08 17:19:46 +02:00
e8621e54e5
Updated tags optimization
2018-10-05 09:40:08 +02:00
453fb3f67b
TODO List
2018-09-27 13:30:32 +02:00
c77bc2328f
Fixed bug in events replication
2018-09-25 12:04:18 +02:00
9a56754384
Revert "Fixed bug in events replication"
...
This reverts commit e59c40d687
2018-09-25 11:59:37 +02:00
e59c40d687
Fixed bug in events replication
2018-09-24 14:01:17 +02:00
481582f628
Changed event type 'Going down to critical' to 'Going up to critical'
2018-09-06 16:42:52 +02:00
5b30aa5560
Added source, comment and id_extra in event filter
2018-08-31 16:25:12 +02:00
6372f44212
Added some docs
2018-08-14 17:08:00 +02:00
05a0eb0db6
Fixed events secondary groups filter in metaconsole
2018-08-14 17:06:15 +02:00
d3c3304976
Fixed pagination and added filter to All events
2018-08-14 10:40:56 +02:00
62617e609c
[Secondary groups] Fixed group agents and group events in events filter
2018-08-08 13:17:03 +02:00
097661d82b
implemented sort filter to event view custom fields
2018-08-03 10:38:53 +02:00
01656f2e76
conflict resolution on branch 2389-Ordenar-eventos-por-campo
2018-08-02 10:27:31 +02:00
4b23824eb4
fix bug in metaconsole view events
2018-07-26 15:41:52 +02:00
b922066a72
Add items to the view events
2018-07-19 18:04:50 +02:00
6ec4787c38
added order filters to events table
2018-07-10 15:11:18 +02:00
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
f6184b52da
Merge branch 'develop' into ent-639-add-user-defined-timezones
2018-06-11 17:42:02 +02:00
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
0d6115726a
[Rebranding] Open include root files (except networkmaps related sources)
2018-05-11 12:49:16 +02:00
0b1546be22
Fixed a date
2018-04-30 15:35:41 +02:00
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
c88e6e703a
[Secondary groups] Fixed duplicated agents in group view and agent detail
2018-04-04 11:17:08 +02:00
4d78b28d17
[Secondary Groups] Fixed grouped agents events in node
2018-03-27 17:53:11 +02:00
c96b883614
[Secondary groups] Fixed agent view to include secondary agents
2018-03-26 12:52:37 +02:00
078b370cbd
Hide passwords fields data in treeview and events - #2030
2018-03-22 13:10:25 +01:00
407fbf450f
Fixed permission checks in event_acl
...
Added event response macro _group_custom_id_
2018-02-16 15:09:37 +01:00
5c0f0de1e4
Add module critical instructions when create an event - #1862
2018-02-06 16:01:32 +01:00
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
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
e0b90f2be0
optimization view events
2017-11-30 14:00:08 +01:00
a3e47fb977
Fixed reporting_event_report_module in metaconsole
2017-11-28 15:56:46 +01:00
2ef9d884ee
Added spanish event responses new macros documentation
2017-11-20 11:14:26 +01:00
492b55a713
Added custom_data to events responeses macros
2017-11-17 15:17:08 +01:00
7fb8406bc0
Added several macros to events responses
2017-11-17 14:50:23 +01:00
3493b9c15c
Revert "code backup"
...
This reverts commit b9851a3a71
2017-11-13 10:21:38 +01:00
b9851a3a71
code backup
2017-10-31 11:51:19 +01:00
718a2dbaff
Fixed in visual map
2017-10-30 17:57:47 +01:00
7a061edb66
group by id_agent in group events
2017-09-28 16:46:40 +02:00
89fc3c457a
Fixed no os_version on event agent view
2017-09-11 17:54:28 +02:00
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
418906add5
Fix bad ordination in mobile pandora events list - #1169
2017-08-22 17:24:26 +02:00
031a70cc51
Add instructions,user and force_create_agent parameters to CLI event_creator - #309
2017-08-22 10:43:22 +02:00
06eadbaf81
Fixed urlencode in event popup
2017-07-19 10:52:01 +02:00
9348562ee4
Added good match to tags list
2017-06-28 16:20:57 +02:00
d3a0c4b52b
fixed errors in pandora revent
2017-06-21 14:34:06 +02:00
131753cfba
Inprove event title format and alias rather name - #523
2017-06-12 14:34:03 +02:00
df715561d7
Format module inventary to show only changes on events - #523
2017-05-24 18:24:53 +02:00
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
8f8a17bf24
fixed alias for name in reports
2017-02-27 16:48:28 +01:00
3d521ec290
Changed the agent name by its alias in some sections
2017-02-22 12:51:55 +01:00
550a00cec7
Changed the agent name by its alias
2017-02-20 15:32:49 +01:00
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
5dad591b02
fixed errors in reports evnts
2017-02-02 10:13:58 +01:00
8006c1fc0b
fixed pdf reports events
2017-01-18 10:37:08 +01:00
99aa41b32a
fixed reports events
2017-01-13 14:09:56 +01:00
Alejandro Fraguas
Daniel Rodriguez
Tatiana Llorente
manuel
marcos.alconada
Daniel Maya
daniel
Alejandro Gallardo Escobar
fbsanchez
artica
samucarc
vgilc
fermin831
alejandro-campos
manuel.montes
Fermin
enriquecd
Arturo Gonzalez
m-lopez-f
Alejandro Gallardo Escobar