tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,811 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

8007 Commits

Author SHA1 Message Date
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
Daniel Cebrian 77c7694082 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-29 10:30:05 +02:00
Pablo Aragon ba964dfb16 11817-Remove Network maps from autorefresh user list 2023-08-29 08:52:50 +02:00
Daniel Cebrian aa39c4295e #11807 fixed bugs and added new report evolution hardening 2023-08-28 15:43:59 +02:00
Jorge Rincon 797b24af86 #10065 Added switch to filter create/edit modal. 2023-08-28 13:54:35 +02:00
Calvo 32d67361b4 Fix planned downtime string 2023-08-28 10:43:06 +02:00
daniel ecfa71b43c ITSM pandora_enterprise#11471 2023-08-25 14:15:32 +02:00
miguel angel rasteu 73773e6ff9 #11781 clean custom_id 2023-08-25 13:42:41 +02:00
Jonathan e986ac27d6 #10622 add action full name 2023-08-24 13:14:31 +02:00
daniel a7baab0aba Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-24 12:07:32 +02:00
Matias Didier 9e747e9952 Merge branch 'ent-11873-paradas-planificadas-de-modulos-ponen-en-modo-quiet-agente-en-vez-de-modulos' into 'develop' 
Ent 11873 paradas planificadas de modulos ponen en modo quiet agente en vez de modulos

See merge request artica/pandorafms!6345
 2023-08-24 08:43:28 +00:00
Jonathan d9e897568a Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-24 10:06:19 +02:00
Jonathan ab50a519ea #10639 version 2 datepicker 2023-08-24 09:36:15 +02:00
Daniel Cebrian ae288e3dd4 #11807 added new report scoring 2023-08-24 09:24:31 +02:00
daniel dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +02:00
daniel 512d5331d3 ITSM pandora_enterprise#11471 2023-08-23 18:52:06 +02:00
Rafael Ameijeiras 1fa70b3afc Merge branch 'ent-11852-advertencia-al-usar-intervalos-largos' into 'develop' 
Ent 11852 advertencia al usar intervalos largos

See merge request artica/pandorafms!6346
 2023-08-23 05:56:19 +00:00
Rafael Ameijeiras 1bca8b0006 Merge branch 'ent-11819-cambios-en-wizard-de-las-consolas-visuales' into 'develop' 
Ent 11819 cambios en wizard de las consolas visuales

See merge request artica/pandorafms!6338
 2023-08-23 05:54:46 +00:00
Daniel Cebrian 61839db7ff #11807 new report list of checks agent 2023-08-22 16:28:01 +02:00
Daniel Cebrian dd453507d2 #11807 new report top n failed by checks 2023-08-22 09:53:35 +02:00
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
Jonathan 631a247f19 #10622 fix style policy alerts external 2023-08-21 14:50:51 +02:00
miguel angel rasteu 19fb83cd92 #11051 Fix css conflict 2023-08-21 13:16:53 +02:00
Jonathan 563323d0be #11852 warning time lapse more than 30 days 2023-08-21 13:05:39 +02:00
Jorge Rincon 35a7c409bf #11873 Fixed Scheduled Downtime quiet mode for modules 2023-08-21 13:03:44 +02:00
Rafael Ameijeiras b91798947e Merge branch 'ent-10603-personalizacion-weekly-mail-report' into 'develop' 
Ent 10603 personalizacion weekly mail report

See merge request artica/pandorafms!6263
 2023-08-21 10:22:10 +00:00
miguel angel rasteu ebd98b479d #11051 Fix conflict css 2023-08-21 09:01:05 +02:00
miguel angel rasteu 970cc997cc #11051 Fix conflict 2023-08-21 08:25:53 +02:00
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
 2023-08-21 08:08:34 +02:00
