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

20237 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 05af441f19 minor fix 2024-02-01 17:36:21 +01:00
alejandro.campos@artica.es 44e546af39 minor fix 2024-02-01 17:34:42 +01:00
alejandro.campos@artica.es 2eae64407d get data in file count from module 2023-12-07 14:17:42 +01:00
alejandro.campos@artica.es 3d63544939 get data in file count from module 2023-12-07 14:14:12 +01:00
artica cdb3308e7a Auto-updated build strings. 2023-12-05 01:00:24 +01:00
Daniel Rodriguez a7abf4add7 Merge branch 'ent-12382-16531-permitir-cambiar-la-url-del-pdf-para-que-el-chromium-pueda-acceder-a-ella' into 'develop' 
fix chart_generator pdf pandora_enterprise#12382

See merge request artica/pandorafms!6679
 2023-12-04 13:38:18 +00:00
Rafael Ameijeiras a7ca102c5e Merge branch 'ent-12078-grafica-del-log-viewer-con-fecha-erronea-y-caracteres-extranos' into 'develop' 
Ent 12078 grafica del log viewer con fecha erronea y caracteres extranos

See merge request artica/pandorafms!6472
 2023-12-04 08:19:43 +00:00
Rafael Ameijeiras 38672764a3 Merge branch 'ent-12341-agent-basic-options' into 'develop' 
Ent 12341 agent basic options

See merge request artica/pandorafms!6681
 2023-12-04 08:12:23 +00:00
Rafael Ameijeiras 7a238c34d6 Merge branch 'ent-12533-16681-error-al-aplicar-filtro-de-evento-personalizado-en-widget-list-of-latest-events' into 'develop' 
Ent 12533 16681 error al aplicar filtro de evento personalizado en widget list of latest events

See merge request artica/pandorafms!6716
 2023-12-04 08:11:49 +00:00
Rafael Ameijeiras 5e588b1ef1 Merge branch 'ent-12558-error-SQL-al-copiar-módulo-web-de-tipo-check-server-status-code' into 'develop' 
Ent 12558 error sql al copiar módulo web de tipo check server status code

See merge request artica/pandorafms!6717
 2023-12-04 08:11:23 +00:00
Rafael Ameijeiras fdb58daf2d Merge branch 'ent-12247-vistas-tacticas-de-seguridad-fase-2-vulnerabilidades-y-hardening' into 'develop' 
Ent 12247 Vistas tácticas de seguridad fase 2 (vulnerabilidades y hardening)

See merge request artica/pandorafms!6707
 2023-12-04 08:11:03 +00:00
artica 3eac0f9661 Auto-updated build strings. 2023-12-04 01:00:21 +01:00
artica a2ea6f33f3 Auto-updated build strings. 2023-12-03 01:00:20 +01:00
artica 69229987f8 Auto-updated build strings. 2023-12-02 01:00:24 +01:00
Rafael Ameijeiras aa9aa40ebd Merge branch 'ent-12213-cambiar-update-manager-por-warp-update' into 'develop' 
Ent 12213 cambiar update manager por warp update

See merge request artica/pandorafms!6546
 2023-12-01 10:07:07 +00:00
Rafael Ameijeiras e52c596c82 Merge branch 'ent-12086-giss-simbolo-en-bloque-de-modulo-de-tipo-dataserver-se-pierde-al-mover-agentes-a-otros-nodos' into 'develop' 
fix error move agents to metaconsole pandora_enterprise#12086

See merge request artica/pandorafms!6661
 2023-12-01 10:06:51 +00:00
miguel angel rasteu b89f182e19 #12213 Resolve conflicts 2023-12-01 10:31:50 +01:00
daniel b10a9e8274 Merge remote-tracking branch 'origin/develop' into ent-12086-giss-simbolo-en-bloque-de-modulo-de-tipo-dataserver-se-pierde-al-mover-agentes-a-otros-nodos 
Conflicts:
	pandora_console/include/api.php
 2023-12-01 10:31:17 +01:00
miguel angel rasteu f847de7437 Merge branch 'develop' into ent-12052-filtro-de-vista-alert-details-no-muestra-las-alertas-de-los-agentes-que-tienen-grupo 2023-12-01 10:27:23 +01:00
Rafael Ameijeiras d8063fd008 Merge branch 'ent-11652-en-detalles-de-alertas-el-contenido-no-se-adapta-al-espacio-adicional-disponible-al-colapsar' into 'develop' 
Ent 11652 en detalles de alertas el contenido no se adapta al espacio adicional disponible al colapsar

See merge request artica/pandorafms!6397
 2023-12-01 09:23:23 +00:00
Rafael Ameijeiras c91d76706a Merge branch 'ent-12175-fallo-visual-vista-tactica-eventos-recuperados' into 'develop' 
Ent 12175 fallo visual vista tactica eventos recuperados

See merge request artica/pandorafms!6617
 2023-12-01 09:22:56 +00:00
miguel angel rasteu 5ee6eb7306 #12052 Resolve conflicts 2023-12-01 10:19:39 +01:00
miguel angel rasteu ec8d16e49b #11652 Resolve conflicts 2023-12-01 10:07:41 +01:00
miguel angel rasteu fb2e433b5c #12175 Resolve conflicts 2023-12-01 10:00:51 +01:00
Daniel Rodriguez 39c6420d2c Merge branch 'ent-11763-15982-regex-en-busqueda-de-eventos' into 'develop' 
Ent 11763 15982 regex en busqueda de eventos

See merge request artica/pandorafms!6512
 2023-12-01 08:44:46 +00:00
