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
Calvo
3204fdb71f
Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales
2021-09-01 11:06:20 +02: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
fe30b9c785
Merge branch 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' into 'develop'
...
implemented capacity to handle string data for event data
See merge request artica/pandorafms!4184
2021-08-17 12:19:54 +00:00
Calvo
34c3b00426
WIP: Revision ACL part 3
2021-08-13 15:57:01 +02:00
Daniel Rodriguez
77d00fd9e2
Merge branch 'ent-7647-vulnerabilidad-xss-en.nombre.filtro-eventos' into 'develop'
...
Fixedd XSS on load filter event name
See merge request artica/pandorafms!4174
2021-08-09 09:00:15 +00:00
Alejandro Campos
ff93169049
Merge branch 'develop' into 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired'
...
# Conflicts:
# pandora_console/extras/mr/48.sql
2021-08-09 06:45:46 +00:00
fbsanchez
3d5ae6887c
Event migration warnings popups
2021-07-07 16:11:20 +02:00
Daniel Maya
66e9539818
Added agent ip in custom events
2021-07-07 16:07:08 +02:00
José González
47b6e40799
Added controls for filter with hours
2021-07-05 17:42:45 +02:00
alejandro.campos@artica.es
240efc4dcf
truncate string
2021-06-08 16:48:01 +02:00
alejandro.campos@artica.es
fdc6d2f4c8
implemented capacity to handle string data for event data
2021-06-08 16:09:37 +02:00
Calvo
2f3cae8d61
Fixedd XSS on load filter event name
2021-06-04 13:36:32 +02:00
Daniel Barbero Martin
d88520f752
Wip command center
2021-05-28 14:32:41 +02:00
Daniel Barbero Martin
6b248da428
Wip command center
2021-05-25 17:39:21 +02:00
Daniel Barbero Martin
0b36853553
Wip command center
2021-05-24 17:35:15 +02:00
Daniel Maya
8ef21d9b15
Ent 7395 filtro de eventos en metaconsola server
2021-04-28 10:50:04 +00:00
Daniel Rodriguez
5857c0d231
Merge branch 'ent-7393-Filtro-de-eventos-en-Metaconsola-Severity' into 'develop'
...
Ent 7393 filtro de eventos en metaconsola severity
See merge request artica/pandorafms!4070
2021-04-28 06:51:25 +00:00
Daniel Maya
dd124fa7d9
Fixed severity
2021-04-26 14:09:07 +02:00
alejandro.campos@artica.es
8f58b74976
fixed filter load in events view
2021-04-21 13:05:18 +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
b89a860ba7
Merge branch 'ent-6969-bug-refresco-eventos' into 'develop'
...
Fixed mixed response from event datatables
See merge request artica/pandorafms!3952
2021-04-07 10:55:25 +00:00
Daniel Rodriguez
e54e06b6ac
Merge branch 'ent-7030-Alertas-sonoras-VS-eventos-API' into 'develop'
...
fixed errors sound events
See merge request artica/pandorafms!3916
2021-04-06 17:11:37 +00:00
daniel
89ffb05466
fixed errors sound events
2021-04-06 17:11:37 +00:00
Marcos Alconada
9e1bacb66e
fixed visual error
2021-03-29 07:23:03 +00:00
Marcos Alconada
9dd17acb57
fixed visual error
2021-03-26 13:40:55 +00:00
Calvo
d9d98fe1e3
Fixed mixed response from event datatables
2021-03-25 13:20:30 +01:00
Daniel Rodriguez
f92c75639a
Merge branch 'ent-7089-11446-trazas-en-el-codigo-de-release' into 'develop'
...
Removed extra verbosity
See merge request artica/pandorafms!3899
2021-03-23 09:29:05 +00:00
Marcos Alconada
04bae1b4fb
fixed visual errors
2021-03-18 17:05:50 +00:00
fbsanchez
b63f1ad681
Removed extra verbosity
2021-03-15 10:07:36 +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
06a027127f
Merge branch 'ent-6851-Quitar-marquesina-de-vista-de-eventos' into 'develop'
...
Ent 6851 quitar marquesina de vista de eventos
See merge request artica/pandorafms!3752
2021-03-09 16:39:26 +00:00
Daniel Maya
b54845fdcf
Ent 6851 quitar marquesina de vista de eventos
2021-03-09 16:39:26 +00:00
Daniel Rodriguez
825c1f05f0
Merge branch 'ent-6527-mal-link-elementos-servicio' into 'develop'
...
Added control for id_agent_module
Closes pandora_enterprise#6527
See merge request artica/pandorafms!3703
2021-03-09 16:38:32 +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
fbsanchez
40e97f6cf6
Removed warnings
2021-02-09 10:25:08 +01:00
Jose Gonzalez
aee474e43c
Fixed issue with date
2021-02-04 14:54:11 +01:00
Luis Calvo
778419e71d
Merge remote-tracking branch 'origin/develop' into ent-6844-quitar-vista-estadisticas-eventos
2021-01-25 13:06:36 +01:00
Luis Calvo
210f2057cd
Removes event_statistics view
2020-12-21 17:56:24 +01:00
José González
623b729001
Merge branch 'develop' into 'ent-1175-copyright-actualizados'
...
# Conflicts:
# pandora_agents/pc/Win32/pandora_agent.conf
# pandora_agents/win32/bin/pandora_agent.conf
# pandora_console/extensions/realtime_graphs.php
# pandora_console/godmode/snmpconsole/snmp_alert.php
# pandora_console/include/functions_ui.php
# pandora_console/install.php
# pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
Jose Gonzalez
fd6aef1b37
Added control for id_agent_module
2020-12-09 18:15:01 +01:00
Luis
50b1fa3c56
Changed check connection method to ajax. Check deleted from login
2020-12-03 12:27:55 +01:00
Jose Gonzalez
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
Luis
2f2556ef79
Ent 6680 ventana de perdida de conexion incorrecta
2020-11-04 16:41:25 +01:00
Daniel Rodriguez
946c548244
Merge branch 'ent-6626filtros-de-eventos-personalizados-no-guardia-varios-apartados' into 'develop'
...
Primeras modificaciones del filtro de eventos
See merge request artica/pandorafms!3585
2020-10-30 14:42:41 +01:00
daniel
b3043c2e01
Fixed template events
2020-10-30 13:29:50 +01:00
Daniel Rodriguez
9a5291da5a
Merge branch 'ent-6578-Bugs-eventos-sonoros-3' into 'develop'
...
fixed sound events
See merge request artica/pandorafms!3566
2020-10-30 12:16:54 +01:00
Daniel Rodriguez
12b36e7f5a
Merge branch 'ent-6554-status-vacio-al-exportar-eventos-a-csv' into 'develop'
...
fixed error with value status field
See merge request artica/pandorafms!3548
2020-10-29 15:15:52 +01:00
marcos
765d37d4e9
formato funcion
2020-10-29 15:06:01 +01:00
Daniel Maya
43ca5e4972
Ent 6482 fallo en la agrupación de eventos
2020-10-29 12:53:09 +01:00
marcos
cf108c0a17
se cambia el valor del modulo y marca en el filtro usado
2020-10-29 12:30:54 +01:00
marcos
edc9038783
Primeras modificaciones del filtro de eventos
2020-10-29 10:24:37 +01:00
alejandro-campos
4ff0923589
fixed sound events
2020-10-23 13:53:38 +02:00
marcos
8b6b573bde
fixed error with value status field
2020-10-21 16:18:07 +02:00
fbsanchez
42cca865ac
groups_get_children and propagate update
2020-10-21 11:38:57 +02:00
fbsanchez
2187f9d0c9
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
2020-10-02 14:56:07 +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
5d63bc547e
Group selection review
2020-09-29 14:22:58 +02:00
fbsanchez
5f4893ef1a
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
2020-09-29 12:47:11 +02:00
fbsanchez
724de97818
removed extra content
2020-09-18 11:53:16 +02:00
fbsanchez
696b58544c
fixes
2020-09-18 11:47:50 +02:00
fbsanchez
bc166dfba2
module custom id in event list + minor fixes
2020-09-17 16:51:23 +02:00
Daniel Rodriguez
aceedbe795
Merge branch 'ent-6250-Errores-log-consola' into 'develop'
...
Ent 6250 errores log consola
Closes pandora_enterprise#6250
See merge request artica/pandorafms!3436
2020-09-15 15:30:07 +02:00
fbsanchez
c2238ac295
minor changes
2020-09-11 15:30:18 +02:00
fbsanchez
09a5bad4f1
Fixes in visualization (groups selection)
2020-09-11 15:17:08 +02:00
fbsanchez
3374a89ae0
Group selection improvement
2020-09-11 14:34:41 +02:00
Jose Gonzalez
18a993145e
Fixed type array warning messages
2020-09-07 14:38:43 +02:00
marcos
6f02ee8206
fixed error with refresh in events filter
2020-09-04 12:38:46 +02:00
alejandro-campos
6b989109d8
fix event pagination when events history is activated
2020-08-13 10:34:31 +02:00
Luis Calvo
9a8c42f4ac
Fixed xss event comments vulnerabiluty and some acls on event ajax
2020-06-26 15:36:51 +02:00
alejandro-campos
1d167d4aba
fixed agent id strange behavior in events table
2020-05-25 11:12:29 +02:00
Daniel Maya
8ae8ac45f5
Ent 5690 vulnerabilidad critica inyeccion de comandos en llamada a event response
2020-04-15 15:50:08 +02:00
fbsanchez
e48ef76f35
merge
2020-03-26 14:38:23 +01:00
Tatiana Llorente
4777ecd4bf
Ent 5439 error grafica eventos de agente
2020-03-24 10:12:14 +01:00
fbsanchez
ce11d89953
Frontent changes
2020-03-13 14:03:50 +01:00
Tatiana Llorente
7c928b8100
Ent 4795 check seleccionar todos queda marcado
2020-01-14 08:37:04 +01:00
Daniel Maya
7204e7c0f2
Ent 4862 mas opciones en los filtros de severidad
2020-01-13 18:24:29 +01:00
Tatiana Llorente
1747806256
Ent 3136 no se ven los eventos en el mapa de servicios cuando haces click en los elementos de un servicio creado en la meta
2020-01-13 18:19:50 +01:00
Tatiana Llorente
9d3426c0e9
Ent 4897 filtro erroneo de eventos al clickar en grafica events 24h de agente 2
2019-12-10 15:29:35 +01:00
marcos
21bf49c218
update id_source_event
2019-11-22 13:38:08 +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 Rodriguez
137571f2d1
Merge branch 'ent-4856-8969-Filtro-user-ack-evento-no-funciona-del-todo-bien' into 'develop'
...
user ack filter in event list not displaying users with all group
See merge request artica/pandorafms!2860
2019-11-06 14:45:09 +01:00
Daniel Rodriguez
d460429509
Merge branch 'ent-4898-No-funciona-filtro-de-eventos-cuando-el-idioma-del-usuario-está-en-catalán' into 'develop'
...
Fixed agent name and error lenght
See merge request artica/pandorafms!2845
2019-11-06 13:14:06 +01:00
alejandro-campos
e9b516c399
change access permission to users in user ack filter in event list
2019-11-06 12:56:42 +01:00
Daniel Rodriguez
0e628a365d
Merge branch 'ent-4625-Cambiar-titulo-a-archivo-CSV-de-la-vista-de-eventos' into 'develop'
...
Ent 4625 cambiar titulo a archivo csv de la vista de eventos
See merge request artica/pandorafms!2783
2019-11-05 16:57:23 +01:00
alejandro-campos
9fc635a7a9
user ack filter in event list not displaying users with all group
2019-11-05 11:03:28 +01:00
Daniel Maya
8573add0b3
Fixed agent name and error lenght
2019-10-30 13:01:59 +01:00
Tatiana Llorente
5264de2008
Merge branch 'develop' into 'ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos'
...
Conflicts:
pandora_console/operation/events/events.php
2019-10-17 09:27:00 +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
d2dc6ba9c1
Merge remote-tracking branch 'origin/develop' into ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos
...
Conflicts:
pandora_console/operation/events/events.php
2019-10-08 09:14:08 +02:00
Tatiana Llorente
8a85edac93
Merge remote-tracking branch 'origin/develop' into ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos
2019-10-08 08:59:39 +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
Tatiana Llorente
305d74878c
Changed title of csv in events - #4625
2019-10-04 11:51:30 +02:00
marcos.alconada
a44e1feeb4
fixed error comments events
2019-10-01 16:24:02 +02:00
Jose Gonzalez
f55b2ce80f
Improved truncate system and solved issue
2019-10-01 11:22:25 +02:00
Tatiana Llorente
9875b7c701
Added link to go to agent view (node) from metaconsole in events view - #4720
2019-09-30 13:31:15 +02:00
Kike
4ae14e0888
Fixed issue with instructions in events view
2019-09-24 15:14:17 +02:00
Luis Calvo
0c60f13ccd
Event column instructions maked unsortabe
2019-09-17 19:54:34 +02:00
Daniel Rodriguez
c0a0364164
Merge branch 'ent-4608-Bug-en-el-visor-de-eventos-cuando-el-lenguaje-esta-en-español' into 'develop'
...
fix bug in events advanced filter: default option other than All
See merge request artica/pandorafms!2706
2019-09-05 11:39:45 +02:00
alejandro-campos
42fad5acb1
fix bug in events advanced filter: default option other than All
2019-09-05 10:37:12 +02:00
Daniel Rodriguez
258a2f41ce
Merge branch 'ent-4363-Marquesinas-ilegibles-desde-Firefox' into 'develop'
...
Reduced the speed of events marquee - #4363
See merge request artica/pandorafms!2653
2019-08-30 14:19:47 +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
d42bcd17c2
Merge branch 'ent-4366-fallos-visuales-en-el-log-de-pandora' into 'develop'
...
fixed visual error
See merge request artica/pandorafms!2666
2019-08-21 12:17:53 +02:00
Tatiana Llorente
d85e4caa99
Fixed bug in autorefresh in events view with fullscreen - #4522
2019-08-19 11:36:13 +02:00
Tatiana Llorente
7eeafaf351
Fixed bug in autorefresh in events view with fullscreen - #4522
2019-08-19 11:32:40 +02:00
marcos.alconada
0414b4033e
fixed visual error
2019-08-19 10:05:06 +02:00
Tatiana Llorente
2bc57b9561
Reduced the speed of events marquee - #4363
2019-08-09 12:50:07 +02:00
Daniel Rodriguez
a1bac9d851
Merge branch '4439-bugs-vista-eventos' into 'develop'
...
Added text control to avoid show more of 255 chars in his field
See merge request artica/pandorafms!2619
2019-08-09 09:01:18 +02:00
Jose Gonzalez
191db192c9
Solved issue with metaconsole
2019-08-07 14:14:14 +02:00
Jose Gonzalez
6ca2caa511
Added hint and solved other issues when events has a lot of characters
2019-08-06 11:06:11 +02:00
alejandro-campos
225491feb1
fix minor visual bug in event list
2019-08-05 16:23:37 +02:00
alejandro-campos
41029196d8
fix minor visual bug in events table
2019-08-02 10:04:10 +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
243c298ff8
Added text control to avoid show more of 255 chars in his field
2019-07-29 08:59:56 +02:00
Daniel Rodriguez
bfb4cb19a0
Merge branch 'ent-4330-Bug-con-autorefresh-en-eventos' into 'develop'
...
Added feature to autorefresh in events view with datatables - #4330
See merge request artica/pandorafms!2605
2019-07-18 12:22:44 +02:00
Daniel Barbero Martin
397ee95849
fixed minor error sound events
2019-07-16 10:16:25 +02:00
Tatiana Llorente
7d119bfe5a
Added feature to autorefresh in events view with datatables - #4330
2019-07-15 17:41:20 +02:00
Daniel Barbero Martin
45e1c32473
fixed events sound
2019-07-15 15:31:01 +02:00
fbsanchez
85e40b30dc
Fix: user filter load tags
2019-07-09 17:54:23 +02:00
fbsanchez
674c68bd2b
avoided issue latin1 btoa javascript event transfer
2019-06-25 12:49:17 +02:00
fbsanchez
c1ac6b7ed6
mini_severity virtual column added
2019-06-24 19:23:41 +02:00
marcos.alconada
effbf5094f
Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este
2019-06-21 11:34:49 +02:00
marcos.alconada
3fd12975aa
added 2 lines
2019-06-21 11:34:36 +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
marcos.alconada
a0c6dc69aa
add element id_source_event to filters events
2019-06-21 11:22:06 +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
2c5cd007d2
reset form on load filter none
2019-06-20 14:18:49 +02:00
fbsanchez
aa238165d9
events rss
2019-06-20 13:33:37 +02:00
fbsanchez
cfe16ee8c3
minor fixes
2019-06-20 11:46:01 +02:00
fbsanchez
275261e6b3
wip csv export events
2019-06-19 17:30:32 +02:00
fbsanchez
44d8b977cb
event advanced filter fixes
2019-06-19 16:52:14 +02:00
fbsanchez
524575171a
event history viewer
2019-06-19 12:56:16 +02:00
fbsanchez
a7f9484adb
minor style change
2019-06-19 08:43:37 +02:00
fbsanchez
37e98d108b
fit mc
2019-06-18 19:17:21 +02:00
fbsanchez
8b8d17f089
event ajax validation little improvement
2019-06-18 18:35:34 +02:00
fbsanchez
c3ebe88178
style review
2019-06-18 17:40:31 +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
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
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
9740275388
dyn redraw
2019-06-13 13:07:11 +02:00
fbsanchez
d12773cfd0
Avoid double validation, avoid redraw
2019-06-13 12:36:31 +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
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
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
2f5265fcbb
color updates
2019-06-04 14:08:07 +02:00
fbsanchez
c741020538
styles review
2019-06-04 13:57:55 +02:00
fbsanchez
974db824a8
style review
2019-06-03 19:13:29 +02:00
marcos.alconada
36afbea8b7
Add new search for id source event in metaconsole
2019-05-22 11:53:57 +02:00
marcos.alconada
0b118f63ad
Merge remote-tracking branch 'origin/develop' into ent-3758-7777-bug-validacion-eventos-en-consola
2019-05-08 15:19:40 +02:00
Daniel Rodriguez
0c8fab6cb3
Merge branch 'ent-3574-7598-bug-botones-y-casillas-vista-de-eventos' into 'develop'
...
Ent 3574 7598 bug botones y casillas vista de eventos
See merge request artica/pandorafms!2222
2019-05-08 13:52:45 +02:00
alejandro-campos
a622dcc9d4
add condition to avoid trying to retrieve a non existing event filter when synchronizing meta and node
...
Former-commit-id: 83a1f9ad1c99de0e29a880de4ed6c518884bda31
2019-05-06 15:06:26 +02:00
alejandro-campos
bcbcd763a1
fixed double load of events in event list
...
Former-commit-id: ea1294c680b5dbe3b069110012e2b54db5312fd1
2019-04-29 15:04:14 +02:00
marcos.alconada
fb87b97cd4
Merge remote-tracking branch 'origin/develop' into ent-3750-carrefour-api-crear-modificar-y-eliminar-perfiles-de-usuarios-metaconsola
...
Former-commit-id: 628100b56c9528995e0f95ef8918dedaba16c8dd
2019-04-17 15:12:56 +02:00
marcos.alconada
ddfd3339ff
add api
...
Former-commit-id: 7704a1226754067aee849526329eebce372063a1
2019-04-12 11:39:34 +02:00
Tatiana Llorente
845cb85c55
New design for tables - #3707
...
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
2019-03-27 17:03:55 +01:00
marcos.alconada
94768935ee
Pending to review
...
Former-commit-id: c874be78a33585942c825f23b48010b2d604cd7c
2019-03-26 15:42:56 +01:00
Daniel Barbero Martin
4ea17bb0c6
fixed reload page twice
...
Former-commit-id: 5944f47d1e0d2e5997deb6afcab6744a514216f7
2019-03-25 12:53:50 +01:00
Alejandro Fraguas
5411eb9d17
Merge branch 'ent-3735-Buguete-filtrado-de-eventos-por-grupo' into 'develop'
...
fix bug in event filter by group when not using secondary groups
See merge request artica/pandorafms!2276
Former-commit-id: e414c5033fbcde1d97a28190170454080531ef34
2019-03-25 10:22:45 +01:00
alejandro-campos
c19ec2b041
fix bug when filtering events by group
...
Former-commit-id: f5ee52f47cd615007f22ce54e67c1c345eed802b
2019-03-22 10:47:40 +01:00
alejandro-campos
b5e1487736
add strict comparator
...
Former-commit-id: 0561976f26d6bc59f3076f48a5a4261dafaad28b
2019-03-20 15:26:42 +01:00
alejandro-campos
36119ebb85
fix bug in event filter by group when not using secondary groups
...
Former-commit-id: fe9c88e8e2d7552fed7e5c7cd5a5694d47ee444f
2019-03-20 14:48:02 +01:00
samucarc
5b3dd6121b
Fixed error in event filters when is only new events
...
Former-commit-id: a1e0529b58e4a1c62c8c35cba7b133c218f59a93
2019-03-11 17:14:26 +01:00
daniel
798567bf8e
fixed minor errors change word command for parameters
...
Former-commit-id: 6e6e56bded99331c606f7a9f6179826afee22d16
2019-03-07 09:05:38 +01:00
marcos.alconada
f0fa992912
Ticket Resolved
...
Former-commit-id: 023a3b09aff3255b4ea6744ab12ddc2d2a5f540d
2019-02-28 10:08:33 +01:00
marcos.alconada
c7cd59ffb5
Ticket resolved
...
Former-commit-id: c7b3a4c44941a8e2ea91faf811730bbec4d7f877
2019-02-27 18:25:37 +01:00
daniel
8780571a74
add new functionality in event response
...
Former-commit-id: 2cf28b95c068c40e79b8f05b212aad0f720de79b
2019-02-27 10:59:44 +01:00
Alejandro Fraguas
a9eb3cf37b
Merge branch 'ent-3458-Metaconsola_filtro_eventos_por_nombre_agente_no_machea_nombres_con_espacios' into 'develop'
...
Fixed filter by name of agents in events when they contain spaces
See merge request artica/pandorafms!2160
Former-commit-id: 725ca1b5279d8074454ae8ed4b3af27f084e9594
2019-02-21 17:07:36 +01:00
daniel
d116e4742a
add new tocken max events responses
...
Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4
2019-02-19 12:14:42 +01:00
Daniel Maya
ba7540c9ee
improvement of optimization for list event
...
Former-commit-id: a7788b01160c661139e6a3a6aac70c69441265a1
2019-02-08 09:51:08 +01:00
Daniel Maya
c2a44e073f
Update events.build_query.php
...
Former-commit-id: 4622b27b1ce9e81ce81d89d7bc9d2eeb1b30fb93
2019-02-07 18:03:28 +01:00
Samuel Carcases
23a8d0640f
Update events.build_query.php
...
Former-commit-id: 189244aa57d58eb33dd43f707eb6ac929f58e537
2019-02-07 17:05:05 +01:00
samucarc
92af9f84bc
Fixed conflict
...
Former-commit-id: c0e0826c5a70772c049d9e0ce168f3d0b35118c0
2019-02-07 17:00:52 +01:00
Tatiana Llorente
9baa3dcfa2
Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
...
Conflicts:
pandora_console/extensions/agents_modules.php
pandora_console/extensions/module_groups.php
pandora_console/general/login_page.php
pandora_console/godmode/alerts/alert_list.builder.php
pandora_console/godmode/alerts/alert_list.list.php
pandora_console/godmode/gis_maps/configure_gis_map.php
pandora_console/godmode/groups/group_list.php
pandora_console/godmode/reporting/visual_console_builder.data.php
pandora_console/godmode/reporting/visual_console_builder.editor.php
pandora_console/godmode/reporting/visual_console_builder.elements.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/chart_generator.php
pandora_console/include/functions_networkmap.php
pandora_console/include/functions_pandora_networkmap.php
pandora_console/include/functions_ui.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/include/styles/common.css
pandora_console/include/styles/countdown.css
pandora_console/include/styles/datepicker.css
pandora_console/include/styles/dialog.css
pandora_console/include/styles/help.css
pandora_console/include/styles/menu.css
pandora_console/include/styles/pandora.css
pandora_console/include/styles/pandora_forms.css
pandora_console/operation/agentes/estado_monitores.php
pandora_console/operation/agentes/interface_traffic_graph_win.php
pandora_console/operation/agentes/realtime_win.php
pandora_console/operation/agentes/stat_win.php
pandora_console/operation/events/events.php
pandora_console/operation/snmpconsole/snmp_view.php
pandora_console/operation/tree.php
pandora_console/operation/visual_console/render_view.php
Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
samucarc
c5805e439e
Fixed filter by name of agents in events when they contain spaces
...
Former-commit-id: 93557e0ef296d1683acd86cb70ce2da6677e3e6c
2019-02-01 12:38:31 +01:00
Alejandro Gallardo Escobar
d38236091b
Format fixes
...
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
2019-02-01 09:55:29 +01:00
artica
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
tatiana.llorente@artica.es
f5c96b7e5d
New organization of CSS files - #3358
...
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
alejandro-campos
9048a13840
fix bug: in progress events deleting on event view massive deletion
...
Former-commit-id: 4c4f0a387ad3abd7cfea913b45c885ab3af4ecc6
2019-01-15 13:27:14 +01:00
alejandro-campos
5235b62c0d
fix disable actions in event list when centralized mode is enabled
...
Former-commit-id: d5f16b4453b1e291ba051cd381fc6c09ce0bd027
2019-01-15 11:29:12 +01:00
alejandro-campos
1ed90180c9
disable actions in event list when centralized mode is enabled and improve behavior of checkboxes when a massive action is applied
...
Former-commit-id: 11f4606d2e7dd9b91c918323dc8a3dada0c8f765
2019-01-15 11:27:05 +01:00
alejandro-campos
efa2e5332f
fix massive custom event responses
...
Former-commit-id: 24db40167b05bfd7fe4de88060f03a7a0ec38e73
2019-01-14 13:40:49 +01:00
alejandro-campos
5a8e46d608
modify the way event responses are executed in event list
...
Former-commit-id: 14ef545eef10427d95f96484e8d6b8d9656bd53c
2019-01-14 12:10:43 +01:00
vgilc
14d683b003
Merge branch '2917-Error-al-cambiar-de-página-en-eventos-agrupados-por-agente' into 'develop'
...
Changed url - #2917
See merge request artica/pandorafms!1869
2018-11-30 13:08:53 +01:00
alejandro-campos
8371e75757
modified event list visualization
2018-11-26 16:40:20 +01:00
daniel
494b858a20
fixed errors session_start
2018-11-21 13:08:58 +01:00
vgilc
9b4eeb5c84
Merge branch '2723-Fallo-hint-en-eventos' into 'develop'
...
new function that adds a border to the image if the status is warning - #2723
See merge request artica/pandorafms!1743
2018-10-25 12:07:58 +02:00
tatiana.llorente@artica.es
f96c626823
Changed url - #2917
2018-10-18 16:34:03 +02:00
fermin831
2693bbe209
Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev
...
Conflicts:
pandora_console/godmode/massive/massive_delete_modules.php
pandora_console/operation/agentes/ver_agente.php
2018-10-10 19:39:27 +02:00
danielmaya
4558c909ef
Changed source filter in event list
2018-10-10 16:57:04 +02:00
tatiana.llorente@artica.es
eeba7b9350
Added two missing parameters in the url - #2884
2018-10-09 09:58:28 +02:00
danielmaya
e8621e54e5
Updated tags optimization
2018-10-05 09:40:08 +02:00
samucarc
3c54710d1b
Fixed conflicts
2018-10-03 13:09:39 +02:00
danielmaya
453fb3f67b
TODO List
2018-09-27 13:30:32 +02:00
tatiana.llorente@artica.es
d36c10fa08
new function that adds a border to the image if the status is warning - #2723
2018-09-10 13:22:02 +02:00
danielmaya
5b30aa5560
Added source, comment and id_extra in event filter
2018-08-31 16:25:12 +02:00
vgilc
a4d1cfc9e6
Merge branch '2641-no-se-filtran-eventos-por-grupo-secundario-en-meta' into 'develop'
...
2641 no se filtran eventos por grupo secundario en meta
See merge request artica/pandorafms!1688
2018-08-16 11:03:02 +02:00
vgilc
dc8020dbdc
Merge branch 'ent-2626-pantalla-de-edicion-de-modulos-en-grupos-secundarios' into 'develop'
...
[Secondary groups] Fixed modules permissions in some views
See merge request artica/pandorafms!1669
2018-08-16 09:46:28 +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
fermin831
4315cef4c9
[Secondary groups] Fixed modules permissions in some views
2018-08-08 11:49:54 +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
a476d008ac
fix bug in metaconsole view events
2018-07-26 15:30:49 +02:00
samucarc
202f72d1c3
Fixed fields list in manage events-custom fields
2018-07-25 17:23:13 +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
fermin831
288d2bafb6
Added in progres selected button to events view
2018-06-20 18:56:44 +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
fermin831
6bd672fd38
Fixed free search in events view
2018-05-31 20:32:04 +02:00
fermin831
88e060893a
Merge branch 'develop' into 2106-intracom-rebranding
...
Conflicts resolved:
pandora_console/operation/events/events_rss.php
2018-05-28 12:12:16 +02:00
fermin831
750ed29ac9
[Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable
2018-05-24 16:59:50 +02:00
fermin831
ed18d58676
[Rebranding] Open operation/*
2018-05-14 15:52:51 +02:00
fermin831
fe124bff5f
Fixed rss events due to secondary groups
2018-05-14 14:41:11 +02:00
vgilc
d746af9c28
Merge branch 'ent-1888-anadir-nueva-feature-para-poder-cambiar-los-eventos-a-estado-en-proceso' into 'develop'
...
Ent 1888 anadir nueva feature para poder cambiar los eventos a estado en proceso
See merge request artica/pandorafms!1442
2018-05-09 10:24:19 +02:00
vgilc
96df6938fa
Merge branch 'ent-1917-tmb-personalizacion-exportacion-csv-de-eventos' into 'develop'
...
Ent 1917 tmb personalizacion exportacion csv de eventos
See merge request artica/pandorafms!1438
2018-05-09 10:23:38 +02:00
fermin831
7162241ef9
Change the extension of CSV events file to .csv
2018-04-30 15:55:15 +02:00
fermin831
57c928ec8a
[Events] Fixed csv export after secondary groups
2018-04-30 12:38:29 +02:00
fermin831
9c9f75152d
Added custom confirm dialog to events
2018-04-25 12:34:33 +02:00
fermin831
112bbac527
Added id to in progress status bin icon (disabled)
2018-04-24 12:11:04 +02:00
fermin831
e09e1c4cd4
Fixed in progress event button in metaconsole and other problems
2018-04-24 11:54:45 +02:00
fermin831
a21eaafc61
Added in progress button to events list
2018-04-23 18:41:44 +02:00
fermin831
32f96c45ba
[Events] Added ID to export CSV
2018-04-18 19:50:13 +02:00
fermin831
0b23f25455
[Events] Fixed csv export after secondary groups
2018-04-18 19:47:20 +02:00
danielmaya
70bf27f48a
Added checking user tags in event list
2018-04-17 10:10:18 +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
f6e03c0faa
[Secondary groups] Added secondary groups in some events queries
2018-04-09 17:01:39 +02:00
fermin831
c88e6e703a
[Secondary groups] Fixed duplicated agents in group view and agent detail
2018-04-04 11:17:08 +02:00
fermin831
2839388e9e
[Secondary Groups] More events fixes
2018-03-27 18:07:43 +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
danielmaya
0fc33f3fa2
Fixed module filter in view events
2018-02-23 14:38:26 +01:00
fbsanchez
1a986fccf6
Fixed SQL error on unscaped parameter
2018-02-13 17:34:09 +01:00
vgilc
3cad7be4a5
Merge branch '1749-sistena-cache-de-acl-s-de-la-consola' into 'develop'
...
Modified users_get_groups
See merge request artica/pandorafms!1244
2018-01-31 15:15:50 +01:00
daniel
f3239b46a3
add propagate groups in list events
2018-01-31 12:39:25 +01:00