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

28708 Commits

Author SHA1 Message Date
Rafael Ameijeiras 0d316c0d27 Merge branch 'ent-11583-iconos-de-tipos-de-eventos-en-informes' into 'develop' 
Ent 11583 iconos de tipos de eventos en informes

See merge request artica/pandorafms!6156
 2023-08-11 09:43:46 +00:00
Jorge Rincon 7b9aae83ca #11583 Fixed agent icon in firefox and chrome browser 2023-08-11 10:47:15 +02:00
Rafael Ameijeiras 320c407637 Merge branch 'ent-10424-fix-http-auth-login-password-problem-2' into 'develop' 
Ent 10424 fix http auth login password problem 2

See merge request artica/pandorafms!6329
 2023-08-11 08:22:22 +00:00
Daniel Rodriguez c4ff61a2c0 Merge branch 'ent-11326-security-hardening-console' into 'develop' 
Ent 11326 Security hardening: Console

See merge request artica/pandorafms!6242
 2023-08-11 08:20:03 +00:00
Daniel Cebrian 24b346ddd6 #11326 fixed tentacle_client and changed security module name 2023-08-11 10:14:35 +02:00
Rafael Ameijeiras 90c7a98dc4 Merge branch 'ent-11864-quitar-foreign-key-del-mr-65' into 'develop' 
Ent 11864 quitar foreign key del mr 65

See merge request artica/pandorafms!6330
 2023-08-11 07:41:43 +00:00
Jonathan df91ea25b5 #10622 massive policies alerts and external 2023-08-11 09:18:50 +02:00
Rafael Ameijeiras 0e317edf70 Merge branch 'ent-11851-fallo-en-el-editor-de-intervalos-del-setup' into 'develop' 
Ent 11851 fallo en el editor de intervalos del setup

See merge request artica/pandorafms!6324
 2023-08-11 06:32:24 +00:00
Jonathan 8aff02beb9 #11864 remove foreign key id_user tevent_comment 2023-08-11 08:11:35 +02:00
artica 8be7d85405 Auto-updated build strings. 2023-08-11 01:00:53 +02:00
Daniel Cebrian 843dbef258 #11326 added security module in inventary windows 2023-08-10 14:18:01 +02:00
Jorge Rincon 236ad09ad6 #11843 Added MR and pandorabd_data 2023-08-10 14:08:31 +02:00
Daniel Cebrian 8da33cd0ca #11326 codify tsca data 2023-08-10 13:25:55 +02:00
Jorge Rincon 7fc4788353 #11851 Fixed weird interval 2023-08-10 13:08:12 +02:00
Daniel Maya f90cbd87a0 #10424 Fixed auth login and password 2023-08-10 13:06:00 +02:00
Daniel Cebrian c21b16bd45 #11326 added security module in inventary 2023-08-10 12:26:24 +02:00
Pablo Aragon 28b8eeca61 11423-Graph analytics (WIP) 2023-08-10 09:13:48 +02:00
Rafael Ameijeiras b45df5082a Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop' 
Ent 10598 nuevo wizard de bienvenida

See merge request artica/pandorafms!6325
 2023-08-10 06:18:09 +00:00
artica 9affc955e4 Auto-updated build strings. 2023-08-10 01:00:39 +02:00
Jorge Rincon 6cd5fc491b #11843 adjusted type for extensions 2023-08-09 15:26:30 +02:00
Daniel Cebrian 2e983b3ef0 #11326 added tsca table in mr and scheme database 2023-08-09 15:01:14 +02:00
Jorge Rincon ed9b70725d #11843 Added word legacy in the discovery. It is added only for version 1.0 of discovery. 2023-08-09 14:40:56 +02:00
Daniel Cebrian 06eae47560 Merge branch 'develop' into ent-11326-security-hardening-console 2023-08-09 13:27:21 +02:00
Jonathan fb4ac30b57 #10598 show error on create web and check 2023-08-09 13:20:43 +02:00
Jorge Rincon f1cbe8c360 #11851 Fixed operation of the interval field, allowing to add more than one. 2023-08-09 12:47:51 +02:00
Jonathan 5964cdecc0 #10598 fix error sql on create web and check web 2023-08-09 11:55:37 +02:00
Jonathan e7be37167e #10598 change title group 2023-08-09 11:21:19 +02:00
Daniel Cebrian 2035286f3a #11326 fixed mr session_max_time_expire conclict 2023-08-09 10:15:48 +02:00
Jorge Rincon 5a440f1078 #11851 fixed setup interval editor 2023-08-09 09:47:09 +02:00
Daniel Rodriguez 4aa735d1ab Merge branch 'ent-11850-500-actualizacion-nuevo-discovery' into 'develop' 
11850 adding auto delete deprecated files to rpms

