Commit Graph

8007 Commits

Author SHA1 Message Date
miguel angel rasteu 84bc687d5d #12177 Fix conflict 2023-10-30 09:53:00 +01:00
miguel angel rasteu 0f32550f21 #11650 Fix conflict 2023-10-30 08:35:34 +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
Daniel Cebrian 5e497db840 #11126 moved token vulnerabilities to enterprise 2023-10-25 11:48:49 +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
Daniel Cebrian a862a8018c #11126 added token in config agent and setup 2023-10-24 18:02:14 +02: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 Cebrian 490e39c2d8 Merge branch 'develop' into ent-11126-vulnerability-scanner-interface 2023-10-24 13:43:31 +02:00
Jorge Rincon 1838126354 #12298 clear hidden fields 2023-10-24 09:57:25 +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
Jorge Rincon 0e58c64a39 #12260 Adjusted icon path depending on icon extension 2023-10-23 11:14:30 +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
alejandro.campos@artica.es 36f12d5432 minor fix 2023-10-18 20:16:40 +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
Daniel Cebrian 2a4f8ce646 Merge branch 'develop' into ent-11126-vulnerability-scanner-interface 2023-10-16 16:56:29 +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
alejandro.campos@artica.es c67a8ba25d remove required 2023-10-13 14:31:17 +02:00
miguel angel rasteu 35efc20fc7 #12177 Fix message 2023-10-13 12:58:21 +02:00
miguel angel rasteu 2062169f2f #12177 Fix upload os icon 2023-10-13 12:55:58 +02:00
alejandro.campos@artica.es fbe2629de3 fix policy synthetic module form 2023-10-13 10:39:33 +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
miguel angel rasteu a7436efd8c #12219 Fix delete last user profile 2023-10-11 13:31:25 +02:00
miguel angel rasteu 3e20ff7eaa #12218 Fix show hide password button 2023-10-11 09:59:26 +02:00
Jorge Rincon a8713264e2 #10807 fixed GIS MAP creation/editing view styles 2023-10-11 09:55:44 +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
miguel angel rasteu 041a13cb49 #12206 User password change limitation to local 2023-10-09 16:03:04 +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 e980e60025 changed behavior of prediction modules creation 2023-10-06 14:33:06 +02:00
miguel angel rasteu 049e25f866 #8686 Add filter in managemnet tree group 2023-10-06 13:51:18 +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
Daniel Cebrian 2228011812 #11126 new view vulnerability scanner 2023-10-04 17:37:42 +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
Jorge Rincon 5b7e1a9c80 #12122 Entities are added to avoid SQL injection in visual consoles 2023-10-03 11:36:20 +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
Jonathan 2a2a1b6e3e #10316 hover ip custom field get value 2023-10-03 10:46:31 +02:00
alejandro.campos@artica.es 0771094e85 minor changes 2023-10-02 16:42:32 +02:00
miguel angel rasteu 3f41e4f32b #12138 delete agent access graph 2023-10-02 16:24:23 +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 b1fa001fe8 #12091 Change selection type in agents and modules in Bulk Operations Add alerts 2023-09-29 12:50:18 +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
Jonathan 6db13cc55a merge conflict solution 2023-09-28 13:14:49 +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
alejandro.campos@artica.es 3f2caf9404 some gotty changes 2023-09-27 18:28:12 +02:00
alejandro.campos@artica.es 831ed2570d implemented cron in open 2023-09-27 11:35:57 +02:00
Daniel Maya d096fa263d #11914 Added log_alerts 2023-09-27 11:05:06 +02:00
Jorge Rincon d1f2fa4b44 #12113 Set select to close when an option is chosen 2023-09-27 10:50:33 +02:00
Rafael Ameijeiras 03700d2653 Merge branch 'ent-12032-refactoring-visual-de-la-vista-de-clusters' into 'develop'
refactor cluster view pandora_enterprise#12032

