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

831 Commits

Author SHA1 Message Date
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
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
Daniel Barbero Martin 64dd4f2c2b Wip command center, Plugins in meta 2021-06-15 17:24:03 +02:00
marcos 0521ffb7bf fixed sql error without profile 2021-06-14 14:46:41 +02:00
marcos afa1eef63c fixed sql error without profile 2021-06-14 14:10:16 +02:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Daniel Barbero Martin 8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
Marcos Alconada 3bc2844b4d fixed visual error black theme 2021-06-04 11:03:35 +00:00
Daniel Barbero Martin 97595ad973 Wip command center 2021-06-03 10:16:29 +02:00
Daniel Barbero Martin 12e67380ee Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-28 14:37:20 +02:00
Jose Gonzalez 84902a5d3d Fixed code 2021-05-28 13:20:16 +02:00
Daniel Barbero Martin 8c7654cd2d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/godmode/setup/os.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/users/user_edit.php
 2021-05-28 08:26:19 +02:00
José González 76628117fa Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs' 
# Conflicts:
#   pandora_console/operation/messages/message_edit.php
 2021-05-25 13:50:17 +00:00
Daniel Barbero Martin 6c305833bf fix groups, module_groups, network_components user_edit synch 2021-05-18 17:18:54 +02:00
Marcos Alconada f8eafa5015 fixed visual error on snmp interfaces agent graphs black theme 2021-05-12 12:52:44 +00:00
José González 9ab027b286 WIP: Upload 2021-04-29 13:28:03 +02:00
Daniel Rodriguez 7b9c638f0d Merge branch 'ent-7349-error-500-importar-recursos-resource-registration' into 'develop' 
Fix reource registraton error 500 on empty or bad ptr file

See merge request artica/pandorafms!4051
 2021-04-27 11:48:17 +00:00
alejandro.campos@artica.es 1c8e73df9d fixed count in several views 2021-04-21 17:11:32 +02:00
Calvo 888915a1c1 Fix reource registraton error 500 on empty or bad ptr file 2021-04-21 17:04:11 +02:00
marcos ec4f23e502 fixed visual error 2021-03-25 14:36:51 +01:00
Jose Gonzalez 5b1517f767 Merge 2021-03-12 11:07:44 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
José González 69e1f1fb33 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
#   pandora_console/include/styles/pandora.css
 2021-03-09 14:39:15 +00:00
Alejandro Campos 66e4e2b173 Merge branch 'develop' into 'ent-6848-Varios-bugs-en-la-vista-Connected-users' 
# Conflicts:
#   pandora_console/extensions/users_connected.php
 2021-03-02 16:34:10 +00:00
Luis 29913883ae Fixed connected users seeing all users 2021-01-26 13:35:46 +01:00
Daniel Rodriguez 64ec705f2c Merge branch 'ent-6736-guardia-ticket-10925-omnishell-falla-con-certificados-autofirmados' into 'develop' 
allowing self signed certs for quickshell

See merge request artica/pandorafms!3625
 2021-01-25 09:26:04 +01:00
Jose Gonzalez 1fc1752b01 Solved merge 2021-01-12 13:26:48 +01:00
Daniel Rodriguez 86794af7b4 Merge branch 'ent-6889-vista-usuarios-aparece-ip' into 'develop' 
Removed ip from connected user list

See merge request artica/pandorafms!3741
 2021-01-11 18:11:28 +01:00
Daniel Rodriguez 2a2e63fedb Merge branch 'ent-6209-10494-quickshell-duplica-pantalla-en-firefox' into 'develop' 
Fix firefox double load of quickshell

See merge request artica/pandorafms!3686
 2021-01-04 11:15:26 +01:00
Luis Calvo 69c33b45fa Removed ip from connected user list 2020-12-23 14:33:20 +01:00
Jose Gonzalez 5f0d686034 Changed Network Tools for External Tools 2020-12-18 12:31:44 +01:00
alejandro-campos 7a74ae4d20 changes in connected users view 2020-12-15 17:40:15 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
fbsanchez e501b018e4 Fix firefox double load of quickshell 2020-12-02 13:42:23 +01:00
daniel 35bfd765f3 fix SNMP v3 show realtime charts 2020-11-30 14:26:49 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Rodriguez 8471f170fb Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop' 
Fix

