Jonathan
c6d29ea60e
#12435 external link users fix
2023-12-14 16:59:39 +01: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
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
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
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 Cebrian
464ad467aa
#12631 created new token Ignore unknown for agent and modules
2023-12-12 15:30:10 +01:00
Enrique Martin
a2f60a1d22
Updated MR changes
2023-12-12 12:12:24 +01:00
Enrique Martin
00a0fa8eae
Fixed reports generation
2023-12-11 11:53:46 +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
49fd9435dd
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-12-11 10:13:46 +01: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
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
Jonathan
78bb8e0bae
#8365 ix merge conflict
2023-12-07 10:58:45 +01:00
miguel angel rasteu
0337afcdaf
#12138 Fix SQL code
2023-12-07 10:21:57 +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
Enrique Martin
2d1b2bf6d2
Added new dashboard widgets
2023-12-05 12:11:25 +01:00
alejandro.campos@artica.es
60137eb300
changes in discovery extensions
2023-12-05 11:32:19 +01:00
Enrique Martin
e833499dc3
Improvements, fixes and new demo elements
2023-12-04 16:58:08 +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
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
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
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
daniel
9da2ad8682
add tables merge process pandora_enterprise#12352
2023-12-01 09:26:48 +01:00
daniel
9197562e52
Merge remote-tracking branch 'origin/develop' into ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql
2023-12-01 08:13:23 +01:00
Enrique Martin
3807baa8ef
Added GIS random data to agents
2023-11-30 17:41:01 +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
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
daniel
d5c24609d6
add tables merge process pandora_enterprise#12352
2023-11-30 11:21:54 +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
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
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
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
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
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
f86a3e60e8
#11763 save filter regex on bbdd
2023-11-29 11:14:40 +01:00
Enrique Martin
02e8c1b2d5
Fixed quotes in PRD file
2023-11-29 10:19:24 +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
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
