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
63c74e2aa9
#8365 recovery after vscode revert error
2023-10-30 08:55:21 +01:00
c01af3e9b6
Merge branch 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3
2023-10-30 08:37:37 +01:00
1fd45fb95f
implement demo data feature
2023-10-26 19:05:07 +02:00
aaea2e59c4
Fix MADE minor bugs
2023-10-26 16:23:07 +02:00
48e1782910
Merge branch 'develop' into ent-11126-vulnerability-scanner-interface
2023-10-26 15:18:17 +02:00
763f656822
Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine
2023-10-26 14:31:22 +02:00
90249d4631
#8365 NCM add backup id to ncm queue
2023-10-26 12:49:30 +02:00
7d485c7c26
#11126 update pandora_cve
2023-10-26 11:55:19 +02:00
a862a8018c
#11126 added token in config agent and setup
2023-10-24 18:02:14 +02:00
08921ad8db
Merge branch 'ent-12174-error-vmware-discovery-2-0' into 'develop'
...
Update VMware migration hash code
See merge request artica/pandorafms!6554
2023-10-24 13:55:07 +00:00
Daniel Cebrian
Jonathan
daniel
miguel angel rasteu
Alejandro Campos
Enrique Martin
Daniel Rodriguez
Rafael Ameijeiras
Jorge Rincon
Daniel Maya
alejandro
vgilc
Ramon Novoa
Calvo