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

1131 Commits

Author SHA1 Message Date
Daniel Barbero Martin 1e976a8605 alerts special days wip 2021-11-03 10:59:00 +01:00
Daniel Barbero Martin 25268ec9b4 color 2021-11-02 17:49:45 +01:00
fbsanchez 3a74a6ea42 custom val 2021-11-02 13:59:17 +01:00
fbsanchez 4f2bca1df4 Added sync status notifications 2021-11-02 13:51:30 +01:00
fbsanchez 976e881cb9 Message update notif.syncqueue.length 2021-11-02 12:48:48 +01:00
fbsanchez 7f35845944 Notifications if syncqueue exceeds limits in MC 2021-11-02 12:47:36 +01:00
Daniel Maya 2de38a915b #7912 Hidden agents without modules 2021-10-26 15:36:12 +02: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
Daniel Maya 030938c78e #8134 Fixed search module 2021-10-25 15:40:43 +02:00
fbsanchez 5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
Jose Gonzalez dc3e690502 Fixed issue with OK label 2021-10-18 17:24:41 +02:00
Daniel Rodriguez aa2eb08edb Merge branch 'ent-fix-snmp-interfaces-wizard' into 'develop' 
Fixed SNMP interfaces wizard against 32bit counter devices.

See merge request artica/pandorafms!4348
 2021-10-18 08:33:17 +00:00
Calvo bd46cb7abc Fix metaconsole services tree view agent module data popup 2021-10-18 10:26:47 +02:00
Daniel Maya a300ca5786 #8098 Fixed pagination 2021-10-14 11:33:06 +02:00
Jose Gonzalez aafa979b4a Fixed name 2021-10-08 12:37:09 +02:00
Jose Gonzalez 2c22e53e9d Fixed Diagnostics 2021-10-07 14:20:59 +02:00
fbsanchez dae8a9ba14 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-06 14:50:13 +02:00
Daniel Rodriguez ce656997a5 Merge branch 'ent-8078-Los-tokens-de-selector-general-del-wizard-SNMP-no-funcionan' into 'develop' 
fix block selector in snmp wizards

See merge request artica/pandorafms!4443
 2021-10-06 12:28:40 +00:00
alejandro.campos@artica.es 4016d97c39 fix block selector in snmp wizards 2021-10-05 16:51:13 +02:00
Daniel Rodriguez 1595b99e09 Merge branch 'ent-7748-fallo-visual-en-snmp-interfaces-wizard' into 'develop' 
fallo critico del swich regordete

See merge request artica/pandorafms!4288
 2021-10-05 09:24:51 +00:00
fbsanchez 9dff230b65 Allow enable or disable cache in Entity and some minor fixes 2021-09-30 12:23:37 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Jose Gonzalez 0a0d055252 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-09-29 14:21:23 +02:00
fbsanchez 8c1838abb7 Merge remote-tracking branch 'origin/develop' into ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola 
Conflicts:
	pandora_console/install.php
 2021-09-29 13:47:10 +02:00
Jose Gonzalez 1a884a9df6 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-09-28 11:33:48 +02:00
Calvo 46136a66ca Merge remote-tracking branch 'origin/develop' into ent-7651-anadir-nodos-filtrando-por-grupo-en-un-mapa-de-red-no-es-recursivo 2021-09-27 10:40:50 +02:00
Daniel Rodriguez 49961ed261 Merge branch 'ent-6296-10650-Añadir-widget-de-lista-de-servicios' into 'develop' 
Ent 6296 10650 añadir widget de lista de servicios

See merge request artica/pandorafms!4355
 2021-09-24 09:09:28 +00:00
Jose Gonzalez de1bf03976 Clean logs 2021-09-23 17:19:47 +02:00
Jose Gonzalez 7bfe699802 Fixes minor issues 2021-09-23 17:01:22 +02:00
Daniel Rodriguez ce286f2654 Merge branch 'ent-8003-bung-en-despliegue-de-tags-en-tree-view' into 'develop' 
Fix tag treeview level2

See merge request artica/pandorafms!4407
 2021-09-22 09:09:11 +00:00
Daniel Rodriguez 1ac070d35d Merge branch 'ent-7339-warning-module-templates' into 'develop' 
Improve pen list handling

