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

732 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 022ca1c6a4 fixed ssrf vulnerability 2023-02-01 13:12:12 +01:00
Calvo d8428a46a7 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2023-01-13 10:12:21 +01:00
Ramon Novoa 58ff352df8 Remove sample_agent. 
Remove sample_agent, since it is not used anymore and has performance
issues.
 2023-01-12 12:04:39 +01:00
Calvo c14842a4f9 WIP:Api auth with bearer token 2022-12-29 17:20:34 +01:00
Calvo f84f9733e3 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-20 12:15:10 +01:00
José González 23f163ed2a Fix api checker 2022-06-28 17:21:18 +02:00
José González cdf5485aee Updated api checker extension 2022-06-27 18:06:51 +02:00
Daniel Maya 62e0dfa36e #9146 Fixed dbmanager 2022-06-14 13:11:39 +02:00
Daniel Rodriguez a4bce4aa7a Merge branch 'ent-8739-12903-Graficas-real-time-dan-error-500-php-8' into 'develop' 
Ent 8739 12903 graficas real time dan error 500 php 8

See merge request artica/pandorafms!4790
 2022-04-01 07:23:25 +00:00
Daniel Rodriguez 9da8be71bc Merge branch 'ent-8533-Mostrar-valores-en-elementos-Agents-modules' into 'develop' 
Ent 8533 mostrar valores en elementos agents modules

See merge request artica/pandorafms!4764
 2022-03-31 14:26:51 +00:00
Daniel Maya f2fb3fd7cb #8739 Fixed table 2022-03-31 13:10:09 +02:00
Daniel Rodriguez 7f1e8aab8d Merge branch 'ent-8703-file-repository-tamano-de-descarga-excedido' into 'develop' 
Fix files repo download file hash error

See merge request artica/pandorafms!4760
 2022-03-30 07:45:46 +00:00
Calvo b7923fe494 Added files repo error information for post_max_size and upload_max_filesize 2022-03-28 11:18:08 +02:00
Daniel Maya 4c9bdca3f8 #8533 Fixed label 2022-03-24 15:15:08 +01:00
Daniel Maya e83d63430c #8533 added show module data 2022-03-17 14:48:01 +01:00
Daniel Rodriguez c9a31722d4 Merge branch 'ent-8102-giss-interfaz-de-base-de-datos-para-metaconsola' into 'develop' 
Added db interface to metaconsole with option to query nodes

See merge request artica/pandorafms!4679
 2022-03-15 10:05:37 +00:00
Calvo 52df92e715 Fix files repo download file hash error 2022-03-14 17:56:04 +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
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
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
Calvo 0b9ddc210c Added db interface to metaconsole with option to query nodes 2022-02-04 15:14:32 +01:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/include/class/HTML.class.php
 2022-01-25 14:16:47 +01:00
vgilc b547278930 Merge branch 'ent-7988-no-se-puede-cambiar-la-skin-de-pandora-en-entorno-meta-nodo-sincronizados' into 'develop' 
Ent 7988 no se puede cambiar la skin de pandora en entorno meta nodo sincronizados

See merge request artica/pandorafms!4633
 2022-01-25 10:27:25 +00:00
fbsanchez 35184c4eb6 ws php8 2022-01-21 17:39:11 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Jose Gonzalez 6fb7f317a6 Fix issues with links 2022-01-17 17:13:29 +01:00
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
fbsanchez fee3f4ab96 php8 review + mdpf update 2022-01-12 14:22:16 +01:00
Calvo f19ed2fbc0 Fix api checker form 2022-01-04 17:20:51 +01:00
Daniel Barbero Martin b19bc9c8ab wip reports alert actions 2021-12-07 09:05:50 +01:00
Daniel Maya 2894d23e40 #7316 Fixed config_url 2021-11-25 16:15:44 +01:00
Daniel Rodriguez c73c0e91f4 Merge branch 'ent-8138-Monitoring-Module-Groups-Falla-la-muestra-de-datos' into 'develop' 
fix count in module groups view

See merge request artica/pandorafms!4501
 2021-11-17 17:20:20 +00:00
Daniel Rodriguez eb9e73ecb0 Merge branch 'ent-7838-revision-acl-enterprise-parte-1-eliminacion-opciones' into 'develop' 
Deleted and reubicated acl options

See merge request artica/pandorafms!4340
 2021-11-15 11:24:50 +00:00
Daniel Rodriguez cd2f3b8a54 Merge branch 'ent-8098-Bug-en-filtro-de-Agents/Alerts' into 'develop' 
Ent 8098 bug en filtro de agents/alerts

See merge request artica/pandorafms!4470
 2021-11-15 11:18:27 +00:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
fbsanchez a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
 2021-10-26 14:21:40 +02:00
alejandro.campos@artica.es 24e73ce420 fix count in module groups view 2021-10-26 12:57:01 +02:00
Daniel Maya a300ca5786 #8098 Fixed pagination 2021-10-14 11:33:06 +02:00
Daniel Rodriguez 086761b7b6 Merge branch 'ent-7822-vista-agents-modules-descuadra-cuando-la-ventana-no-esta-maximizada' into 'develop' 
fixed visual error with modules agents

See merge request artica/pandorafms!4390
 2021-10-05 09:22:05 +00:00
Daniel Rodriguez d0e738e8fb Merge branch 'ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola' into 'develop' 
Ent 7937 mensaje this node is configured with centralized mode de nodo sale en metaconsola

See merge request artica/pandorafms!4409
 2021-10-05 09:18:41 +00:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
marcos b332e59687 fixed minnor error with resource library url 2021-09-27 13:48:07 +02:00
fbsanchez fe42a8782b Updated messages in centralised environment status check 2021-09-23 11:16:48 +02:00
marcos 1b4a137579 fixed visual error with modules agents 2021-09-06 17:16:49 +02:00
Daniel Rodriguez cdc8b0a80c Merge branch 'ent-7676-12038-error-en-users-connected' into 'develop' 
fixed sql error without profile

See merge request artica/pandorafms!4200
 2021-08-03 06:48:56 +00:00
Calvo 9b736d0c48 Deleted and reubicated acl options 2021-07-30 13:49:22 +02:00
fbsanchez eec373e896 Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url 2021-06-24 19:48:07 +02:00