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

30254 Commits

Author SHA1 Message Date
Alejandro Campos c700633fce Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo' 
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
 2023-12-18 10:54:27 +00:00
daniel 9b0bee3b36 fix rerors duplicate in CVS pandora_enterprise#9640 2023-12-18 11:35:39 +01:00
Jonathan 7ae77773e6 #12597 popup open 2023-12-18 11:28:09 +01:00
daniel 8aeee6d876 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-18 11:15:18 +01:00
daniel d56e3a5496 fix rerors duplicate in CVS pandora_enterprise#9640 2023-12-18 11:14:55 +01:00
Jonathan 82e4eb46e0 #12667 move translate string to open 2023-12-18 10:51:48 +01:00
Rafael Ameijeiras 3dd082c60f Merge branch 'ent-12647-salto-de-linea-en-nombre-de-evento' into 'develop' 
Ent 12647 Salto de linea en nombre de evento

See merge request artica/pandorafms!6777
 2023-12-18 07:52:31 +00:00
Diego Muñoz-Reja 5a9f888ecc Merge branch 'ent-12649-traza-olvidada' into 'develop' 
Ent 12649 traza olvidada

See merge request artica/pandorafms!6779
 2023-12-18 07:07:12 +00:00
artica 0336f87b24 Auto-updated build strings. 2023-12-18 01:00:22 +01:00
artica 2d379f6700 Auto-updated build strings. 2023-12-17 01:00:20 +01:00
artica 9037819ceb Auto-updated build strings. 2023-12-16 01:00:26 +01:00
Daniel Maya e6981fb436 #12456 Fixed os text style 2023-12-15 12:59:56 +01:00
Matias Didier 9158b43945 Merge branch 'ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql' into 'develop' 
move extension translate_string and file_repo pandora_enterprise#12333

See merge request artica/pandorafms!6706
 2023-12-15 11:49:11 +00:00
Jonathan f35e7d52ed #12643 fix pagination 2023-12-15 11:34:27 +01:00
Daniel Rodriguez 3fe41179e0 Merge branch 'ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline' into 'develop' 
Ent 12216 entradas fantasma para elementos de discovery offline

See merge request artica/pandorafms!6740
 2023-12-15 09:22:10 +00:00
Daniel Maya 971db37147 #12649 remove trace 2023-12-15 10:19:52 +01:00
daniel 70dd1719db Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-15 09:13:07 +01:00
daniel 0584b9afd0 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 2023-12-15 09:12:39 +01:00
daniel e14a2bcb67 fix times sound events pandora_enterprise#12607 2023-12-15 09:11:05 +01:00
Rafael Ameijeiras fef77d12bf Merge branch 'ent-12201-eastern-egg-setup' into 'develop' 
Ent 12201 eastern egg setup

See merge request artica/pandorafms!6701
 2023-12-15 07:43:17 +00:00
Diego Muñoz-Reja fe3aa7f745 Merge branch 'ent-11166-Vista-de-datos-de-netflow-por-defecto-network-usage-map' into 'develop' 
Ent 11166 vista de datos de netflow por defecto network usage map

See merge request artica/pandorafms!6427
 2023-12-15 07:19:46 +00:00
Diego Muñoz-Reja b545cfec23 Merge branch 'ent-11802-giss-y-entornos-pesados-optimizar-la-query-de-la-seccion-vista-de-alertas-y-vista-de-monitores' into 'develop' 
Optimiized monitors view

See merge request artica/pandorafms!6627
 2023-12-15 07:18:13 +00:00
artica d81805d2c2 Auto-updated build strings. 2023-12-15 01:00:29 +01:00
Daniel Cebrian 67ffe8627b #12647 fixed line break in event list 2023-12-14 19:08:34 +01:00
Daniel Cebrian d84faad8cf #12631 added field ignore_unknown in api modules and cli 2023-12-14 18:11:34 +01:00
daniel cf692ba7ef fix times sound events pandora_enterprise#12607 2023-12-14 17:07:03 +01:00
Rafael Ameijeiras e3d408ea44 Merge branch 'ent-12365-nueva-automonitorizacion-de-logs-erronea' into 'develop' 
Fix opensearch total documents automonitorization