Daniel Cebrian 0696ca60da Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-18 14:48:47 +02:00
Daniel Cebrian abb173c1a7 #11807 new report top checks more frequent 2023-08-18 10:27:55 +02:00
Jorge Rincon 3b50481c28 Merge branch develop into ent-11543-pantalla-de-login-en-modo-blanco 2023-08-18 09:49:27 +02:00
Jorge Rincon 3e4178c490 Merge branch develop into ent-10065-post-filtros-de-eventos-privados 2023-08-18 09:19:57 +02:00
Rafael Ameijeiras 43b9972aef Merge branch 'ent-11871-error-sql-en-discovery-task-list-con-usuario-estandar-y-perfil-operator-read' into 'develop' 
Ent 11871 error sql en discovery task list con usuario estandar y perfil operator read

See merge request artica/pandorafms!6340
 2023-08-18 06:49:48 +00:00
Rafael Ameijeiras e28c7db126 Merge branch 'ent-11805-error-en-custom-reports-report-tasks-1-sin-reports' into 'develop' 
Ent 11805 error en custom reports report tasks 1 sin reports

See merge request artica/pandorafms!6310
 2023-08-18 06:42:26 +00:00
Rafael Ameijeiras 640c417a35 Merge branch 'ent-11375-user-bulk-operations-al-intentar-anadir-un-perfil-que-el-usuario-ya-tiene-el-aviso-de-error' into 'develop' 
Ent 11375 user bulk operations al intentar anadir un perfil que el usuario ya tiene el aviso de error

See merge request artica/pandorafms!6160
 2023-08-18 06:37:31 +00:00
Rafael Ameijeiras 46e5d4edcd Merge branch 'ent-11022-mejora-en-visualizacion-de-licencia' into 'develop' 
Ent 11022 mejora en visualizacion de licencia

See merge request artica/pandorafms!6204
 2023-08-18 06:35:41 +00:00
Daniel Rodriguez 2e4c542f28 Merge branch 'ent-11636-SNMP-v2-hace-que-wizard-no-funcione' into 'develop' 
Ent 11636 snmp v2 hace que wizard no funcione

See merge request artica/pandorafms!6303
 2023-08-18 06:29:45 +00:00
daniel 1fecd7d289 ITSM pandora_enterprise#11471 2023-08-17 14:56:55 +02:00
Daniel Cebrian 9327d50306 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-17 08:26:58 +02:00
daniel 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
Jorge Rincon c7809b429f #11871 Fixed SQL query 2023-08-16 13:46:19 +02:00
Jonathan 53bf10acc0 #11819 wizard visual console update 2023-08-14 14:54:15 +02:00
daniel 98a5355c94 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 13:33:35 +02:00
Jorge Rincon f275cde745 #11843 Warning added message in cloud view 2023-08-14 11:50:06 +02:00
Jorge Rincon 3f0f6f8c44 Merge branch develop into ent-11843-advertencia-de-deprecado-de-discovery-y-marcar-las-tarea-antiguas-como-legacy. conflict is resolved 2023-08-14 11:25:11 +02:00
daniel 64c7f56235 ITSM pandora_enterprise#11471 2023-08-14 10:59:56 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
Jonathan de0fdd58af #10622 fix string policie to policies 2023-08-14 08:00:24 +02:00
daniel f0d78a44d1 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2023-08-11 14:32:54 +02:00
daniel dbf98689c2 ITSM pandora_enterprise#11471 2023-08-11 14:30:18 +02:00
Daniel Cebrian 4c3432cf40 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-11 11:09:49 +02:00
Rafael Ameijeiras 320c407637 Merge branch 'ent-10424-fix-http-auth-login-password-problem-2' into 'develop' 
Ent 10424 fix http auth login password problem 2

See merge request artica/pandorafms!6329
 2023-08-11 08:22:22 +00:00
Jonathan df91ea25b5 #10622 massive policies alerts and external 2023-08-11 09:18:50 +02:00
Rafael Ameijeiras 0e317edf70 Merge branch 'ent-11851-fallo-en-el-editor-de-intervalos-del-setup' into 'develop' 
Ent 11851 fallo en el editor de intervalos del setup

See merge request artica/pandorafms!6324
 2023-08-11 06:32:24 +00:00