Closes pandora_enterprise#7339

See merge request artica/pandorafms!4263
 2021-09-21 13:16:44 +00:00
Daniel Maya 30ab96003c #6296 Fixed info popup and status images 2021-09-21 13:22:37 +02:00
fbsanchez 8f7e49b0d1 CS fix in memory_limit detection (MC) 2021-09-14 18:59:15 +02:00
Calvo e30fb70f11 Fix tag treeview level2 2021-09-14 13:03:38 +02:00
Jose Gonzalez 423bd106d5 Fix issues 2021-09-01 16:57:48 +02:00
fbsanchez 88e4a804f5 Fix map styles 2021-08-31 11:05:41 +02:00
Daniel Rodriguez 3be0c18165 Merge branch 'ent-7889-vulnerabilidad-xss-en-elementos-de-servicios' into 'develop' 
Ent 7889 vulnerabilidad xss en elementos de servicios

See merge request artica/pandorafms!4360
 2021-08-30 08:45:13 +00:00
Daniel Rodriguez e6c5d1a6ef Merge branch 'ent-7392-aviso-configuracion-cron' into 'develop' 
Change time check for cron

Closes pandora_enterprise#7392

See merge request artica/pandorafms!4296
 2021-08-25 12:57:40 +00:00
José González 357b47a6d5 Merge remote-tracking branch 'origin' into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-25 10:27:56 +02:00
José González 64982ee292 Fix issues with select inputs 2021-08-24 11:52:37 +02:00
Daniel Maya fc4074b70b Fixed xss vulnerability 2021-08-18 13:57:47 +02:00
fbsanchez 3109975e7d Notifications in MC 2021-08-12 12:01:24 +02:00
Junichi Satoh cadaca669f Fixed SNMP interfaces wizard against 32bit counter devices. 2021-08-10 12:08:28 +09:00
Daniel Rodriguez 0c4b5619f5 Merge branch 'ent-7738-Pandora-recien-instalado-via-cloud-enlaces-a-mensajes-del-sistema-son-url-invalida' into 'develop' 
set urls as macros in console supervisor

See merge request artica/pandorafms!4234
 2021-08-06 12:53:54 +00:00
Calvo 7890c4269c Added checkbox for group recursion in network maps 2021-07-14 18:00:07 +02:00
José González 4c962cd25c Change time check for cron 2021-07-14 11:31:54 +02:00
fbsanchez d3fe504241 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-13 13:14:01 +02:00
fbsanchez cc23b8310f Avoid check for UM messages more often than 2h 2021-07-12 17:41:58 +02:00
marcos 640c81b487 fallo critico del swich regordete 2021-07-12 13:06:30 +02:00
fbsanchez 198e4bf6a3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-05 20:56:48 +02:00
vgilc 2be851ef83 Merge branch 'ent-7625-eliminar-traza-tree-class' into 'develop' 
trace deleted

See merge request artica/pandorafms!4163
 2021-07-05 15:21:59 +00:00
José González d219e004df Improve pen list handling 2021-07-02 16:39:59 +02:00
José González 350f34ebf5 Fixed type mismatch 2021-07-02 13:29:00 +02:00
fbsanchez b3d88e6f6e Some general fixes, deprecated rrdir (use Files::rmrf) 2021-07-01 00:37:13 +02:00
fbsanchez 771c51ef5d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 10:13:51 +02:00
Daniel Rodriguez a13256043c Merge branch 'ent-7644-mapa-servicio-tree-view-muestra-elementos-deshabilitados' into 'develop' 
Ent 7644 mapa servicio tree view muestra elementos deshabilitados

See merge request artica/pandorafms!4193
 2021-06-25 09:37:09 +00:00
Luis 14e69c5c07 Ent 7644 mapa servicio tree view muestra elementos deshabilitados 2021-06-25 09:37:09 +00:00
Daniel Rodriguez cb101d5540 Merge branch 'ent-7707-wizard-de-interfaz-snmp-no-soporta-determinados-caracteres' into 'develop' 
Fixed SNMP interface wizard modules with special chars

See merge request artica/pandorafms!4215
 2021-06-25 09:15:55 +00:00
fbsanchez 4c2ac234b8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
	pandora_console/godmode/servers/plugin.php
 2021-06-24 14:37:30 +02:00
