Commit Graph

30254 Commits

Author SHA1 Message Date
Rafael Ameijeiras 048c2cbec6 Merge branch 'ent-12596-modificar-banner-version-en-consola-open' into 'develop'
Ent 12596 modificar banner version en consola open

See merge request artica/pandorafms!6752
2023-12-11 14:19:15 +00:00
Matias Didier fe9dcb2c91 Merge branch 'ent-12530-reportes-SLA-rotos-al-mover-agente' into 'develop'
Ent 12530 reportes sla rotos al mover agente

See merge request artica/pandorafms!6725
2023-12-11 13:10:51 +00:00
miguel angel rasteu 3a00ba0fd6 Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed 2023-12-11 12:41:37 +01:00
Jonathan 28dc5cada0 #12596 new dialog on baner open version 2023-12-11 12:21:33 +01:00
Enrique Martin 9f98710248 Set default agents to create 2023-12-11 12:15:53 +01:00
Enrique Martin 93293f41ef Removed debug default agents to create value 2023-12-11 12:14:19 +01:00
Matias Didier 962111936e Merge branch 'ent-12150-errores-en-los-cambios-para-los-logs-de-consola-y-directorios' into 'develop'
Ent 12150 errores en los cambios para los logs de consola y directorios

See merge request artica/pandorafms!6518
2023-12-11 11:13:35 +00:00
Enrique Martin 28d6b73bd8 Removed services and plugin agents setup for demo 2023-12-11 12:12:47 +01:00
Enrique Martin c8e7e1e375 Added text to welcome wizard 2023-12-11 12:08:50 +01:00
Rafael Ameijeiras 88bcafaba3 Merge branch 'ent-12459-16599-vista-de-monitoring-vmware-view-no-muestra-informacion-del-datacenter-ni-el-data' into 'develop'
Ent 12459 [#16599] Vista de Monitoring > VMWare View no muestra información del Datacenter ni el Datastore

See merge request artica/pandorafms!6671
2023-12-11 11:07:14 +00:00
Enrique Martin 00a0fa8eae Fixed reports generation 2023-12-11 11:53:46 +01:00
Diego Muñoz-Reja 5c0435d226 Merge branch 'ent-11846-rehacer-vista-list-of-elements-consolas-visuales-relacionado-con-11835' into 'develop'
Ent 11846 rehacer vista list of elements consolas visuales relacionado con 11835

See merge request artica/pandorafms!6563
2023-12-11 10:34:10 +00:00
daniel fd212e7c20 fix error hide/show input sliced mode pandora_enterprise#9640 2023-12-11 11:24:45 +01:00
daniel a418673489 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-11 11:09:54 +01:00
Daniel Cebrian f6c31887a3 Merge branch 'develop' into ent-12459-16599-vista-de-monitoring-vmware-view-no-muestra-informacion-del-datacenter-ni-el-data 2023-12-11 10:36:32 +01:00
Enrique Martin 5a5674f3b4 Set default agents to create to 30 2023-12-11 10:33:03 +01:00
Jonathan 52ce386ea8 Merge branch 'develop' into ent-12150-errores-en-los-cambios-para-los-logs-de-consola-y-directorios 2023-12-11 10:31:07 +01:00
Jonathan 49fd9435dd Merge branch 'develop' into ent-8365-ncm-fase-3 2023-12-11 10:13:46 +01:00
Rafael Ameijeiras 071427e60b Merge branch 'ent-12274-pandora-gotty-no-se-levanta-automaticamente-con-el-cron-en-ubuntu' into 'develop'
fix pgrep process in ubuntu

See merge request artica/pandorafms!6658
2023-12-11 08:54:30 +00:00
Daniel Cebrian cf203a1a45 Merge branch 'develop' into ent-12459-16599-vista-de-monitoring-vmware-view-no-muestra-informacion-del-datacenter-ni-el-data 2023-12-11 09:32:50 +01:00
Rafael Ameijeiras be553ed170 Merge branch 'ent-11954-16123-borrado-de-acciones-no-deseadas-con-bulk' into 'develop'
Ent 11954 16123 borrado de acciones no deseadas con bulk

See merge request artica/pandorafms!6380
2023-12-11 08:29:29 +00:00
Rafael Ameijeiras 1e2f573a3b Merge branch 'ent-12385-filtro-de-grupo-al-anadir-nodos-a-un-mapa-de-red-vacio-no-funciona' into 'develop'
Ent 12385 filtro de grupo al anadir nodos a un mapa de red vacio no funciona

See merge request artica/pandorafms!6673
2023-12-11 08:28:56 +00:00
miguel angel rasteu d034116dd3 #11495 Fix report 2023-12-11 09:26:57 +01:00
Rafael Ameijeiras ce298c1e8f Merge branch 'ent-12353-URL-de-Pandora-RC-en-Pandora-FMS-continua-siendo-ehorus-en-el-Setup' into 'develop'
change url pandorarc name

See merge request artica/pandorafms!6649
2023-12-11 08:24:46 +00:00
Rafael Ameijeiras 62538643e4 Merge branch 'ent-12334-query-para-borrar-el-campo-transactional_agent-de-tagente' into 'develop'
queries remove field transactional_agent pandora_enterprise#12334

See merge request artica/pandorafms!6643
2023-12-11 08:24:04 +00:00
Rafael Ameijeiras 781a3656cc Merge branch 'ent-11494-nuevo-widget-service-level-detail' into 'develop'
Ent 11494 nuevo widget service level detail

See merge request artica/pandorafms!6438
2023-12-11 08:21:13 +00:00
miguel angel rasteu 8e69326e3c Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed 2023-12-11 08:43:37 +01:00
artica 5351af2f7a Auto-updated build strings. 2023-12-11 01:00:22 +01:00
artica 16f75809f1 Auto-updated build strings. 2023-12-10 01:00:20 +01:00
artica ef339a1bbe Auto-updated build strings. 2023-12-09 01:00:21 +01:00
artica d83a64da9c Auto-updated build strings. 2023-12-08 01:00:28 +01:00
Matias Didier 385989f185 Merge branch 'ent-12329-16465-problema-public-link-consolas-visuales-metaconsola' into 'develop'
VC Public links pandora_enterprise#12329

See merge request artica/pandorafms!6633
2023-12-07 15:27:57 +00:00
Jorge Rincon 725c5d964c #12620 fixed blacklist items in setup 2023-12-07 13:09:42 +01:00
Daniel Maya b99b0d4708 #12606 Fixed period 2023-12-07 12:49:20 +01:00
daniel 06dcafaf0f Merge remote-tracking branch 'origin/develop' into ent-12334-query-para-borrar-el-campo-transactional_agent-de-tagente
Conflicts:
	pandora_console/extras/mr/67.sql
2023-12-07 11:44:59 +01:00
Diego Muñoz-Reja 4d8aa8f697 Merge branch 'ent-11886-errata-minimun-en-informes' into 'develop'
Ent 11886 errata minimun en informes

See merge request artica/pandorafms!6386
2023-12-07 09:59:29 +00:00
Jonathan 78bb8e0bae #8365 ix merge conflict 2023-12-07 10:58:45 +01:00
Diego Muñoz-Reja b1b3cced7d Merge branch 'ent-11903-16107-borrar-listado-mapas-gis' into 'develop'
Ent 11903 16107 borrar listado mapas gis

See merge request artica/pandorafms!6393
2023-12-07 09:27:38 +00:00
miguel angel rasteu 0337afcdaf #12138 Fix SQL code 2023-12-07 10:21:57 +01:00
artica 62901b6a70 Auto-updated build strings. 2023-12-07 01:00:21 +01:00
artica 0481af6b50 Auto-updated build strings. 2023-12-06 01:00:26 +01:00
alejandro.campos@artica.es d229e06d77 Merge remote-tracking branch 'origin/develop' into ent-11711-Comprobar-versiones-de-dependencias-antes-de-actualizar 2023-12-05 18:04:24 +01:00
daniel 98f22dac72 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 2023-12-05 16:48:33 +01:00
daniel 5c6f11511c fix error events sound modal pandora_enterprise#12607 2023-12-05 16:48:12 +01:00
Alejandro Campos 0bdc6978e6 Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
2023-12-05 15:30:06 +00:00
alejandro.campos@artica.es 457f8e9448 some changes in discovery 2023-12-05 16:07:14 +01:00
Daniel Cebrian 75720df6fa #12176 fixed empty news board 2023-12-05 13:23:37 +01:00
daniel 066cb857e9 fix error histogram pandora_enterprise#12209 2023-12-05 13:15:54 +01:00
miguel angel rasteu 21ea0f5196 #11494 Fix MTRS 2023-12-05 12:53:32 +01:00
alejandro.campos@artica.es 08e514e12c Merge branch 'ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline' of brutus.artica.es:artica/pandorafms into ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline 2023-12-05 12:40:50 +01:00
alejandro.campos@artica.es 28d230433a upload image 2023-12-05 12:40:21 +01:00
daniel 10515e88df Merge remote-tracking branch 'origin/develop' into ent-12209-module-histogram-widget-no-coge-bien-los-estados-del-modulo 2023-12-05 12:37:17 +01:00
Enrique Martin 1a473d3846 Added applications images 2023-12-05 12:33:42 +01:00
alejandro.campos@artica.es cfc1992d26 Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-05 12:20:58 +01:00
alejandro.campos@artica.es 9622b61557 Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-05 12:20:40 +01:00
Enrique Martin 2d1b2bf6d2 Added new dashboard widgets 2023-12-05 12:11:25 +01:00
alejandro.campos@artica.es e7f18709b7 optimization 2023-12-05 12:07:23 +01:00
alejandro.campos@artica.es d601103df3 fix url 2023-12-05 11:49:43 +01:00
daniel 34784752b7 fix error js load modal filter sound events pandora_enterprise#12607 2023-12-05 11:47:37 +01:00
alejandro.campos@artica.es 433ce7971f minor change 2023-12-05 11:38:11 +01:00
alejandro.campos@artica.es 60137eb300 changes in discovery extensions 2023-12-05 11:32:19 +01:00
miguel angel rasteu 6455314f0c Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail 2023-12-05 11:16:42 +01:00
daniel ee3df634d6 fix error histogram and events history graph pandora_enterprise#12209 2023-12-05 10:35:02 +01:00
daniel 1d36d8a436 fix error 500 and warnings pandora_enterprise#12605 2023-12-05 09:14:02 +01:00
alejandro.campos@artica.es c9c3426b16 minor change 2023-12-05 08:30:00 +01:00
daniel 77cf0ce6ca Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/styles/pandora.css
2023-12-05 08:02:55 +01:00
artica cdb3308e7a Auto-updated build strings. 2023-12-05 01:00:24 +01:00
Enrique Martin e833499dc3 Improvements, fixes and new demo elements 2023-12-04 16:58:08 +01:00
Daniel Cebrian c22525febc #12569 fixed actions credential boxes 2023-12-04 16:54:14 +01:00
Daniel Cebrian ea474ecd89 #12566 changes in events table 2023-12-04 15:05:01 +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
alejandro.campos@artica.es 4a64f023fe Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-04 11:37:41 +01:00
alejandro.campos@artica.es 75ddb3b934 minor changes in demo data functionality 2023-12-04 11:37:12 +01:00
Diego Muñoz-Reja 3952c259d4 Merge branch 'ent-12062-16257-16240-caracteres-extranos-bloquean-modulo-plugin-con-o-sin-politica' into 'develop'
Ent 12062 16257 16240 caracteres extranos bloquean modulo plugin con o sin politica

See merge request artica/pandorafms!6545
2023-12-04 09:22:13 +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 e91230b165 Merge branch 'ent-12440-16596-agregar-acl-operation-events-events-no-hace-nada' into 'develop'
Ent 12440 16596 agregar acl operation events events no hace nada

See merge request artica/pandorafms!6713
2023-12-04 08:12:48 +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
Enrique Martin 7892eb5c0c Added log modules 2023-12-03 23:52:55 +01:00
Enrique Martin 55aee67df3 Added GIS maps creation 2023-12-03 23:23:57 +01:00
Enrique Martin b14c77862e Added new items to visual consoles 2023-12-03 21:43:00 +01:00
Enrique Martin 14fc8ef2b1 Added new items to visual consoles and fixed unknown modules on creation 2023-12-03 21:30:17 +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
Daniel Cebrian 5609bc2313 #12581 fixed strong size in visual console 2023-12-01 13:45:17 +01:00
miguel angel rasteu 3c99a2e49a #11494 Fix Av. bug 2023-12-01 13:29:51 +01:00
Jonathan 1fb98d34ae #12296 fix conflict merge develop 2023-12-01 11:59:03 +01:00
Jonathan e2eaf6e01e #12381 fix conflict merge develop 2023-12-01 11:22:15 +01:00
Calvo fd48d6eba6 Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica 2023-12-01 11:16:56 +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
Rafael Ameijeiras bc2c27d839 Merge branch 'ent-12052-filtro-de-vista-alert-details-no-muestra-las-alertas-de-los-agentes-que-tienen-grupo' into 'develop'
Ent 12052 filtro de vista alert details no muestra las alertas de los agentes que tienen grupo

See merge request artica/pandorafms!6463
2023-12-01 10:04:46 +00:00
miguel angel rasteu 41b92cc55f Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail 2023-12-01 10:34:43 +01: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
Rafael Ameijeiras 0ed2a6f946 Merge branch 'ent-12516-cambio-de-modelo-en-actualizaciones-solo-LTS-por-defecto-mostrar-informacion-sobre-versiones-en-warp-update' into 'develop'
Ent 12516 cambio de modelo en actualizaciones solo lts por defecto mostrar informacion sobre versiones en warp update

See merge request artica/pandorafms!6715
2023-12-01 09:27:45 +00: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
Rafael Ameijeiras 269a4ddfa9 Merge branch 'ent-12123-cve-2023-44089-xss-en-consola-visual' into 'develop'
Ent 12123 cve 2023 44089 xss en consola visual

See merge request artica/pandorafms!6497
2023-12-01 09:22:31 +00:00
miguel angel rasteu 5ee6eb7306 #12052 Resolve conflicts 2023-12-01 10:19:39 +01:00
Daniel Maya 87f4a6e15f #12384 Fixed acl 2023-12-01 10:08:25 +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
alejandro.campos@artica.es cb60581bcf Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-01 09:49:37 +01:00
alejandro.campos@artica.es d6e107ea95 performance improvement 2023-12-01 09:48:45 +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
miguel angel rasteu 0ef4685569 #12123 Resolve conflicts 2023-12-01 09:35:50 +01:00
artica 3b6eac4284 Auto-updated build strings. 2023-12-01 01:00:28 +01:00
Enrique Martin 3807baa8ef Added GIS random data to agents 2023-11-30 17:41:01 +01:00
Daniel Cebrian 24c8e606f4 #12569 fixed button credential boxes 2023-11-30 16:29:18 +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
Jorge Rincon 6edc90ec87 #12516 The modal is added to the online updates view.
lts_updates token is added to pandoradb_data.sql
2023-11-30 15:59:57 +01:00
Jonathan f780d0bd2a #12533 enable event list no group (Default all) 2023-11-30 15:58:39 +01:00
Jorge Rincon 741c8d40b3 #12530 Validation is added to the SLA report, the data of the SLA report item is not painted if the agent is not informed 2023-11-30 15:24:34 +01:00
Diego Muñoz-Reja 6cde922505 Merge branch 'ent-11681-15856-duplicidad-de-informacion-en-db-con-elementos-de-servicio-con-un-mismo-padre' into 'develop'
change service modules async to generic pandora_enterprise#11681

See merge request artica/pandorafms!6654
2023-11-30 14:03:07 +00:00
Daniel Cebrian 1e4c5563d3 #12416 fixed encryption_passphrase in metaconsole 2023-11-30 14:44:27 +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
Jonathan ee6717aa06 #12341 limit invnetory on windows basic options 2023-11-30 12:53:59 +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
Jonathan 607d7e36e5 #12341 enable invetory .vbs 2023-11-30 12:11:12 +01:00
Jonathan c41b360a6e #8365 merge conflict 2023-11-30 12:04:28 +01:00
Jorge Rincon 313407dcc5 Merge branch 'develop' into ent-12516-cambio-de-modelo-en-actualizaciones-solo-LTS-por-defecto-mostrar-informacion-sobre-versiones-en-warp-update 2023-11-30 11:53:35 +01:00
Jorge Rincon f9fd33fa2e #12516 Fixed set token configuration lts updates 2023-11-30 11:50:19 +01:00
Jonathan f600648cc0 #12341 fix agent_version 2023-11-30 11:43:54 +01:00
daniel 75606f679e Merge remote-tracking branch 'origin/develop' into ent-11681-15856-duplicidad-de-informacion-en-db-con-elementos-de-servicio-con-un-mismo-padre
Conflicts:
	pandora_console/extras/mr/67.sql
2023-11-30 11:27:20 +01:00
Rafael Ameijeiras 6a998c79ae Merge branch 'ent-12095-correlacion-de-alertas-con-field-event-user-comment-no-funciona-adecuadamente' into 'develop'
Ent 12095 correlacion de alertas con field event user comment no funciona adecuadamente

See merge request artica/pandorafms!6639
2023-11-30 09:24:33 +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
daniel 817811ffac fix error update manager pandora_enterprise#12447 2023-11-30 10:13:18 +01: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 bac9d4b7a6 #12341 agent version when string have build 2023-11-30 09:38:12 +01:00
Jorge Rincon ac4b45646d #12516 Modal update lts added 2023-11-30 09:30:50 +01:00
Jonathan 1fc2c432e5 Merge branch 'develop' into ent-12341-agent-basic-options 2023-11-30 09:14:35 +01:00
Enrique Martin 76327c6d73 Fixed demo graphs generation 2023-11-30 08:54:21 +01:00
Jonathan b99c9240de #8365 NCM Merge conflict 2023-11-30 08:32:15 +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
alejandro.campos@artica.es dc2ac2a1b3 implement load demo data 2023-11-29 18:13:56 +01:00
alejandro.campos@artica.es 17ed07e83a Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-11-29 18:09:49 +01:00
alejandro.campos@artica.es ca17eef68a implement load demo data 2023-11-29 18:09:32 +01:00
Enrique Martin 50ab2841e7 Removed some elements from network map PRD 2023-11-29 18:02:33 +01:00
Enrique Martin 93e79b51eb Changed traps chance 2023-11-29 17:30:57 +01:00
alejandro.campos@artica.es 86ba16c270 Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-11-29 16:58:25 +01:00
alejandro.campos@artica.es a290203847 implement demo data load 2023-11-29 16:57:38 +01:00
Jonathan 7a5201db4f #8365 NCM V3 Minor fix 2023-11-29 16:31:06 +01:00
daniel db89c72be5 fix error empty clusters pandora_enterprise#12511 2023-11-29 16:00:46 +01: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
Daniel Maya 544997d30c Merge branch 'develop' into ent-12095-correlacion-de-alertas-con-field-event-user-comment-no-funciona-adecuadamente 2023-11-29 15:44:04 +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
Jorge Rincon 38a79fa6a6 #12516 fixed modal body padding 2023-11-29 15:30:41 +01:00
Rafael Ameijeiras e46fc163a9 Merge branch 'ent-12451-nuevas-alertas-por-defecto-de-Telegram-y-Vonage-con-mensaje-erroneo' into 'develop'
Ent 12451 nuevas alertas por defecto de telegram y vonage con mensaje erroneo

See merge request artica/pandorafms!6664
2023-11-29 14:27:28 +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
Jorge Rincon df76a5194c #12561 information for LTS versions in Warp Update 2023-11-29 13:40:38 +01:00
Enrique Martin 8e1d30adfe Fixed reports PRD 2023-11-29 13:31:39 +01:00
Enrique Martin 9bb47fc12f Fixed custom report PRD file 2023-11-29 11:57:34 +01:00
Jonathan 4c25e4cab1 #12440 add operation/events/events check readonly 2023-11-29 11:55:59 +01:00
alejandro.campos@artica.es 6f96087d90 implement demo data load 2023-11-29 11:30:48 +01:00
Jonathan f86a3e60e8 #11763 save filter regex on bbdd 2023-11-29 11:14:40 +01:00
Daniel Cebrian 28820f4471 #12543 fixed pagination metaconsole 2023-11-29 11:04:48 +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
Matias Didier 9511d82692 Merge branch 'ent-11714-15928-pantalla-personalizada-del-usuario-error-al-establecer-link-externo-como-homescreen' into 'develop'
Ent 11714 15928 pantalla personalizada del usuario error al establecer link externo como homescreen

See merge request artica/pandorafms!6250
2023-11-29 09:29:43 +00:00
Daniel Maya 892048554e #12468 Fixed instructions 2023-11-29 10:27:55 +01:00
Jonathan 824e6b78a0 #12341 module plugin enable disable windows 2023-11-29 10:27:40 +01:00
Enrique Martin 02e8c1b2d5 Fixed quotes in PRD file 2023-11-29 10:19:24 +01:00
miguel angel rasteu 63945df5fd #11495 Add tip and fix MTRS bug 2023-11-29 09:44:25 +01:00
miguel angel rasteu 64b612faea #11494 Add tip and fix MTRS bug 2023-11-29 09:40:34 +01:00
Matias Didier 22969eff6e Merge branch 'ent-11074-para-el-listado-de-plugin-registrados-falta-enlace-web-desde-nodo-registrado-hacia-metaconsola' into 'develop'
Ent 11074 para el listado de plugin registrados falta enlace web desde nodo registrado hacia metaconsola

See merge request artica/pandorafms!6482
2023-11-29 08:09:54 +00:00
alejandro.campos@artica.es d03691b884 Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-11-29 09:01:13 +01:00
alejandro.campos@artica.es 7240bbf934 implement demo data load 2023-11-29 09:00:45 +01:00
miguel angel rasteu d096f3f9ea Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail 2023-11-29 08:44:08 +01:00
artica 8378d7ef91 Auto-updated build strings. 2023-11-29 01:00:30 +01:00
Daniel Cebrian 4d1df2dcc5 #12247 refactored vulnerabilities and hardening 2023-11-28 16:59:04 +01:00
Enrique Martin e56b0ee37e Added all widgets by defult 2023-11-28 16:46:42 +01:00
Enrique Martin 4cf2b3427e Added peridicity to reports prd format 2023-11-28 16:00:01 +01:00
Matias Didier 447e788ab3 Merge branch 'ent-12260-cuando-haces-el-cambio-de-grupo-en-un-agente-el-icono-se-queda-petado' into 'develop'
Ent 12260 cuando haces el cambio de grupo en un agente el icono se queda petado

See merge request artica/pandorafms!6587
2023-11-28 14:14:26 +00:00
Jorge Rincon faffada931 Merge branch 'develop' into ent-12451-nuevas-alertas-por-defecto-de-Telegram-y-Vonage-con-mensaje-erroneo 2023-11-28 15:10:02 +01:00
Jonathan 837f1ff73c Merge branch 'develop' into ent-8365-ncm-fase-3 2023-11-28 13:04:13 +01:00
Enrique Martin 8849e80406 Added demodata PRD files 2023-11-28 12:59:11 +01:00
Jonathan c68bf25886 #12341 agent basic options 2023-11-28 12:52:27 +01:00
Rafael Ameijeiras 8b6a4733cf Merge branch 'ent-12253-informe-de-vulnerabilidades' into 'develop'
Ent 12253 Informe de vulnerabilidades

See merge request artica/pandorafms!6686
2023-11-28 11:14:48 +00:00
daniel 5bd689500c move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 11:06:39 +01:00
Alejandro Sánchez 41e2b36b13 Merge branch 'ent-12374-16517-cambio-en-discovery-oracle-3' into 'develop'
re merge mr changes

See merge request artica/pandorafms!6708
2023-11-28 10:04:12 +00:00
Matias Didier c8daeda489 Merge branch 'ent-12372-error-visual-al-acceder-configuracion-avanzada-remota-del-servidor' into 'develop'
Ent 12372 error visual al acceder configuracion avanzada remota del servidor

See merge request artica/pandorafms!6662
2023-11-28 10:01:01 +00:00
alejandro bb7c618528 re merge mr changes 2023-11-28 10:59:04 +01:00
Rafael Ameijeiras e5237aafe1 Merge branch 'ent-12517-cambiar-nombre-al-token-allow-all-ips' into 'develop'
Ent 12517 Cambiar nombre al token "Allow all IPs"

See merge request artica/pandorafms!6696
2023-11-28 09:58:44 +00:00
Matias Didier 8425e70740 Merge branch 'ent-12387-bug-edicion-item-agent-module-view' into 'develop'
Ent 12387 bug edicion item agent module view

See merge request artica/pandorafms!6622
2023-11-28 09:29:14 +00:00
Daniel Cebrian 4ce47cec8e #12176 control error legacy 2023-11-28 09:56:51 +01:00
Jonathan 49a81b34c4 Merge branch 'develop' into ent-11763-15982-regex-en-busqueda-de-eventos 2023-11-28 09:50:48 +01:00
Daniel Cebrian e7ebbedabc #12176 formatted error 2023-11-28 09:34:10 +01:00
Jonathan 30fd521cb7 Merge branch 'develop' into ent-12341-agent-basic-options 2023-11-28 09:32:59 +01:00
Matias Didier c532bfc4c7 Merge branch 'ent-11832-Cambiar-artica.es-por-pandorafms.com-en-fichero-pandoradb_data.sql' into 'develop'
Ent 11832 cambiar artica.es por pandorafms.com en fichero pandoradb data.sql

See merge request artica/pandorafms!6433
2023-11-28 08:23:46 +00:00
Matias Didier bda55cc3a5 Merge branch 'ent-11894-editor-de-links-no-actualiza-la-pagina-al-crear-o-borrar-enlaces' into 'develop'
Ent 11894 editor de links no actualiza la pagina al crear o borrar enlaces

See merge request artica/pandorafms!6373
2023-11-28 08:22:37 +00:00
Matias Didier 44aff84d9e Merge branch 'ent-11699-filtro-paradas-planificadas-con-fondo-blanco-en-black-theme-en-v772lts' into 'develop'
Ent 11699 filtro paradas planificadas con fondo blanco en black theme en v772lts

See merge request artica/pandorafms!6253
2023-11-28 08:22:29 +00:00
Jonathan 6e71cb8b7a Merge branch 'develop' into ent-12387-bug-edicion-item-agent-module-view 2023-11-28 09:03:49 +01:00
daniel 6eefd38f65 move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 08:49:58 +01:00
daniel f9e7f19771 Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql 2023-11-28 08:43:45 +01:00
daniel 730cfb30ff Merge remote-tracking branch 'origin/develop' into ent-12378-alertas-sonoras-en-vista-de-eventos
Conflicts:
	pandora_console/include/styles/pandora.css
2023-11-28 08:40:07 +01:00
Jonathan 9819c3a5ff Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-28 08:30:23 +01:00
daniel f6f0f15731 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/lib/Dashboard/Widgets/single_graph.php
	pandora_console/include/styles/pandora.css
2023-11-28 08:29:10 +01:00
Jonathan 2dec31485a Merge branch 'develop' into ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer 2023-11-28 08:19:53 +01:00
daniel 3f3e8e42bc move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 08:13:00 +01:00
Matias Didier 4dc84d58e3 Merge branch 'ent-12023-en-create-custom-report-al-seleccionar-write-access-no-aparece-lista-de-grupo' into 'develop'
Ent 12023 en create custom report al seleccionar write access no aparece lista de grupo

See merge request artica/pandorafms!6460
2023-11-28 07:12:51 +00:00
Matias Didier 3b2c5237d1 Merge branch 'ent-12036-error-en-el-nombre-de-la-copia-de-un-dashboard-cualquiera' into 'develop'
Ent 12036 error en el nombre de la copia de un dashboard cualquiera

See merge request artica/pandorafms!6457
2023-11-28 07:09:11 +00:00
Matias Didier b47b076cf1 Merge branch 'ent-1205-projection-graph-se-inventa-la-grafica-a-veces' into 'develop'
Ent 1205 projection graph se inventa la grafica a veces

See merge request artica/pandorafms!6435
2023-11-28 07:08:36 +00:00
Matias Didier 746eb298ea Merge branch 'ent-11831-literales-de-opciones-de-menu-no-coinciden' into 'develop'
Ent 11831 literales de opciones de menu no coinciden

See merge request artica/pandorafms!6437
2023-11-28 07:07:58 +00:00
Matias Didier 64cb2ad912 Merge branch 'ent-11911-welcome-dialog-no-detecta-bien-el-correo-configurado' into 'develop'
Ent 11911 welcome dialog no detecta bien el correo configurado

See merge request artica/pandorafms!6440
2023-11-28 07:07:26 +00:00
Jonathan def169abb8 Merge branch 'develop' into ent-8365-ncm-fase-3 2023-11-28 07:58:50 +01:00
artica 8bb4758439 Auto-updated build strings. 2023-11-28 01:00:28 +01:00
Daniel Cebrian dde1146ccb #fixed delete allow ip when edit user 2023-11-27 17:54:05 +01:00
Diego Muñoz-Reja de370ff05c Merge branch 'ent-12117-Comprobar-archivos-antes-de-actualizar-oum' into 'develop'
oum install checks

See merge request artica/pandorafms!6584
2023-11-27 16:48:31 +00:00
Daniel Rodriguez c7fcf7c168 Merge branch 'ent-11815-Modificar-creacion-de-modulos-predictivos-en-politicas-e-individualmente' into 'develop'
changed behavior of prediction modules creation

See merge request artica/pandorafms!6540
2023-11-27 16:01:57 +00:00
Daniel Cebrian ead68be05a Merge branch 'develop' into ent-12517-cambiar-nombre-al-token-allow-all-ips 2023-11-27 16:59:29 +01:00
Daniel Cebrian 139d884525 #12517 fixed permission 2023-11-27 16:59:21 +01:00
Jorge Rincon 34f9e0df49 Merge branch 'develop' into ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico 2023-11-27 15:52:41 +01:00
Rafael Ameijeiras 215c665a9c Merge branch 'ent-12173-nombres-de-modulos-en-vista-de-eventos-se-muestran-de-manera-incorrecta' into 'develop'
Ent 12173 nombres de modulos en vista de eventos se muestran de manera incorrecta

See merge request artica/pandorafms!6565
2023-11-27 14:51:48 +00:00
Rafael Ameijeiras 4ac9316391 Merge branch 'ent-12079-no-se-aplican-los-filtros-por-defecto-al-hacer-clic-en-el-numero-de-alertas' into 'develop'
Ent 12079 no se aplican los filtros por defecto al hacer clic en el numero de alertas

See merge request artica/pandorafms!6475
2023-11-27 14:51:02 +00:00
Rafael Ameijeiras 964321d1bd Merge branch 'ent-12091-filtrado-de-agentes-modulos-en-operaciones-masivas-de-alertas' into 'develop'
Ent 12091 filtrado de agentes modulos en operaciones masivas de alertas

See merge request artica/pandorafms!6516
2023-11-27 14:50:39 +00:00
Rafael Ameijeiras 41e1593afb Merge branch 'ent-11759-15977-cambios-en-la-eliminacion-de-acciones-en-las-alertas-snmp' into 'develop'
Ent 11759 15977 cambios en la eliminacion de acciones en las alertas snmp

See merge request artica/pandorafms!6387
2023-11-27 14:49:08 +00:00
Rafael Ameijeiras 728b9d7e7f Merge branch 'ent-12157-sistema-de-notificaciones-muestra-mensaje-sin-texto-alguno' into 'develop'
Ent 12157 sistema de notificaciones muestra mensaje sin texto alguno

See merge request artica/pandorafms!6561
2023-11-27 14:48:49 +00:00
Rafael Ameijeiras e3153166c1 Merge branch 'ent-11856-view-events-ubicacion-erronea-para-el-tip-del-token-search-in-secondary-groups' into 'develop'
Ent 11856 view events ubicacion erronea para el tip del token search in secondary groups

See merge request artica/pandorafms!6388
2023-11-27 14:48:24 +00:00
Rafael Ameijeiras 5825a95eae Merge branch 'ent-11855-bug-custom-graphs-el-icono-graph-container-desaparece' into 'develop'
Ent 11855 bug custom graphs el icono graph container desaparece

See merge request artica/pandorafms!6428
2023-11-27 14:47:55 +00:00
Rafael Ameijeiras 67700a1ea2 Merge branch 'ent-12083-open-inventory-widget-no-carga' into 'develop'
Ent 12083 open inventory widget no carga

See merge request artica/pandorafms!6506
2023-11-27 14:46:47 +00:00
Jorge Rincon 6b385ca260 Merge branch 'develop' into ent-12372-error-visual-al-acceder-configuracion-avanzada-remota-del-servidor 2023-11-27 15:45:14 +01:00
Rafael Ameijeiras 6e46875721 Merge branch 'ent-12208-desplegable-styles-de-widget-panel-with-a-message' into 'develop'
Ent 12208 desplegable styles de widget panel with a message

See merge request artica/pandorafms!6549
2023-11-27 14:39:38 +00:00
Rafael Ameijeiras 8e68198ab5 Merge branch 'ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion' into 'develop'
Ent 11679 15855 nombres de modulos no tienen link a su edicion

See merge request artica/pandorafms!6422
2023-11-27 14:39:14 +00:00
Rafael Ameijeiras 25152e27f8 Merge branch 'ent-12082-error-al-copiar-widget-de-inventario' into 'develop'
Ent 12082 error al copiar widget de inventario

See merge request artica/pandorafms!6503
2023-11-27 14:38:33 +00:00
Rafael Ameijeiras 2fa8ed3c9e Merge branch 'ent-12219-error-al-eliminar-perfiles-en-edicion-de-usuario' into 'develop'
Ent 12219 error al eliminar perfiles en edicion de usuario

See merge request artica/pandorafms!6555
2023-11-27 14:38:14 +00:00
Rafael Ameijeiras f13ba41e4c Merge branch 'ent-12373-API-checker-da-URL-incorrecta' into 'develop'
fix api check url

See merge request artica/pandorafms!6648
2023-11-27 14:37:24 +00:00
Rafael Ameijeiras 4406828cc2 Merge branch 'ent-12362-no-se-pueden-anadir-alertas-a-modulos-desde-la-vista-agents-alerts-view' into 'develop'
Fix add alerts pandora_enterprise#12362

See merge request artica/pandorafms!6625
2023-11-27 14:37:09 +00:00
Rafael Ameijeiras 57124c4f26 Merge branch 'ent-12363-agent-module-view-las-columnas-se-muestran-mal-al-exportar-a-csv' into 'develop'
Fix csv agent-module pandora_enterprise#12363

See merge request artica/pandorafms!6623
2023-11-27 14:36:53 +00:00
Rafael Ameijeiras 707f85ed7f Merge branch 'ent-11511-cambiar-el-apartado-de-tools-a-seccion-management' into 'develop'
Ent 11511 cambiar el apartado de tools a seccion management

See merge request artica/pandorafms!6403
2023-11-27 14:36:38 +00:00
Daniel Cebrian 0ca7f0eb36 Merge branch 'develop' into ent-12459-16599-vista-de-monitoring-vmware-view-no-muestra-informacion-del-datacenter-ni-el-data 2023-11-27 14:55:33 +01:00
Daniel Cebrian afa6a7d415 #12517 allow ip limited to user admin 2023-11-27 13:55:08 +01:00
Daniel Cebrian 09708255aa Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards 2023-11-27 13:34:33 +01:00
Daniel Cebrian 27d78ef049 Merge branch 'develop' into ent-12253-informe-de-vulnerabilidades 2023-11-27 13:29:05 +01:00
Daniel Cebrian 7cd163b01e #12253 new reports 2023-11-27 13:25:52 +01:00
Matias Didier 9919de1d66 Merge branch 'ent-11026-si-el-token-automatically-check-for-updates-esta-desactivado-no-debe-mostrar-aviso-para' into 'develop'
Ent 11026 si el token automatically check for updates esta desactivado no debe mostrar aviso para

See merge request artica/pandorafms!6392
2023-11-27 12:24:45 +00:00