See merge request artica/pandorafms!6773
 2023-12-14 16:05:23 +00:00
daniel 4c11595899 fix name token easter eggs pandora_enterprise#12201 2023-12-14 16:48:10 +01:00
daniel 27a83a8eb5 Merge remote-tracking branch 'origin/develop' into ent-12201-eastern-egg-setup 
Conflicts:
	pandora_console/include/functions_config.php
 2023-12-14 16:36:11 +01:00
daniel 9e3c17bf2c Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 2023-12-14 16:32:33 +01:00
daniel 06f6c7d16f Merge remote-tracking branch 'origin/develop' into ent-11166-Vista-de-datos-de-netflow-por-defecto-network-usage-map 
Conflicts:
	pandora_console/operation/network/network_usage_map.php
 2023-12-14 16:13:25 +01:00
Rafael Ameijeiras 2420c79500 Merge branch 'ent-12447-errores-al-aplicar-parches' into 'develop' 
fix error update manager pandora_enterprise#12447

Closes pandora_enterprise#12447

See merge request artica/pandorafms!6721
 2023-12-14 14:36:36 +00:00
daniel ea97bb8f60 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-14 13:27:03 +01:00
daniel f78c7495e5 fixed modal close click button execute twice function close pandora_enterprise#12447 2023-12-14 13:18:53 +01:00
alejandro.campos@artica.es 7398982912 fix multiple selector 2023-12-14 12:27:00 +01:00
alejandro.campos@artica.es 9258de7edc fix multiple selector 2023-12-14 12:25:21 +01:00
Diego Muñoz-Reja 60a2557878 Merge branch 'ent-10116-14775-service-view-widget-no-tiene-filtro-de-grupos-y-recursion' into 'develop' 
Ent 10116 14775 service view widget no tiene filtro de grupos y recursion

See merge request artica/pandorafms!6451
 2023-12-14 11:19:25 +00:00
Matias Didier 352434d69a Merge branch 'ent-12132-bug-en-welcome-tips-con-muchos-tips' into 'develop' 
Ent 12132 bug en welcome tips con muchos tips

See merge request artica/pandorafms!6557
 2023-12-14 11:03:37 +00:00
Calvo 036425ddda Fix opensearch total documents automonitorization 2023-12-14 11:40:26 +01:00
daniel 3cb4b5cce4 Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/67.sql
	pandora_console/operation/menu.php
 2023-12-14 11:21:51 +01:00
daniel 2890fd3dab 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-14 11:05:29 +01:00
daniel 27d76a0890 fix error cv item module graph periodicity mode pandora_enterprise#9640 2023-12-14 11:03:45 +01:00
Rafael Ameijeiras e71a104e74 Merge branch 'ent-12566-mejoras-en-visualizacion-de-eventos' into 'develop' 
Draft: Ent 12566 Mejoras en visualización de eventos

See merge request artica/pandorafms!6735
 2023-12-14 08:57:44 +00:00
Rafael Ameijeiras d5b3bd1c02 Merge branch 'ent-12483-varios-bugs-en-la-vista-de-campos-personalizados' into 'develop' 
Ent 12483 varios bugs en la vista de campos personalizados

See merge request artica/pandorafms!6689
 2023-12-14 08:42:02 +00:00
Rafael Ameijeiras f3d190a8bb Merge branch 'ent-8365-ncm-fase-3' into 'develop' 
Ent 8365 ncm fase 3

See merge request artica/pandorafms!6612
 2023-12-14 08:40:31 +00:00
