53da63d7b6
#12132 Fix MR
2023-12-21 16:03:49 +01:00
6114c6a37a
Merge branch 'ent-12236-varios-bugs-en-modulos-predictivos-de-politica' into 'develop'
...
Policy capacity planning modules. JS errors
See merge request artica/pandorafms!6650
2023-12-21 10:57:42 +00:00
d84300f2c7
#11494 Add widget in database
2023-12-20 13:21:43 +01:00
421eb1fe23
Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica
2023-12-19 18:59:07 +01:00
e41dc13ac2
WIP: Policy synthetic op: Creating modules
2023-12-19 18:37:49 +01:00
d4e6c09acb
Merge branch 'ent-10906-Carga-de-datos-de-demo' into 'develop'
...
implement demo data feature
See merge request artica/pandorafms!6606
2023-12-19 15:40:09 +00:00
855fc32a7d
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
...
Conflicts:
pandora_console/include/javascript/pandora.js
pandora_console/include/styles/pandora.css
2023-12-19 09:39:24 +01:00
348c48d974
Merge branch 'ent-12631-nuevo-modo-de-los-modulos-ignorar-desconocidos-ignore-unknown-parte-de-consola' into 'develop'
...
Ent 12631 Nuevo modo de los modulos: ignorar desconocidos (Ignore unknown). Parte de Consola
See merge request artica/pandorafms!6757
2023-12-18 13:40:21 +00:00
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
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
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
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
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
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
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
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
27d76a0890
fix error cv item module graph periodicity mode pandora_enterprise#9640
2023-12-14 11:03:45 +01:00
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
464ad467aa
#12631 created new token Ignore unknown for agent and modules
2023-12-12 15:30:10 +01:00
a2f60a1d22
Updated MR changes
2023-12-12 12:12:24 +01:00
00a0fa8eae
Fixed reports generation
2023-12-11 11:53:46 +01:00
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
49fd9435dd
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-12-11 10:13:46 +01:00
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
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
78bb8e0bae
#8365 ix merge conflict
2023-12-07 10:58:45 +01:00
0337afcdaf
#12138 Fix SQL code
2023-12-07 10:21:57 +01:00
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
2d1b2bf6d2
Added new dashboard widgets
2023-12-05 12:11:25 +01:00
60137eb300
changes in discovery extensions
2023-12-05 11:32:19 +01:00
e833499dc3
Improvements, fixes and new demo elements
2023-12-04 16:58:08 +01:00
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
7892eb5c0c
Added log modules
2023-12-03 23:52:55 +01:00
55aee67df3
Added GIS maps creation
2023-12-03 23:23:57 +01:00
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
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
3807baa8ef
Added GIS random data to agents
2023-11-30 17:41:01 +01:00
c41b360a6e
#8365 merge conflict
2023-11-30 12:04:28 +01:00
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
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
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
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
76327c6d73
Fixed demo graphs generation
2023-11-30 08:54:21 +01:00
b99c9240de
#8365 NCM Merge conflict
2023-11-30 08:32:15 +01:00
75d57337af
#11705 Fix merge conflict
2023-11-30 08:10:32 +01:00
e8272c0006
#11763 Fix merge conflict
2023-11-30 07:57:25 +01:00
50ab2841e7
Removed some elements from network map PRD
2023-11-29 18:02:33 +01:00
93e79b51eb
Changed traps chance
2023-11-29 17:30:57 +01:00
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
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
miguel angel rasteu
Diego Muñoz-Reja
Calvo
Daniel Rodriguez
daniel
Alejandro Campos
Matias Didier
Jonathan
Daniel Cebrian
Enrique Martin
Rafael Ameijeiras
Jorge Rincon
Daniel Maya