See merge request artica/pandorafms!6323
 2023-08-09 07:34:19 +00:00
Rafael Ameijeiras bfd505a538 Merge branch 'ent-11682-no-se-configuran-las-listas-de-dias-especiales' into 'develop' 
Ent 11682 No se configuran las listas de dias especiales

See merge request artica/pandorafms!6220
 2023-08-09 07:27:27 +00:00
artica 449d9fe3cb Auto-updated build strings. 2023-08-09 01:00:45 +02:00
Daniel Cebrian 131f78e21e #11682 fixed special days calendar 2023-08-08 18:04:30 +02:00
Daniel Cebrian a72309ffa9 Merge branch 'develop' into ent-11682-no-se-configuran-las-listas-de-dias-especiales 2023-08-08 17:35:34 +02:00
Daniel Cebrian c45b9fb541 Merge branch 'develop' into ent-11682-no-se-configuran-las-listas-de-dias-especiales 2023-08-08 17:30:16 +02:00
rafael 9d08261a2c 11850 adding files to delete to delete_file.txt 2023-08-08 15:17:13 +02:00
Jorge Rincon f4b555162b #11843 First part of discovery deprecate warning change 2023-08-08 15:02:31 +02:00
rafael e88a990164 11850 adding auto delete deprecated files to rpms 2023-08-08 14:51:32 +02:00
Rafael Ameijeiras bc5357c4fe Merge branch 'ent-11835-list-of-elements-se-carga-items-visual-console' into 'develop' 
Ent 11835 list of elements se carga items visual console

See merge request artica/pandorafms!6317
 2023-08-08 12:19:24 +00:00
Matias Didier 16513cf52d Merge branch 'ent-10071-14719-Comprobacion-estado-previo-del-agente-ante-paradas-planificadas' into 'develop' 
Ent 10071 14719 comprobacion estado previo del agente ante paradas planificadas

See merge request artica/pandorafms!6319
 2023-08-08 10:29:36 +00:00
Daniel Cebrian 496afbc973 #11326 reorganized tables 2023-08-08 08:46:56 +02:00
artica 96710ed03f Auto-updated build strings. 2023-08-08 01:00:43 +02:00
alejandro.campos@artica.es a4e186ae84 preserve previous disabled or quiet condition when downtime is over 2023-08-07 17:04:48 +02:00
alejandro.campos@artica.es 68525f0a12 preserve previous disabled or quiet condition when downtime is over 2023-08-07 17:03:25 +02:00
Jonathan 70460ac77b #11835 fix temporary 503 error on update items 2023-08-07 13:12:12 +02:00
Rafael Ameijeiras 67dab1dfb1 Merge branch 'ent-11778-unauthenticated-admin-account-takeover-via-cron-log-file-backups' into 'develop' 
11778 adding gz files to the deny on htaccess

See merge request artica/pandorafms!6316
 2023-08-07 11:10:19 +00:00
Matias Didier 633370fdc1 Merge branch 'ent-11783-arbitrary-file-read-via-api-checker-page' into 'develop' 
Ent 11783 arbitrary file read via api checker page

See merge request artica/pandorafms!6311
 2023-08-07 10:20:59 +00:00
Matias Didier 4e926e3076 Merge branch 'ent-10147-login-nodo-tarda' into 'develop' 
Ent 10147 login nodo tarda

See merge request artica/pandorafms!6315
 2023-08-07 08:49:43 +00:00
Matias Didier e4aea936e0 Merge branch 'ent-10231-limpieza-de-codigo-del-server-transaccional' into 'develop' 
Ent-10231 limpieza-de-codigo-del-server-transaccional

See merge request artica/pandorafms!6073
 2023-08-07 08:18:07 +00:00
rafael 7bb9ec4634 11778 adding gz files to the deny on htaccess 2023-08-07 09:49:15 +02:00
Rafael Ameijeiras d84f69d922 Merge branch 'ent-11651-menu-lateral-se-despista-al-solicitar-detalle-de-alertas' into 'develop' 
Ent 11651 menu lateral se despista al solicitar detalle de alertas

See merge request artica/pandorafms!6268
 2023-08-07 07:28:55 +00:00
Rafael Ameijeiras 3545a276d0 Merge branch 'ent-11505-botones-en-resource-exporting-carecen-del-estilo-de-la-nueva-interfaz' into 'develop' 
Ent 11505 botones en resource exporting carecen del estilo de la nueva interfaz

See merge request artica/pandorafms!6264
 2023-08-07 07:28:23 +00:00