Daniel Rodriguez 040010d169 Merge branch 'ent-7670-reemplazar-url-en-ayuda-contextual' into 'develop' 
Changed new wiki url on helps

See merge request artica/pandorafms!4205
 2021-06-24 12:31:15 +00:00
Luis 497ecb329d Changed new wiki url on helps 2021-06-24 12:31:15 +00:00
Marcos Alconada 4bbd0ae508 fixed error with block current value 2021-06-24 12:28:49 +00:00
alejandro.campos@artica.es fec0114801 set urls as macros in console supervisor 2021-06-24 13:22:25 +02:00
fbsanchez faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
 2021-06-21 17:33:45 +02:00
Daniel Rodriguez f134377b37 Merge branch 'ent-7547-Tree-view-no-filtra-bien-Dashboard' into 'develop' 
Ent 7547 tree view no filtra bien dashboard

See merge request artica/pandorafms!4136
 2021-06-21 14:01:32 +00:00
Daniel Maya 878a5321e8 Ent 7547 tree view no filtra bien dashboard 2021-06-21 14:01:32 +00:00
Daniel Rodriguez f5221083b1 Merge branch 'ent-7244-Errores-network-tools' into 'develop' 
Solved issues with double quotes and improve the code

Closes pandora_enterprise#7244

See merge request artica/pandorafms!4101
 2021-06-21 09:13:35 +00:00
Calvo 06f3b0ea36 Fixed SNMP interface wizard modules with special chars 2021-06-16 16:30:45 +02:00
fbsanchez 94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
 2021-06-14 17:37:01 +02:00
Daniel Rodriguez 08011d60b2 Merge branch 'ent-7122-nuevo-update-manager' into 'develop' 
Embebed UMC in Pandora FMS

See merge request artica/pandorafms!3894
 2021-06-14 11:56:43 +00:00
fbsanchez cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +00:00
Daniel Barbero Martin a7c1c49636 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-14 08:42:31 +02:00
José González e17b63e6fc Fixed issue with single line 2021-06-14 08:16:35 +02:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
Calvo e0b3536d1b Fix treeview modules sql inner condition 2021-06-10 18:00:53 +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 12e67380ee Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-28 14:37:20 +02:00
Calvo 8010b375dd trace deleted 2021-05-28 14:10:12 +02:00
Daniel Rodriguez 2eb85562c2 Merge branch 'ent-7468-campo-plugin-falla-bandwith-politicas' into 'develop' 
Fixed issue with id_plugin with bandwidth modules

Closes pandora_enterprise#7468

See merge request artica/pandorafms!4159
 2021-05-28 10:38:21 +00: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 91e870edbc Fixed issue with id_plugin with bandwidth modules 2021-05-27 22:06:58 +02:00
Daniel Rodriguez be77599c07 Merge branch 'ent-7337-tree-view-os-no-aparecen-not-init-modules' into 'develop' 
Fixed not showing agents with not init modules on os treeview

See merge request artica/pandorafms!4120
 2021-05-27 16:22:47 +00:00
Luis cb6f130ab0 Fixed not showing agents with not init modules on os treeview 2021-05-27 16:22:47 +00:00
Daniel Rodriguez 3f8d3a883f Merge branch 'ent-7002-Revision-cabeceras-tabs' into 'develop' 
Ent 7002 revision cabeceras tabs

Closes pandora_enterprise#7002

See merge request artica/pandorafms!4094
 2021-05-27 16:21:48 +00:00
Daniel Rodriguez c2314717e3 Merge branch 'ent-7467-wizard-snmp-falla-para-modulos-que-usen-braa' into 'develop' 
Ent 7467 wizard snmp falla para modulos que usen braa

See merge request artica/pandorafms!4139
 2021-05-27 16:19:08 +00:00
Daniel Barbero Martin a1ca4abe8f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-27 08:22:43 +02:00
fbsanchez 50242d3030 OID fixes while retrieving from remote Satellite server 2021-05-26 17:55:30 +02:00
Daniel Rodriguez e3cd5b6d56 Merge branch 'ent-7468-snmp-wizard-modulos-plugin-no-configuran-campo-plugin' into 'develop' 
Fixed missed parameter

Closes pandora_enterprise#7468

