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

30545 Commits

Author SHA1 Message Date
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
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 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
Matias Didier eba0ce9e80 Merge branch 'ent-12624-cambio-estilo-de-ventanas-modales' into 'develop' 
Ent 12624 cambio estilo de ventanas modales

See merge request artica/pandorafms!6826
 2024-01-23 09:44:21 +00:00
Daniel Rodriguez b11651aa6e Merge branch 'ent-12580-16708-modulos-webserver-no-loguean-y-devuelven-critico' into 'develop' 
Ent-12580-16708-modulos-webserver-no-loguean-y-devuelven-critico

Closes pandora_enterprise#12580

See merge request artica/pandorafms!6791
 2024-01-23 09:20:40 +00:00
Calvo 7fe8bfc096 Merge remote-tracking branch 'origin/develop' into ent-11642-comprobacion-de-la-estructura-de-la-base-de-datos-en-772-lts 2024-01-23 10:14:58 +01:00
Rafael Ameijeiras 013d2119d6 Merge branch 'ent-12752-unauth-time-based-sql-injection' into 'develop' 
Ent 12752 Unauth Time-Based SQL Injection

See merge request artica/pandorafms!6861
 2024-01-23 07:38:34 +00:00
Rafael Ameijeiras 30f6e9ea36 Merge branch 'ent-12539-mostrar-dialogo-con-retardo-de-cierre-en-vista-ppal-de-agente' into 'develop' 
Ent 12539 mostrar dialogo con retardo de cierre en vista ppal de agente

See merge request artica/pandorafms!6807
 2024-01-23 07:27:34 +00:00
Rafael Ameijeiras 028c8a5aee Merge branch 'ent-12538-meter-chequeos-adicionales-en-el-systemcheck-para-controlar-total-de-modulos-en-el-sistema' into 'develop' 
Ent 12538 Meter chequeos adicionales en el systemcheck para controlar total de modulos en el sistema

See merge request artica/pandorafms!6867
 2024-01-23 07:23:16 +00:00
Rafael Ameijeiras c5f94a203e Merge branch 'ent-12693-bug-al-editar-inventario-remoto' into 'develop' 
Ent 12693 bug al editar inventario remoto

See merge request artica/pandorafms!6863
 2024-01-23 07:22:16 +00:00
Rafael Ameijeiras b14825b2b3 Merge branch 'ent-12734-perdida-de-agente-al-actualizar-gis-map' into 'develop' 
Ent 12734 perdida de agente al actualizar gis map

See merge request artica/pandorafms!6839
 2024-01-23 07:21:50 +00:00
Rafael Ameijeiras 7fd8423f88 Merge branch 'ent-12673-eliminar-el-de-todas-las-custom-queries-en-el-discovery-de-oracle-2' into 'develop' 
mr changes

See merge request artica/pandorafms!6860
 2024-01-23 07:19:33 +00:00
artica d4c5d2f316 Auto-updated build strings. 2024-01-23 01:00:29 +01:00
Daniel Maya 6948306d82 #12767 Fixed password 3 2024-01-22 17:29:51 +01:00
Luis e6203ab708 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-22 16:12:56 +00:00
Diego Muñoz-Reja 9bdcfb4b4d Merge branch 'ent-12519-anadir-el-campo-event-custom-id-a-la-creacion-de-eventos-por-cli-y-api' into 'develop' 
Ent-12519-anadir-el-campo-event-custom-id-a-la-creacion-de-eventos-por-cli-y-api

Closes pandora_enterprise#12519

See merge request artica/pandorafms!6769
 2024-01-22 15:49:32 +00:00
Matias Didier 23c33a73f6 Merge branch 'ent-12299-al-borrar-un-agente-por-masivas-en-meta-no-se-borra-el-md5-y-el-conf' into 'develop' 
remove agents bulk operation pandora_enterprise#12299

See merge request artica/pandorafms!6749
 2024-01-22 14:34:29 +00:00
Daniel Cebrian 54e3f94d62 #12782 fixed button sound events style in events 2024-01-22 15:07:25 +01:00
alejandro 82c8d519b4 update grafana extension 2024-01-22 13:25:43 +01:00
Matias Didier e2a2e27fe7 Merge branch 'ent-11086-usuarios-pueden-borrar-y-deshabilitar-extensiones-de-sistema-pfms' into 'develop' 
Ent 11086 Usuarios pueden borrar y deshabilitar "extensiones de sistema PFMS"