Daniel Maya f90cbd87a0 #10424 Fixed auth login and password 2023-08-10 13:06:00 +02:00
Daniel Cebrian 85de06fbec #11807 new report vulnerability by category 2023-08-10 11:36:50 +02:00
Daniel Cebrian f871f4e4d0 Merge branch 'ent-11326-security-hardening-console' into ent-11807-security-hardening-console-informes 2023-08-10 08:19:03 +02:00
Jorge Rincon 6cd5fc491b #11843 adjusted type for extensions 2023-08-09 15:26:30 +02:00
Jorge Rincon ed9b70725d #11843 Added word legacy in the discovery. It is added only for version 1.0 of discovery. 2023-08-09 14:40:56 +02:00
Jorge Rincon 5a440f1078 #11851 fixed setup interval editor 2023-08-09 09:47:09 +02:00
Daniel Cebrian 0a23448259 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-09 09:29:19 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/65.sql
 2023-08-09 08:59:01 +02:00
Daniel Cebrian a72309ffa9 Merge branch 'develop' into ent-11682-no-se-configuran-las-listas-de-dias-especiales 2023-08-08 17:35:34 +02:00
Daniel Cebrian c45b9fb541 Merge branch 'develop' into ent-11682-no-se-configuran-las-listas-de-dias-especiales 2023-08-08 17:30:16 +02:00
Jorge Rincon f4b555162b #11843 First part of discovery deprecate warning change 2023-08-08 15:02:31 +02:00
Jorge Rincon 3429e0d190 #10065 Added the option to create-edit a private event filter. 2023-08-07 14:43:50 +02:00
Jonathan 70460ac77b #11835 fix temporary 503 error on update items 2023-08-07 13:12:12 +02:00
Daniel Cebrian bc66f71e14 #11807 added report vul_by_cat 2023-08-07 12:42:05 +02:00
Rafael Ameijeiras d84f69d922 Merge branch 'ent-11651-menu-lateral-se-despista-al-solicitar-detalle-de-alertas' into 'develop' 
Ent 11651 menu lateral se despista al solicitar detalle de alertas

See merge request artica/pandorafms!6268
 2023-08-07 07:28:55 +00:00
Jonathan 49f2dc35f8 #fix agent manager 2023-08-04 12:23:09 +02:00
Jonathan 47155513cc #11710 fix error redirect url and pagination 2023-08-04 10:17:59 +02:00
Jonathan 10dd156b16 #11710 redirect meta message 2023-08-04 09:29:47 +02:00
Jonathan 9dabecffce Merge branch 'develop' into ent-11710-fallo-en-la-paginacion-de-el-apartado-de-alert-commands-en-nodos-con-metaconsola 2023-08-04 09:27:24 +02:00
Rafael Ameijeiras 019efcb124 Merge branch 'ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro' into 'develop' 
Ent 11668 noticias en consola tienen fondo blanco en tema oscuro

See merge request artica/pandorafms!6182
 2023-08-04 06:45:42 +00:00
Rafael Ameijeiras 2cfa209147 Merge branch 'ent-10177-consola-web-no-muestra-cual-servidor-pfms-se-esta-editando' into 'develop' 
Ent 10177 consola web no muestra cual servidor pfms se esta editando

See merge request artica/pandorafms!6304
 2023-08-04 06:43:07 +00:00
Jonathan 6c4143db10 #11710 change message "go to metaconsole" 2023-08-04 08:40:46 +02:00
Rafael Ameijeiras b2821c0db3 Merge branch 'ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola' into 'develop' 
Ent 11713 bugs de visualizacion de los botones de accion en metaconsola y consola

See merge request artica/pandorafms!6249
 2023-08-04 06:34:35 +00:00
Rafael Ameijeiras 0b680568b5 Merge branch 'ent-11739-compatibilidad-php-8-2-second' into 'develop' 
Ent 11739 compatibilidad php 8 2 second

See merge request artica/pandorafms!6300
 2023-08-04 06:32:37 +00:00