See merge request artica/pandorafms!4097
 2021-05-26 13:38:43 +00:00
Daniel Rodriguez 693e3988b9 Merge branch 'ent-7182-barra-de-busqueda-no-funciona-correctamente' into 'develop' 
Changed search bar text

See merge request artica/pandorafms!4004
 2021-05-26 13:36:47 +00:00
Daniel Barbero Martin d91e7f6aba Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-26 08:28:42 +02:00
Daniel Rodriguez b875199f28 Merge branch 'ent-7492-bug-visual-vista-agents-alerts-no-alerts' into 'develop' 
Ent 7492 bug visual vista agents alerts no alerts

See merge request artica/pandorafms!4110
 2021-05-25 15:53:41 +00:00
Luis eb54ce9a62 Ent 7492 bug visual vista agents alerts no alerts 2021-05-25 15:53:41 +00: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 73454dd4ea Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-20 08:21:31 +02:00
Daniel Rodriguez 4ea790a649 Merge branch 'ent-7141-Vulnerabilities-CSRF' into 'develop' 
Ent 7141 vulnerabilities csrf

Closes pandora_enterprise#7141

See merge request artica/pandorafms!4015
 2021-05-19 16:00:16 +00:00
Daniel Barbero Martin 6c305833bf fix groups, module_groups, network_components user_edit synch 2021-05-18 17:18:54 +02:00
José González e5ebc52356 Fixed missed parameter 2021-05-18 13:32:10 +02:00
fbsanchez 0d50ea94db Ensure oid starts with dot - braa requriements 2021-05-18 13:27:06 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Daniel Rodriguez 13fa1159ce Merge branch 'ent-6858-Goliat-opensource' into 'develop' 
Backup upload

See merge request artica/pandorafms!3936
 2021-05-12 13:10:48 +00:00
José González 9e9ea4d00a Merge with last develop 2021-05-12 09:17:32 +02:00
Daniel Rodriguez 858adb2628 Merge branch 'ent-7345-Bugs-en-el-apartado-de-Diagnosticos' into 'develop' 
Fixed errors diagnostic

See merge request artica/pandorafms!4047
 2021-05-11 13:48:55 +00:00
Daniel Rodriguez 5efb331568 Merge branch 'ent-7140-vista-agents-alerts-salta-vista-principal' into 'develop' 
Fixed agents/alerts view group change when public url foreced

See merge request artica/pandorafms!4108
 2021-05-06 12:17:38 +00:00
Daniel Rodriguez 0371a9acd6 Merge branch 'ent-7218-filtrado-erroneo-tree-view' into 'develop' 
Fixed treeview filter by module status

See merge request artica/pandorafms!3981
 2021-05-06 12:14:16 +00:00
Daniel Rodriguez db92b65fd0 Merge branch 'ent-7211-errores-visuales-en-la-vista-de-agente' into 'develop' 
resolved error with sql message error external tools2

See merge request artica/pandorafms!3979
 2021-05-06 12:05:04 +00:00
Calvo dec202ed78 Fixed agents/alerts view group change when public url foreced 2021-05-05 17:53:52 +02:00
José González f8f6016c21 Solved issues with double quotes and improve the code 2021-05-04 19:07:18 +02:00
José González e49edc93d6 Fixed missed parameter 2021-05-04 13:48:13 +02:00
José González 9ab027b286 WIP: Upload 2021-04-29 13:28:03 +02:00
Daniel Rodriguez 4589e77bc8 Merge branch 'ent-7370-modal-incorrecto-al-editar-el-nodo-de-un-cluster' into 'develop' 
fixed error with modal cluster view

See merge request artica/pandorafms!4057
 2021-04-27 10:39:23 +00:00
José González e957961ee5 Fixed issue with id_plugin 2021-04-22 14:15:56 +02:00
marcos 733087f704 fixed error with modal cluster view 2021-04-22 13:23:49 +02:00
Daniel Barbero Martin 998ad91b69 Fixed errors diagnostic 2021-04-21 11:07:20 +02:00
Jose Gonzalez 9f92a4b6c5 Added CSRF token input for PrintForms 2021-04-09 13:31:11 +02:00
Daniel Rodriguez ed6fa1a803 Merge branch 'ent-2685-7938-aadcm-dashboards-en-metaconsola' into 'develop' 
dashboards meta

