cb63c27d2a
Merge branch 'ent-12687-sistema-import-export-prd' into 'develop'
...
Ent 12687 sistema import export prd
See merge request artica/pandorafms!6874
2024-02-14 12:11:16 +00:00
e293bd6ca3
changed prd
2024-02-14 10:10:39 +01:00
5d174013e5
Fixed recon task snmp v3 credentials update
2024-02-13 15:44:09 +01:00
4b4a94e7fb
Fixed recon task snmp v3 credentials update
2024-02-13 15:40:31 +01:00
8ff87ec93a
Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD
2024-02-13 09:36:36 +01:00
731cc195ec
fix safe mode recovery
2024-02-12 17:47:46 +01:00
680ad1b8db
Merge branch 'develop' into 'ent-12857-tickets-vmware-776'
...
# Conflicts:
# pandora_console/extras/mr/68.sql
2024-02-12 13:45:23 +00:00
d382ca4066
Merge remote-tracking branch 'origin/develop' into ent-12317-mejora-del-discovery-host-scan-y-el-wizard-de-discovery-de-bienvenida
...
Conflicts:
pandora_console/extras/mr/68.sql
2024-02-12 09:29:28 +01:00
851b046add
Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0
2024-02-12 08:05:36 +01:00
ecfef0da29
several changes
2024-02-09 18:48:32 +01:00
df8c14864c
improvements
2024-02-09 10:37:04 +01:00
14ae2c5206
Merge remote-tracking branch 'origin/ent-12687-sistema-import-export-prd' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD
2024-02-08 11:06:58 +01:00
8524e7ba31
Merge branch 'develop' into ent-12321-widget-mapa-gis
2024-02-08 09:34:32 +01:00
5bc20f9768
#12687 Added message prd
2024-02-07 15:01:53 +01:00
32c8d23a93
update version and adding units in datastore modules
2024-02-07 13:05:57 +01:00
f00e491738
Fix merge issues
2024-02-05 23:30:35 +01:00
b80f7bdeb1
Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0
2024-02-05 08:05:45 +01:00
f7dbd8f3b2
Net scan improvements
2024-02-02 14:41:28 +01:00
54e4b8dbfa
new api 2.0
2024-02-02 09:15:00 +01:00
774aa6a17b
Merge branch 'ent-12746-No-se-puede-seleccionar-template-en-NCM' into 'develop'
...
fixed database ncm info
See merge request artica/pandorafms!6894
2024-02-01 16:02:10 +00:00
0df4379926
fixed database ncm info
2024-01-30 17:47:43 +01:00
5631f5754b
Merge branch 'develop' into 'ent-11642-comprobacion-de-la-estructura-de-la-base-de-datos-en-772-lts'
...
# Conflicts:
# pandora_console/extras/mr/68.sql
2024-01-29 14:09:51 +00:00
00f9098f56
Merge remote-tracking branch 'origin/develop' into ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql
...
Conflicts:
pandora_console/extras/mr/68.sql
pandora_console/pandoradb.sql
2024-01-25 15:57:20 +01:00
1bc9bc6095
Fix MR
2024-01-23 17:52:06 +01:00
7fe8bfc096
Merge remote-tracking branch 'origin/develop' into ent-11642-comprobacion-de-la-estructura-de-la-base-de-datos-en-772-lts
2024-01-23 10:14:58 +01:00
e6203ab708
Merge branch 'develop' into 'ent-11642-comprobacion-de-la-estructura-de-la-base-de-datos-en-772-lts'
...
# Conflicts:
# pandora_console/extras/mr/68.sql
2024-01-22 16:12:56 +00:00
75481a9677
Merge branch 'develop' into 'ent-12673-eliminar-el-de-todas-las-custom-queries-en-el-discovery-de-oracle-2'
...
# Conflicts:
# pandora_console/extras/mr/68.sql
2024-01-22 10:55:47 +00:00
f35b95f0fe
Merge branch 'ent-12745-falta-un-campo-en-la-tabla-tncm_agent_data' into 'develop'
...
Ent 12745 falta un campo en la tabla tncm agent data
See merge request artica/pandorafms!6857
2024-01-22 09:28:53 +00:00
30e0ed912a
Merge branch 'develop' into ent-12745-falta-un-campo-en-la-tabla-tncm_agent_data
2024-01-19 13:15:01 +01:00
fadb70d740
Merge branch 'develop' into ent-12537-display-de-mensajes-no-tiene-en-cuenta-los-tipos
2024-01-19 13:06:37 +01:00
2b33bf84bf
Merge branch 'develop' into 'ent-12673-eliminar-el-de-todas-las-custom-queries-en-el-discovery-de-oracle-2'
...
# Conflicts:
# pandora_console/extras/mr/68.sql
2024-01-18 13:19:46 +00:00
3839de6f6d
update hash oracle in migratecodes.ini
2024-01-18 14:18:09 +01:00
f34b9c2a7e
mr changes
2024-01-18 14:01:15 +01:00
f3f3c4728b
#11642 . Fix missing sql in MR
2024-01-18 10:49:07 +01:00
c771127371
#12745 add id_agent_data ncm MR
2024-01-17 17:45:59 +01:00
e2471f817d
#12321 Added widget Gis map
2024-01-09 14:38:44 +01:00
72d34ef99b
#12435 fix conflict merge develop
2024-01-08 13:14:07 +01:00
22baa45387
#12537 new icons for notifications
2024-01-03 11:39:15 +01:00
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
c6d29ea60e
#12435 external link users fix
2023-12-14 16:59:39 +01: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
9da2ad8682
add tables merge process pandora_enterprise#12352
2023-12-01 09:26:48 +01:00
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
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
d5c24609d6
add tables merge process pandora_enterprise#12352
2023-11-30 11:21:54 +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
df76a5194c
#12561 information for LTS versions in Warp Update
2023-11-29 13:40:38 +01:00
8e1d30adfe
Fixed reports PRD
2023-11-29 13:31:39 +01:00
9bb47fc12f
Fixed custom report PRD file
2023-11-29 11:57:34 +01:00
f86a3e60e8
#11763 save filter regex on bbdd
2023-11-29 11:14:40 +01:00
02e8c1b2d5
Fixed quotes in PRD file
2023-11-29 10:19:24 +01:00
e56b0ee37e
Added all widgets by defult
2023-11-28 16:46:42 +01:00
4cf2b3427e
Added peridicity to reports prd format
2023-11-28 16:00:01 +01:00
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
837f1ff73c
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-11-28 13:04:13 +01:00
8849e80406
Added demodata PRD files
2023-11-28 12:59:11 +01:00
5bd689500c
move extension translate_string and file_repo pandora_enterprise#12333
2023-11-28 11:06:39 +01:00
bb7c618528
re merge mr changes
2023-11-28 10:59:04 +01:00
6eefd38f65
move extension translate_string and file_repo pandora_enterprise#12333
2023-11-28 08:49:58 +01:00
9819c3a5ff
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
2023-11-28 08:30:23 +01:00
3f3e8e42bc
move extension translate_string and file_repo pandora_enterprise#12333
2023-11-28 08:13:00 +01:00
def169abb8
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-11-28 07:58:50 +01:00
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
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
d8e1dc4e7c
#12095 resolved conflict
2023-11-27 12:11:13 +01:00
a4cd6d7fe1
#12138 Resolve conflict
2023-11-27 11:43:24 +01:00
2c0a88f7da
Merge branch 'develop' into ent-11691-15801-feature-token-para-ignorar-desconocidos-en-grafica-simple
2023-11-27 09:14:04 +01:00
082a641742
#12138 Add MR
2023-11-27 08:19:33 +01:00
4f707a5a1b
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
2023-11-23 09:27:46 +01:00
a277e56672
#8365 NCM v3 rename snipet to snippet
2023-11-22 16:47:13 +01:00
0a9e127576
#8365 NCM v3 snipets
2023-11-22 16:12:37 +01:00
bdd4628d24
Revert "Merge branch 'ent-12374-16517-cambio-en-discovery-oracle-2' into 'develop'"
...
This reverts merge request !6674
2023-11-21 16:00:27 +00:00
d84937e6c9
Added snippet script to MR and pandoradb_data.sql
2023-11-17 12:24:07 +01:00
58aeb59b2c
Updated MR
2023-11-17 10:22:52 +01:00
42e278bd7c
update version and tasks with the new macros
2023-11-16 15:55:07 +01:00
0f9facb999
fix chart_generator pdf pandora_enterprise#12382
2023-11-16 13:17:25 +01:00
1a931c71b4
update vmwre md5 code
2023-11-16 10:10:54 +01:00
f75baa72e9
update vmwre md5 code
2023-11-16 10:07:28 +01:00
4b0e134fba
update md5 hash
2023-11-15 15:13:08 +01:00
4579fe21d9
update version in mr
2023-11-15 14:24:42 +01:00
db91fe3127
#12451 fixed default alert action for Telegram and Vonage.
2023-11-14 15:34:14 +01:00
b23e4330a6
Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards
2023-11-14 10:51:25 +01:00
613d1eb9cb
fix error sql edit agents to conected metaconsole pandora_enterprise#12449
2023-11-14 09:16:47 +01:00
2923de8872
#11126-2 fixed mr
2023-11-13 14:57:11 +01:00
ca66efb4f4
change service modules async to generic pandora_enterprise#11681
2023-11-13 13:20:55 +01:00
c24cc4eea1
Merge branch 'develop' into ent-11126-vulnerability-scanner-interface
2023-11-10 10:45:51 +01:00
8ec1432414
Merge remote-tracking branch 'origin/develop' into ent-11125-pandora-security-monitoring-vulnerability-scanner
2023-11-10 09:53:17 +01:00
4f60c62626
#12132 Fix conflict
2023-11-08 16:31:01 +01:00
98bc73a83a
#8365 Fix ncm report for multiple agents
2023-11-08 14:40:47 +01:00
14fff84876
queries remove field transactional_agent pandora_enterprise#12334
2023-11-08 11:56:32 +01:00
aafdf32793
#11126 refactored
2023-11-08 09:55:33 +01:00
84ee69b435
#12095 remove user_comment
2023-11-07 15:56:23 +01:00
ba64bfb882
#11126 refactored
2023-11-06 15:49:19 +01:00
3506ba1b5a
Added default NCM templates
2023-11-06 15:06:16 +01:00
98332d728e
#8365 change name ncm agent data
2023-10-31 16:55:35 +01:00
b327c824da
#8365 NCM new special templates
2023-10-31 13:45:26 +01:00
ee231c1ee4
#11126 fixed pipeline
2023-10-31 12:56:23 +01:00
0699759b60
#11126 fixed table cve
2023-10-31 11:24:45 +01:00
5088149d5c
Merge branch 'develop' into ent-11126-vulnerability-scanner-interface
2023-10-31 10:08:58 +01:00
e6ca7ce476
#11126 added binary
2023-10-31 10:04:39 +01:00
ed1ae83770
#12344 Fixed log source
2023-10-30 15:15:53 +01:00
c48414ac8a
Merge branch 'ent-12278-meter-por-defecto-las-integraciones-de-alertas-en-el-paquete-de-pandora-y-generar-comando-y' into 'develop'
...
Added messaging alerts to pandoradb_data.sql and 66.sql
See merge request artica/pandorafms!6599
2023-10-30 12:45:02 +00:00
307fd7b8cb
#8365 remove fk tncm_queue
2023-10-30 10:52:13 +01:00
200f63b516
#11126 added .disco by default
2023-10-30 10:02:11 +01:00
Enrique Martin
alejandro.campos@artica.es
Alejandro Sánchez
daniel
Daniel Maya
Diego Muñoz-Reja
Luis
Matias Didier
Jonathan
Daniel Cebrian
miguel angel rasteu
Daniel Rodriguez
Rafael Ameijeiras
Jorge Rincon
vgilc
Ramon Novoa