Commit Graph

29323 Commits

Author SHA1 Message Date
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
daniel 98d843c32f Merge remote-tracking branch 'origin/develop' into ent-12196-problemas-con-la-vista-mobile 2023-10-10 09:39:36 +02:00
daniel d3ada18866 fix cv in mobile pandora_enterprise#12196 2023-10-10 09:38:50 +02:00
alejandro.campos@artica.es 6a58a2e86f ip check 2023-10-10 09:10:42 +02:00
artica bbcc8ee7ef Auto-updated build strings. 2023-10-10 01:00:24 +02:00
Daniel Cebrian 2c352ad9dd #10194 new graph for license and changes in design 2023-10-09 19:04:01 +02:00
alejandro.campos@artica.es c059f83420 some changes in gotty 2023-10-09 18:56:02 +02:00
Calvo 44fa1c5cdc Api asign admin status to server api calls instead assignin user admin 2023-10-09 18:08:30 +02:00
Calvo a822f6db86 Fix discovery migration bugs 2023-10-09 16:52:52 +02:00
Daniel Cebrian 9b675868b9 Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-10-09 16:43:25 +02:00
Daniel Cebrian 5ea3e47264 #10194 added acl 2023-10-09 16:42:39 +02:00
Enrique Martin 62b52b901a Fixed SQL migration scripts 2023-10-09 14:37:31 +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
alejandro.campos@artica.es 025abbed93 add timeout 2023-10-09 14:17:16 +02:00
daniel d8bdbc7bd1 Merge remote-tracking branch 'origin/develop' into ent-12196-problemas-con-la-vista-mobile 2023-10-09 08:03:22 +02:00
artica 64a17cb59d Auto-updated build strings. 2023-10-09 01:00:21 +02:00
artica b41ec6f30b Auto-updated build strings. 2023-10-08 01:00:19 +02:00
artica a21f85276c Auto-updated build strings. 2023-10-07 01:00:27 +02:00
Daniel Cebrian f48e83da01 #10194 added acl 2023-10-06 14:43:54 +02:00
Daniel Maya 3479245a6b #11391 Fixed https 2023-10-06 13:34:21 +02:00
Matias Didier 3f74126495 Merge branch 'ent-12087-guardia-16249-error-500-en-reportes' into 'develop'
Ent 12087 guardia 16249 error 500 en reportes

See merge request artica/pandorafms!6526
2023-10-06 11:25:48 +00:00
daniel 588f19fa18 fix cv in mobile pandora_enterprise#12196 2023-10-06 12:59:33 +02:00
Daniel Cebrian 44c654cdb4 #10194 added acl 2023-10-06 11:48:47 +02:00
Rafael Ameijeiras e1d8f862ae Merge branch 'ent-12166-estilos-calendarios' into 'develop'
Ent 12166 estilos calendarios

See merge request artica/pandorafms!6529
2023-10-06 07:32:11 +00:00
Daniel Maya 030ffc55f9 resolved conflict 2023-10-06 09:15:38 +02:00
Matias Didier ee6ef65da6 Merge branch 'ent-12029-vista-heatmap-tamano-de-texto-muy-grande' into 'develop'
Ent 12029 vista heatmap tamano de texto muy grande

See merge request artica/pandorafms!6534
2023-10-06 07:07:30 +00:00
artica c616d2cf49 Auto-updated build strings. 2023-10-06 01:00:29 +02:00
Daniel Cebrian 1a89761727 #10194 adjust max height divs 2023-10-05 18:15:33 +02:00
Calvo d091ee8194 Migration dicovery fix bugs and changed script paths 2023-10-05 10:52:52 +02:00
Daniel Maya 9bdaed3cd0 #11818 Fixed refresh 2023-10-05 09:31:43 +02:00
alejandro.campos@artica.es 780d29fce3 ssh by default 2023-10-05 09:08:20 +02:00
artica 8225384e55 Auto-updated build strings. 2023-10-05 01:00:25 +02:00
alejandro.campos@artica.es 17f5b0dede quick shell changes 2023-10-04 18:00:19 +02:00
Jorge Rincon 80807ae085 #12166 fixed style of selected item in calendar 2023-10-04 16:46:43 +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
Daniel Maya ae0bb2022d #12029 Fixed font size 2023-10-04 15:42:19 +02:00
miguel angel rasteu 27bee15d50 #12172 Change truncate event name limit to description_size_text 2023-10-04 12:56:28 +02:00
artica b9f94050a2 Auto-updated build strings. 2023-10-04 01:00:26 +02:00
Daniel Maya a842c8249f #12087 Fixed report with fatal error 2023-10-03 15:44:27 +02:00
Jorge Rincon a685a04493 #12166 fixed calendar button and border styles 2023-10-03 15:42:57 +02:00
Daniel Cebrian c2bc53bbd9 #10194 graph adjusted and fixed bug 2023-10-03 15:32:53 +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 134aa82330 Deleted mysql app added by mistake 2023-10-03 12:12:50 +02:00
Calvo 7e20e6b048 Changed migration scripts and migration ini path 2023-10-03 12:10:53 +02:00
Enrique Martin 67df5ee92a Fixed vmware app issue, updated migrate code and removed xenserver insert sql 2023-10-03 11:45:59 +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
Daniel Cebrian e64eadcb37 #10194 hide widget not activated 2023-10-03 10:31:57 +02:00
artica 19821c4a40 Auto-updated build strings. 2023-10-03 01:00:30 +02:00
Daniel Cebrian 438cb11f95 #10194 added automonitoritation modules and interval refresh async 2023-10-02 16:44:53 +02:00
alejandro.campos@artica.es 0771094e85 minor changes 2023-10-02 16:42:32 +02:00
alejandro.campos@artica.es 12fbd1e522 some functional changes in gotty 2023-10-02 13:57:11 +02:00
Rafael Ameijeiras b0d12c8a18 Merge branch 'ent-12081-añadir-el-lapso-de-tiempo-none-para-el-filtro-de-los-informes-en-la-vista-HTML-por-defecto' into 'develop'
Ent 12081 añadir el lapso de tiempo none para el filtro de los informes en la vista html por defecto