See merge request artica/pandorafms!3840
 2021-04-07 10:53:31 +00:00
Calvo 420960ed9e Changed search bar text 2021-04-07 10:14:27 +02:00
Luis 4ab7b1a135 Ent 6952 bug group creation user admin no all 2021-04-07 08:11:35 +00:00
Daniel Rodriguez 32527863cb Merge branch 'ent-7095-Bug-en-Tree-group-metaconsola-con-usuario-no-ALL' into 'develop' 
fixed error tree groups agent edition metaconsole

See merge request artica/pandorafms!3904
 2021-04-06 17:23:18 +00:00
Daniel Rodriguez c192a1681b Merge branch 'ent-7022-open-error-en-la-ruta-de-netscan-custom' into 'develop' 
Fixed task edit url when nof fully defined (custom-script)

See merge request artica/pandorafms!3906
 2021-04-06 17:00:49 +00:00
fbsanchez 5143bbdfdb networkmaps in dashboards MC 2021-04-06 16:47:32 +02:00
Daniel Rodriguez 8a62fa67ad Merge branch 'ent-7171-iconos-poco-visibles-en-monitor-detail-black-theme' into 'develop' 
Ent 7171 iconos poco visibles en monitor detail black theme

See merge request artica/pandorafms!3929
 2021-03-30 09:51:04 +00:00
marcos 063bbb4433 resolved conflict merge 2021-03-30 11:31:29 +02:00
Calvo 245286330c Fixed treeview filter by module status 2021-03-30 08:28:10 +02:00
marcos 5d38740630 resolved error with sql message error external tools2 2021-03-29 16:54:41 +02:00
marcos 1f89a0d293 fixed visual error 2021-03-29 09:58:23 +02:00
marcos 3934096d03 Merge remote-tracking branch 'origin/develop' into ent-7202-fallos-visuales-discovery 2021-03-29 09:21:04 +02:00
marcos 88f3ce9b90 fixed lost icons 2021-03-29 08:12:54 +02:00
marcos 89ba8b43fb fixed visual error 2021-03-26 13:58:13 +01:00
Calvo 2c86e3e26c Substituted eye with operation (magnifier) icon on credential store and tasklist 2021-03-26 12:20:37 +01:00
marcos a6b9998bbe fixed visual error 2021-03-25 13:42:21 +01:00
fbsanchez 0179e89740 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-24 13:16:54 +01:00
Daniel Rodriguez 9f22c061f5 Merge branch 'ent-5929-revision-general-logstash' into 'develop' 
Deleted logstash references

Closes pandora_enterprise#5929

See merge request artica/pandorafms!3729
 2021-03-24 11:57:47 +00:00
fbsanchez c3232b0f2a Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos 
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
 2021-03-24 09:55:31 +01:00
José González 6fbd40ea74 Merge branch 'develop' into 'ent-5929-revision-general-logstash' 
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
 2021-03-23 12:00:45 +00:00
Jose Gonzalez d43c51cc66 WIP: Backup upload 2021-03-22 17:37:15 +01:00
Daniel Rodriguez 8f33c767b7 Merge branch 'ent-7132-bug-en-vista-agents-alerts' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3911
 2021-03-22 12:46:58 +00:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01:00
marcos ebf912437b fixed error with sort function 2021-03-18 18:05:53 +01:00
Daniel Rodriguez 3eaff54b73 Merge branch 'ent-6232-nt-incluir-metricas-en-el-wizard-de-interfaces-snmp' into 'develop' 
Ent 6232 nt incluir metricas en el wizard de interfaces snmp

See merge request artica/pandorafms!3935
 2021-03-18 16:02:56 +00:00
marcos b55ebd69f0 fixed visual error 2021-03-18 11:30:53 +01:00
marcos b6a7598c33 fixed visual error 2021-03-18 09:53:39 +01:00
Daniel Rodriguez b6b399e635 Merge branch 'ent-7170-color-de-icono-de-alertas-en-tree-view-black-theme' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3926
 2021-03-17 16:29:41 +00:00
Daniel Rodriguez 372d367b8e Merge branch 'ent-6760-interfaces-con-guion-nombre-no-generan-correctamente' into 'develop' 
Fixed interfaces wizard modules genartion wit hypen

