Commit Graph

30610 Commits

Author SHA1 Message Date
Daniel Cebrian 3e40558443 #12810 fixed license_mode status 2024-02-02 10:55:57 +01:00
Daniel Cebrian d8fdb22c89 #12810 change value status license in diagnostics 2024-02-02 10:47:36 +01:00
Rafael Ameijeiras 67bbaa311c Merge branch 'ent-12824-no-se-pueden-crear-agentes-manualmente-en-develop-775' into 'develop'
Ent 12824 No se pueden crear agentes manualmente en develop (775)

See merge request artica/pandorafms!6899
2024-02-01 16:37:10 +00:00
Rafael Ameijeiras b114fa852f Merge branch 'ent-12790-se-meten-entities-al-crear-cv' into 'develop'
Ent 12790 se meten entities al crear cv

See merge request artica/pandorafms!6902
2024-02-01 16:36:36 +00:00
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
Diego Muñoz-Reja 774aa6a17b Merge branch 'ent-12746-No-se-puede-seleccionar-template-en-NCM' into 'develop'
fixed database ncm info

See merge request artica/pandorafms!6894
2024-02-01 16:02:10 +00:00
Diego Muñoz-Reja 83e6ad429d Merge branch 'ent-12794-no-se-puede-cambiar-pass-de-users-locales-con-autenticacion-externa' into 'develop'
Ent 12794 No se puede cambiar pass de users locales con autenticación externa

See merge request artica/pandorafms!6896
2024-02-01 15:07:33 +00:00
Matias Didier e546278a01 Merge branch 'ent-12805-operator-users-en-tareas-de-ipam-no-funciona' into 'develop'
Ent 12805 operator users en tareas de ipam no funciona

See merge request artica/pandorafms!6900
2024-02-01 15:02:20 +00:00
Daniel Cebrian 64698c4951 #12149 upload max file size in about and diagnostic info 2024-02-01 15:38:52 +01:00
Daniel Cebrian 48d7a63eb1 #12149 added post_max_size notification 2024-02-01 14:54:23 +01:00
Daniel Cebrian 9b57534f2a #12751 fixed vul 2024-02-01 11:41:19 +01:00
Matias Didier 993f1e4124 Merge branch 'ent-12718-el-update-manager-online-no-da-error-cuando-la-firma-del-server-esta-mal' into 'develop'
Ent 12718 el update manager online no da error cuando la firma del server esta mal

See merge request artica/pandorafms!6890
2024-02-01 08:22:43 +00:00
Rafael Ameijeiras 8feab8ab45 Merge branch 'ent-12798-unauth-sql-injection' into 'develop'
Ent 12798 Unauth SQL Injection

See merge request artica/pandorafms!6897
2024-02-01 08:07:53 +00:00
Jonathan eecf92657a #12790 remove entities only name 2024-01-31 17:02:02 +01:00
Daniel Cebrian 5feb11c547 9992 added email test dialog in metaconsole 2024-01-31 16:34:25 +01:00
Jonathan b026a248e3 #12805 ipam change permisions AW/PM 2024-01-31 15:40:44 +01:00
Rafael Ameijeiras 2daa6f1e87 Merge branch 'ent-12797-error-select2-javascript-discovery' into 'develop'
Ent 12797 error select2 javascript discovery

See merge request artica/pandorafms!6892
2024-01-31 14:06:36 +00:00
Rafael Ameijeiras 8d45692b76 Merge branch 'ent-9757-anadir-escalado-de-estados-a-api-y-cli' into 'develop'
Add warning time to CLI create

Closes pandora_enterprise#9757

See merge request artica/pandorafms!6815
2024-01-31 14:06:07 +00:00
Daniel Cebrian 8bf3794072 #12824 fixed create agent view 2024-01-31 15:02:20 +01:00
Matias Didier 5ea053800a Merge branch 'ent-12815-16977-cuadro-de-busqueda-en-filtro-de-vista-de-configuracion-de-modulos-de-agente-no' into 'develop'
Ent 12815 16977 cuadro de busqueda en filtro de vista de configuracion de modulos de agente no

