Commit Graph

7875 Commits

Author SHA1 Message Date
Rafael Ameijeiras 72ebccd981 Merge branch 'ent-12322-errores-en-los-menus-de-paginacion-de-operating-systems-y-alert-details' into 'develop'
Ent 12322 errores en los menus de paginacion de operating systems y alert details

See merge request artica/pandorafms!6642
2023-11-10 08:49:54 +00:00
Matias Didier ca8d0ed7f8 Merge branch 'ent-12376-problemas-vistos-en-la-nueva-vista-tactica' into 'develop'
Ent 12376 Problemas vistos en la nueva vista táctica

See merge request artica/pandorafms!6628
2023-11-08 13:36:10 +00:00
Jonathan 9fae476d9e Merge branch 'develop' into ent-12322-errores-en-los-menus-de-paginacion-de-operating-systems-y-alert-details 2023-11-08 14:08:20 +01:00
Rafael Ameijeiras ff1c239ab7 Merge branch 'ent-12413-interno-y-cliente-home-screen-external-link-no-funciona' into 'develop'
Fix home screen external link pandora_enterprise#12413

See merge request artica/pandorafms!6634
2023-11-08 12:01:41 +00:00
Rafael Ameijeiras 3fac744a4f Merge branch 'ent-12414-16555-no-hay-paginacion-en-consolas-visuales' into 'develop'
Fix list CV pagination pandora_enterprise#12414

See merge request artica/pandorafms!6635
2023-11-08 12:01:07 +00:00
Jonathan 679386a964 #12322 fix pagination 2023-11-08 10:38:33 +01:00
Daniel Cebrian cacb524ece #12376 changed label in new token 2023-11-07 13:28:35 +01:00
daniel 76721a9445 Fix home screen external link pandora_enterprise#12413 2023-11-07 13:20:08 +01:00
Daniel Cebrian 8f8e5ecf45 #12376 multiple changes in general tactical view 2023-11-07 13:18:44 +01:00
daniel 65dbef9889 Fix list CV pagination pandora_enterprise#12414 2023-11-07 11:57:24 +01:00
daniel 7b7370659e Fix home screen external link pandora_enterprise#12413 2023-11-07 11:11:08 +01:00
daniel 5486b500f0 Add action ITSM in SNMP alert pandora_enterprise#12327 2023-11-06 13:12:14 +01:00
Daniel Maya c8bab9032d #12349 Fixed csv 2023-10-27 12:09:56 +02:00
Calvo aaea2e59c4 Fix MADE minor bugs 2023-10-26 16:23:07 +02:00
Calvo 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
Matias Didier f89a31e421 Merge branch 'ent-12203-mejoras-y-correccion-de-fallos-automaticos-de-sintaxis-en-el-editor-de-chequeos-web' into 'develop'
Ent 12203 mejoras y correccion de fallos automaticos de sintaxis en el editor de chequeos web

See merge request artica/pandorafms!6556
2023-10-25 09:44:48 +00:00
Calvo 715f6abc69 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-24 14:02:36 +02:00
Daniel Rodriguez 1f8554e8d1 Merge branch 'ent-11914-editor-de-alertas-de-logs' into 'develop'
Ent 11914 editor de alertas de logs

See merge request artica/pandorafms!6505
2023-10-23 12:34:32 +00:00
Calvo 1ef42182a7 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-20 10:46:34 +02:00
Rafael Ameijeiras ac1727e7d6 Merge branch 'ent-12207-tarea-discovery-sale-como-done-cuando-esta-en-proceso' into 'develop'
Draft: Ent 12207 tarea discovery sale como done cuando esta en proceso

See merge request artica/pandorafms!6564
2023-10-17 13:47:40 +00:00
miguel angel rasteu f859049acf #12207 Fix status 2023-10-17 15:00:58 +02:00
Rafael Ameijeiras 55c5251a67 Merge branch 'ent-12113-desplegable-de-credenciales-discovery-se-queda-abierto-tras-seleccionar' into 'develop'
Ent 12113 desplegable de credenciales discovery se queda abierto tras seleccionar

