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

6310 Commits

Author SHA1 Message Date
fbsanchez b832fd17e4 update_manager_client => vendor 2022-03-28 12:20:36 +02:00
Daniel Rodriguez 42b561ab2b Merge branch 'ent-8612-Bugs-varios-relacionados-con-Netflow' into 'develop' 
Ent 8612 bugs varios relacionados con netflow

See merge request artica/pandorafms!4768
 2022-03-25 10:42:25 +00:00
Daniel Rodriguez ecd2f7e35e Merge branch 'ent-8651-fallos-menores-de-usabilidad-en-setup' into 'develop' 
Fix console setup visual issues

See merge request artica/pandorafms!4756
 2022-03-25 10:39:05 +00:00
Daniel Maya 4c9bdca3f8 #8533 Fixed label 2022-03-24 15:15:08 +01:00
Calvo 84261fcc82 Fix menu header visual issues 2022-03-23 18:03:27 +01:00
Calvo 8cae675841 Hide menu title when screen is too small 2022-03-23 17:55:52 +01:00
Daniel Maya 98aebc4587 #8533 added show module data (report) 2022-03-23 16:59:15 +01:00
Daniel Rodriguez 1e6d92f7fe Merge branch 'ent-8399-borrado-contenido-cache' into 'develop' 
phantomjs cache auto-clean

See merge request artica/pandorafms!4726
 2022-03-23 10:53:22 +00:00
José González cc776ddbf7 Added enable console task feature 2022-03-23 11:47:34 +01:00
Daniel Rodriguez 38b71b3de7 Merge branch 'ent-7063-Informes-de-servicio-en-Meta' into 'develop' 
report SLA services to metaconsole pandora_enterprise#7063

See merge request artica/pandorafms!4678
 2022-03-23 10:44:01 +00:00
Calvo c9cea837fa Fix setup header visual issues 2022-03-23 10:16:35 +01:00
Calvo 24b6394c83 Merge remote-tracking branch 'origin/develop' into ent-8651-fallos-menores-de-usabilidad-en-setup 2022-03-23 09:25:17 +01:00
Daniel Barbero Martin cc4f325e3f Merge remote-tracking branch 'origin/develop' into ent-7063-Informes-de-servicio-en-Meta 2022-03-22 09:32:07 +01:00
alejandro.campos@artica.es 1a030bcd42 fixed several netflow bugs 2022-03-21 12:21:47 +01:00
fbsanchez 82c5cbb929 PJ scheduler only enterprise 2022-03-21 12:07:14 +01:00
fbsanchez 2796d3c4e2 Merge remote-tracking branch 'origin/develop' into ent-8399-borrado-contenido-cache 2022-03-21 11:30:32 +01:00
Daniel Barbero Martin e5f8e32a9e fixed CV in console mobile metaconsole #8676 2022-03-18 13:07:29 +01:00
Daniel Barbero Martin 8ef56aa076 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-18 09:05:38 +01:00
Daniel Rodriguez 8ff3b4f0ee Merge branch 'ent-8243-Netflow-nuevo-informe-top-n-connections' into 'develop' 
Ent 8243 netflow nuevo informe top n connections

See merge request artica/pandorafms!4709
 2022-03-17 08:56:07 +00:00
Daniel Barbero Martin 51998d5e71 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-17 08:57:17 +01:00
Daniel Rodriguez 0ca61eff7a Merge branch 'ent-8699-error-sql-al-crear-usuario-sin-perfil' into 'develop' 
Fix sql error when user has no profile

See merge request artica/pandorafms!4757
 2022-03-16 10:06:04 +00:00
alejandro.campos@artica.es 7d38617278 Merge remote-tracking branch 'origin/develop' into ent-8243-Netflow-nuevo-informe-top-n-connections 2022-03-15 17:09:19 +01:00
Daniel Barbero Martin a310194f5d Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-15 11:47:55 +01:00
Daniel Rodriguez de75277c8a Merge branch 'ent-8664-deshabilitado-de-modulos-no-funciona-correctametne-en-docker-php8-de-develop' into 'develop' 
Fix missing include

See merge request artica/pandorafms!4741
 2022-03-15 10:47:39 +00:00
