Commit Graph

28591 Commits

Author SHA1 Message Date
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
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
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
alejandro.campos@artica.es f027173862 fixed error with new implementation of datatables 2023-07-25 09:26:58 +02:00
artica 1de2fe9898 Auto-updated build strings. 2023-07-25 01:02:35 +02:00
Daniel Cebrian 62a70dee2c #11326 added new section and validated if exist plugin 2023-07-24 18:42:27 +02:00
Jorge Rincon 19c600fb9b #11467 fixed error message and advanced info section from tree view 2023-07-24 14:54:38 +02:00
alejandro.campos@artica.es 31ec1b8209 Merge remote-tracking branch 'origin/develop' into ent-11421-Config-remota-del-servidor-no-accesible-si-no-hay-dataserver 2023-07-24 13:49:28 +02:00
Rafael Ameijeiras 6b3b98ac04 Merge branch 'ent-11480-widget-de-estado-de-grupos-no-deberia-mostar-grupos-vacios' into 'develop'
Ent 11480 Widget de estado de grupos no deberia mostar grupos vacios

See merge request artica/pandorafms!6152
2023-07-24 10:54:24 +00:00
Rafael Ameijeiras db62d257df Merge branch 'ent-11716-text-area-plugin-parameters-se-rompe-si-no-anadimos-espacios' into 'develop'
Ent 11716 text area plugin parameters se rompe si no anadimos espacios

See merge request artica/pandorafms!6244
2023-07-24 10:52:56 +00:00
miguel angel rasteu a1965de2ea #11386 Fix sound alert modal 2023-07-24 12:25:06 +02:00
Daniel Cebrian e88a33d984 #11326 added new property in chartjs 2023-07-24 12:22:20 +02:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
Pablo Aragon 2a89a494cc 10640-Report task. Resolve conflict 2023-07-24 10:06:43 +02:00
Pablo Aragon 8389169e16 Merge branch 'develop' into ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa 2023-07-24 08:40:33 +02:00
artica c57fb14bc2 Auto-updated build strings. 2023-07-24 01:00:48 +02:00
artica 3e6f88e812 Auto-updated build strings. 2023-07-23 01:00:51 +02:00
artica 13552e74f1 Auto-updated build strings. 2023-07-22 01:00:52 +02:00
Daniel Cebrian 247bcc1cf5 #11326 fixed bug and reorganized data 2023-07-21 19:38:06 +02:00
miguel angel rasteu 5084c0490b #11386 Fix changes in soun event dialog 2023-07-21 13:32:12 +02:00
alejandro.campos@artica.es 66d2fef3aa implemented pending alerts list for event server 2023-07-21 11:53:04 +02:00
alejandro.campos@artica.es 7b9170312c implemented pending alerts list for event server 2023-07-21 11:50:53 +02:00
Daniel Rodriguez 4148074996 Merge branch 'ent-11012-Flag-Experimental-para-la-consola' into 'develop'
added setup token

See merge request artica/pandorafms!6133
2023-07-21 07:23:33 +00:00
artica 6da7520dd1 Auto-updated build strings. 2023-07-21 01:00:53 +02:00
Daniel Cebrian 2d0fe4b149 #11326 added design 2023-07-20 15:13:58 +02:00
miguel angel rasteu ed77e042e1 #11751 Fix node CSV 2023-07-20 13:16:25 +02:00
miguel angel rasteu 88ba679875 #11651 Fix console.log 2023-07-20 12:52:36 +02:00
miguel angel rasteu a4442ce31b #11651 Fix menu 2023-07-20 10:42:22 +02:00
miguel angel rasteu 9978bbe645 #11754 Add pagination 2023-07-20 09:42:09 +02:00
miguel angel rasteu 80b60eb86f #11749 Fix agent count 2023-07-20 08:43:51 +02:00
artica 1f722998e6 Auto-updated build strings. 2023-07-20 01:01:06 +02:00
Jorge Rincon ac23a4c375 #11653 Fixed operation for Agent parent field 2023-07-19 15:48:33 +02:00
daniel a10412872b alerts user comment pandora_enterprise#11387 2023-07-19 15:04:37 +02:00
Rafael Ameijeiras 9ff13234be Merge branch 'ent-10696-nuevo-widget-netflow' into 'develop'
Ent 10696 nuevo widget netflow