See merge request artica/pandorafms!6891
2024-01-31 12:34:23 +00:00
Diego Muñoz-Reja 1980b36c17 Merge branch 'ent-11165-anadir-info-de-whois-de-una-ip-dada-en-netflow-explorer' into 'develop'
Ent 11165 Añadir info de whois de una IP dada en Netflow explorer

See merge request artica/pandorafms!6827
2024-01-31 09:14:44 +00:00
Daniel Cebrian 137488ee8c #12798 fixed unauth sql injection in grafana 2024-01-31 10:05:36 +01:00
Matias Didier a7bb08a984 Merge branch 'ent-12791-configuration-wizard-parece-roto-al-entrar-desde-el-header' into 'develop'
Ent 12791 configuration wizard parece roto al entrar desde el header

See merge request artica/pandorafms!6893
2024-01-31 08:59:54 +00:00
Matias Didier 66eda7368d Merge branch 'ent-12034-enlace-publico-de-dashboard-que-ha-sido-borrado-no-muestra-nada' into 'develop'
Ent 12034 Enlace público de dashboard que ha sido borrado no muestra nada

See merge request artica/pandorafms!6828
2024-01-31 08:21:45 +00:00
Daniel Cebrian 60d2733066 #12794 fixed login when user use external login 2024-01-30 18:22:20 +01:00
Daniel Cebrian 1882c7a624 #12833 fixed critical value in bulk operation 2024-01-30 17:58:41 +01:00
alejandro.campos@artica.es 0df4379926 fixed database ncm info 2024-01-30 17:47:43 +01:00
Daniel Cebrian d4ceb1ac4d Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 17:11:30 +01:00
Daniel Cebrian f68615cba0 #12460 fixed deprecated 2024-01-30 17:00:38 +01:00
Jonathan 727ee659ae #12791 fix wizard welcome 2024-01-30 15:37:04 +01:00
Daniel Cebrian 2531de8cb0 #12034 fixed page not access when dashboard is deleted 2024-01-30 14:58:04 +01:00
Jonathan f430d3ce9f #12797 fix select2 2024-01-30 14:53:48 +01:00
Rafael Ameijeiras 9e1d5469ed Merge branch 'ent-11642-comprobacion-de-la-estructura-de-la-base-de-datos-en-772-lts' into 'develop'
#11642. Fix missing sql in MR

See merge request artica/pandorafms!6873
2024-01-30 13:53:43 +00:00
Rafael Ameijeiras 35b5644f9c Merge branch 'ent-12789-busqueda-por-regex-funciona-mal' into 'develop'
Ent 12789 Búsqueda por regex funciona mal

See merge request artica/pandorafms!6889
2024-01-30 13:52:57 +00:00
Daniel Cebrian b28c97b9b7 Merge branch 'develop' into ent-12034-enlace-publico-de-dashboard-que-ha-sido-borrado-no-muestra-nada 2024-01-30 13:25:58 +01:00
Daniel Cebrian 5b7a123086 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 13:21:44 +01:00
Daniel Cebrian c0ad547625 #12460 fixed deprecated 2024-01-30 13:14:54 +01:00
Jonathan c008aee180 #12815 modules search space entity 2024-01-30 12:01:20 +01:00
Jonathan 6091071f03 #12718 fix error on signature package ums 2024-01-30 10:11:53 +01:00
Daniel Cebrian 4971c29819 #12789 fixed pagination in events 2024-01-30 09:25:17 +01:00
Daniel Cebrian 61e38865f6 Merge branch 'develop' into ent-12789-busqueda-por-regex-funciona-mal 2024-01-30 08:53:04 +01:00
Daniel Cebrian 22598b4bc2 #12460 fixed deprecated 2024-01-29 17:31:19 +01:00
Rafael Ameijeiras 813deba7a5 Merge branch 'ent-12698-nuevos-mensajes-de-bienvenida-quedan-raros-si-el-usuario-no-tiene-full-name' into 'develop'
Ent 12698 nuevos mensajes de bienvenida quedan raros si el usuario no tiene full name