See merge request artica/pandorafms!6476
2023-09-26 15:15:27 +00:00
miguel angel rasteu b9b12b13fe #12126 Fix priority selector 2023-09-26 12:18:05 +02:00
miguel angel rasteu d6faec76d7 #12121 Clear html tag characters to prevent XSS attacks 2023-09-26 09:57:39 +02:00
alejandro.campos@artica.es 19a9f82fe1 gotty changes 2023-09-25 19:08:24 +02:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/styles/pandora.css
2023-09-25 17:06:08 +02:00
Luis 086835765d Merge branch 'develop' into 'ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-09-25 14:08:43 +00:00
Jonathan 70e3707b64 #11705 group extra id heredity event custom id 2023-09-25 12:22:10 +02:00
Jonathan e5c5f91576 #11705 change name event_custom_id 2023-09-25 10:32:23 +02:00
Jorge Rincon 01bf91f213 #11127 Added token Number of modules in queue 2023-09-22 13:13:06 +02:00
Jonathan 79fe89c3c5 #11705 new custom_field tevento 2023-09-22 12:24:15 +02:00
Daniel Maya d4e2fb4fea resolved conflict 2023-09-21 18:04:15 +02:00
Jorge Rincon cce958e348 #11074 The warning message is adjusted on the plugin page. 2023-09-21 15:53:14 +02:00
daniel f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +02:00
alejandro.campos@artica.es dbd418d6dc remove trace 2023-09-20 16:01:23 +02:00
alejandro.campos@artica.es ae74caf7b1 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:52:56 +02:00
alejandro.campos@artica.es 6f8212ed40 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:46:47 +02:00
felix.suarez 976a32617f Add logic to complex alerts 2023-09-20 08:18:39 -05:00
Félix Suárez 2de84982cf Updates to save new Complex templates 2023-09-20 08:16:22 -05:00
Jorge Rincon fece93d38b #11691 Added the Show unknowns in graph token in the item editor view when creating the report item. 2023-09-20 08:49:56 +02:00
Daniel Cebrian 592d7ab745 #11807 fixed empty field agent 2023-09-19 09:21:42 +02:00
Daniel Cebrian a1fd85f486 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-18 16:49:00 +02:00
miguel angel rasteu f2f17de643 #12023 Fix write access group in reports 2023-09-18 16:33:47 +02:00
Rafael Ameijeiras a75369aeda Merge branch 'ent-11839-error-en-direccion-url-por-correo-electronico-con-incorrect-config-value-y-error-en-causa-raiz' into 'develop'
Ent 11839 error en direccion url por correo electronico con incorrect config value y error en causa raiz

See merge request artica/pandorafms!6381
2023-09-18 13:18:36 +00:00
Daniel Rodriguez 6ecd8ca899 Merge branch 'ent-10065-post-filtros-de-eventos-privados' into 'develop'
Draft: Ent 10065 post filtros de eventos privados

See merge request artica/pandorafms!6318
2023-09-18 07:55:18 +00:00
Daniel Cebrian ca928bd4a4 #11807 new input interval in report hardening 2023-09-18 09:41:53 +02:00
Pablo Aragon bed83f1406 11839-Add max in User->Block size pagination 2023-09-18 08:23:05 +02:00
Daniel Cebrian f1c153231f #11807 added period in evolution 2023-09-15 14:55:49 +02:00
Daniel Cebrian 2844dfd4f0 #11807 fixed export csv in hardening, fixed interval time in exports report and fixed modal error in reports 2023-09-15 13:34:07 +02:00
daniel 09bcedde62 ITSM pandora_enterprise#11471 2023-09-14 16:36:52 +02:00
Calvo d0c1fa7db3 Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda 2023-09-14 12:24:25 +02:00
Calvo a2baea5710 Migration legacy apps to discovery 2.0 2023-09-14 12:24:12 +02:00
daniel af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
Daniel Cebrian 8ecb57a498 #11807 fixed bug in open 2023-09-13 13:53:53 +02:00
Pablo Aragon 959a2e9110 11806-Add alert icon in Manage agent 2023-09-13 08:14:11 +02:00
miguel angel rasteu 91aee79ab2 #12037 Resolve conflicts 2023-09-12 15:07:00 +02:00
daniel 802f0bf83b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-12 12:37:31 +02:00
Daniel Cebrian 8d0213f841 #11807 fixed selected module in report list check 2023-09-12 12:13:01 +02:00
daniel 5093d54137 ITSM pandora_enterprise#11471 2023-09-11 18:14:32 +02:00
Jorge Rincon 2c430929cb #11831 Fixed menu option literals 2023-09-11 16:53:52 +02:00
miguel angel rasteu 55fa824792 #12037 Fix size of agent text and event text 2023-09-11 11:41:30 +02:00
Jorge Rincon 764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
miguel angel rasteu 99f92b9bec #10676 Fix truncate text 2023-09-11 10:09:34 +02:00
daniel ce0468b37e Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/functions_menu.php
2023-09-08 13:11:52 +02:00
daniel 3d5a5c856b ITSM pandora_enterprise#11471 2023-09-08 13:09:03 +02:00
Jorge Rincon 46142e3702 fixed Graph container icon 2023-09-08 12:12:24 +02:00
Calvo 0afac84b34 Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda 2023-09-08 11:14:11 +02:00
miguel angel rasteu 4b5dcff3cc #10529 Fix token session timeout 2023-09-08 09:26:08 +02:00
Rafael Ameijeiras 885ed9747b Merge branch 'ent-11953-informe-group-report-en-meta-no-muestra-mas-nodos-que-el-1' into 'develop'
Ent 11953 informe group report en meta no muestra mas nodos que el 1