Rafael Ameijeiras dcdd3e139e Merge branch 'ent-12468-instrucciones-se-rompen-en-vista-de-eventos' into 'develop' 
Ent 12468 instrucciones se rompen en vista de eventos

See merge request artica/pandorafms!6711
 2023-12-14 08:39:44 +00:00
Jonathan 53b56b31af Merge branch 'develop' into ent-8365-ncm-fase-3 2023-12-14 08:38:52 +01:00
artica dffdbff8b1 Auto-updated build strings. 2023-12-14 01:00:28 +01:00
Daniel Cebrian fed0d92805 #12566 fixed colums module_custom_id and event_custom_id length_ 2023-12-13 19:53:14 +01:00
alejandro.campos@artica.es a72326a006 Merge remote-tracking branch 'origin/develop' into ent-11711-Comprobar-versiones-de-dependencias-antes-de-actualizar 2023-12-13 18:48:16 +01:00
Rafael Ameijeiras 7c3cdd1d11 Merge branch 'ent-11510-vista-de-inventario-hace-el-filtrado-antes-de-escoger-todos-los-campos' into 'develop' 
Ent 11510 vista de inventario hace el filtrado antes de escoger todos los campos

See merge request artica/pandorafms!6402
 2023-12-13 16:33:34 +00:00
Rafael Ameijeiras c5687ee1fd Merge branch 'ent-12511-error-handeling-en-los-clusters-no-es-del-todo-correcto' into 'develop' 
fix error empty clusters pandora_enterprise#12511

See merge request artica/pandorafms!6719
 2023-12-13 16:32:17 +00:00
Jonathan fe9b35ed77 #12622 help only when feedback enable 2023-12-13 16:51:14 +01:00
Rafael Ameijeiras f4fdacb791 Merge branch 'ent-12381-bugs-visuales-al-editar-modulo-en-politicas' into 'develop' 
Ent 12381 bugs visuales al editar modulo en politicas

See merge request artica/pandorafms!6637
 2023-12-13 14:40:32 +00:00
Jonathan 8a6efadc7c #12398 fix url mcros to macros 2023-12-13 15:31:06 +01:00
Jonathan a750e6010d Merge branch 'develop' into ent-12381-bugs-visuales-al-editar-modulo-en-politicas 2023-12-13 14:46:36 +01:00
Matias Didier 5d9f50fb05 Merge branch 'ent-12270-paginacion-de-widgets-hace-que-me-quepan-en-pantalla' into 'develop' 
Ent 12270 paginacion de widgets hace que me quepan en pantalla

See merge request artica/pandorafms!6586
 2023-12-13 13:29:15 +00:00
Rafael Ameijeiras e042c67d2a Merge branch 'ent-11495-nuevo-tipo-de-informe-service-level-detailed' into 'develop' 
Ent 11495 nuevo tipo de informe service level detailed

See merge request artica/pandorafms!6447
 2023-12-13 12:20:17 +00:00
Rafael Ameijeiras a5c5e07565 Merge branch 'ent-12065-faltan-opciones-al-abrir-consola-visual-en-la-vista-de-eventos' into 'develop' 
Ent 12065 faltan opciones al abrir consola visual en la vista de eventos

See merge request artica/pandorafms!6454
 2023-12-13 12:19:25 +00:00
Rafael Ameijeiras adcf2df86d Merge branch 'ent-12345-16503-boton-deshabilitar-modulo-en-vista-modulos-no-inserta-token-module_disabled-1' into 'develop' 
Ent 12345 16503 boton deshabilitar modulo en vista modulos no inserta token module disabled 1

See merge request artica/pandorafms!6638
 2023-12-13 12:18:52 +00:00
Rafael Ameijeiras 645c2d886a Merge branch 'ent-12390-item-heatmap-se-rompe-al-no-elegir-grupo' into 'develop' 
Ent 12390 item heatmap se rompe al no elegir grupo

See merge request artica/pandorafms!6652
 2023-12-13 12:17:10 +00:00