Rafael Ameijeiras 752878fdeb Merge branch 'ent-9558-derivado-del-trabajo-q-a-765-error-en-metaconsola-parama-para-el-fichero-de-imagen' into 'develop' 
Ent 9558 derivado del trabajo q a 765 error en metaconsola parama para el fichero de imagen

See merge request artica/pandorafms!6306
 2023-08-07 07:27:50 +00:00
Daniel Cebrian 043e92afe2 #11682 fixed error sql in special day when group is empty 2023-08-07 09:06:50 +02:00
artica 5e588736ff Auto-updated build strings. 2023-08-07 01:00:15 +02:00
artica cb15459cb3 Auto-updated build strings. 2023-08-06 01:00:07 +02:00
artica 99317de9cf Auto-updated build strings. 2023-08-05 01:00:37 +02:00
Daniel Maya 0534f59f92 #10147 optimize group search 2023-08-04 15:08:57 +02:00
Rafael Ameijeiras 7e7de8415e Merge branch 'ent-11836-error-en-el-espaciado-general-de-la-consola-de-pandora' into 'develop' 
Ent 11836 error en el espaciado general de la consola de pandora

See merge request artica/pandorafms!6314
 2023-08-04 12:55:05 +00:00
Jonathan 7eb8dccc44 #11836 text-warp to white-space 2023-08-04 14:04:08 +02:00
Jonathan e5f72058a7 #11836 fix style for error on #11219 2023-08-04 13:46:57 +02:00
Jonathan 2a4500bd16 #11836 fix style for error on #11219 2023-08-04 13:46:15 +02:00
Jonathan 774ab78a5b #11836 fix style pandora.css fonts 2023-08-04 13:24:23 +02:00
Jonathan 49f2dc35f8 #fix agent manager 2023-08-04 12:23:09 +02:00
Rafael Ameijeiras 7a5bb117d5 Merge branch 'ent-11710-fallo-en-la-paginacion-de-el-apartado-de-alert-commands-en-nodos-con-metaconsola' into 'develop' 
Ent 11710 fallo en la paginacion de el apartado de alert commands en nodos con metaconsola

See merge request artica/pandorafms!6241
 2023-08-04 09:40:25 +00:00
Rafael Ameijeiras 3cfa60b38a Merge branch 'ent-11219-fallo-en-traducciones' into 'develop' 
Ent 11219 fallo en traducciones

See merge request artica/pandorafms!6305
 2023-08-04 09:38:01 +00:00
Rafael Ameijeiras 246b4f9765 Merge branch 'ent-11694-15885-perdida-visibilidad-modulos-por-timeticks' into 'develop' 
Ent 11694 15885 perdida visibilidad modulos por timeticks

See merge request artica/pandorafms!6214
 2023-08-04 09:36:08 +00:00
Jonathan 47155513cc #11710 fix error redirect url and pagination 2023-08-04 10:17:59 +02:00
Jonathan 10dd156b16 #11710 redirect meta message 2023-08-04 09:29:47 +02:00
Jonathan 9dabecffce Merge branch 'develop' into ent-11710-fallo-en-la-paginacion-de-el-apartado-de-alert-commands-en-nodos-con-metaconsola 2023-08-04 09:27:24 +02:00
Rafael Ameijeiras 019efcb124 Merge branch 'ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro' into 'develop' 
Ent 11668 noticias en consola tienen fondo blanco en tema oscuro

See merge request artica/pandorafms!6182
 2023-08-04 06:45:42 +00:00
Rafael Ameijeiras 3698eac497 Merge branch 'ent-11772-corregir-color-del-icono-de-netflow-server-en-listado-de-servidores' into 'develop' 
Ent 11772 corregir color del icono de netflow server en listado de servidores

See merge request artica/pandorafms!6295
 2023-08-04 06:44:12 +00:00
Rafael Ameijeiras 2cfa209147 Merge branch 'ent-10177-consola-web-no-muestra-cual-servidor-pfms-se-esta-editando' into 'develop' 
Ent 10177 consola web no muestra cual servidor pfms se esta editando

See merge request artica/pandorafms!6304
 2023-08-04 06:43:07 +00:00
Rafael Ameijeiras 354276fb9e Merge branch 'ent-11822-acoustic-console-no-funciona' into 'develop' 
Ent 11822 acoustic console no funciona

See merge request artica/pandorafms!6309
 2023-08-04 06:42:34 +00:00
Rafael Ameijeiras 298afeebe3 Merge branch 'ent-11709-funcionamiento-erroneo-de-los-botones-de-accion-de-la-tarea-backup-pandora-database-y-execute' into 'develop' 
Ent 11709 funcionamiento erroneo de los botones de accion de la tarea backup pandora database y execute

See merge request artica/pandorafms!6232
 2023-08-04 06:42:01 +00:00
