Commit Graph

29301 Commits

Author SHA1 Message Date
Daniel Cebrian 8d624fe371 Merge branch 'develop' into ent-12288-varios-bugs-en-netflow 2023-10-23 14:59:20 +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
alejandro.campos@artica.es fd4a66dd37 fix 2023-10-23 14:11:21 +02:00
alejandro.campos@artica.es a747b8fa56 fix 2023-10-23 14:09:38 +02:00
Diego Muñoz-Reja 48c314669a Merge branch 'ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion' into 'develop'
Ent 10194 Nueva pantalla táctica (relacionado con mejoras en la automonitorización)

See merge request artica/pandorafms!6485
2023-10-23 07:24:20 +00:00
Daniel Rodriguez 9aee38aa0b Merge branch 'ent-11391-pandora-indexer-cambios-en-el-collector-de-logs' into 'develop'
#11391 Fixed ace editor and log viewer

See merge request artica/pandorafms!6461
2023-10-23 07:19:51 +00:00
artica 46ce3073db Auto-updated build strings. 2023-10-23 01:00:18 +02:00
artica 2a1dcb2aea Auto-updated build strings. 2023-10-22 01:00:18 +02:00
artica 9c18352629 Auto-updated build strings. 2023-10-21 01:00:23 +02: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
Daniel Cebrian 7bee2a9784 #12288 fixed translate 2023-10-20 10:15:48 +02:00
Daniel Cebrian 04e001c010 #12288 fixed string translate 2023-10-20 10:10:27 +02:00
daniel 5d28ed6710 fix cv in mobile pandora_enterprise#12297 2023-10-20 09:04:40 +02:00
Matias Didier dcd891eedb Merge branch 'ent-12286-16465-acceso-a-pandora-a-traves-de-public-link-url-de-consolas-visuales-con-usuario-de-public-2' into 'develop'
Ent 12286 16465 acceso a pandora a traves de public link url de consolas visuales con usuario de public 2

See merge request artica/pandorafms!6578
2023-10-20 05:51:32 +00:00
artica 6247bd52c1 Auto-updated build strings. 2023-10-20 01:00:21 +02:00
felix.suarez ef2950ff56 Fix conflict 2023-10-19 14:02:32 -06:00
felix.suarez 4080f92316 Add alter to MR 2023-10-19 14:02:32 -06:00
Félix Suárez 66b614d631 Changes on compact db 2023-10-19 14:02:32 -06:00
Daniel Cebrian 7bba90cd4f #12288 added spinner in netflow and fixed bug filter 2023-10-19 17:18:13 +02:00
Jonathan 98388bb7d2 #12286 fix dashboard vulnerability login admin 2023-10-19 17:06:01 +02:00
Matias Didier 981f8c709b Merge branch 'ent-12196-problemas-con-la-vista-mobile' into 'develop'
fix cv in mobile pandora_enterprise#12196

