Commit Graph

974 Commits

Author SHA1 Message Date
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 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 
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 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 
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 
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 
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 
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 
2021-09-21 13:16:44 +00:00
Daniel Maya 30ab96003c 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 
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 
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 
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 
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 
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 
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 
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 
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 
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 
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 
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 
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 
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 
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 
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 
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 
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 
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 
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 
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 
2021-05-11 13:48:55 +00:00