See merge request artica/pandorafms!3652
 2020-11-25 14:40:38 +01:00
Jose Gonzalez 7187c54730 Fix 2020-11-25 14:33:52 +01:00
Daniel Rodriguez b1fd90ae58 Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop' 
Ent 6542 agents alerts view fallos visuales

Closes pandora_enterprise#6542

See merge request artica/pandorafms!3594
 2020-11-25 13:35:17 +01:00
Jose Gonzalez f081a6e376 Merge remote-tracking branch 'origin/develop' into ent-6542-agents-alerts-view-fallos-visuales 
Merge with last updates
 2020-11-23 10:08:16 +01:00
José González 32dcd8a7ca Merge branch 'develop' into 'ent-6398-Poner-ojito-mostrar-passwords' 
# Conflicts:
#   pandora_console/include/javascript/pandora_ui.js
 2020-11-19 15:21:58 +01:00
fbsanchez ea346afcc5 allowing self signed certs for quickshell 2020-11-17 17:06:36 +01:00
Jose Gonzalez d172aad1d2 Fix error with category 2020-11-10 16:51:28 +01:00
Jose Gonzalez 702b5025e9 Ended development 2020-11-10 16:48:09 +01:00
Jose Gonzalez f501d19539 Solved issue with main view 2020-11-10 10:58:06 +01:00
Jose Gonzalez b5dc75ce93 WIP: Backup upload 2020-11-04 16:40:18 +01:00
Daniel Rodriguez 2063849dd0 Merge branch 'ent-6569-Exportado/importado-de-informes' into 'develop' 
fix exportation/exportation

See merge request artica/pandorafms!3563
 2020-10-30 13:29:04 +01:00
Daniel Rodriguez 83233b6192 Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop' 
groups_get_children and propagate update

See merge request artica/pandorafms!3545
 2020-10-29 12:36:49 +01:00
Daniel Barbero Martin bebac548d3 fix exportation/exportation 2020-10-23 10:47:03 +02:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
Daniel Maya 0f379a2888 Fixed pagination counter 2020-10-20 12:38:42 +02:00
fbsanchez 2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2020-10-02 14:56:07 +02:00
fbsanchez ea3f147bad minor fixes group selector 2020-10-02 14:31:41 +02:00
daniel 0db539c444 fix visual windows charts 2020-10-01 15:29:54 +02:00
fbsanchez 5d63bc547e Group selection review 2020-09-29 14:22:58 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
Jose Gonzalez 9d0becc012 Added other password fields 2020-09-29 10:12:49 +02:00
fbsanchez f69166bd53 Updates style width group selector 2020-09-28 18:04:46 +02:00
manuel.montes f7fe604914 Fixed entities in resource exporting 2020-08-28 14:43:20 +02:00
Daniel Rodriguez 1adcce21af Merge branch 'ent-5386-9454-Graficas-en-tiempo-real-modulos-snmp-no-funcionan-con-caracteres-especiales-en-comunidad' into 'develop' 
fix broken snmp modules real time graphs when community string has certain chars

See merge request artica/pandorafms!3131
 2020-06-26 13:28:04 +02:00
alejandro-campos 1243968872 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:12:52 +02:00
alejandro-campos ab61cf1fc5 changed console and audit log locations 2020-06-08 10:48:48 +02:00
Alejandro Fraguas bf66724c9f Merge branch 'ent-5217-websocket-settings-en-open-no-funciona-bien' into 'develop' 
Form fixes

See merge request artica/pandorafms!3242
 2020-06-08 10:16:58 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