See merge request artica/pandorafms!6496
2023-10-02 11:23:35 +00:00
Daniel Maya 06e42de207 #11391 Fixed date 2023-10-02 12:39:40 +02:00
Rafael Ameijeiras 958c428e91 Merge branch 'ent-12142-error-500-cuando-la-consola-no-conecta-con-la-DB' into 'develop'
Ent 12142 error 500 cuando la consola no conecta con la db

See merge request artica/pandorafms!6515
2023-10-02 10:02:50 +00:00
Daniel Maya 528c5a726a Merge branch 'develop' into ent-11391-pandora-indexer-cambios-en-el-collector-de-logs 2023-10-02 10:27:14 +02:00
Enrique Martin 22769342b8 Merge remote-tracking branch 'origin/develop' into ent-11213-plugin-sap-para-discovery-2-0
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/pandoradb_data.sql
2023-10-02 10:24:31 +02:00
Enrique Martin c19a76e58e Merge branch 'ent-10923-scripts-cloud-para-el-nuevo-discovery-2' into 'develop'
added discovery cloud plugins in MR

See merge request artica/pandorafms!6513
2023-10-02 07:54:54 +00:00
Rafael Ameijeiras 439d5b54aa Merge branch 'ent-11961-16159-activar-show-all-events-24h-por-defecto-en-vista-de-ultimos-eventos-de-agente' into 'develop'
Agents show events 24h switch checked default

See merge request artica/pandorafms!6405
2023-10-02 07:08:52 +00:00
artica 323572a4c7 Auto-updated build strings. 2023-10-02 01:00:18 +02:00
artica f6fdd587e7 Auto-updated build strings. 2023-10-01 01:00:18 +02:00
artica 7a890d5820 Auto-updated build strings. 2023-09-30 01:00:22 +02:00
Calvo 1073d492f7 Deleted mysql app added by mistake 2023-09-29 15:22:02 +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
Jorge Rincon 418624000f #12142 Caught bd exception in php version 8.0 and 8.2 2023-09-29 09:21:08 +02:00
Daniel Cebrian 63bd979855 Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-09-29 08:55:59 +02:00
Daniel Cebrian e7e27855a6 #10194 fixed name empty in agents y monitoring 2023-09-29 08:55:24 +02:00
artica 477d3e62f8 Auto-updated build strings. 2023-09-29 01:00:27 +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
Daniel Cebrian b8df74dace Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-09-28 16:22:58 +02:00
Daniel Cebrian 9f5836e2cc #10194 new sections in general tactical view 2023-09-28 16:10:57 +02:00
Diego Muñoz-Reja b84ffc124b Merge branch 'ent-12066-eventos-que-no-muestran-los-comentarios' into 'develop'
fix show comment events ticket pandora_enterprise#12066

See merge request artica/pandorafms!6488
2023-09-28 14:06:30 +00: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
alejandro fd6757dbde added discovery cloud plugins in MR 2023-09-28 11:08:38 +02:00
Enrique Martin 4e6bb65790 Debugging rpm generation incompatibility with EL7 binaries 2023-09-28 10:42:39 +02:00
Enrique Martin 59024fa846 Added SAP plugin to MR 2023-09-28 09:18:36 +02:00
artica 52f63a6f12 Auto-updated build strings. 2023-09-28 01:00:23 +02:00