miguel angel rasteu 1009404bfd Merge branch 'develop' into ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro 2023-08-03 13:42:49 +02:00
Jonathan 1807c1f84c #11805 hide "-1" on message 2023-08-03 13:00:33 +02:00
Jonathan 52038585f2 #11805 fix error for open 2023-08-03 12:57:31 +02:00
Daniel Maya ddcfa02e6f #11739 Fixed date_format 2 2023-08-03 12:51:50 +02:00
miguel angel rasteu 135c6835bd #11713 fix title buttons 2023-08-03 12:51:09 +02:00
miguel angel rasteu 1dc24cdfb4 #11668 Fix black theme 2023-08-03 12:22:20 +02:00
Rafael Ameijeiras 8f04fbec4d Merge branch 'ent-11645-mensaje-de-error-en-sla-items-erroneo' into 'develop' 
Ent 11645 mensaje de error en sla items erroneo

See merge request artica/pandorafms!6179
 2023-08-03 07:04:39 +00:00
Rafael Ameijeiras fec85ce8e7 Merge branch 'ent-11749-15964-conteo-de-agentes-no-aparece-en-v772' into 'develop' 
Ent 11749 15964 conteo de agentes no aparece en v772

See merge request artica/pandorafms!6266
 2023-08-03 07:04:11 +00:00
miguel angel rasteu ef07bea496 #10177 Fix underscore 2023-08-03 07:59:13 +02:00
miguel angel rasteu 3f85562f21 #10177 Fix server name 2023-08-02 13:42:11 +02:00
Rafael Ameijeiras f692dd4c7d Merge branch 'ent-11693-15876-inverse-interval-no-se-activa-para-modulos-web-server-de-tipo-string' into 'develop' 
Ent 11693 15876 inverse interval no se activa para modulos web server de tipo string

See merge request artica/pandorafms!6218
 2023-08-02 10:43:12 +00:00
Rafael Ameijeiras e6eee88a63 Merge branch 'ent-11377-users-bulk-operations-usuarios-con-perfil-x-anadido-no-aparecen-al-intentar-borrar-perfil' into 'develop' 
Ent 11377 users bulk operations usuarios con perfil x anadido no aparecen al intentar borrar perfil

See merge request artica/pandorafms!6010
 2023-08-02 10:42:36 +00:00
alejandro.campos@artica.es 8074448bfd remove snmp version 2 2023-08-02 11:07:08 +02:00
Rafael Ameijeiras d96977b883 Merge branch 'ent-10562-Nueva-vista-de-detalle-de-alertas-encoladas' into 'develop' 
Ent 10562 nueva vista de detalle de alertas encoladas

See merge request artica/pandorafms!6273
 2023-08-02 08:26:50 +00:00
Jonathan 7e8b26b73a Merge branch 'develop' into ent-11693-15876-inverse-interval-no-se-activa-para-modulos-web-server-de-tipo-string 2023-08-02 09:29:42 +02:00
Jonathan f063c5182e #11693 fix warning/critical inverse for serverdata 2023-08-02 09:26:14 +02:00
miguel angel rasteu 57df761622 #11377 Fix sql query 2023-08-02 09:11:55 +02:00
Daniel Maya ae22b99835 Merge branch 'develop' into ent-11739-compatibilidad-php-8-2-second 2023-08-02 09:10:04 +02:00
alejandro.campos@artica.es 700bb53df4 implemented pending alerts list for event server 2023-08-01 14:37:16 +02:00
Rafael Ameijeiras 965184c688 Merge branch 'ent-11629-neflow-filter-no-admite-grupo-all' into 'develop' 
Ent 11629 neflow filter no admite grupo all

See merge request artica/pandorafms!6151
 2023-08-01 12:33:07 +00:00
Daniel Maya 0d321f5311 #11739 Fixed deprecated functions 3 2023-08-01 11:19:04 +02:00
Jonathan 84df4e1195 #11571 fix for firefox margin api token span 2023-08-01 11:11:24 +02:00