Jonathan 6c4143db10 #11710 change message "go to metaconsole" 2023-08-04 08:40:46 +02:00
Rafael Ameijeiras b2821c0db3 Merge branch 'ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola' into 'develop' 
Ent 11713 bugs de visualizacion de los botones de accion en metaconsola y consola

See merge request artica/pandorafms!6249
 2023-08-04 06:34:35 +00:00
Rafael Ameijeiras 0b680568b5 Merge branch 'ent-11739-compatibilidad-php-8-2-second' into 'develop' 
Ent 11739 compatibilidad php 8 2 second

See merge request artica/pandorafms!6300
 2023-08-04 06:32:37 +00:00
artica eb104dd2e4 Auto-updated build strings. 2023-08-04 01:00:26 +02:00
Jonathan 8040c6923e #11709 add confirm on delete cron task 2023-08-03 14:15:08 +02:00
miguel angel rasteu c2cdbcce1b #11668 Fix black theme 2023-08-03 13:45:31 +02:00
miguel angel rasteu 1009404bfd Merge branch 'develop' into ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro 2023-08-03 13:42:49 +02:00
miguel angel rasteu 10b2b6f6f4 #11783 Fix vulneravility api checker page 2023-08-03 13:37:09 +02:00
Jonathan 1807c1f84c #11805 hide "-1" on message 2023-08-03 13:00:33 +02:00
Jonathan 52038585f2 #11805 fix error for open 2023-08-03 12:57:31 +02:00
Daniel Maya ddcfa02e6f #11739 Fixed date_format 2 2023-08-03 12:51:50 +02:00
miguel angel rasteu 135c6835bd #11713 fix title buttons 2023-08-03 12:51:09 +02:00
Jonathan a48c496e14 #11822 fix sound events window 2023-08-03 12:22:35 +02:00
miguel angel rasteu 1dc24cdfb4 #11668 Fix black theme 2023-08-03 12:22:20 +02:00
alejandro.campos@artica.es 1fde2ed9b1 use user configured timezone for event export 2023-08-03 11:03:56 +02:00
Daniel Maya 59ef20e214 #11739 Fixed date_format 2023-08-03 10:56:28 +02:00
miguel angel rasteu 2ced051f56 #11668 Fix modal 2023-08-03 09:43:06 +02:00
alejandro.campos@artica.es 9f76e7cc83 update mr 2023-08-03 09:09:13 +02:00
Rafael Ameijeiras 8f04fbec4d Merge branch 'ent-11645-mensaje-de-error-en-sla-items-erroneo' into 'develop' 
Ent 11645 mensaje de error en sla items erroneo

See merge request artica/pandorafms!6179
 2023-08-03 07:04:39 +00:00
Rafael Ameijeiras fec85ce8e7 Merge branch 'ent-11749-15964-conteo-de-agentes-no-aparece-en-v772' into 'develop' 
Ent 11749 15964 conteo de agentes no aparece en v772

See merge request artica/pandorafms!6266
 2023-08-03 07:04:11 +00:00
Rafael Ameijeiras a653c0e2e7 Merge branch 'ent-9866-visualizacion-completa-de-notificaciones-en-metaconsola' into 'develop' 
Ent 9866 visualizacion completa de notificaciones en metaconsola

See merge request artica/pandorafms!6170
 2023-08-03 07:03:47 +00:00
Pablo Aragon 413528146b 9558-Fix background url html_print_autocomplete_modules() 2023-08-03 08:25:38 +02:00
miguel angel rasteu ef07bea496 #10177 Fix underscore 2023-08-03 07:59:13 +02:00
artica ab0fda5a5d Auto-updated build strings. 2023-08-03 01:00:42 +02:00
miguel angel rasteu fddc709aee #11219 Fix transaltes 2023-08-02 14:48:02 +02:00
Rafael Ameijeiras 507c91ab1e Merge branch 'ent-11683-faltan-opciones-en-las-listas-de-dias-especiales' into 'develop' 
Ent 11683 Faltan opciones en las listas de días especiales

See merge request artica/pandorafms!6221
 2023-08-02 12:01:07 +00:00
Rafael Ameijeiras b23397ef82 Merge branch 'ent-11707-iconos-de-modulos-en-tree-view-estan-pegados-al-texto' into 'develop' 
Ent 11707 iconos de modulos en tree view estan pegados al texto

See merge request artica/pandorafms!6229
 2023-08-02 11:43:31 +00:00
miguel angel rasteu 3f85562f21 #10177 Fix server name 2023-08-02 13:42:11 +02:00
Rafael Ameijeiras f692dd4c7d Merge branch 'ent-11693-15876-inverse-interval-no-se-activa-para-modulos-web-server-de-tipo-string' into 'develop' 
Ent 11693 15876 inverse interval no se activa para modulos web server de tipo string