See merge request artica/pandorafms!6875
2024-01-29 15:20:27 +00:00
Luis 5631f5754b Merge branch 'develop' into 'ent-11642-comprobacion-de-la-estructura-de-la-base-de-datos-en-772-lts'
# Conflicts:
#   pandora_console/extras/mr/68.sql
2024-01-29 14:09:51 +00:00
Matias Didier 8269f5fcc6 Merge branch 'ent-11014-codigo-qr-en-user-detail-editor-mantiene-fija-su-posicion-mientras-se-redimensiona-ventana' into 'develop'
Ent 11014 codigo qr en user detail editor mantiene fija su posicion mientras se redimensiona ventana

See merge request artica/pandorafms!6415
2024-01-29 14:01:15 +00:00
Daniel Cebrian 1738a06cf2 #12789 added tip in regex search 2024-01-29 13:42:09 +01:00
Diego Muñoz-Reja eba2f45ed1 Merge branch 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada' into 'develop'
fix filter bug

See merge request artica/pandorafms!6761
2024-01-29 12:39:42 +00:00
Daniel Cebrian f01902903c #12789 fixed regex in event table 2024-01-29 13:38:29 +01:00
Matias Didier a2ea701ef0 Merge branch 'ent-12623-edicion-de-inventory-modules-se-despista-con-el-menu-principal' into 'develop'
Ent 12623 edicion de inventory modules se despista con el menu principal

See merge request artica/pandorafms!6876
2024-01-29 12:15:49 +00:00
Daniel Rodriguez 3db0090c0e Merge branch 'ent-12351-16497-Mejoras-Ampliacion-de-los-informes-monitorizacion-Netflow-Top-N-Connection' into 'develop'
implement several changes in top-n connection report item

See merge request artica/pandorafms!6833
2024-01-29 11:14:58 +00:00
Rafael Ameijeiras c1b74ab7f0 Merge branch 'ent-12267-dashboard-mejora-del-widget-de-module-status' into 'develop'
add new filters widget modules status pandora_enterprise#12267

See merge request artica/pandorafms!6734
2024-01-29 09:33:56 +00:00
Rafael Ameijeiras 8bb2b46c48 Merge branch 'ent-12568-Falta-la-opcion-de-escoger-Exec-server-en-la-configuracion-de-Event-response' into 'develop'
fix missing fields

See merge request artica/pandorafms!6766
2024-01-29 09:32:50 +00:00
Rafael Ameijeiras ccaa25da23 Merge branch 'ent-12657-mostrar-show-entries-de-eventos-de-menor-a-mayor' into 'develop'
Ent 12657 mostrar show entries de eventos de menor a mayor

See merge request artica/pandorafms!6785
2024-01-29 09:30:55 +00:00
Rafael Ameijeiras c5c0b838e0 Merge branch 'ent-12807-error-sql-vista-de-alertas-en-develop' into 'develop'
Ent 12807 error sql vista de alertas en develop

See merge request artica/pandorafms!6888
2024-01-29 09:30:14 +00:00
Rafael Ameijeiras e39a87ebd7 Merge branch 'ent-12802-insert-data-no-recoge-bien-la-fecha' into 'develop'
Ent 12802 insert data no recoge bien la fecha

See merge request artica/pandorafms!6886
2024-01-29 09:16:00 +00:00
Alejandro Campos 618f677906 Merge branch 'develop' into 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada'
# Conflicts:
#   pandora_console/include/functions_events.php
#   pandora_console/operation/events/events.php
2024-01-26 13:42:59 +00:00
Diego Muñoz-Reja 04126c2407 Merge branch 'ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql' into 'develop'
add tables merge process pandora_enterprise#12352

See merge request artica/pandorafms!6722
2024-01-26 12:27:59 +00:00
Matias Didier ca3a9b3c56 Merge branch 'ent-12399-bugs-visuales-en-update-manager-offline' into 'develop'
fix visual error um-offline pandora_enterprise#12399