See merge request artica/pandorafms!3694
 2021-03-17 16:29:07 +00:00
Luis e667bdd2e8 Fixed interfaces wizard modules genartion wit hypen 2021-03-17 16:29:07 +00:00
marcos 1ea562fe17 fixed visual error 2021-03-17 13:22:11 +01:00
marcos e689813e2c fixed icons 2021-03-16 13:37:13 +01:00
marcos 4c5f220264 fixed visual error 2021-03-15 17:55:54 +01:00
fbsanchez c20c206a5f Fixed task edit url when nof fully defined (custom-script) 2021-03-15 14:37:08 +01:00
Daniel Barbero Martin b78f4093ac fixed error tree groups agent edition metaconsole 2021-03-15 13:31:24 +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
Daniel Maya c7b33c9c9c Ent 7119 11478 ticket guardia snmp browser falla a la hora de visualizar datos 2021-03-11 11:18:13 +00:00
fbsanchez 95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-03-11 10:00:17 +01:00
Jose Gonzalez cf1c460a9d Fixed all issues 2021-03-11 09:12:53 +01:00
Jose Gonzalez 92d654763f Fixed some issues 2021-03-10 16:20:45 +01:00
José González b7bd28ba07 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-03-10 10:17:27 +00:00
Daniel Rodriguez 39e735ed22 Merge branch 'ent-5760-problema-sistema-de-notificaciones-en-servidores-con-pocos-modulos' into 'develop' 
Avoid performance tests if there are not enough modules in system

See merge request artica/pandorafms!3765
 2021-03-09 16:31:38 +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
Daniel Rodriguez bf2705f571 Merge branch 'ent-6528-fallo-acl-servicios' into 'develop' 
Fixed services ACL on services treeview

See merge request artica/pandorafms!3685
 2021-03-04 10:46:31 +00:00
fbsanchez c5b2b90476 Merge remote-tracking branch 'origin/develop' into ent-6232-nt-incluir-ifspeed-como-custom-macro-en-ifoperstatus 
Conflicts:
	pandora_console/extras/mr/45.sql
 2021-03-02 09:48:33 +01:00
fbsanchez d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2021-03-02 09:40:15 +01:00
fbsanchez 85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
 2021-02-22 12:01:29 +01:00
fbsanchez 0fb3ba9232 System status notifications filtered by subtype 2021-02-19 13:36:29 +01:00
Jose Gonzalez ed6c6dfad5 Hide OK button meanwhile is loading data 2021-02-16 13:43:10 +01:00
fbsanchez 416bc8cad4 Minor fixes 
and speed out of control
 2021-02-16 12:33:15 +01:00
fbsanchez 74ee4971d0 Added inUsage and outUsage, added units 2021-02-16 12:14:56 +01:00
fbsanchez 30755ba256 minor fixes 2021-02-15 19:12:06 +01:00
fbsanchez 2826f4fd89 Fixes in MR, added uniqid macro to pandora_snmp_bandwidth 2021-02-15 19:08:32 +01:00
fbsanchez 09b5400023 MR info + bandwidth analysis in wizards 2021-02-15 18:56:42 +01:00
fbsanchez 24ed77b5a1 Pandora bandwidth server plugin 2021-02-12 15:25:41 +01:00
fbsanchez 376a46a925 WIP extra modules for interfaces wizard 2021-02-11 13:28:13 +01:00
fbsanchez 0be3e0ab90 Event widget and some notices fixed 2021-02-10 15:00:23 +01:00
fbsanchez 679ada717e filter with preload - filtering improved 2021-02-05 15:10:31 +01:00
fbsanchez 9a439a96e5 filtering interfaces in wizard 2021-02-05 12:37:27 +01:00
fbsanchez 63834c62a7 Awesome wizard 2021-02-04 18:26:34 +01:00
fbsanchez 7bb68abbad Wizard RC1 with filtering and improved comm 2021-02-04 18:19:35 +01:00
fbsanchez 3dc699e8fd Fix for unexistent OIDs values or names in dynamic wizard 6980 2021-02-04 15:33:54 +01:00
fbsanchez 43040801c4 SNMP wizard performance review RC1 2021-02-04 14:55:07 +01:00
fbsanchez d43507ff53 minor fix 2021-02-04 13:18:40 +01:00
fbsanchez 3ad3e7e562 removed traces 2021-02-04 13:13:49 +01:00
fbsanchez 5a38d31a6d Wizard (interfaces) backend performance improved 2021-02-04 13:11:47 +01:00
fbsanchez 9fc3856f83 WIP historical database automaintenance + minor fixes 2021-01-28 13:20:36 +01:00
fbsanchez dd4849f7c3 WIP Scheduled install & update of history database processes 2021-01-27 19:23:31 +01:00
Daniel Rodriguez e88ca95a8d Merge branch 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso' into 'develop' 
Ent 6631 bug en dashboard de usuario sin permiso