See merge request artica/pandorafms!6218
 2023-08-02 10:43:12 +00:00
Rafael Ameijeiras e6eee88a63 Merge branch 'ent-11377-users-bulk-operations-usuarios-con-perfil-x-anadido-no-aparecen-al-intentar-borrar-perfil' into 'develop' 
Ent 11377 users bulk operations usuarios con perfil x anadido no aparecen al intentar borrar perfil

See merge request artica/pandorafms!6010
 2023-08-02 10:42:36 +00:00
miguel angel rasteu 0a799c51e6 #10701 D3 Tree implementation, links and colors 2023-08-02 12:29:20 +02:00
alejandro.campos@artica.es 27766d9650 remove snmp version 2 2023-08-02 11:07:24 +02:00
alejandro.campos@artica.es 8074448bfd remove snmp version 2 2023-08-02 11:07:08 +02:00
Rafael Ameijeiras d96977b883 Merge branch 'ent-10562-Nueva-vista-de-detalle-de-alertas-encoladas' into 'develop' 
Ent 10562 nueva vista de detalle de alertas encoladas

See merge request artica/pandorafms!6273
 2023-08-02 08:26:50 +00:00
Rafael Ameijeiras 25b2532c7a Merge branch 'ent-11777-API-add-event-comment-se-ha-roto-cambios-tevent-comment' into 'develop' 
fixed api call

See merge request artica/pandorafms!6288
 2023-08-02 08:26:10 +00:00
Jonathan 7e8b26b73a Merge branch 'develop' into ent-11693-15876-inverse-interval-no-se-activa-para-modulos-web-server-de-tipo-string 2023-08-02 09:29:42 +02:00
Jonathan f063c5182e #11693 fix warning/critical inverse for serverdata 2023-08-02 09:26:14 +02:00
miguel angel rasteu 57df761622 #11377 Fix sql query 2023-08-02 09:11:55 +02:00
Daniel Maya ae22b99835 Merge branch 'develop' into ent-11739-compatibilidad-php-8-2-second 2023-08-02 09:10:04 +02:00
artica d3fdb28d05 Auto-updated build strings. 2023-08-02 01:00:29 +02:00
miguel angel rasteu ca42714fca #10701 include d3 v7 2023-08-01 14:56:44 +02:00
Daniel Maya aef7f0edd0 #11739 Fixed deprecated functions 4 2023-08-01 14:51:31 +02:00
alejandro.campos@artica.es 700bb53df4 implemented pending alerts list for event server 2023-08-01 14:37:16 +02:00
Rafael Ameijeiras 965184c688 Merge branch 'ent-11629-neflow-filter-no-admite-grupo-all' into 'develop' 
Ent 11629 neflow filter no admite grupo all

See merge request artica/pandorafms!6151
 2023-08-01 12:33:07 +00:00
Rafael Ameijeiras b052711c92 Merge branch 'ent-11697-arreglar-menu-sin-click-to-display' into 'develop' 
Draft: Ent 11697 arreglar menu sin click to display

See merge request artica/pandorafms!6230
 2023-08-01 12:32:37 +00:00
Jonathan cf1e274456 #11697 fix menu display lateral 2023-08-01 13:54:48 +02:00
Jonathan 3b38824ca7 #11697 arrow left menu collapse 2023-08-01 13:06:43 +02:00
Daniel Maya 0d321f5311 #11739 Fixed deprecated functions 3 2023-08-01 11:19:04 +02:00
Jonathan 84df4e1195 #11571 fix for firefox margin api token span 2023-08-01 11:11:24 +02:00
Jonathan 629f43c8f5 Merge branch 'develop' into ent-11571-contact-details 2023-08-01 10:27:40 +02:00
Rafael Ameijeiras 9f36729d30 Merge branch 'ent-11771-15990-configuracion-de-modulos-de-plugin-en-politicas-en-metaconsola-se-muestran-vacias' into 'develop' 
Ent 11771 15990 configuracion de modulos de plugin en politicas en metaconsola se muestran vacias

See merge request artica/pandorafms!6291
 2023-08-01 07:28:27 +00:00
artica dcb9f89b5d Auto-updated build strings. 2023-08-01 01:00:44 +02:00
Jorge Rincon e7c2340e72 #11771 Fixed plugin field operation in module creation/edition 2023-07-31 15:30:39 +02:00
Rafael Ameijeiras f65a4ddca9 Merge branch 'ent-11755-netflow-live-view-tipo-summary-no-muestra-grafica-al-usar-aggregated-by-ports' into 'develop' 
Ent 11755 netflow live view tipo summary no muestra grafica al usar aggregated by ports