See merge request artica/pandorafms!6538
2023-10-19 14:57:53 +00:00
Rafael Ameijeiras 796282086c Merge branch 'ent-11639-15813-neflow-tener-2-fuentes-de-datos-a-monitorizar' into 'develop'
Ent 11639 [#15813] Neflow: Tener 2 fuentes de datos a monitorizar

See merge request artica/pandorafms!6577
2023-10-19 14:23:23 +00:00
Daniel Cebrian b1b7a1e57d #10194 fixed acl in view 2023-10-19 16:18:36 +02:00
Matias Didier e77283cd60 Merge branch 'ent-12191-guardia-16081-optimizacion-de-comando-usr-bin-nfcapd-en-netflow' into 'develop'
Ent 12191 guardia 16081 optimizacion de comando usr bin nfcapd en netflow

See merge request artica/pandorafms!6576
2023-10-19 13:33:30 +00:00
daniel 5c52dd95f7 fix cv in mobile pandora_enterprise#12196 2023-10-19 14:58:35 +02:00
Daniel Maya ef1cd39cac #11391 Changed Days_purge_old_information 2023-10-19 11:31:22 +02:00
Daniel Cebrian 8259f4a503 #11639 fixed router_ip in netflow 2023-10-19 10:58:30 +02:00
Jonathan 42aa751d29 #12286 fix issue logout public link visual console 2023-10-19 10:53:20 +02:00
daniel eb5e56cc78 Merge remote-tracking branch 'origin/develop' into ent-12196-problemas-con-la-vista-mobile 2023-10-19 08:16:33 +02:00
artica d5193615f9 Auto-updated build strings. 2023-10-19 01:00:19 +02:00
Daniel Cebrian 8aa1e88317 #12191 optimized command netflow and sflow 2023-10-18 19:02:27 +02:00
Rafael Ameijeiras c6d6598bf8 Merge branch 'ent-12256-solucionar-modulos-de-inventario-insertados-del-mr-65' into 'develop'
Ent 12256 solucionar modulos de inventario insertados del mr 65

See merge request artica/pandorafms!6568
2023-10-18 08:07:25 +00:00
Jonathan 4a23c6a6b9 #12264 update translations 2023-10-18 09:51:58 +02:00
Matias Didier 773e99599d Merge branch 'ent-12254-descuadre-de-alineacion-en-el-menu-entre-iconos-y-textos' into 'develop'
Ent 12254 descuadre de alineacion en el menu entre iconos y textos

See merge request artica/pandorafms!6571
2023-10-18 07:45:51 +00:00
Jonathan ac0f89b24f #12256 remove id and check duplicate before insert 2023-10-18 09:15:46 +02:00
Jonathan a3ce979b39 Revert "#12256 remove id and check duplicate before insert"
This reverts commit 75b035261f.
2023-10-18 09:13:00 +02:00
artica bd2ae54d8c Auto-updated build strings. 2023-10-18 01:00:23 +02:00
Jonathan 33d20a0dae #12264 update translates and MR upload 2023-10-17 17:14:36 +02:00
Jonathan 5cfc89c05f #12254 align text and icons menu 2023-10-17 17:07:46 +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
Matias Didier a840550759 Merge branch 'ent-11818-16015-mapas-de-red-se-descolocan-tras-aparecer-un-nuevo-dispositivo' into 'develop'
Ent 11818 16015 mapas de red se descolocan tras aparecer un nuevo dispositivo

See merge request artica/pandorafms!6535
2023-10-17 13:08:52 +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
Rafael Ameijeiras 2451eaff62 Merge branch 'ent-12073-consola-sonora-no-funciona-si-la-pestana-se-minimiza' into 'develop'
Ent 12073 consola sonora no funciona si la pestana se minimiza

See merge request artica/pandorafms!6495
2023-10-17 12:25:58 +00:00
miguel angel rasteu de2221d9b7 #12207 Fix status 2023-10-17 12:53:24 +02:00
Jonathan 75b035261f #12256 remove id and check duplicate before insert 2023-10-17 12:52:40 +02:00
Daniel Cebrian 17f761afbe #10194 fixed policies in open 2023-10-17 12:49:53 +02:00
Daniel Cebrian 953df647a2 #10194 added include files graphs for security 2023-10-17 12:20:32 +02:00
Daniel Maya d253dd1fbd #11818 Fixed link 2023-10-17 10:37:21 +02:00
Daniel Cebrian af0d311e1c #10194 fixed black theme 2023-10-17 09:40:50 +02:00
artica 14bc896f0f Auto-updated build strings. 2023-10-17 01:00:22 +02:00
Daniel Cebrian 48ffbc6c08 #10194 fixed bug in responsive 2023-10-16 21:09:33 +02:00
Daniel Cebrian d54a6faede #10194 adjust bars 24 hrs in events and changed numbers 2023-10-16 20:47:47 +02:00
Daniel Cebrian 9237e4038a Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-10-16 17:10:33 +02:00
Calvo b27ae3ef2b Fix image names 2023-10-16 16:39:16 +02:00
Calvo 16cecdf82b Fix image names 2023-10-16 16:39:01 +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
Matias Didier f0a3b3af63 Merge branch 'ent-11848-meter-modulos-de-seguridad-hardening-y-auditoria-con-el-grupo-de-modulos-security' into 'develop'
Case insensitive option for get module id

See merge request artica/pandorafms!6551
2023-10-16 10:36:23 +00:00
Rafael Ameijeiras 2c76e30591 Merge branch 'ent-11075-cambiar-apostrofe-en-apartado-de-creacion-de-mapas-de-red' into 'develop'
Ent 11075 cambiar apostrofe en apartado de creacion de mapas de red

See merge request artica/pandorafms!6510
2023-10-16 10:07:13 +00:00
Enrique Martin fecbc14981 Merge branch 'ent-12238-error-cicd-rhel' into 'develop'
Fix console RPM generation

See merge request artica/pandorafms!6562
2023-10-16 09:20:13 +00:00
Daniel Rodriguez f7c045c939 Merge branch 'ent-11206-anadir-la-custom-field-view-de-la-meta-a-los-nodos' into 'develop'
Ent 11206 anadir la custom field view de la meta a los nodos

See merge request artica/pandorafms!6233
2023-10-16 09:13:33 +00:00
Enrique Martin f729b6fdee Fix console RPM generation 2023-10-16 11:07:27 +02:00
artica a47748a2db Auto-updated build strings. 2023-10-16 01:00:15 +02:00
artica 5480de361d Auto-updated build strings. 2023-10-15 01:00:15 +02:00
artica e9beb22030 Auto-updated build strings. 2023-10-14 01:01:35 +02:00
Daniel Maya dbc4d35a64 #11914 Added alert_correlation in delete_file 2023-10-13 10:27:43 +02:00
Daniel Maya ddc29e9bb9 #11914 Added icon 2023-10-13 09:40:28 +02:00
miguel angel rasteu 5060398661 #11206 Fix conflict 2023-10-13 09:00:03 +02:00
Rafael Ameijeiras a7a80029d9 Merge branch 'ent-12171-graficas-en-alertas-de-mail-no-se-ven' into 'develop'
Api asign admin status to server api calls instead assignin user admin

See merge request artica/pandorafms!6543
2023-10-13 06:23:31 +00:00
artica 4727829e90 Auto-updated build strings. 2023-10-13 01:00:20 +02:00
artica e266f7e6d0 Auto-updated build strings. 2023-10-12 01:00:26 +02:00
Calvo 6612fe96bd MADE only on compatible module types 2023-10-11 17:43:28 +02:00
Daniel Maya 58261effaf #11914 Added update 2 2023-10-11 17:12:10 +02:00
Daniel Maya f5535a1fc8 #11914 Added update 2023-10-11 17:10:14 +02:00
miguel angel rasteu 3ce6c6de19 #12203 Fix sintaxis module editor webserver 2023-10-11 15:34:10 +02:00
Calvo 3813ae45aa delete traces 2023-10-11 14:30:04 +02:00
Calvo 480b6828b6 chart generator secured with apipass 2023-10-11 14:25:58 +02:00
Enrique Martin f8a54d16c1 Update VMware migration hash code 2023-10-11 12:49:54 +02:00
Calvo d3a6edc9cf Chart generator bypass security if server request 2023-10-11 12:44:41 +02:00
Rafael Ameijeiras f8c99c6ada Merge branch 'ent-11213-plugin-sap-para-discovery-2-0' into 'develop'
Added SAP plugin to MR

See merge request artica/pandorafms!6511
2023-10-11 10:15:20 +00:00
daniel 744a563034 Merge remote-tracking branch 'origin/develop' into ent-12196-problemas-con-la-vista-mobile 2023-10-11 10:50:05 +02:00
daniel d19b506781 fix cv in mobile pandora_enterprise#12196 2023-10-11 10:48:26 +02:00
Calvo a333e3bbd8 Add grop security MR 2023-10-11 10:46:36 +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
artica f4487dee5a Auto-updated build strings. 2023-10-11 01:00:28 +02:00
Calvo 8557c68ecd Fix pandoradb bug 2023-10-10 20:01:51 +02:00
Calvo 71c4016d63 Case insensitive option for get module id 2023-10-10 17:58:29 +02:00
Daniel Cebrian 4562998352 #10194 control empty value in license graph 2023-10-10 16:27:50 +02:00
Daniel Cebrian e3e7328a01 #10194 change in graph 2023-10-10 15:51:48 +02:00
Daniel Cebrian a02482ac5d #10194 added links 2023-10-10 15:15:43 +02:00
Daniel Maya 455ffd8326 #11914 Fied icon 2023-10-10 14:16:01 +02:00
miguel angel rasteu f22fd10659 #12205 Fix url 2023-10-10 13:44:57 +02:00
alejandro.campos@artica.es 8cc34d2199 visual change 2023-10-10 13:24:27 +02:00
alejandro.campos@artica.es 295654d26b revert changes 2023-10-10 12:38:56 +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
Enrique Martin 1856d31b9c Merge branch 'ent-11607-migracion-de-discovery-bajo-demanda' into 'develop'
Discovery migration. Console visual cahnges

See merge request artica/pandorafms!6404
2023-10-10 08:47:07 +00: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