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

3884 Commits

Author SHA1 Message Date
alejandro-campos 60c766ca29 minor visual changes on user notifications editor 2020-04-02 10:37:59 +02:00
Luis Calvo e575f65b6a Added agent description to search and agent detail 2020-03-31 20:02:28 +02:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
alejandro-campos 531e729ebe added N/A in case last status change is not set 2020-03-25 18:01:39 +01:00
Alejandro Campos b56076044b Merge branch 'develop' into 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado' 
# Conflicts:
#   pandora_console/extras/mr/37.sql
 2020-03-24 13:55:57 +01:00
Tatiana Llorente 4777ecd4bf Ent 5439 error grafica eventos de agente 2020-03-24 10:12:14 +01:00
alejandro-campos 9d14c25b40 added order functionality to last status change column 2020-03-23 13:19:08 +01:00
alejandro-campos e05c292d7d show last status change of module 2020-03-23 12:47:58 +01:00
fbsanchez ce11d89953 Frontent changes 2020-03-13 14:03:50 +01:00
alejandro-campos db3709164a Merge branch 'develop' into ent-5214-Bug-rutas 2020-03-12 13:15:19 +01:00
Tatiana Llorente 04f2ebeaf1 Ent 4515 filtro de alertas en vista de agente 2020-03-12 10:47:59 +01:00
Luis Calvo 1196524581 Fixed monitor view groups without tags 2020-02-28 12:33:36 +01:00
alejandro-campos b29e0c7966 added ui_get_full_url to paths 2020-02-28 11:38:41 +01:00
Luis 82fe47cfd9 Ent 5312 snmp browser enchancements 2020-02-27 16:31:09 +01:00
Daniel Rodriguez 4e403bca72 Merge branch 'ent-5436-Vulnerabilidad' into 'develop' 
fix bug when saving netflow filters

See merge request artica/pandorafms!3064
 2020-02-21 13:27:34 +01:00
alejandro-campos 0a1dd6fe24 fix save of filters 2020-02-21 13:01:47 +01:00
Daniel Barbero Martin c96dd8e930 Fix selector modules only string in VC barsgraph and donutgraph 2020-02-13 09:55:49 +01:00
Daniel Barbero Martin 10972a2364 Fix bug icon builder view not legacy mode 2020-02-13 08:45:25 +01:00
Daniel Barbero Martin cad6889c46 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-13 07:58:06 +01:00
Daniel Maya e908019d4f Ent 5318 no hay opcion de pantalla completa para las consolas visuales en la meta 2020-02-12 17:05:29 +01:00
Daniel Barbero Martin 0042f390ef Fixed errors VC 2020-02-10 17:31:48 +01:00
Daniel Barbero Martin 902c42b559 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-05 14:05:26 +01:00
Daniel Rodriguez 22649e016f Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop' 
fix html special characters breaking html in modules search

See merge request artica/pandorafms!3046
 2020-02-04 16:56:26 +01:00
alejandro-campos a51c17b512 fix html special characters breaking html in modules search 2020-02-04 16:39:54 +01:00
Daniel Rodriguez 8b60daa9ba Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop' 
fix module string data with html special chars breaking html in page

See merge request artica/pandorafms!3042
 2020-02-04 10:10:07 +01:00
fbsanchez 5da211aae0 ACL edit mode 2020-02-03 17:08:37 +01:00
alejandro-campos d05551f85a fix characters breaking html 2020-02-03 16:17:46 +01:00
Daniel Barbero Martin dc6f1e3049 fixed errors VC 2020-01-29 10:56:29 +01:00
Daniel Barbero Martin 3f5e418d98 fixed errors VC 2020-01-28 16:42:51 +01:00
Daniel Barbero Martin fe697a98ec fixed errors VC 2020-01-23 19:54:47 +01:00
Daniel Barbero Martin cd3691ecc3 fixed errors VC 2020-01-23 17:52:59 +01:00
Daniel Barbero Martin 3124e09c12 fixed errors VC 2020-01-23 09:20:40 +01:00
Daniel Barbero 203a91f065 fixed errors 2020-01-22 17:47:47 +01:00
Daniel Barbero Martin 89e83e38e0 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2020-01-21 08:28:00 +01:00
Daniel Rodriguez 738361d237 Merge branch 'ent-4876-pandora_ui.js' into 'develop' 
first changes pandora.js to pandora_ui.js