See merge request artica/pandorafms!6279
 2023-07-31 13:11:34 +00:00
Rafael Ameijeiras 75b311ad97 Merge branch 'ent-11768-texto-del-modal-de-save-filter-se-muestra-mal' into 'develop' 
Ent 11768 texto del modal de save filter se muestra mal

See merge request artica/pandorafms!6287
 2023-07-31 13:10:53 +00:00
Rafael Ameijeiras 02bf721e39 Merge branch 'ent-11751-15966-metaconsola-no-se-exportan-los-eventos-a-csv' into 'develop' 
Ent 11751 15966 metaconsola no se exportan los eventos a csv

See merge request artica/pandorafms!6269
 2023-07-31 13:04:24 +00:00
Rafael Ameijeiras 0c4331f9d4 Merge branch 'ent-11351-15668-snmp-alerts-crea-alerta-sin-tener-ningun-dato-puesto-en-formulario' into 'develop' 
Ent 11351 15668 snmp alerts crea alerta sin tener ningun dato puesto en formulario

See merge request artica/pandorafms!5988
 2023-07-31 11:08:29 +00:00
Rafael Ameijeiras 68b2fbd616 Merge branch 'ent-11467-bug-en-vista-tree-view' into 'develop' 
Ent 11467 bug en vista tree view

See merge request artica/pandorafms!6276
 2023-07-31 10:12:33 +00:00
miguel angel rasteu ded7bb1017 #11751 Fix reset 2023-07-31 11:49:29 +02:00
miguel angel rasteu 63923e3599 Merge branch 'develop' into ent-11751-15966-metaconsola-no-se-exportan-los-eventos-a-csv 2023-07-31 11:28:59 +02:00
miguel angel rasteu f09ab409cc #11794 Fix entitites in dashboard 2023-07-31 11:24:44 +02:00
miguel angel rasteu 1937c3fa00 #11713 Fix style 2023-07-31 10:06:12 +02:00
Daniel Maya ad24712eed resolved conflict 2 2023-07-31 09:48:42 +02:00
Daniel Maya 8bbaa11ce3 resolved conflict 2023-07-31 09:44:46 +02:00
Rafael Ameijeiras c26d721ecb Merge branch 'ent-11386-post-alertas-sonoras-integradas-en-consola-y-metaconsola' into 'develop' 
Ent 11386 post alertas sonoras integradas en consola y metaconsola

See merge request artica/pandorafms!6217
 2023-07-31 07:30:15 +00:00
miguel angel rasteu 9781809b22 #11713 Fix title 2023-07-31 09:27:50 +02:00
miguel angel rasteu 95e17b46bf Merge branch 'develop' into ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola 2023-07-31 09:03:03 +02:00
Daniel Maya 858a6230b3 resolved conflict 2023-07-31 09:02:58 +02:00
Jorge Rincon 2fb9634c4b #11772 Fixed netflow server image 2023-07-31 09:02:46 +02:00
Rafael Ameijeiras 3a9404ad12 Merge branch 'ent-11653-cascade-protection-modules-solamente-se-debe-permitir-habilitar-si-se-tiene-un-agente-padre' into 'develop' 
Ent 11653 cascade protection modules solamente se debe permitir habilitar si se tiene un agente padre

See merge request artica/pandorafms!6262
 2023-07-31 06:57:32 +00:00
Rafael Ameijeiras 6db5b41633 Merge branch 'ent-10875-15383-limitar-ancho-y-o-largo-de-la-linea-de-los-eventos' into 'develop' 
Ent 10875 15383 limitar ancho y o largo de la linea de los eventos

See merge request artica/pandorafms!6034
 2023-07-31 06:40:38 +00:00
artica 3dae79d593 Auto-updated build strings. 2023-07-31 01:00:25 +02:00
artica c52539ebdc Auto-updated build strings. 2023-07-30 01:00:35 +02:00
artica 0682574cc8 Auto-updated build strings. 2023-07-29 01:00:52 +02:00
Jorge Rincon 89f604a602 #11771 Fixed plugin type fields 2023-07-28 14:03:24 +02:00
Daniel Cebrian 21435b32c3 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-28 13:39:22 +02:00
miguel angel rasteu 539dd0ddee #10875 Fix title dialog event 2023-07-28 13:07:04 +02:00
miguel angel rasteu cf7b123eb0 #11795 Prevent XSS attack in site news page 2023-07-28 12:36:10 +02:00
alejandro.campos@artica.es 75219fb465 keep user id 2023-07-28 12:31:20 +02:00
miguel angel rasteu 014d32181c #10875 Fix title 2023-07-28 12:12:14 +02:00
miguel angel rasteu b4ae714af3 #10875 Truncate long string 2023-07-28 10:39:46 +02:00
Rafael Ameijeiras f7df38a0c4 Merge branch 'ent-11174-graficas-descolocadas-en-diagnostic-info' into 'develop' 
Ent 11174 graficas descolocadas en diagnostic info