See merge request artica/pandorafms!3781
 2021-01-25 10:07:53 +01:00
Daniel Rodriguez 7a614fcf48 Merge branch 'ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL' into 'develop' 
Ent 6354 bug de creacion de dashboard con permisos no all

See merge request artica/pandorafms!3780
 2021-01-25 10:02:41 +01:00
Daniel Rodriguez 7a9d928a98 Merge branch 'ent-6634-Bug-borrado-net-scan-scripts' into 'develop' 
fixed wrong error message: recon task is not necessarily linked to script

See merge request artica/pandorafms!3601
 2021-01-25 09:52:47 +01:00
Daniel Rodriguez 713abb63e6 Merge branch 'ent-6786-error-componentes-remotos-dynamic' into 'develop' 
Added control for avoid null values in dynamic components

Closes pandora_enterprise#6786

See merge request artica/pandorafms!3670
 2021-01-25 09:27:23 +01:00
alejandro-campos 535486a429 Merge branch 'develop' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-18 11:48:51 +01:00
Alejandro Campos 5b9d7bcb81 Merge branch 'develop' into 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso-2' 
# Conflicts:
#   pandora_console/include/lib/Dashboard/Widgets/agent_module.php
 2021-01-15 14:52:26 +01:00
alejandro-campos a0931d7ada changes in dashboard permissions 2021-01-15 13:52:31 +01:00
Daniel Rodriguez ea86889673 Merge branch 'ent-6645-bug-acl-discovery-tasks' into 'develop' 
Fixed acl on discovery tasklist

See merge request artica/pandorafms!3618
 2021-01-14 14:43:42 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
Jose Gonzalez 1fc1752b01 Solved merge 2021-01-12 13:26:48 +01:00
Jose Gonzalez d1831e71fb Finished development 2021-01-12 13:24:08 +01:00
fbsanchez 73c182f65d Avoid performance tests if there are not enough modules in system 2021-01-11 18:32:44 +01:00
Jose Gonzalez 422174b66f WIP: Backup upload 2021-01-11 18:00:24 +01:00
fbsanchez 186b807ff7 Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery 
Conflicts:
	pandora_console/include/styles/wizard.css
 2021-01-07 10:50:57 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
 2020-12-23 06:48:22 +01:00
Daniel Rodriguez ad1ede437c Merge branch 'ent-5983-Bugs-y-cambios-en-el-nuevo-tree-view' into 'develop' 
changes in treeview

See merge request artica/pandorafms!3654
 2020-12-22 13:02:17 +01:00
Jose Gonzalez ba527391b4 WIP: Backup upload 2020-12-18 13:18:03 +01:00
Jose Gonzalez 5f0d686034 Changed Network Tools for External Tools 2020-12-18 12:31:44 +01:00
Jose Gonzalez daa6e47768 Changes ended 2020-12-17 19:33:10 +01:00
Daniel Rodriguez 2591d8874a Merge branch 'ent-6804-buscador-pandora-permite-acceder-politicas-open' into 'develop' 
Ent 6804 buscador pandora permite acceder politicas open

Closes pandora_enterprise#6804

See merge request artica/pandorafms!3688
 2020-12-17 17:05:26 +01:00
Daniel Rodriguez 7ae5b65740 Merge branch 'ent-6282-module-templates-sin-datos' into 'develop' 
Fixed issue

Closes pandora_enterprise#6282

See merge request artica/pandorafms!3624
 2020-12-17 16:56:17 +01:00