See merge request artica/pandorafms!2909
 2020-01-20 09:54:20 +01:00
Daniel Barbero Martin 4a1801bc50 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 08:04:18 +01:00
Luis 2926ead13b Fixed group change on networkmap.ACL and source group working separated 2020-01-15 12:14:37 +01:00
Daniel Barbero ed53399c3c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-14 09:34:31 +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
Daniel Rodriguez df721fc550 Merge branch 'ent-4602-Descuadre-Visual-console-Chrome-y-Chromium' into 'develop' 
Fixed public_console height

See merge request artica/pandorafms!2950
 2020-01-13 18:24:01 +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
Daniel Barbero Martin fe46a2a74e Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-13 08:07:20 +01:00
Daniel Maya c9a524b128 fixed interval counter 2020-01-10 11:12:05 +01:00
Daniel Barbero Martin 14e4e37c2a Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-10 08:09:13 +01:00
Daniel Barbero 7e4cb02ceb fixed styles and more 2020-01-09 18:05:21 +01:00
Daniel Rodriguez 1cef8aa62f Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop' 
Changed the mode of obtain the title

See merge request artica/pandorafms!2743
 2020-01-09 16:46:58 +01:00
Daniel Barbero Martin c4f0305f9b Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-08 08:29:59 +01:00
Daniel Rodriguez fa9d60a3ef Merge branch 'ent-5128-Metaconsola-conteo-y-paginacion' into 'develop' 
fix pagination in meta monitor view

See merge request artica/pandorafms!2963
 2020-01-07 09:46:22 +01:00
Daniel Rodriguez e6616374f0 Merge branch 'ent-5000-Bug-en-el-icono-de-graficas-de-Monitor-detail-con-modulos-con-tags' into 'develop' 
fix bug when checking acl permissions with regard to secondary groups in monitor view

See merge request artica/pandorafms!2908
 2020-01-07 09:41:11 +01:00
Daniel Barbero Martin 5e008e684d Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-02 17:45:52 +01:00
Alejandro Fraguas 45c57abb70 Merge branch 'ent-4883-Mensaje-erroneo-WebChat' into 'develop' 
Ent 4883 mensaje erroneo web chat

See merge request artica/pandorafms!2856
 2019-12-23 17:45:25 +01:00
Alejandro Fraguas 7061ab81b6 Merge branch 'ent-4911-Informacion-mostrada-en-mapa-GIS-the-Satellite-Server' into 'develop' 
Ent 4911 informacion mostrada en mapa gis the satellite server

See merge request artica/pandorafms!2876
 2019-12-23 10:24:10 +01:00
alejandro-campos cc574cdb39 fix pagination in meta monitor view 2019-12-16 11:46:07 +01:00
Daniel Barbero 63dd3c48f8 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2019-12-12 16:32:32 +01:00
Daniel Maya b2b2cdbede Fixed public_console height 2019-12-11 12:05:57 +01:00
Alejandro Fraguas 9a21710cd5 Merge branch 'ent-5054-Vista-de-Netflow-live-view-descojonada' into 'develop' 
Ent 5054 vista de netflow live view descojonada

See merge request artica/pandorafms!2928
 2019-12-11 11:37:02 +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
vgilc f4372bb766 Merge branch 'ent-4917-Pete-SQL-al-añadir-un-dia-especial-a-la-lista-de-dias-especiales' into 'develop' 
Ent 4917 pete sql al añadir un dia especial a la lista de dias especiales

See merge request artica/pandorafms!2861
 2019-12-10 11:43:46 +01:00
vgilc 776c683ac9 Merge branch 'ent-4922-Filtros-del-visor-de-traps-actualizan-solos' into 'develop' 
Ent 4922 filtros del visor de traps actualizan solos

See merge request artica/pandorafms!2879
 2019-12-10 11:43:07 +01:00
Tatiana Llorente 2d62955020 Changed filters styles in netflow live view 2019-12-02 16:11:17 +01:00
Marcos Alconada 888988572a Merge branch 'develop' into 'ent-4876-pandora_ui.js' 
# Conflicts:
#   pandora_console/include/javascript/pandora.js
 2019-11-27 11:39:11 +01:00