See merge request artica/pandorafms!6147
 2023-07-28 05:14:18 +00:00
artica 5692f69ed4 Auto-updated build strings. 2023-07-28 01:00:46 +02:00
Félix Suárez 06bba6c2b2 Add events and notifications 2023-07-27 11:58:06 -06:00
alejandro.campos@artica.es cf26f4c32a fix inherit ack timestamp feature 2023-07-27 15:11:15 +02:00
Daniel Rodriguez 42a5fc0716 Merge branch 'ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados-manualmente' into 'develop' 
Ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados

See merge request artica/pandorafms!6051
 2023-07-27 13:08:05 +00:00
alejandro.campos@artica.es 8029125929 fix inherit ack timestamp feature 2023-07-27 15:04:22 +02:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
alejandro.campos@artica.es d7ad90dabf fixed api call 2023-07-27 12:58:57 +02:00
Daniel Rodriguez 84f61c9022 Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop' 
Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada

See merge request artica/pandorafms!6028
 2023-07-27 10:27:55 +00:00
Pablo Aragon 0eb60cf5c8 11174-Timezone iana graph firefox 2023-07-27 11:24:52 +02:00
Rafael Ameijeiras 9ce383d2ec Merge branch 'ent-11739-compatibilidad-php-8-2' into 'develop' 
Ent 11739 compatibilidad php 8 2

See merge request artica/pandorafms!6286
 2023-07-27 09:17:24 +00:00
Jorge Rincon 03feeebbdf #11768 Fixed the style of the checkbox in the modal save filter 2023-07-27 11:09:24 +02:00
miguel angel rasteu 2b20b7f8ee #11386 Fix modal 2023-07-27 10:47:51 +02:00
Pablo Aragon 5dbf61b424 11174-Timezone iana graph firefox 2023-07-27 09:46:29 +02:00
Daniel Rodriguez 0c6877e7d2 Merge branch 'ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery' into 'develop' 
Ent 9771 discovery 2 0 sistema de extensiones disco para el discovery

See merge request artica/pandorafms!5603
 2023-07-27 07:24:09 +00:00
Pablo Aragon b45a563308 Merge branch 'develop' into ent-11174-graficas-descolocadas-en-diagnostic-info 2023-07-27 08:44:06 +02:00
Rafael Ameijeiras 9f888643bf Merge branch 'ent-11602-vista-de-traps-no-mantiene-el-ancho-ni-traps-abiertas' into 'develop' 
Ent 11602 vista de traps no mantiene el ancho ni traps abiertas

See merge request artica/pandorafms!6146
 2023-07-27 05:46:57 +00:00
artica cc9f3c6df2 Auto-updated build strings. 2023-07-27 01:00:55 +02:00
Daniel Cebrian 2c9f7e026e Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-26 15:58:26 +02:00
Daniel Maya bee65bc575 #11739 Fixed deprecated functions 2023-07-26 14:18:20 +02:00
Daniel Rodriguez c2d7c10442 Merge branch 'ent-11606-Quitar-consolas-visuales-legacy' into 'develop' 
remove legacy visual console

See merge request artica/pandorafms!6140
 2023-07-26 11:09:44 +00:00
Daniel Cebrian 001ffc1799 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-26 10:55:49 +02:00
miguel angel rasteu a651a296e5 #10701 Add icon 2023-07-26 08:03:32 +02:00
Rafael Ameijeiras 161ad1b6f7 Merge branch 'ent-11764-refactorizacion-visual-del-formulario-de-filtro-de-la-vista-de-logs' into 'develop' 
Ent 11764 refactorizacion visual del formulario de filtro de la vista de logs

See merge request artica/pandorafms!6280
 2023-07-26 05:05:01 +00:00
artica 244c717355 Auto-updated build strings. 2023-07-26 01:00:54 +02:00
Daniel Cebrian a3d5bd80f9 #11326 fixed dark theme in security hardening 2023-07-25 14:25:16 +02:00
Rafael Ameijeiras d046e82208 Merge branch 'ent-11644-desaparece-selector-en-bulk-operations-en-nodo-centralizado' into 'develop' 
Ent 11644 desaparece selector en bulk operations en nodo centralizado

See merge request artica/pandorafms!6168
 2023-07-25 11:04:38 +00:00
Rafael Ameijeiras b4742f9e46 Merge branch 'ent-11698-proteccion-en-cascada-de-modulos-no-se-puede-configurar' into 'develop' 
Ent 11698 proteccion en cascada de modulos no se puede configurar

