tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,370 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

3760 Commits

Author SHA1 Message Date
Tatiana Llorente e94d8726c7 Changed date in webchat 2019-11-04 13:59:30 +01:00
Daniel Maya 8573add0b3 Fixed agent name and error lenght 2019-10-30 13:01:59 +01:00
alejandro-campos 14230d218a fix bug in snmp console filter 2019-10-29 16:14:33 +01:00
fbsanchez ccf971c2eb Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 2019-10-28 12:18:19 +01:00
Daniel Rodriguez 0cf3e01f74 Merge branch 'ent-1880-Umbrales-inversos-en-negativo' into 'develop' 
Ent 1880 umbrales inversos en negativo

See merge request artica/pandorafms!2818
 2019-10-22 12:56:21 +02:00
Daniel Rodriguez 13898da4c1 Merge branch 'ent-4733-no-funciona-buscador-general-de-politicas' into 'develop' 
fixed minor error

See merge request artica/pandorafms!2777
 2019-10-18 11:42:30 +02:00
Tatiana Llorente adf3b08537 Add text (inv) in the help of the thresholds for inverse intervals - #1880 2019-10-17 11:50:50 +02: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
Daniel Rodriguez b6db2aa041 Merge branch 'ent-4684-migracion-de-mapas-open-y-enterprise-de-v6-a-v7' into 'develop' 
Fixed open and enterprise network map migration

See merge request artica/pandorafms!2745
 2019-10-16 19:03:24 +02:00
Alejandro Fraguas ca5a31db6a Merge branch 'ent-3830-autorrefresh-en-mapas-gis' into 'develop' 
add gis maps to autorefresh list

See merge request artica/pandorafms!2731
 2019-10-15 13:21:19 +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
Alejandro Fraguas 8407d7fe9a Merge branch 'ent-3913-gis-data-refresh-bug' into 'develop' 
Added current gis location to agent gis view list

See merge request artica/pandorafms!2772
 2019-10-14 15:57:27 +02:00
Daniel Barbero 8af72c1c9d add Remote CMD 2019-10-09 17:26:06 +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 d198cc3297 Merge branch 'ent-4567-Habilitar-borrado-masivo-de-traps-con-permisos-AW' into 'develop' 
Changed permissions to delete traps to IM - #4567

See merge request artica/pandorafms!2690
 2019-10-07 17:08:32 +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
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 6f14aa3d2a Merge remote-tracking branch 'origin/develop' into ent-4583-hint-mal-construido-en-editar-usuario-home-screen 2019-10-03 14:17:23 +02:00
Kike f34d30dd39 Fixed loop on network map migration process 2019-10-02 12:38:13 +02:00
marcos.alconada d539b935bc fixed minor error 2019-10-02 11:27:52 +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
Luis Calvo 0aa73b1a60 Added current gis location to agent gis view list 2019-09-30 14:58:44 +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
alejandro-campos 96622933fc added new section in integria setup to configure different options for event responses and alert created tickets 2019-09-26 13:22:10 +02:00
alejandro-campos 0fdf3874d4 Add ACL in integria ticket dashboard 2019-09-26 11:05:27 +02:00
alejandro-campos 93b176269c remove acl check in integria ticket dashboard 2019-09-26 10:38:12 +02:00
alejandro-campos ca184faaa0 minor visual fix in integria ticket creation 2019-09-26 10:10:55 +02:00
alejandro-campos ad01cd0303 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-26 09:48:13 +02:00
alejandro-campos 91f90d07d6 minor fixes in integria integration 2019-09-26 09:44:58 +02:00
Tatiana Llorente 5436df5575 Changed the word incident for ticket - #4461 2019-09-25 16:13:37 +02:00
Tatiana Llorente 84ae4a8391 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria 
Conflicts:
	pandora_console/extras/mr/32.sql
 2019-09-25 10:50:31 +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
Alejandro Campos 20cebbe988 Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-23 17:16:15 +02:00
alejandro-campos b8e1caba9d minor fixes 2019-09-23 16:59:16 +02:00
manuel b7ff7bc121 Fixed bug in report items 2019-09-23 15:27:06 +02:00
alejandro-campos 8d2820df37 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-23 15:17:22 +02:00
alejandro-campos f73cd80336 minor changes in integria integration 2019-09-23 15:16:31 +02:00
Tatiana Llorente 59eed5f1af Minor fixes - #4644 2019-09-23 15:09:52 +02:00
alejandro-campos 637700422e Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-23 14:47:23 +02:00
alejandro-campos 9153330832 minor changes in integria integration 2019-09-23 14:47:08 +02:00
Tatiana Llorente 51a1d7c0b7 Merge branch 'ent-4461-Configuracion-integracion-integria' of brutus.artica.lan:artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-23 13:18:08 +02:00
Tatiana Llorente f9a903319c Adding tabs and new functions - #4644 2019-09-23 13:14:20 +02:00
alejandro-campos 9bf2980f01 fix minor bugs in integria integration 2019-09-23 12:48:20 +02:00
alejandro-campos be3de8dcfb Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-20 12:45:22 +02:00
alejandro-campos 0df2447770 added comment management and fixed some errors in incident edition 2019-09-20 12:37:47 +02:00
Tatiana Llorente 375bfca6ff New view - Dashboard details of Integria IMS tickets - #4644 2019-09-20 12:27:36 +02:00
Kike 279b360236 Fixed open and enterprise network map migration 2019-09-20 10:13:09 +02:00
alejandro-campos e09db0b9a9 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-19 10:24:58 +02:00
alejandro-campos 1177cce25f added attached files section to incident edition 2019-09-19 10:24:43 +02:00
Tatiana Llorente 8acdde9f3a Added date filter - #4642 2019-09-18 18:19:29 +02:00
Tatiana Llorente eb271a93eb Added button for export to csv - #4642 2019-09-18 15:32:36 +02:00
Daniel Rodriguez c81cb1d222 Merge branch 'ent-3878-Report-type-summation-not-working-properly' into 'develop' 
Ent 3878 report type summation not working properly