Daniel Barbero Martin 9e07afdab2 fixed CV in console mobile metaconsole #8676 2022-03-15 11:39:57 +01:00
Daniel Rodriguez b582fff47e Merge branch 'ent-8679-Vulnerabilidad-File-Manager' into 'develop' 
Fix upload of not wanted files in File Manager

See merge request artica/pandorafms!4754
 2022-03-15 10:08:48 +00:00
Calvo 6ac7488ca4 Fix sql error when user has no profile 2022-03-11 15:42:06 +01:00
Daniel Rodriguez e66e738072 Merge branch 'ent-8663-error-500-en-docker' into 'develop' 
Ent 8663 error 500 en docker

See merge request artica/pandorafms!4740
 2022-03-11 10:03:50 +00:00
Daniel Rodriguez a67b6647f7 Merge branch 'ent-2152-Operaciones-masivas-de-grupos-secundarios' into 'develop' 
bulk operation edit agents add secundary groups pandora_enterprise#2152

See merge request artica/pandorafms!4677
 2022-03-11 08:51:33 +00:00
Daniel Rodriguez 83b7173fc6 Merge branch 'ent-8351-error-visual-en-mensaje-de-exito-de-la-edicion-de-items-de-informes' into 'develop' 
Fix success message position on edit report items

See merge request artica/pandorafms!4720
 2022-03-11 08:51:02 +00:00
Daniel Barbero Martin 1a6a75390d fixed error massive operation agents #2152 2022-03-11 09:20:20 +01:00
Daniel Barbero Martin 7ffca83b29 fixed error massive operation agents #2152 2022-03-10 20:06:45 +01:00
Daniel Rodriguez ef98f5bdef Merge branch 'ent-8611-vulnerabilidad-en-bulk-operations' into 'develop' 
Fix permission vulnerabilities on profile massive operations

See merge request artica/pandorafms!4717
 2022-03-10 13:54:10 +00:00
Luis d1709a631c Merge branch 'develop' into 'ent-8664-deshabilitado-de-modulos-no-funciona-correctametne-en-docker-php8-de-develop' 
# Conflicts:
#   pandora_console/godmode/agentes/configurar_agente.php
 2022-03-10 10:55:12 +00:00
Daniel Rodriguez 8218df83d7 Merge branch 'ent-8633-escalada-de-privilegios-en-la-seccion-de-gestion-de-usuarios' into 'develop' 
Fix users vulnerabilities

See merge request artica/pandorafms!4734
 2022-03-10 10:49:12 +00:00
Calvo 565cb588ac Merge remote-tracking branch 'origin/develop' into ent-8447-conteo-erroneo-de-usuarios-en-index 2022-03-10 08:07:51 +01:00
Calvo aaf01c6a01 User list php format 2022-03-10 08:03:47 +01:00
Calvo ec9936bd59 Fix users vulnerabilities and bugs 2022-03-10 07:57:34 +01:00
José González 73838ef843 Fix upload of not wanted files in File Manager 2022-03-09 17:27:08 +01:00
Luis 81da96ac33 Merge branch 'develop' into 'ent-8611-vulnerabilidad-en-bulk-operations' 
# Conflicts:
#   pandora_console/include/functions_groups.php
 2022-03-09 16:24:06 +00:00
Calvo f06c90e692 Fix console setup visual issues 2022-03-09 17:20:24 +01:00
Daniel Barbero Martin 28047f2348 Merge remote-tracking branch 'origin/develop' into ent-7653-Nuevo-informe-de-estados-de-modulos-de-agentes 2022-03-09 16:49:02 +01:00
Daniel Barbero Martin 0d6570ea24 fixed error massive operation agents #2152 2022-03-09 15:12:26 +01:00
Daniel Rodriguez e637c74dbf Merge branch 'ent-8692-Faltan-iconos-de-configuración-del-agente-en-760' into 'develop' 
Ent 8692 faltan iconos de configuración del agente en 760

See merge request artica/pandorafms!4752
 2022-03-09 13:20:12 +00:00
Daniel Maya 29906b3c53 #8692 Fixed remote config 2 2022-03-09 13:55:49 +01:00
Daniel Rodriguez 09ba16c593 Merge branch 'ent-5886-Vista-para-mostrar-modulos-agentes-en-paradas-planificadas' into 'develop' 
clean file planned_downtime pandora_enterprise#5886