See merge request artica/pandorafms!6830
2024-01-26 12:27:17 +00:00
daniel bba32495a4 fix visual errors in msg umc offline pandora_enterprise#12399 2024-01-26 10:15:01 +01:00
Matias Didier 5b9bf180d8 Merge branch 'ent-11799-15999-eliminacion-de-intervalo-en-agentes-broker' into 'develop'
Ent 11799 15999 eliminacion de intervalo en agentes broker

See merge request artica/pandorafms!6885
2024-01-26 08:34:36 +00:00
daniel 51524f4263 Merge remote-tracking branch 'origin/develop' into ent-12399-bugs-visuales-en-update-manager-offline 2024-01-26 09:27:06 +01:00
daniel 65385f36c1 fix visual errors in widgets dashboard pandora_enterprise#12267 2024-01-26 09:18:47 +01:00
Jonathan c07ecff571 #12807 check id_agent for alert view 2024-01-26 08:13:10 +01:00
daniel b84d2aeec9 Merge remote-tracking branch 'origin/develop' into ent-12267-dashboard-mejora-del-widget-de-module-status
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
2024-01-26 08:10:07 +01:00
artica c5cefb3c13 Auto-updated build strings. 2024-01-26 01:00:30 +01:00
alejandro.campos@artica.es 31312eaa53 visual fix 2024-01-25 17:19:05 +01:00
Jonathan 1c094cd219 #12802 fix date error 2024-01-25 16:58:21 +01:00
alejandro.campos@artica.es 18cb14bec6 minor fixes 2024-01-25 16:03:48 +01:00
daniel 00f9098f56 Merge remote-tracking branch 'origin/develop' into ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
2024-01-25 15:57:20 +01:00
Jonathan cdd9af5108 #11799 hide interval for broker agents 2024-01-25 15:25:08 +01:00
Jonathan 874bd04aa8 #11799 hide interval for broker agents 2024-01-25 15:23:48 +01:00
Rafael Ameijeiras e19f520eb0 Merge branch 'ent-12522-mejoras-en-audit-log' into 'develop'
Ent 12522 Mejoras en audit log

See merge request artica/pandorafms!6816
2024-01-25 14:00:56 +00:00
Rafael Ameijeiras b271cff73e Merge branch 'ent-12754-widget-modules-by-status-bug-al-filtrar-por-estados' into 'develop'
Ent 12754 widget modules by status bug al filtrar por estados

See merge request artica/pandorafms!6858
2024-01-25 13:58:02 +00:00
Rafael Ameijeiras 574db2befe Merge branch 'ent-12128-en-alert-details-no-se-muestra-el-nombre-de-la-accion-correspondiente-a-la-alerta-al-usar' into 'develop'
Ent 12128 en alert details no se muestra el nombre de la accion correspondiente a la alerta al usar

See merge request artica/pandorafms!6802
2024-01-25 13:57:05 +00:00
artica 8bbfa2803f Auto-updated build strings. 2024-01-25 01:00:29 +01:00
Rafael Ameijeiras 8eadf06ed8 Merge branch 'ent-12574-vista-de-insert-data-a-veces-muestra-el-aviso-muy-abajo-en-la-pantalla' into 'develop'
Ent 12574 vista de insert data a veces muestra el aviso muy abajo en la pantalla

See merge request artica/pandorafms!6880
2024-01-24 15:25:24 +00:00
Diego Muñoz-Reja 077252d9cb Merge branch 'ent-11605-item-weekly-sla-mete-salto-de-pagina-si-el-siguiente-elemento-es-del-mismo-tipo-aunque-haya' into 'develop'
quit pagebreak pandora_enterprise#11605

See merge request artica/pandorafms!6737
2024-01-24 13:41:00 +00:00
Daniel Cebrian fd8d233cf8 #12460 fixed deprecated 2024-01-24 13:28:43 +01:00
Daniel Cebrian fbb5d349a2 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-24 11:58:00 +01:00
Jonathan 4e523e94cc #12574 fix datepicker and give style 2024-01-24 09:51:35 +01:00
Rafael Ameijeiras 5dc0e35be8 Merge branch 'ent-12753-os-command-injection' into 'develop'
Ent 12753 OS Command Injection