Marcos Alconada f9b2417d89 error con modulos duplicados en module templates 2020-12-17 16:55:30 +01:00
Jose Gonzalez 7d5f4f8f65 WIP: Backup upload 2020-12-17 16:51:05 +01:00
Jose Gonzalez 959fbd4764 WIP: Backup upload 2020-12-17 13:04:21 +01:00
Jose Gonzalez 6da8f33e20 WIP 2020-12-16 14:26:32 +01:00
Jose Gonzalez 010dc65dd4 WIP: Backup upload 2020-12-16 14:09:54 +01:00
Jose Gonzalez 430457b30a Deleted logstash references 2020-12-15 13:12:00 +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
Daniel Maya 46d40b72c2 Fixed snmp interfaces 2020-12-11 14:42:37 +01:00
Daniel Rodriguez 4b51e26086 Merge branch 'ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery' into 'develop' 
discovery.cloud.gcp

See merge request artica/pandorafms!3479
 2020-12-09 13:54:25 +01:00
Daniel Maya 296cb9125e Ent 5316 anadir seccion credential store al menu de discovery 2020-12-03 14:48:12 +01:00
Jose Gonzalez 4760e0b20c Fix 2020-12-02 15:49:13 +01:00
Luis Calvo a90aeb14ff Fixed services ACL on services treeview 2020-12-02 11:45:54 +01:00
Marcos Alconada f72d924f1e ticket 6435 2020-12-02 10:10:34 +01:00
fbsanchez eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery 
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
 2020-12-01 17:32:02 +01:00
Luis aeb7a7e9c6 Add decimal separator to all pandora csv 2020-12-01 11:56:15 +01:00
Daniel Rodriguez f869fbb7cd Merge branch 'ent-6406-No-se-ven-los-datos-string-en-el-tree' into 'develop' 
fixed bad module id reference

See merge request artica/pandorafms!3505
 2020-12-01 11:55:56 +01:00
Jose Gonzalez 250a378773 Fixed for show better results 2020-12-01 11:52:12 +01:00
fbsanchez 54d5529599 removed duplicated methods (unified in HTML class) added minor improvements 2020-11-30 17:50:36 +01:00
Jose Gonzalez efff64c4bf Added control for avoid null values in dynamic components 2020-11-30 12:29:25 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
fbsanchez 79b3f2d762 Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido 2020-11-26 11:28:39 +01:00
fbsanchez 1121440943 Clean only recovered servers 2020-11-26 11:28:31 +01:00
alejandro-campos 448cc253b4 changes in treeview 2020-11-25 17:00:37 +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
Jose Gonzalez da3bb9b808 Fix 2020-11-25 14:29:11 +01:00
Jose Gonzalez 5f9db9a896 Fix 2020-11-25 14:27:42 +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
fbsanchez d18fffb0cb Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido 
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
 2020-11-25 12:07:53 +01:00
Jose Gonzalez 60ca2109f3 Solved issue with full screen 2020-11-25 11:59:03 +01:00
Jose Gonzalez 912b2179bd Fix visual issues 2020-11-25 11:36:14 +01:00
Jose Gonzalez 0cc1da21b0 Fix errors 2020-11-24 15:53:25 +01:00
Jose Gonzalez ed1b8f9713 Fix some bugs and added surround input feature 2020-11-24 15:51:02 +01:00
alejandro-campos f5648d734d fixed snapshot in meta 2020-11-23 17:09:58 +01:00
Daniel Rodriguez f2383aa4a3 Merge branch 'ent-6590-comprobacion-ha-ralentiza-la-consola' into 'develop' 
Avoid check ha nodes while navigating, scheduled

See merge request artica/pandorafms!3620
 2020-11-23 16:55:56 +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
Jose Gonzalez 8706ec060c Solve OIDs issues and malfunction of some modules 2020-11-19 13:31:32 +01:00
Jose Gonzalez ea259f0aa7 Fixed issue 2020-11-17 16:36:30 +01:00
fbsanchez f9ab987825 Avoid check ha nodes while navigating, scheduled 2020-11-17 11:44:52 +01:00
Luis Calvo 2ee187ae53 Fixed acl on discovery tasklist 2020-11-16 18:30:23 +01:00
alejandro-campos fc429efce2 fixed wrong error message: recon task is not necessarily linked to script 2020-11-11 09:52:15 +01:00