artica 3b6eac4284 Auto-updated build strings. 2023-12-01 01:00:28 +01:00
Rafael Ameijeiras b0b05a833d Merge branch 'ent-12495-volver-al-comportamiento-anterior-en-temas-de-permisos-politicas-10894' into 'develop' 
Ent 12495 volver al comportamiento anterior en temas de permisos politicas 10894

See merge request artica/pandorafms!6700
 2023-11-30 15:11:38 +00:00
Jonathan f780d0bd2a #12533 enable event list no group (Default all) 2023-11-30 15:58:39 +01:00
Matias Didier 874e60bf55 Merge branch 'ent-12248-mover-token-de-configuracion-s-flow-a-la-seccion-de-netflow' into 'develop' 
Ent 12248 mover token de configuracion s flow a la seccion de netflow

See merge request artica/pandorafms!6621
 2023-11-30 13:05:46 +00:00
Diego Muñoz-Reja c4e5a3bebd Merge branch 'ent-12088-colocar-enlace-de-la-consola-web-en-mensaje-del-correo-electronico-cuando-no-se-tenga-acceso' into 'develop' 
Ent 12088 colocar enlace de la consola web en mensaje del correo electronico cuando no se tenga acceso

See merge request artica/pandorafms!6501
 2023-11-30 12:48:00 +00:00
Daniel Maya e4b369c769 Merge branch 'develop' into ent-12495-volver-al-comportamiento-anterior-en-temas-de-permisos-politicas-10894 2023-11-30 13:30:29 +01:00
Daniel Cebrian 01e1ecefac #12247 fixed name graphs 2023-11-30 13:06:05 +01:00
Matias Didier 8cfb0353dd Merge branch 'ent-12378-alertas-sonoras-en-vista-de-eventos' into 'develop' 
fix sound alerts severity filter pandora_enterprise#12378

See merge request artica/pandorafms!6663
 2023-11-30 11:41:30 +00:00
Rafael Ameijeiras c60c75475b Merge branch 'ent-10316-hover-para-mostrar-ip-no-funciona-si-se-utiliza-una-macro' into 'develop' 
Ent 10316 hover para mostrar ip no funciona si se utiliza una macro

See merge request artica/pandorafms!6523
 2023-11-30 09:23:16 +00:00
Rafael Ameijeiras 0957a87dcb Merge branch 'ent-11705-15916-campo-editable-en-vista-de-eventos' into 'develop' 
Ent 11705 15916 campo editable en vista de eventos

See merge request artica/pandorafms!6486
 2023-11-30 09:18:28 +00:00
Rafael Ameijeiras 98d414f262 Merge branch 'ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards' into 'develop' 
Ent 10983 Selector de rango de fechas para múltiples elementos a la vez en dashboards

See merge request artica/pandorafms!6413
 2023-11-30 08:58:15 +00:00
Jonathan 1fc2c432e5 Merge branch 'develop' into ent-12341-agent-basic-options 2023-11-30 09:14:35 +01:00
Jonathan 75d57337af #11705 Fix merge conflict 2023-11-30 08:10:32 +01:00
Jonathan e8272c0006 #11763 Fix merge conflict 2023-11-30 07:57:25 +01:00
artica 9d1e4b47ab Auto-updated build strings. 2023-11-30 01:00:25 +01:00
Daniel Rodriguez 7f4a928f35 Merge branch 'ent-12243-no-funciona-integracion-pandora-pitsm-a-nivel-usuario' into 'develop' 
Hide test button and setup in ITSM pandora_enterprise#12243

See merge request artica/pandorafms!6629
 2023-11-29 17:52:26 +00:00
Daniel Cebrian c0218ad75c Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards 2023-11-29 15:45:07 +01:00
Diego Muñoz-Reja eebab43e36 Merge branch 'ent-11907-incluir-distro-y-version-en-about-y-diagnostic-info' into 'develop' 
Ent 11907 incluir distro y version en about y diagnostic info

See merge request artica/pandorafms!6420
 2023-11-29 14:34:05 +00:00
Rafael Ameijeiras 60d9fffe22 Merge branch 'ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente' into 'develop' 
Ent 12137 propuesta de refactoring visual de vista ppal de agente

See merge request artica/pandorafms!6520
 2023-11-29 14:26:53 +00:00
Rafael Ameijeiras 33ca5ab4ab Merge branch 'ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer' into 'develop' 
Ent 12424 aviso en thresholds de tipo percentage que no deberia aparecer

See merge request artica/pandorafms!6651
 2023-11-29 14:23:32 +00:00
Rafael Ameijeiras 2e0d732eb9 Merge branch 'ent-12498-widget-top-n-of-agent-modules-no-muestra-resultados-de-todos-los-agentes' into 'develop' 
Ent 12498 Widget TOP N of Agent Modules no muestra resultados de TODOS los agentes

See merge request artica/pandorafms!6695
 2023-11-29 14:22:48 +00:00
Jonathan f50dade117 #12533 send events groupid widget 2023-11-29 15:08:22 +01:00
Jorge Rincon e5ccd88f61 #12558 fixed SQL error when copying web module server status in debug_content field 2023-11-29 15:03:08 +01:00
Jonathan f86a3e60e8 #11763 save filter regex on bbdd 2023-11-29 11:14:40 +01:00
Matias Didier e7ad23c477 Merge branch 'ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico' into 'develop' 
Ent 11127 poner el aviso de cantidad de modulos en cola dinamico

See merge request artica/pandorafms!6489
 2023-11-29 09:30:08 +00:00