See merge request artica/pandorafms!6864
 2024-01-22 12:18:08 +00:00
Matias Didier 5a640960c1 Merge branch 'ent-12778-secciones-sin-enlace-al-menu' into 'develop' 
Ent 12778 secciones sin enlace al menu

See merge request artica/pandorafms!6866
 2024-01-22 11:53:13 +00:00
Daniel Cebrian 5d5bfc654d #12753 fixed os command injection 2024-01-22 12:39:43 +01:00
Diego Muñoz-Reja f560ae8d56 Merge branch 'ent-12520-errores-en-formularios-de-los-dashboards' into 'develop' 
Ent 12520 errores en formularios de los dashboards

See merge request artica/pandorafms!6718
 2024-01-22 11:16:19 +00:00
Matias Didier 1276b1a972 Merge branch 'ent-12509-cuadro-grupos-vista-tactica-y-vista-tactica-de-grupos-muestra-deshabilitados' into 'develop' 
Ent 12509 Cuadro grupos vista táctica y vista táctica de grupos muestra deshabilitados

See merge request artica/pandorafms!6764
 2024-01-22 11:04:20 +00:00
Alejandro Sánchez 75481a9677 Merge branch 'develop' into 'ent-12673-eliminar-el-de-todas-las-custom-queries-en-el-discovery-de-oracle-2' 
# Conflicts:
#   pandora_console/extras/mr/68.sql
 2024-01-22 10:55:47 +00:00
Daniel Cebrian a9c16e1f69 #12538 added url in new notificacions 2024-01-22 10:55:37 +01:00
Daniel Cebrian d85a488cb0 #12538 new notifications in console supervisor 2024-01-22 10:37:03 +01:00
Matias Didier b38d50a3b2 Merge branch 'ent-12515-bug-al-mostrar-el-evento-completo-en-un-tooltip-en-la-vista-de-eventos' into 'develop' 
Ent 12515 bug al mostrar el evento completo en un tooltip en la vista de eventos

See merge request artica/pandorafms!6787
 2024-01-22 09:30:08 +00:00
Matias Didier f35b95f0fe Merge branch 'ent-12745-falta-un-campo-en-la-tabla-tncm_agent_data' into 'develop' 
Ent 12745 falta un campo en la tabla tncm agent data

See merge request artica/pandorafms!6857
 2024-01-22 09:28:53 +00:00
Jonathan 740c0adc9c #12778 add sections hack 2024-01-22 10:15:31 +01:00
Matias Didier c6a9dce7b2 Merge branch 'ent-12537-display-de-mensajes-no-tiene-en-cuenta-los-tipos' into 'develop' 
Ent 12537 Display de mensajes no tiene en cuenta los tipos

See merge request artica/pandorafms!6825
 2024-01-22 08:57:06 +00:00
Jonathan f43279acc3 #12777 qr name remove entities 2024-01-22 09:27:02 +01:00
Daniel Cebrian cb58b6e8f0 Merge branch 'develop' into ent-12509-cuadro-grupos-vista-tactica-y-vista-tactica-de-grupos-muestra-deshabilitados 2024-01-22 08:33:42 +01:00
artica 895684238e Auto-updated build strings. 2024-01-22 01:00:15 +01:00
artica 91e072e384 Auto-updated build strings. 2024-01-21 01:00:15 +01:00
artica f67c9185f8 Auto-updated build strings. 2024-01-20 01:00:29 +01:00
Daniel Cebrian 5ece13fc9f #11086 fixed acl in extensions view 2024-01-19 14:05:20 +01:00
Jonathan 30e0ed912a Merge branch 'develop' into ent-12745-falta-un-campo-en-la-tabla-tncm_agent_data 2024-01-19 13:15:01 +01:00
Daniel Cebrian fadb70d740 Merge branch 'develop' into ent-12537-display-de-mensajes-no-tiene-en-cuenta-los-tipos 2024-01-19 13:06:37 +01:00
Matias Didier a4f67d353b Merge branch 'ent-12725-16851-tree-view-no-marca-agentes-en-estado-quiet' into 'develop' 
Ent 12725 16851 tree view no marca agentes en estado quiet

See merge request artica/pandorafms!6849
 2024-01-19 11:36:30 +00:00
Matias Didier 1664764fb1 Merge branch 'ent-12439-16595-lista-del-buscador-no-marca-agentes-silenciosos' into 'develop' 
Ent 12439 16595 lista del buscador no marca agentes silenciosos