See merge request artica/pandorafms!4688
 2022-03-09 12:48:47 +00:00
Daniel Maya 0a7238fe33 #8692 Fixed remote config 2022-03-09 12:06:21 +01:00
Daniel Barbero Martin 640d93045f Merge remote-tracking branch 'origin/develop' into ent-2152-Operaciones-masivas-de-grupos-secundarios 
Conflicts:
	pandora_console/godmode/massive/massive_edit_agents.php
 2022-03-09 09:28:08 +01:00
Daniel Rodriguez 6e98545bda Merge branch 'ent-8415-lista-templates-descuadrada-usuario-sin-RM' into 'develop' 
Fix reports view

Closes pandora_enterprise#8415

See merge request artica/pandorafms!4703
 2022-03-08 15:36:37 +00:00
Daniel Rodriguez 24da0283ee Merge branch 'ent-8524-se-pueden-crear-respuestas-de-eventos-sin-nombre' into 'develop' 
Event response creation name required

See merge request artica/pandorafms!4685
 2022-03-08 15:33:57 +00:00
Calvo a34ba86129 Fix missing include 2022-03-04 15:26:47 +01:00
Calvo 17aa669d58 Fix modificar server non ininitalisez table 2022-03-04 10:49:25 +01:00
Calvo 036e2e3d6c Fix users vulnerabilities 2022-03-03 16:35:31 +01:00
Daniel Rodriguez 953aa2887c Merge branch 'ent-6375-proyectos-auto-aplicacion-de-politicas' into 'develop' 
some tools for policy-auto-application

See merge request artica/pandorafms!4526
 2022-03-01 12:53:36 +00:00
fbsanchez c5d648677d phantomjs cache auto-clean 2022-02-28 18:56:01 +01:00
José González 95e8a10fe1 Clean traces 2022-02-25 08:31:14 +01:00
Calvo e95f2cd09d Fix success message position on edit report items 2022-02-24 18:02:38 +01:00
José González 08b393614a Fixed missing char 2022-02-24 14:55:47 +01:00
Calvo 39a971ad5b Fix permission vulnerabilities on profile massive operations 2022-02-24 12:17:21 +01:00
Daniel Rodriguez 3f7067fe48 Merge branch 'ent-I-do-now-like-procedures' into 'develop' 
Allow both behaviours in alert time slots

See merge request artica/pandorafms!4711
 2022-02-24 09:55:40 +00:00
fbsanchez cad5b8efa5 float current v 2022-02-23 17:52:09 +01:00
fbsanchez 45d1641169 Merge remote-tracking branch 'origin/develop' into ent-8319-update-manager-comprobar-que-los-oums-y-los-mr-sean-consecutivos 2022-02-23 17:45:15 +01:00
fbsanchez 5d5b0cb553 errata fix 2022-02-23 17:44:51 +01:00
fbsanchez eee355ff00 errata fix 2022-02-23 14:07:20 +01:00
fbsanchez deb46436d3 Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 
Conflicts:
	pandora_console/extras/mr/52.sql
 2022-02-23 12:11:44 +01:00
fbsanchez 2f304f9250 sync with updatemanager repo 2022-02-23 10:53:33 +01:00
fbsanchez 130b077202 Minor change 2022-02-23 10:51:19 +01:00
fbsanchez be9996ab9f Weird stuff for updates 2022-02-23 10:24:01 +01:00
Daniel Barbero Martin 237a7feb98 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-22 13:20:53 +01:00
Daniel Rodriguez ffc7cb2b44 Merge branch 'ent-8455-ampliar-limite-comandos' into 'develop' 
Increased field size

Closes pandora_enterprise#8455

See merge request artica/pandorafms!4706
 2022-02-22 12:08:46 +00:00
Daniel Barbero Martin 93cad269c8 fixed json entities pandora_enterprise#3943 2022-02-22 12:03:22 +01:00
alejandro.campos@artica.es 659408ee44 Implement new netflow item 2022-02-21 11:44:31 +01:00
Daniel Rodriguez 45b97be611 Merge branch 'ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad' into 'develop' 
Added token local user to allow enabling local auth  at user level