Alejandro Fraguas ed0ad76e61 Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' into 'develop' 
Add new search for id source event in metaconsole

See merge request artica/pandorafms!2438
 2019-11-27 10:14:35 +01:00
Daniel Rodriguez 66c67ea74a Merge branch 'ent-4226-mejoras-plugin-sap' into 'develop' 
Ent 4226 mejoras plugin sap

See merge request artica/pandorafms!2853
 2019-11-26 14:14:10 +01:00
marcos 0490024abc add sap view to autorefresh edit my user 2019-11-25 15:01:27 +01:00
marcos 6f8bf104b4 update sap view 2019-11-25 13:50:26 +01:00
marcos 21bf49c218 update id_source_event 2019-11-22 13:38:08 +01:00
marcos ab1a64a2e6 Merge remote-tracking branch 'origin/develop' into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este 2019-11-22 10:56:36 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
marcos 1640c03fc3 first changes pandora.js to pandora_ui.js 2019-11-21 16:42:39 +01:00
alejandro-campos 02780aed41 fix bug when checking acl permissions with regard to secondary groups in monitor view 2019-11-21 16:36:34 +01:00
Daniel Rodriguez 775289fc20 Merge branch 'ent-4550-ACL-acceso-denegado-detalles-agente-icono-grupo' into 'develop' 
Changed definition of link in group icon

See merge request artica/pandorafms!2891
 2019-11-21 10:21:07 +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
marcos 294c160622 semifinal sap sap view agent 2019-11-20 18:01:07 +01:00
Jose Gonzalez 93200e2af1 Changed definition of link in group icon 2019-11-18 10:51:09 +01:00
fbsanchez 9440570548 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-15 13:08:09 +01:00
fbsanchez e561b1f906 omnishell multiselect 2019-11-15 13:07:23 +01:00
fbsanchez f69b86663a Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/godmode/wizards/Wizard.main.php
 2019-11-14 21:40:35 +01:00
fbsanchez 14128590d6 Minor corrections&fixes 2019-11-14 17:05:01 +01:00
marcos a8b6f40ca1 change sap view menu position 2019-11-14 10:51:00 +01:00
fbsanchez 83590146b1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 2019-11-13 17:38:24 +01:00
fbsanchez 9b1a3a9cd1 Firts_task => first_task 2019-11-13 14:58:53 +01:00
fbsanchez b11dbc639f Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF 
Conflicts:
	pandora_console/general/header.php
 2019-11-13 12:20:29 +01:00
marcos fe45afa662 Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap 2019-11-13 12:01:36 +01:00
Daniel Rodriguez 2f0b646cd8 Merge branch 'ent-4463-Histórico-IP' into 'develop' 
Fixed scroll in other ip addres in agent view - #4463

See merge request artica/pandorafms!2641
 2019-11-12 18:10:16 +01:00
Tatiana Llorente 50be60409e Dont refresh the page when filter is changed in traps view 2019-11-12 15:58:36 +01:00
fbsanchez b9633933e1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/general/header.php
 2019-11-12 14:17:45 +01:00
Tatiana Llorente c652f758f4 Changed label agent version for agents with satellite os 2019-11-12 13:06:59 +01:00
fbsanchez 307eabc7b9 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-07 18:33:37 +01:00
Tatiana Llorente 90912e2636 Hide agent info when only GIS data is displayed and it is empty 2019-11-07 09:52:06 +01:00
fbsanchez 79d165b164 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-06 20:01:28 +01:00
Daniel Rodriguez e81932cf0d Merge branch 'ent-4809-Seleccion-de-tamaño-de-fuente-en-Agent-detail' into 'develop' 
Fixed visual styles ticket 4809

See merge request artica/pandorafms!2867
 2019-11-06 16:23:51 +01:00
fbsanchez 98237a8d34 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/general/header.php
 2019-11-06 15:36:53 +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
manuel a486738920 Fixed visual styles ticket 4809 2019-11-06 10:31:26 +01:00
Daniel Rodriguez 0f2d30698c Merge branch 'ent-4872-Cambiar-titulo-a-archivo-XML-de-los-templates-de-reports' into 'develop' 
Ent 4872 cambiar titulo a archivo xml de los templates de reports

See merge request artica/pandorafms!2862
 2019-11-05 17:03:53 +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