Rafael Ameijeiras 14a74ca5f2 Merge branch 'ent-12416-error-con-php82-y-encryption_passphrase' into 'develop' 
Ent 12416 Error con php82 y encryption_passphrase

See merge request artica/pandorafms!6724
 2023-12-13 12:12:00 +00:00
Rafael Ameijeiras 710edde3e0 Merge branch 'ent-9753-derivado-del-trabajo-q-a-766-reparar-la-administracion-de-module-groups-en-metaconsola' into 'develop' 
Ent 9753 derivado del trabajo q a 766 reparar la administracion de module groups en metaconsola

See merge request artica/pandorafms!6703
 2023-12-13 12:08:45 +00:00
Rafael Ameijeiras 891c5a521c Merge branch 'ent-12632-ack-timestamp-de-in-process-o-validacion-de-evento-no-se-muestra-en-el-detalle' into 'develop' 
Ent 12632 ack timestamp de in process o validacion de evento no se muestra en el detalle

See merge request artica/pandorafms!6759
 2023-12-13 12:07:53 +00:00
daniel af99c10b19 fix events sound pandora_enterprise#12607 2023-12-13 13:03:58 +01:00
miguel angel rasteu e80e7d6996 #11510 Resolve conflicts 2023-12-13 12:08:08 +01:00
Daniel Rodriguez 70d8b344b7 Merge branch 'ent-12176-mejorar-la-captura-de-errores-en-nuevo-discovery-cuando-termine-con-errores' into 'develop' 
Ent 12176 Mejorar la captura de errores en nuevo Discovery cuando termine con errores

See merge request artica/pandorafms!6705
 2023-12-13 10:32:58 +00:00
Jonathan 5fa9cd5877 Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3 2023-12-13 11:19:32 +01:00
daniel f4d2a40f13 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 2023-12-13 10:58:57 +01:00
daniel cc12c77008 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-13 10:39:48 +01:00
daniel 7df7fdff7d fix msg error agent cluster pandora_enterprise#12511 2023-12-13 10:32:29 +01:00
daniel 56f50bf4b0 Merge remote-tracking branch 'origin/develop' into ent-12511-error-handeling-en-los-clusters-no-es-del-todo-correcto 2023-12-13 10:05:07 +01:00
miguel angel rasteu a3feac4f2e #12065 Resolve conflicts 2023-12-13 08:32:12 +01:00
Jonathan 5279bb3e17 Merge branch 'develop' into ent-12296-mejorar-aspecto-filtros-de-busqueda-en-la-vista-principal-de-agentes 2023-12-13 08:24:43 +01:00
Jonathan 475453ac3d #12398 fix minor errors 2023-12-13 08:02:43 +01:00
artica 14f8deebca Auto-updated build strings. 2023-12-13 01:00:28 +01:00
Daniel Cebrian a5889b5913 #12631 added Ignore unknown in massive edit agent 2023-12-12 15:55:27 +01:00
Jonathan 6e60d19193 #8365 ftp server ip 2023-12-12 15:46:42 +01:00
Daniel Cebrian 464ad467aa #12631 created new token Ignore unknown for agent and modules 2023-12-12 15:30:10 +01:00
Matias Didier aa9d65927b Merge branch 'ent-12581-consola-visual-labels-con-negrita-pierden-el-tamano' into 'develop' 
Ent 12581 Consola visual. Labels con negrita pierden el tamaño

See merge request artica/pandorafms!6731
 2023-12-12 13:51:58 +00:00
Daniel Maya 9dbac217c1 #12633 Fixed Acknowledged 2 2023-12-12 14:07:18 +01:00
Daniel Maya 90c91f67fa #12633 Fixed Acknowledged 2023-12-12 12:45:13 +01:00
Jonathan c593161525 #12398 change urls wiki 2023-12-12 12:22:51 +01:00
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
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