fbsanchez fae026a089 Form fixes 2020-05-26 13:48:43 +02:00
fbsanchez 2ca9e6fb4a 1st approach avoid quick_shell vulnerability (telnet) 2020-04-17 11:18:49 +02:00
alejandro-campos a12851d0a2 fix broken snmp modules real time graphs when community string has certain chars 2020-04-01 16:37:30 +02:00
alejandro-campos 674f2a2873 minor fix: data string not being displayed correctly when module unknown 2020-02-03 18:04:52 +01:00
alejandro-campos d05551f85a fix characters breaking html 2020-02-03 16:17:46 +01:00
Luis Calvo 3d0b71d953 Added enconding to POST variables 2020-01-21 11:05:49 +01:00
Daniel Rodriguez ffce6399b0 Merge branch '5249-Fallo-seguridad-gestor-uploads' into 'develop' 
Secured get_file script for unauthorized file download

See merge request artica/pandorafms!2999
 2020-01-13 16:46:20 +01:00
Daniel Rodriguez 1cef8aa62f Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop' 
Changed the mode of obtain the title

See merge request artica/pandorafms!2743
 2020-01-09 16:46:58 +01:00
Jose Gonzalez f6163f4f80 Secured get_file script for unauthorized file download 2020-01-07 17:31:14 +01:00
Luis Calvo 2c37ef4acb dbmanager blankspaces transparent to user 2019-12-20 14:18:48 +01:00
fbsanchez 4631d9ea64 minor style fix 2019-12-16 16:48:29 +01:00
fbsanchez bd1954ce38 Setup Websocket engine, unified 2019-12-13 13:11:38 +01:00
fbsanchez 3b5ebd0bf7 Better quickshell integration and fixes 2019-12-13 11:46:44 +01:00
manuel a799b22a5c Fixed bug in network tools 2019-11-27 14:06:52 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
Tatiana Llorente 15aaf0cae6 Added acl checks to module groups view 2019-11-18 17:18:40 +01:00
fbsanchez 1a7165f751 allow to remove user/pass from quick_shell configuration 2019-11-12 13:19:03 +01:00
fbsanchez e583b71a99 missaligned tips 2019-11-05 11:51:26 +01:00
fbsanchez b1d4bfe149 Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace 
Conflicts:
	pandora_console/pandoradb_data.sql
 2019-11-05 11:16:26 +01:00
Tatiana Llorente c83b85c225 Ent 4801 error informes pdf csv 2019-11-04 18:41:03 +01:00
fbsanchez 6478c7a51f minor tips quickshell 2019-10-29 15:55:39 +01:00
fbsanchez 06c7544041 minor fixes 2019-10-29 15:44:46 +01:00
Jose Gonzalez c4c7d916e7 Applying of better way for save config 2019-10-24 17:21:21 +02:00
Jose Gonzalez b0db7c729d Solved minor issues 2019-10-24 16:23:58 +02:00
Jose Gonzalez 742329336e Added link with visual consoles 2019-10-24 14:30:34 +02:00
fbsanchez 045d42d2bb quickShell auth 2019-10-24 12:05:00 +02:00
Jose Gonzalez 29bcd379f7 Added changes for liking with visual consoles 2019-10-24 11:53:35 +02:00
fbsanchez df576a3b86 ws gotty credentials and ws gotty proxy redirection 2019-10-24 10:59:08 +02:00
fbsanchez 709f4cac81 WebSocket configuration, quickShell settings, quickShell proxied url compatibility 2019-10-23 19:56:48 +02:00
fbsanchez 0d67d23cb6 quickShell support for ws_proxy_url 2019-10-23 19:19:38 +02:00
fbsanchez 66ceb93d04 minor changes and init.d script for websocket engine 2019-10-23 15:23:21 +02:00
fbsanchez c963681098 Quick shell telnet improvements 2019-10-21 21:10:26 +02:00
fbsanchez 9d8bb880fa Modular WebSocket engine, added ssh and telnet to quickshell extension 2019-10-21 17:36:50 +02:00
fbsanchez 6c52462c8c Modular WebSocket engine, added ssh and telnet to quickshell extension 2019-10-21 17:36:26 +02:00
fbsanchez e24024d2f4 WS gotty extension - global 2019-10-17 15:31:17 +02:00
fbsanchez 4cceb38762 1st RC WebSocketProxy 2019-10-15 22:16:54 +02:00