See merge request artica/pandorafms!6678
 2024-01-19 11:16:51 +00:00
Daniel Rodriguez cc33e5413a Merge branch 'ent-12202-eastern-egg-asteroids' into 'develop' 
Ent 12202 eastern egg asteroids

See merge request artica/pandorafms!6693
 2024-01-19 11:10:55 +00:00
Daniel Cebrian da8769c860 #12509 resolve conflicts 2024-01-19 10:26:09 +01:00
Jonathan d36ec9a8c0 #12693 add filter id_agente 2024-01-19 10:18:38 +01:00
Rafael Ameijeiras 6e9a367d05 Merge branch 'ent-12677-corregir-timezone-en-eventos' into 'develop' 
fix timezone events pandora_enterprise#12677

See merge request artica/pandorafms!6796
 2024-01-19 08:38:39 +00:00
Rafael Ameijeiras 7caabd9805 Merge branch 'ent-12666-severity-mini-no-se-estira-verticalmente-en-la-vista-de-eventos' into 'develop' 
Ent 12666 severity mini no se estira verticalmente en la vista de eventos

See merge request artica/pandorafms!6799
 2024-01-19 08:38:14 +00:00
Rafael Ameijeiras 3386347253 Merge branch 'ent-12575-no-se-puede-ordenar-por-columnas-en-la-vista-de-dashboards' into 'develop' 
Ent 12575 No se puede ordenar por columnas en la vista de Dashboards

See merge request artica/pandorafms!6756
 2024-01-19 08:37:12 +00:00
Rafael Ameijeiras 0c73dab521 Merge branch 'ent-12366-bug-al-asignar-5-o-mas-perfiles-a-un-usuario' into 'develop' 
Ent 12366 bug al asignar 5 o mas perfiles a un usuario

See merge request artica/pandorafms!6771
 2024-01-19 08:36:45 +00:00
Daniel Maya a41d2214e6 #12767 Fixed password 2 2024-01-19 09:33:53 +01:00
Rafael Ameijeiras 2baef1ccf2 Merge branch 'ent-12553-correccion-de-erratas' into 'develop' 
Ent 12553 Corrección de erratas

See merge request artica/pandorafms!6817
 2024-01-19 08:23:35 +00:00
Daniel Cebrian ae9b786dd5 #12752 fixed sql injection 2024-01-19 09:21:57 +01:00
Rafael Ameijeiras 23c63e2c3f Merge branch 'ent-12674-selectores-sin-accion-en-custom-graphs' into 'develop' 
Ent 12674 selectores sin accion en custom graphs

See merge request artica/pandorafms!6798
 2024-01-19 08:21:43 +00:00
Rafael Ameijeiras 5afa5c36c0 Merge branch 'ent-12598-16733-Filtro-de-eventos-borrado-y-asignado-como-favorito-permanece-en-la-seccion' into 'develop' 
Ent 12598 16733 filtro de eventos borrado y asignado como favorito permanece en la seccion

See merge request artica/pandorafms!6736
 2024-01-19 08:20:47 +00:00
Rafael Ameijeiras 49487c0960 Merge branch 'ent-12577-Error-visual-de-los-contenedores-de-opciones-avanzadas-de-modulos-Dynamic-Threshold-FF-threshold-y-Cron-from' into 'develop' 
Ent 12577 error visual de los contenedores de opciones avanzadas de modulos dynamic threshold ff threshold y cron from

See merge request artica/pandorafms!6743
 2024-01-19 08:20:07 +00:00
Rafael Ameijeiras 4705aefb83 Merge branch 'ent-12692-anadir-informacion-i-al-token-event-storm-protection-del-setup-para-evitar-confusiones' into 'develop' 
Ent 12692 anadir informacion i al token event storm protection del setup para evitar confusiones

See merge request artica/pandorafms!6819
 2024-01-19 08:19:48 +00:00
Rafael Ameijeiras 838d68d5e4 Merge branch 'ent-12733-faltan-los-botones-de-accion-de-los-filtros-de-eventos' into 'develop' 
Ent 12733 faltan los botones de accion de los filtros de eventos

See merge request artica/pandorafms!6836
 2024-01-19 08:19:15 +00:00
Rafael Ameijeiras e4c30eaeb6 Merge branch 'ent-12501-varios-errores-en-los-campos-personalizados-por-consola-web' into 'develop' 
Ent 12501 varios errores en los campos personalizados por consola web

See merge request artica/pandorafms!6723
 2024-01-19 08:18:53 +00:00