See merge request artica/pandorafms!5890
2023-07-19 11:54:01 +00:00
daniel c520375c61 ack utimestamp pandora_enterprise#11387 2023-07-19 13:28:53 +02:00
miguel angel rasteu 9078b006ff #11505 Fix style button 2023-07-19 12:18:43 +02:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
Daniel Cebrian 018bfe1288 #10696 fixed resize circular mesh 2023-07-19 10:36:30 +02:00
Daniel Cebrian c8f7ab2f1c #11326 new modal details 2023-07-19 09:08:44 +02:00
artica e645f65e8e Auto-updated build strings. 2023-07-19 01:00:45 +02:00
Daniel Cebrian 6eaa8e9cd8 #11326 fixed pagination with multiples datatable 2023-07-18 14:52:34 +02:00
Rafael Ameijeiras 7a9629a4e5 Merge branch 'ent-11487-sunburst-no-muestra-elementos-en-su-interior' into 'develop'
Ent 11487 sunburst no muestra elementos en su interior

See merge request artica/pandorafms!6257
2023-07-18 12:35:01 +00:00
Rafael Ameijeiras 06d3664b2f Merge branch 'ent-10254-15114-anadir-timeout-y-secondary-server-a-ad' into 'develop'
Ent 10254 [#15114]Añadir timeout y secondary server a AD

See merge request artica/pandorafms!6091
2023-07-18 10:14:29 +00:00
Daniel Maya 5806da78dd #11487 Fixed subgroups 2023-07-18 10:18:30 +02:00
Rafael Ameijeiras ab94dbba4c Merge branch 'ent-9785-14479-widgets-en-dashboard-no-se-actualizan-de-forma-recursiva-con-el-borrado-de-agentes' into 'develop'
Clean deleted agents from dashboards, reports, etc

See merge request artica/pandorafms!6171
2023-07-18 08:01:49 +00:00
Rafael Ameijeiras 36d9f6bb37 Merge branch 'ent-11737-sale-mensaje-php-update-required-solo-en-ubuntu' into 'develop'
Ent 11737 sale mensaje php update required solo en ubuntu

See merge request artica/pandorafms!6255
2023-07-18 07:55:42 +00:00
Daniel Cebrian 092e1dfd62 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:46:19 +02:00
Jorge Rincon 844f61cc73 #11315 Change type of select to select_from_sql 2023-07-18 09:34:14 +02:00
Diego Muñoz-Reja 92623a5837 Merge branch 'ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2' into 'develop'
Ent 11573 mejora de los informes en vivo de netflow 2

See merge request artica/pandorafms!6142
2023-07-18 07:30:00 +00:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02:00
Rafael Ameijeiras dffb9d5bbf Merge branch 'ent-11493-nuevo-widget-colmena-de-agentes-agent-hive' into 'develop'
Ent 11493 nuevo widget colmena de agentes agent hive

See merge request artica/pandorafms!6085
2023-07-18 05:30:04 +00:00
artica 20e05f677e Auto-updated build strings. 2023-07-18 01:01:01 +02:00
Daniel Maya a0dc60a49f #11493 Added png 2023-07-17 14:57:54 +02:00
Daniel Cebrian 8aaa98a741 #10254 added message timeout 2023-07-17 14:10:08 +02:00
Rafael Ameijeiras a8597e1cb4 Merge branch 'ent-11735-listado-de-modulos-rotos-en-develop' into 'develop'
Ent 11735 listado de modulos rotos en develop

See merge request artica/pandorafms!6254
2023-07-17 12:09:09 +00:00
Rafael Ameijeiras 9ad7ea0d6f Merge branch 'ent-11420-botones-incorrectos-en-config-remota-del-servidor' into 'develop'
Ent 11420 botones incorrectos en config remota del servidor

See merge request artica/pandorafms!6035
2023-07-17 11:12:17 +00:00
miguel angel rasteu 567bfdcbb7 #11737 Fix version 2023-07-17 13:08:13 +02:00
miguel angel rasteu 2e4066973a #11377 Show all groups 2023-07-17 12:32:47 +02:00
Daniel Maya 37b1c94b45 #11493 Fixed icon 2023-07-17 11:53:14 +02:00
Miguel Angel Rasteu c428a7d69c Merge branch 'develop' into 'ent-10875-15383-limitar-ancho-y-o-largo-de-la-linea-de-los-eventos'
# Conflicts:
#   pandora_console/operation/events/events.php
2023-07-17 08:45:28 +00:00
miguel angel rasteu f96adf59e9 #11737 Fix pgp update required message 2023-07-17 10:16:13 +02:00
Rafael Ameijeiras de84f5fae9 Merge branch 'ent-11418-cambiar-vista-de-graficas-del-detalle-de-un-agente' into 'develop'
Ent 11418 cambiar vista de graficas del detalle de un agente

See merge request artica/pandorafms!6014
2023-07-17 07:53:10 +00:00
Rafael Ameijeiras 58a1f8ecff Merge branch 'ent-11256-metaconsola-widget-icon-and-module-value-muestra-icono-critico-en-modulo-normal' into 'develop'
Ent 11256 metaconsola widget icon and module value muestra icono critico en modulo normal

See merge request artica/pandorafms!6019
2023-07-17 07:52:05 +00:00
Daniel Rodriguez 5a52abab74 Merge branch 'ent-11539-eliminar-wizard-de-metaconsola' into 'develop'
Ent 11539 Eliminar wizard de metaconsola

See merge request artica/pandorafms!6083
2023-07-17 07:43:51 +00:00
miguel angel rasteu 8d89ed90d3 #11735 Fix Agent view modules 2023-07-17 09:34:57 +02:00
Daniel Maya c333ffcf0a #11420 fixed url and added buttons 2023-07-17 08:59:32 +02:00
Daniel Maya 89f55fd24e resolved conflict 2023-07-17 08:28:38 +02:00
Rafael Ameijeiras df70aa6ee6 Merge branch 'ent-11680-15857-bug-dashboard-metaconsola-widgets-servicio-con-mapa-sunburts' into 'develop'
Ent 11680 [#15857]Bug Dashboard metaconsola widgets servicio con mapa sunburts

See merge request artica/pandorafms!6190
2023-07-17 06:04:55 +00:00
Rafael Ameijeiras 8d423fa0ad Merge branch 'ent-2892-6602-borrar-en-descripcion-de-modulo-mensaje-de-que-ha-sido-creado-a-traves-de-plantilla' into 'develop'
Ent 2892 6602 borrar en descripcion de modulo mensaje de que ha sido creado a traves de plantilla

See merge request artica/pandorafms!5791
2023-07-17 06:02:29 +00:00
Rafael Ameijeiras 3f9aea5fe4 Merge branch 'ent-7116-anadir-token-en-snmp-browser-para-poder-aplicar-ip-del-agente-a-los-modulos' into 'develop'
Ent 7116 anadir token en snmp browser para poder aplicar ip del agente a los modulos

See merge request artica/pandorafms!6061
2023-07-17 06:00:36 +00:00
Rafael Ameijeiras 9cec3e1ba5 Merge branch 'ent-5344-seleccionables-de-pdf-en-open-reports' into 'develop'
Ent 5344 seleccionables de pdf en open reports

See merge request artica/pandorafms!5792
2023-07-17 05:59:15 +00:00
Rafael Ameijeiras d860d613d6 Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop'
Ent 10598 nuevo wizard de bienvenida

See merge request artica/pandorafms!6043
2023-07-17 05:57:29 +00:00
artica bff5210835 Auto-updated build strings. 2023-07-17 01:00:44 +02:00
artica bdf2ac1e0b Auto-updated build strings. 2023-07-16 01:00:51 +02:00
artica fd17e2179a Auto-updated build strings. 2023-07-15 01:01:00 +02:00
miguel angel rasteu fd56631ae4 #11713 Fix action button title 2023-07-14 13:07:04 +02:00
Jonathan 4407efecc0 #10598 remove show license and show always 2023-07-14 12:39:13 +02:00
Jonathan e6e4448ea9 #10598 license and dropsearch select2 2023-07-14 12:33:19 +02:00
Jonathan 9e81e28c62 #10598 basic_net fix 2023-07-14 12:12:20 +02:00
Jonathan ee37487b74 #10598 unknown create template and show 2023-07-14 11:44:37 +02:00
Rafael Ameijeiras bff3fcd762 Merge branch 'ent-11163-cambiar-la-forma-en-la-que-se-generan-las-graficas-para-la-macro-de-envio-por-correo' into 'develop'
Ent-11163-cambiar-la-forma-en-la-que-se-generan-las-graficas-para-la-macro-de-envio-por-correo

Closes pandora_enterprise#11163

See merge request artica/pandorafms!6234
2023-07-14 09:20:11 +00:00
Rafael Ameijeiras 92ea46b70e Merge branch 'ent-11732-las-graficas-generadas-por-api-para-el-correo-estan-rotas' into 'develop'
Ent 11732 las graficas generadas por api para el correo estan rotas

See merge request artica/pandorafms!6247
2023-07-14 07:32:26 +00:00
Rafael Ameijeiras 9499e50eea Merge branch 'ent-9686-crear-seccion-de-politicas-dentro-del-agente' into 'develop'
Ent 9686 crear seccion de politicas dentro del agente

See merge request artica/pandorafms!5830
2023-07-14 06:58:00 +00:00
artica 0a6301a3a8 Auto-updated build strings. 2023-07-14 01:00:57 +02:00
Jonathan f748a07c75 #10598 fix discovery include 2023-07-13 15:40:35 +02:00
Jonathan 8dcf516196 #11732 fix graphs for email 2023-07-13 13:45:18 +02:00
Rafael Ameijeiras be8ccde589 Merge branch 'ent-11728-erro-al-cambiar-un-modulo-de-plugin-server-modifca-el-plugin-pero-no-cambia-guarda-los-campos' into 'develop'
Ent 11728 erro al cambiar un modulo de plugin server modifca el plugin pero no cambia guarda los campos

See merge request artica/pandorafms!6243
2023-07-13 10:44:31 +00:00
Rafael Ameijeiras d9b95c08ed Merge branch 'ent-11719-selector-de-modulos-en-las-alertas-del-agente-no-muestra-los-modulos-del-agente-solo-en-nodo' into 'develop'
Ent 11719 selector de modulos en las alertas del agente no muestra los modulos del agente solo en nodo

See merge request artica/pandorafms!6237
2023-07-13 10:43:46 +00:00
Rafael Ameijeiras 9e3dcbd390 Merge branch 'ent-11331-editar-tarea-de-google-cloud-te-lleva-a-discovery' into 'develop'
Ent 11331 editar tarea de google cloud te lleva a discovery

See merge request artica/pandorafms!5957
2023-07-13 10:43:03 +00:00
Daniel Cebrian 9012b897f9 #9686 added status in centralized mode 2023-07-13 11:59:10 +02:00
Daniel Cebrian b35b4e40a1 #9686 fixed bug pagination in datatable 2023-07-13 10:46:10 +02:00
Daniel Cebrian 20c225e410 Merge branch 'develop' into ent-9686-crear-seccion-de-politicas-dentro-del-agente 2023-07-13 10:16:52 +02:00
Diego Muñoz-Reja 57058c4f9c Merge branch 'ent-11266-no-se-habilita-el-log-de-consola-en-770-ni-771' into 'develop'
Ent 11266 no se habilita el log de consola en 770 ni 771

See merge request artica/pandorafms!6001
2023-07-13 07:55:47 +00:00
Daniel Cebrian 4f26bc2d51 #9686 fixed pagination in policies manager 2023-07-13 08:56:58 +02:00
artica 79e2591939 Auto-updated build strings. 2023-07-13 01:00:52 +02:00
Gorka Sanchez 9c6ff04977 Merge branch 'ent-11723-nodo-intenta-usar-login-hash-al-redirigir-desde-le-vista-de-arbol-y-te-deslogea' into 'develop'
Ent 11723 nodo intenta usar login hash al redirigir desde le vista de arbol y te deslogea

See merge request artica/pandorafms!6239
2023-07-12 14:43:41 +00:00
Félix Suárez 356a3cc9c3 Modify aditional user/pass on core. 2023-07-12 08:31:52 -06:00
Jonathan ab590f6493 #11716 fix size plugins preview 2023-07-12 16:24:46 +02:00
miguel angel rasteu 46f898c5a6 #11728 Fix module plugin server 2023-07-12 16:05:55 +02:00
Daniel Cebrian 0e2d1ee47f #11326 security hardening 2023-07-12 15:54:04 +02:00
Jonathan 4ad1aa6237 #11687 show all in agent group 2023-07-12 15:35:22 +02:00
Jonathan 5ba8b4d1ad Merge branch 'develop' into ent-11687-giss-anchura-insuficiente-en-columna-de-agentes-al-utilizar-operaciones-masivas-de-eliminar 2023-07-12 15:30:55 +02:00
Jonathan 9a32c0c700 #11710 fix pagination alerts node on centraliced 2023-07-12 14:16:35 +02:00
miguel angel rasteu 2af618b765 #11726 Fix alert status column name agent 2023-07-12 14:11:00 +02:00
miguel angel rasteu e40c60f6c5 #11723 Fix tree view node 2023-07-12 13:54:06 +02:00
Matias Didier 676b7a9302 Merge branch 'ent-11040-valores-para-notif.security.default_password-grabados-a-fuego-con-md5' into 'develop'
Ent 11040 Valores para NOTIF.SECURITY.DEFAULT_PASSWORD grabados "a fuego" con MD5

See merge request artica/pandorafms!6086
2023-07-12 11:25:20 +00:00
miguel angel rasteu 8332dce850 #11724 Fix show hide button 2023-07-12 13:15:46 +02:00
Jonathan 0f1b8fce02 #11719 fix modules create alert 2023-07-12 12:11:50 +02:00
Jonathan d5335da885 #11687 overflow fix 2023-07-12 12:05:17 +02:00
Jonathan eada8e0652 #11687 fix errors agents and checks 2023-07-12 11:26:33 +02:00
miguel angel rasteu f6637e3827 #11031 fix audit log filter 2023-07-12 10:19:08 +02:00
Rafael Ameijeiras 9084df382b Merge branch 'ent-10645-15201-peticion-de-cambio-get_events' into 'develop'
Ent 10645 15201 peticion de cambio get events

See merge request artica/pandorafms!5824
2023-07-12 07:26:15 +00:00