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

839 Commits

Author SHA1 Message Date
miguel angel rasteu 3c345ed1f9 #8285 Add CSV export on agents modules view 2023-07-13 13:12:43 +02:00
Rafael Ameijeiras 48e29def9b Merge branch 'ent-10252-errata-en-la-interfaz-de-bases-de-datos-de-nodos-y-metaconsola' into 'develop' 
Ent 10252 errata en la interfaz de bases de datos de nodos y metaconsola

See merge request artica/pandorafms!5696
 2023-06-27 11:26:37 +00:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Pablo Aragon 94b4584d45 11521-Fix filter SNMP graph 2023-06-08 08:29:35 +02:00
Daniel Cebrian ad0dcf45d9 #10979 added grafana plugin 2023-05-31 15:34:19 +02:00
miguel angel rasteu 390f18e963 #11317 Fix ACL Check 2023-05-23 10:53:08 +02:00
Daniel Rodriguez 24b1262e17 Merge branch 'ent-11181-resource-exporting-no-funciona-no-hace-nada' into 'develop' 
Ent 11181 resource exporting no funciona no hace nada

See merge request artica/pandorafms!5907
 2023-05-18 12:18:35 +00:00
Daniel Cebrian 6469a12b91 #11181 fixed resource exporting 2023-05-16 15:19:56 +02:00
Jorge Rincon 927e36b793 #11194 fixed display of SNMP browser in real time graph 2023-05-16 11:48:11 +02:00
miguel angel rasteu 63228ef370 #10252 fix translate 2023-04-11 17:21:35 +02:00
Pablo Aragon 7b9d6fdca2 10871-Filter fixed in realtime snmp graph 2023-04-06 09:52:46 +02:00
daniel c315a7f8c5 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-31 13:31:39 +02:00
Pablo Aragon be9be17398 10748 2023-03-31 13:24:20 +02:00
Daniel Rodriguez ca16c5dd61 Merge branch 'ent-10441-control-de-cache-en-actualizaciones' into 'develop' 
Ent 10441 control de cache en actualizaciones

See merge request artica/pandorafms!5623
 2023-03-31 07:33:26 +00:00
Jonathan 779849d949 Agent modules view fix filters 2023-03-30 13:56:53 +02:00
Jonathan 9a0dffbee3 Agents modules view fix filters 2023-03-29 11:02:57 +02:00
Daniel Cebrian 075d0a1c4f #10441 added version file in css 2023-03-24 12:06:40 +01:00
Daniel Cebrian da742bc15e #10441 added version file in js 2023-03-24 09:13:22 +01:00
daniel e82de5d6aa fixed styles 2023-03-22 14:08:03 +01:00
Jose Gonzalez 211f29c0f9 Websocket engine and quickshell 2023-03-16 17:49:57 +01:00
Pablo Aragon 2215097100 Manage agent, modules 2023-03-13 17:39:58 +01:00
Jose Gonzalez edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
Pablo Aragon d3ed5a93fc Admin tools 2023-03-09 17:21:18 +01:00
Pablo Aragon 2a97b26cfe Admin tools 2023-03-09 15:14:47 +01:00
Jose Gonzalez 651469b562 Users connected view 2023-03-07 17:37:33 +01:00
Jose Gonzalez b13892ecdb Users connected view 2023-03-07 17:37:01 +01:00
Jose Gonzalez f7aab35082 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 15:59:51 +01:00
Jose Gonzalez 226b80b7c7 Icon revision 2023-03-07 15:59:10 +01:00
vgilc 7c0259be78 Merge branch 'ent-10518-nuevo-menu-metaconsola' into 'develop' 
Draft: Ent 10518 nuevo menu metaconsola

See merge request artica/pandorafms!5573
 2023-03-07 13:00:17 +00:00
Jose Gonzalez d9913818cb Private Enterprise Numbers minor fixes 2023-03-06 23:47:05 +01:00
Jose Gonzalez 44fb762fdf Minor fixes with graphs 2023-03-06 15:44:32 +01:00
Daniel Maya ccb0d69edd #10518 Added new menu 2023-03-03 09:15:51 +01:00
daniel 5f8e9a3e3c fixed styles 2023-03-02 12:46:47 +01:00
daniel f00f974c60 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/alert_templates.php
	pandora_console/godmode/groups/configure_modu_group.php
	pandora_console/godmode/groups/modu_group_list.php
	pandora_console/godmode/modules/manage_network_components.php
	pandora_console/godmode/users/user_list.php
 2023-02-28 07:32:43 +01:00
daniel 12212fff02 restyling 2023-02-27 13:41:44 +01:00
Jose Gonzalez cba3ba8452 Fixed resource registration 2023-02-27 10:09:34 +01:00
Jose Gonzalez 9972b14ccd Resource Exportation view 2023-02-27 09:55:31 +01:00
Jose Gonzalez 4e2af1d5f2 Fixes 2023-02-24 14:34:32 +01:00
daniel fcf380851b restyling 2023-02-24 13:09:03 +01:00
daniel 41f6ea0d6e restyling 2023-02-24 12:16:30 +01:00
daniel 3575e199b0 restyling 2023-02-24 10:46:46 +01:00
daniel 6381aaa9a8 restyling 2023-02-24 10:18:52 +01:00
daniel e514a0efb5 fixed styles 2023-02-22 17:41:19 +01:00
Jose Gonzalez bbde3e4181 Minor fixes 2023-02-22 12:15:17 +01:00
Jose Gonzalez 2fd52eff48 Sprint 2025Feb Improve UI-UX and Resources views 2023-02-21 14:14:13 +01:00
alejandro.campos@artica.es 2e9b1c7099 fixed node connection 2023-02-07 14:16:59 +01:00
Jose Gonzalez e3b2ec529a Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-02-03 14:16:47 +01:00
alejandro.campos@artica.es 022ca1c6a4 fixed ssrf vulnerability 2023-02-01 13:12:12 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +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
jose.gonzalez@pandorafms.com 4fd0115d80 Adapt views 2022-12-15 12:42:35 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
jose.gonzalez@pandorafms.com 92dd21701f View changes 2022-11-04 13:00:00 +01:00
jose.gonzalez@pandorafms.com 13b0c7d0c8 Fixed views 2022-10-25 13:13:52 +02:00
jose.gonzalez@pandorafms.com 00de0faac3 Adapted views 2022-10-24 19:55:22 +02:00
jose.gonzalez@pandorafms.com 83de025bc9 Several adaptations 2022-10-21 13:47:41 +02: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