See merge request artica/pandorafms!6408
2023-09-08 07:25:04 +00:00
Calvo c4271bf737 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-09-07 17:58:27 +02:00
alejandro.campos@artica.es 318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00
Daniel Cebrian 39a44828fc Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-07 13:55:48 +02:00
Calvo 9deccd7d29 Fix OS stats for group report 2023-09-07 12:41:37 +02:00
alejandro.campos@artica.es 753851410e implemented os version management 2023-09-06 17:02:15 +02:00
alejandro.campos@artica.es f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00
Rafael Ameijeiras 81ef243d66 Merge branch 'ent-11889-quitar-legacy-de-las-tareas-de-netscan-y-ipam' into 'develop'
Ent 11889 quitar legacy de las tareas de netscan y ipam

See merge request artica/pandorafms!6411
2023-09-06 14:33:39 +00:00
Jorge Rincon 0cd43b8315 fixed web console erratas 2023-09-06 15:45:35 +02:00
Rafael Ameijeiras a67b943c17 Merge branch 'ent-11985-fallo-al-guardar-valores-por-defecto-en-snmp-v3' into 'develop'
Fix default values for SNMP v3 modules

See merge request artica/pandorafms!6407
2023-09-06 09:29:54 +00:00
Rafael Ameijeiras e3c30ad313 Merge branch 'ent-11964-16168-errores-editor-alertas-snmp' into 'develop'
Ent 11964 16168 errores editor alertas snmp

See merge request artica/pandorafms!6377
2023-09-06 09:28:21 +00:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
Calvo 5059d67d61 Fix default values for SNMP v3 modules 2023-09-05 14:20:17 +02:00
Calvo c0fbfda25c Merge remote-tracking branch 'origin/develop' into ent-11953-informe-group-report-en-meta-no-muestra-mas-nodos-que-el-1 2023-09-05 13:32:45 +02:00
Jorge Rincon bd9aecb168 The word legacy has been removed from the ipam and netscan tasks 2023-09-05 11:19:34 +02:00
Rafael Ameijeiras f2b99cf38e Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop'
Ent 10639 unificacion de controles de fecha

See merge request artica/pandorafms!6212
2023-09-05 07:50:45 +00:00
Daniel Cebrian a417b15d6f Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-05 09:23:35 +02:00
Calvo deb1b0d88b Fix meta group report always selecting one node 2023-09-04 17:41:50 +02:00
Calvo 57c608a28f Fix meta group report always selecting one node 2023-09-04 17:36:28 +02:00
Calvo e1829d5bea Fix default values for SNMP v3 modules 2023-09-04 17:18:01 +02:00
daniel a059f18b4b ITSM pandora_enterprise#11471 2023-09-04 16:36:58 +02:00
Calvo 9a42e5e333 Discovery migration. Console visual cahnges 2023-09-04 16:27:43 +02:00
miguel angel rasteu bf4ef92610 #11511 Move tools from operation to management 2023-09-04 13:44:44 +02:00
daniel 1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/66.sql
2023-09-04 08:16:48 +02:00
miguel angel rasteu 083043eaba #11650 Change style for tooltip 2023-09-01 14:06:48 +02:00
Calvo 788b6f9c26 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-09-01 13:30:28 +02:00
Jonathan 98112d9ff3 #11759 fix delete action snmp alert 2023-09-01 09:05:16 +02:00
Calvo 2fc08b7246 Added enable MADE option to modules and bulk op 2023-08-31 18:07:26 +02:00
Gorka Sanchez 2afd8d3ff3 Merge branch 'ent-11781-unauthenticated-admin-account-takeover-via-malicious-agent-and-xss' into 'develop'
Ent 11781 unauthenticated admin account takeover via malicious agent and xss

See merge request artica/pandorafms!6362
2023-08-31 10:34:30 +00:00
Gorka Sanchez 34ddf9e06c Merge branch 'ent-11734-paradas-planificadas-periodicas-y-de-cron-no-deshabilitan-los-modulos' into 'develop'
Fix cron and periodically module planned downtimes

See merge request artica/pandorafms!6248
2023-08-31 10:33:18 +00:00
miguel angel rasteu 9c470053ae #11954 Fix pagination 2023-08-31 10:58:39 +02:00
Gorka Sanchez 0d4a097a48 Merge branch 'ent-10622-anadir-acciones-sobre-alertas-y-alertas-externas-en-politicas-de-manera-masiva' into 'develop'
Ent 10622 anadir acciones sobre alertas y alertas externas en politicas de manera masiva

See merge request artica/pandorafms!6331
2023-08-31 06:48:45 +00:00
miguel angel rasteu 6305d13a86 #11964 Fix snmp alerts editor 2023-08-30 11:57:40 +02:00
Jorge Rincon aead8d006e #11894 Fixed links does not update the page when creating or deleting links 2023-08-29 14:11:32 +02:00
Jonathan b83c8c6da6 #10622 fix bug 2023-08-29 14:08:06 +02:00
Jonathan 4ca9b6d8d2 Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-29 12:29:41 +02:00