Enrique Martin
a2f60a1d22
Updated MR changes
2023-12-12 12:12:24 +01:00
miguel angel rasteu
77fd03d58a
#11495 Fix agent name in module selection
2023-12-12 10:15:37 +01:00
miguel angel rasteu
fec7bf8b90
Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed
2023-12-12 09:45:36 +01:00
Diego Muñoz-Reja
f5a455aa15
Merge branch 'ent-11750-15965-conflictos-en-la-insercion-de-datos-mediante-la-api' into 'develop'
...
Ent 11750 15965 conflictos en la insercion de datos mediante la api
See merge request artica/pandorafms!6389
2023-12-12 07:30:18 +00:00
artica
ffdf0d81b9
Auto-updated build strings.
2023-12-12 01:00:30 +01:00
Daniel Cebrian
616a8d728b
#12416 fixed multiples encrypts
2023-12-11 17:56:48 +01:00
Daniel Cebrian
1a9bdf97d1
#12566 changes in view events
2023-12-11 17:01:40 +01:00
miguel angel rasteu
94256559f1
#11495 Fix agent name in metaconsole module selector
2023-12-11 16:46:19 +01:00
Rafael Ameijeiras
a2436cf60e
Merge branch 'ent-12620-elementos-de-lista-negra-de-deteccion-de-cambios-en-inventario-en-el-setup-no-funciona' into 'develop'
...
Ent 12620 elementos de lista negra de deteccion de cambios en inventario en el setup no funciona
See merge request artica/pandorafms!6745
2023-12-11 14:46:27 +00:00
Rafael Ameijeiras
206bdc4acb
Merge branch 'ent-12168-GISS-Jerarquia-en-vista-de-arbol-de-servicios-no-se-muestra-bien-al-hacer-búsquedas-en-el-filtro-Nodo-y-Meta' into 'develop'
...
Ent 12168 giss jerarquia en vista de arbol de servicios no se muestra bien al hacer búsquedas en el filtro nodo y meta
See merge request artica/pandorafms!6547
2023-12-11 14:45:36 +00:00
Rafael Ameijeiras
ab370f1cf6
Merge branch 'ent-12096-arreglar-apostrofe-en-texto-let-s-do-it-del-mensaje-de-bienvenida' into 'develop'
...
Ent 12096 arreglar apostrofe en texto let s do it del mensaje de bienvenida
See merge request artica/pandorafms!6484
2023-12-11 14:45:06 +00:00
Rafael Ameijeiras
fa13fd5730
Merge branch 'ent-11936-cambiar-o-arreglar-nombres-de-apartados-de-menu-lateral-en-hover' into 'develop'
...
Ent 11936 cambiar o arreglar nombres de apartados de menu lateral en hover
See merge request artica/pandorafms!6442
2023-12-11 14:32:20 +00:00
Rafael Ameijeiras
7f75445d75
Merge branch 'ent-11537-bug-en-cuadros-de-busqueda-con-los-caracteres-2-y-0' into 'develop'
...
Ent 11537 bug en cuadros de busqueda con los caracteres 2 y 0
See merge request artica/pandorafms!6410
2023-12-11 14:30:51 +00:00
Rafael Ameijeiras
94211ac75d
Merge branch 'ent-11107-permitir-solamente-extension-mib-en-el-mib-uploader' into 'develop'
...
Fix upload file function filter by extension. Fix mib uploader only upload .mib file
See merge request artica/pandorafms!6601
2023-12-11 14:29:57 +00:00
Rafael Ameijeiras
43fd67b072
Merge branch 'ent-12058-incluir-version-de-mysql-en-about-y-diagnostic-info' into 'develop'
...
Ent 12058 incluir version de mysql en about y diagnostic info
See merge request artica/pandorafms!6481
2023-12-11 14:28:31 +00:00
Rafael Ameijeiras
d072187a2c
Merge branch 'ent-12605-vista-de-agentes-error-500-en-develop' into 'develop'
...
fix error 500 and warnings pandora_enterprise#12605
See merge request artica/pandorafms!6738
2023-12-11 14:27:39 +00:00
Rafael Ameijeiras
8b0d96bab7
Merge branch 'ent-12606-no-deja-editar-tiempo-en-reportes-sla' into 'develop'
...
Ent 12606 no deja editar tiempo en reportes sla
See merge request artica/pandorafms!6744
2023-12-11 14:23:53 +00:00
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
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
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
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
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
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
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
alejandro.campos@artica.es
d601103df3
fix url
2023-12-05 11:49:43 +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
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
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
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
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
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
miguel angel rasteu
ec8d16e49b
#11652 Resolve conflicts
2023-12-01 10:07:41 +01:00
miguel angel rasteu
fb2e433b5c
#12175 Resolve conflicts
2023-12-01 10:00:51 +01:00
Daniel Rodriguez
39c6420d2c
Merge branch 'ent-11763-15982-regex-en-busqueda-de-eventos' into 'develop'
...
Ent 11763 15982 regex en busqueda de eventos
See merge request artica/pandorafms!6512
2023-12-01 08:44:46 +00:00
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
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