See merge request artica/pandorafms!6216
 2023-07-25 10:34:53 +00:00
Pablo Aragon 5732997d4a 11764-Log viewer, view agent 2023-07-25 12:26:40 +02:00
Daniel Rodriguez 4b6be6596e Merge branch 'ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa' into 'develop' 
Ent 10640 meter programador de informes en la vista de edicion de un informe en una nueva solapa

See merge request artica/pandorafms!5858
 2023-07-25 10:02:12 +00:00
miguel angel rasteu 7c9d441648 #11386 Fix modal error 2023-07-25 11:12:05 +02:00
Rafael Ameijeiras 391447c307 Merge branch 'ent-11708-error-al-visualizar-el-boton-de-delete-en-metaconsola-en-category-management' into 'develop' 
Ent 11708 error al visualizar el boton de delete en metaconsola en category management

See merge request artica/pandorafms!6231
 2023-07-25 09:05:16 +00:00
Rafael Ameijeiras 85a3e32c27 Merge branch 'ent-11421-Config-remota-del-servidor-no-accesible-si-no-hay-dataserver' into 'develop' 
show server conf remote edition in at least one server element

See merge request artica/pandorafms!6197
 2023-07-25 09:03:51 +00:00
Rafael Ameijeiras 7b0c8cffaa Merge branch 'ent-11769-Vista-de-nodos-en-la-meta-rota' into 'develop' 
fixed error with new implementation of datatables

See merge request artica/pandorafms!6277
 2023-07-25 08:52:38 +00:00
miguel angel rasteu 0c995b5dd5 #11755 Fix netflow live view pie graph 2023-07-25 10:33:29 +02:00
Rafael Ameijeiras 39edfa48df Merge branch 'ent-11419-pequenos-cambios-en-widget-de-graficas-simples' into 'develop' 
Ent 11419 Pequeños cambios en widget de graficas simples

See merge request artica/pandorafms!6155
 2023-07-25 08:04:23 +00:00
Rafael Ameijeiras 1f52a2d466 Merge branch 'ent-11031-en-visor-de-auditoria-los-filtros-personalizados-tienen-tres-detalles-que-vale-la-pena' into 'develop' 
Ent 11031 en visor de auditoria los filtros personalizados tienen tres detalles que vale la pena

See merge request artica/pandorafms!6235
 2023-07-25 07:54:36 +00:00
Rafael Ameijeiras 7f2918990c Merge branch 'ent-11360-intervalo-en-1-hora-por-defecto-en-item-de-informe-module-histogram-graph' into 'develop' 
Ent 11360 intervalo en 1 hora por defecto en item de informe module histogram graph

See merge request artica/pandorafms!6166
 2023-07-25 07:53:48 +00:00
Rafael Ameijeiras 0e6531b983 Merge branch 'ent-11335-se-pueden-crear-mapas-de-red-con-el-mismo-nombre-y-grupo' into 'develop' 
Ent 11335 Se pueden crear mapas de red con el mismo nombre y grupo

See merge request artica/pandorafms!6143
 2023-07-25 07:53:15 +00:00
Rafael Ameijeiras 387d18a8af Merge branch 'ent-11057-meter-un-poco-de-borde-de-sombra-a-las-letras-de-login-para-que-se-vean-mejor' into 'develop' 
Ent 11057 meter un poco de borde de sombra a las letras de login para que se vean mejor

See merge request artica/pandorafms!6167
 2023-07-25 07:52:40 +00:00
Rafael Ameijeiras 458226e24d Merge branch 'ent-11754-15970-error-de-paginacion-de-custom_graphs' into 'develop' 
Ent 11754 15970 error de paginacion de custom graphs

See merge request artica/pandorafms!6267
 2023-07-25 07:52:11 +00:00
Rafael Ameijeiras 25e2183d23 Merge branch 'ent-11726-15939-no-hay-columna-nombre-del-agente' into 'develop' 
Ent 11726 15939 no hay columna nombre del agente

See merge request artica/pandorafms!6240
 2023-07-25 07:51:24 +00:00
Rafael Ameijeiras bb74aa13bd Merge branch 'ent-11672-cambiar-referencias-a-artica-st-por-pandora-fms' into 'develop' 
Ent 11672 cambiar referencias a artica st por pandora fms

Closes pandora_enterprise#11672

See merge request artica/pandorafms!6198
 2023-07-25 07:50:53 +00:00
Rafael Ameijeiras ce9d5218e7 Merge branch 'ent-11724-bug-del-boton-show-hide-de-campos-sensibles' into 'develop' 
Ent 11724 bug del boton show hide de campos sensibles

See merge request artica/pandorafms!6238
 2023-07-25 07:50:19 +00:00