See merge request artica/pandorafms!4668
 2022-02-18 11:04:06 +00:00
José González e2621f6230 Increased field size 2022-02-18 11:18:01 +01:00
Calvo 5ba7b47b85 Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad 2022-02-18 09:26:55 +01:00
Jose Gonzalez 7d71c60237 Fix reports view 2022-02-17 14:20:24 +01:00
Calvo 1dbc9c72b8 Fix users count on index and user list 2022-02-17 14:12:48 +01:00
fbsanchez 934be2eaf4 Updated testing and swap messages 2022-02-17 14:07:46 +01:00
fbsanchez 6434095be5 UMC ImSureWhatImDoingWhenInstallingOfflinePatchesBecouseImGoingToIgnoreYourMessages 2022-02-17 13:41:40 +01:00
fbsanchez 3150df98c6 Error fix in report - automatic combined graphs 2022-02-17 11:02:23 +01:00
fbsanchez af45aec166 reporting_label_macro general review 2022-02-16 14:01:23 +01:00
fbsanchez 1da5534484 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	.gitlab-ci.yml
	pandora_console/pandoradb.sql
 2022-02-15 17:32:10 +01:00
fbsanchez 7c11a01b85 Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda 2022-02-15 14:32:50 +01:00
Daniel Rodriguez 6abd7212e6 Merge branch 'ent-7573-Problemas-integracion-Module-Library-vs-Wordpress' into 'develop' 
Ent 7573 problemas integracion module library vs wordpress

Closes pandora_enterprise#7573

See merge request artica/pandorafms!4634
 2022-02-15 10:19:49 +00:00
Daniel Barbero Martin c8daf0a977 fix module name finish % pandora_enterprise#8570 2022-02-14 11:13:33 +01:00
Daniel Barbero Martin bc9bb070df fix module name finish % pandora_enterprise#8570 2022-02-14 08:55:14 +01:00
Daniel Barbero Martin 362c1d2a51 fix module name finish % pandora_enterprise#8570 2022-02-11 13:22:35 +01:00
Daniel Rodriguez cbee39189f Merge branch 'ent-8559-no-aparece-webserver-module' into 'develop' 
Fixed issue with web_available token

Closes pandora_enterprise#8559

See merge request artica/pandorafms!4686
 2022-02-11 10:51:01 +00:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
Daniel Barbero Martin aa2dac1373 new item report agent/modules status pandora_enterprise#7653 2022-02-11 09:28:28 +01:00
fbsanchez 9ba2eb0c74 Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda 
Conflicts:
	pandora_console/extras/mr/52.sql
	pandora_console/pandoradb.sql
 2022-02-10 18:52:51 +01:00
Daniel Barbero Martin 2a37503f2e new item report agent/modules status pandora_enterprise#7653 2022-02-10 16:33:58 +01:00
Daniel Rodriguez f771e2bf9e Merge branch 'ent-8422-Revision-completa-audit-logs' into 'develop' 
Ent 8422 revision completa audit logs

Closes pandora_enterprise#8422

See merge request artica/pandorafms!4669
 2022-02-10 14:20:42 +00:00
Daniel Rodriguez 3f5b9a21f9 Merge branch 'ent-8552-fallo-subida-pspz-y-pspz2' into 'develop' 
Ent 8552 fallo subida pspz y pspz2

See merge request artica/pandorafms!4684
 2022-02-10 14:10:36 +00:00
Daniel Barbero Martin b56c9e6529 new modal planned_downtime resume agents/modules pandora_enterprise#5886 2022-02-09 14:57:36 +01:00
Daniel Barbero Martin 625438c1c3 clean file planned_downtime pandora_enterprise#5886 2022-02-09 10:51:18 +01:00
fbsanchez e26aca338a Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 2022-02-08 22:08:37 +01:00
Daniel Barbero Martin 1dd9ff568e Merge remote-tracking branch 'origin/develop' into ent-7063-Informes-de-servicio-en-Meta 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2022-02-08 14:34:59 +01:00
fbsanchez 6bb754d5d2 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-08 13:02:22 +01:00
José González fc4b702db0 Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/alerts/configure_alert_template.php
 2022-02-08 11:35:01 +00:00