See merge request artica/pandorafms!6868
2024-01-24 08:15:58 +00:00
Daniel Cebrian 4fc3013cc3 #12522 fixed multiple audit when update setup 2024-01-24 09:15:32 +01:00
Rafael Ameijeiras f3152eca09 Merge branch 'ent-12786-edicion-creacion-de-tarea-discovery-aplicacion-o-cloud-muestra-wizard-de-inicio' into 'develop'
Ent 12786 edicion creacion de tarea discovery aplicacion o cloud muestra wizard de inicio

See merge request artica/pandorafms!6878
2024-01-24 08:15:23 +00:00
artica dd252daaf2 Auto-updated build strings. 2024-01-24 01:00:32 +01:00
Calvo 1bc9bc6095 Fix MR 2024-01-23 17:52:06 +01:00
Daniel Cebrian 7f604f0c8d #12460 fixed deprecated 2024-01-23 17:47:26 +01:00
Daniel Cebrian 538177c3e5 #12753 fixed vul command in ajax 2024-01-23 17:08:06 +01:00
Rafael Ameijeiras e1478f61e5 Merge branch 'ent-12364-vista-de-logs-filtro-para-agentes-y-sources' into 'develop'
Ent 12364 vista de logs filtro para agentes y sources

See merge request artica/pandorafms!6855
2024-01-23 15:46:03 +00:00
Rafael Ameijeiras d2bdbc9e42 Merge branch 'ent-12767-passwords-de-ldap-no-se-pueden-visualizar' into 'develop'
Ent 12767 passwords de ldap no se pueden visualizar

See merge request artica/pandorafms!6856
2024-01-23 15:45:23 +00:00
Rafael Ameijeiras b019abbb97 Merge branch 'ent-12782-vista-de-eventos-se-ve-feo-la-paginacion-en-una-pantalla-de-1300px-de-ancho' into 'develop'
Ent 12782 Vista de eventos: se ve feo la paginacion en una pantalla de 1300px de ancho

See merge request artica/pandorafms!6871
2024-01-23 15:44:49 +00:00
Jonathan 3026c9d50d #12786 fix wizard open out of index 2024-01-23 16:27:07 +01:00
Matias Didier a93c9985ec Merge branch 'ent-12792-error-500-en-inventario-al-cambiar-de-agente' into 'develop'
Ent 12792 error 500 en inventario al cambiar de agente

See merge request artica/pandorafms!6877
2024-01-23 14:43:51 +00:00
Diego Muñoz-Reja 6352243e64 Merge branch 'ent-12386-16541-Implementar-autorefresh-en-la-vista-de-modulos-del-agente' into 'develop'
add autorefresh to agent view

See merge request artica/pandorafms!6786
2024-01-23 14:22:22 +00:00
Matias Didier e47b8eb364 Merge branch 'ent-12323-campo-para-configurar-rotado-de-netflow_interval' into 'develop'
Ent 12323 Campo para configurar rotado de netflow_interval

See merge request artica/pandorafms!6824
2024-01-23 12:51:28 +00:00
Diego Muñoz-Reja 43cb4878cc Merge branch 'ent-12518-campo-personalizado-de-enlace-web-desde-agente-software-codifica-mal-al-guardar-en-base-de-datos' into 'develop'
Ent 12518 campo personalizado de enlace web desde agente software codifica mal al guardar en base de datos

See merge request artica/pandorafms!6732
2024-01-23 11:28:59 +00:00
Matias Didier 1cce0a3cea Merge branch 'ent-12777-export-qr-mete-html-encoding' into 'develop'
Ent 12777 export qr mete html encoding

See merge request artica/pandorafms!6865
2024-01-23 11:23:33 +00:00
Jonathan fc08e9b9b6 #12792 fix 500 change agent inventory 2024-01-23 11:27:15 +01:00
Jonathan cd27935b4c #12623 fix menu inventory modules 2024-01-23 11:26:15 +01:00
Jonathan 510c28bb09 #12698 fix welcome messages 2024-01-23 10:56:31 +01:00