See merge request artica/pandorafms!2599
 2019-09-18 14:41:35 +02:00
Luis Calvo 0c60f13ccd Event column instructions maked unsortabe 2019-09-17 19:54:34 +02:00
alejandro-campos f2a6dbb60e Merge remote-tracking branch 'origin/ent-4642-Listado-de-tickets-integración-Integria' into ent-4461-Configuracion-integracion-integria 2019-09-17 14:56:54 +02:00
alejandro-campos 87f8badc18 completed integria setup and incident creation and update 2019-09-17 13:38:17 +02:00
Tatiana Llorente 326b053f23 New view - List of Integria IMS tickets - #4642 2019-09-17 13:03:36 +02:00
Tatiana Llorente 027f9fd9d4 New view - List of Integria IMS tickets - #4642 2019-09-17 12:59:29 +02:00
marcos.alconada 53850a8c1f add gis maps to autorefresh list 2019-09-16 15:51:04 +02:00
Luis Calvo a04268b33c Merge remote-tracking branch 'origin/develop' into ent-3878-Report-type-summation-not-working-properly 2019-09-16 11:02:18 +02:00
Daniel Maya a4a84c154f Fixed refresh 2019-09-13 12:04:30 +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
Tatiana Llorente 770ac250d8 Merge branch 'develop' into 'ent-4567-Habilitar-borrado-masivo-de-traps-con-permisos-AW' 
Conflicts:
   pandora_console/operation/snmpconsole/snmp_view.php
 2019-09-11 18:17:39 +02:00
Daniel Rodriguez 566b7ec7bd Merge branch 'ent-3898-name-alias-statistics-SNMP' into 'develop' 
Changed name for alias when identify an agent in SNMP statistics

See merge request artica/pandorafms!2698
 2019-09-06 12:51:19 +02:00
Daniel Rodriguez 64fc679d89 Merge branch 'ent-4599-no-se-muestran-items-vista-de-consola-visual-de-meta' into 'develop' 
Fixed some errors in visual console

See merge request artica/pandorafms!2708
 2019-09-05 15:27:41 +02:00
marcos.alconada 9e4b5ca5c8 Merge remote-tracking branch 'origin/develop' into ent-4457-bug-visual-style-font 2019-09-05 12:03:37 +02:00
marcos.alconada c12d672109 Add visual condition for JA and CH Lenguage 2019-09-05 12:01:25 +02:00
Daniel Maya 86cf025317 Fixed some errors in visual console 2019-09-05 11:58:15 +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
marcos.alconada 2538504036 chaged hint from home screen 2019-09-04 16:05:10 +02:00
Daniel Rodriguez 66f6267495 Merge branch 'ent-4575-Problema-permisos-en-vista-de-gráficas-dentro-de-un-agente' into 'develop' 
Change permissions to save custom graph in agent view - #4575

See merge request artica/pandorafms!2689
 2019-09-03 17:08:48 +02:00
Jose Gonzalez b60b41878c Changed name for alias when identify an agent in SNMP statistics 2019-09-03 11:14:33 +02:00
alejandro-campos 11cb53582c backup changes 2019-09-02 17:01:41 +02:00
Daniel Rodriguez 71a6394967 Merge branch 'ent-4357-fallo-visual-en-el-menu-topology-maps' into 'develop' 
add space in networkp map

See merge request artica/pandorafms!2661
 2019-08-30 14:22:39 +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
Daniel Rodriguez 191161dbfc Merge branch '4474-Paginacion-SNMP-se-pierde-al-actualizar-Intracom' into 'develop' 
Fixed pagination bug

See merge request artica/pandorafms!2637
 2019-08-30 14:13:29 +02:00
manuel b6870178c9 Fixed minor error 2019-08-29 15:21:39 +02:00
Tatiana Llorente a9e02bbb41 Changed permissions to delete traps to IM - #4567 2019-08-29 12:40:13 +02:00
Tatiana Llorente 94195cf70a Change permissions to save custom graph in agent view - #4575 2019-08-29 11:27:40 +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 38d6a587fd Merge branch 'ent-4504-contador-de-graficas-encontradas-no-funciona' into 'develop' 
fixed error

See merge request artica/pandorafms!2663
 2019-08-22 10:12:57 +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
Alejandro Fraguas 73a421db14 Merge branch 'ent-4502-busqueda-global' into 'develop' 
fixed security warning

See merge request artica/pandorafms!2664
 2019-08-21 11:26:27 +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
marcos.alconada 323c877890 fixed security warning 2019-08-16 11:25:08 +02:00
marcos.alconada e89193ca0f fixed error 2019-08-16 10:43:56 +02:00
marcos.alconada 3d68641e4e add space in networkp map 2019-08-13 14:41:57 +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
alejandro-campos 97353bbfed backup changes 2019-08-08 13:36:12 +02:00
Jose Gonzalez 191db192c9 Solved issue with metaconsole 2019-08-07 14:14:14 +02:00
Tatiana Llorente 4436d96717 Fixed scroll in other ip addres in agent view - #4463 2019-08-07 12:09:34 +02:00
manuel 324690ddad Fixed pagination bug 2019-08-06 14:52:43 +02:00