See merge request artica/pandorafms!6504
2023-10-17 12:27:17 +00:00
miguel angel rasteu de2221d9b7 #12207 Fix status 2023-10-17 12:53:24 +02:00
Calvo 98003c81f9 Added MADE server and icons to server list 2023-10-16 16:32:35 +02:00
miguel angel rasteu 35cd554257 #12207 Fix status discovery task 2023-10-16 15:47:48 +02:00
miguel angel rasteu 5060398661 #11206 Fix conflict 2023-10-13 09:00:03 +02:00
Calvo 6612fe96bd MADE only on compatible module types 2023-10-11 17:43:28 +02:00
miguel angel rasteu 3ce6c6de19 #12203 Fix sintaxis module editor webserver 2023-10-11 15:34:10 +02:00
Rafael Ameijeiras dda7c2a0c0 Merge branch 'ent-12205-interfaz-configuracion-ehorus-pandora-rc-a-nivel-de-usuario-ha-desaparecido' into 'develop'
Ent 12205 interfaz configuracion ehorus pandora rc a nivel de usuario ha desaparecido

See merge request artica/pandorafms!6544
2023-10-11 07:18:34 +00:00
miguel angel rasteu f22fd10659 #12205 Fix url 2023-10-10 13:44:57 +02:00
miguel angel rasteu 23c5836ddc #12205 Change ehorus images 2023-10-10 11:34:11 +02:00
alejandro.campos@artica.es 10d94daf30 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-10-10 11:09:53 +02:00
Calvo c790b48fd7 Fix discovery list network column for disco ext 2023-10-10 10:40:37 +02:00
miguel angel rasteu 133826b498 #12205 Fix ehorus conf interfaz 2023-10-10 09:57:09 +02:00
Calvo a822f6db86 Fix discovery migration bugs 2023-10-09 16:52:52 +02:00
alejandro.campos@artica.es 0e0b5bba43 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-10-09 14:17:25 +02:00
Daniel Maya 030ffc55f9 resolved conflict 2023-10-06 09:15:38 +02:00
Calvo d091ee8194 Migration dicovery fix bugs and changed script paths 2023-10-05 10:52:52 +02:00
Calvo db291c77f5 Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda 2023-10-04 16:21:29 +02:00
Alejandro Campos 0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-10-03 13:11:09 +00:00
Calvo 7e20e6b048 Changed migration scripts and migration ini path 2023-10-03 12:10:53 +02:00
Matias Didier 9e4903e545 Merge branch 'ent-12145-16086-gis-no-carga-en-mapas' into 'develop'
Ent 12145 16086 gis no carga en mapas

See merge request artica/pandorafms!6514
2023-10-03 08:52:21 +00:00
alejandro.campos@artica.es 0771094e85 minor changes 2023-10-02 16:42:32 +02:00
Calvo bfe9bcaac0 Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda 2023-09-29 15:18:08 +02:00
Calvo 33d9badd3e Added md5 check to server path for migrating discovery apps 2023-09-29 15:17:43 +02:00
alejandro.campos@artica.es 85598d5012 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-09-28 16:36:59 +02:00
alejandro.campos@artica.es 70ad1ea986 minor changes 2023-09-28 13:08:33 +02:00
Daniel Rodriguez 05cd8142bf Merge branch 'ent-11471-integracion-pandora-integria' into 'develop'
wip integration integriaIMS pandora_enterprise#11471

Closes pandora_enterprise#11471

See merge request artica/pandorafms!6131
2023-09-28 10:05:15 +00:00
Jonathan a1d170cf0f #12145 remove maxlength 2023-09-28 11:47:58 +02:00
Jonathan c577fedff4 #12145 remove maxlength 2023-09-28 11:46:15 +02:00