Junichi Satoh
5fcf3a4009
Added support for FreeBSD in checkAllowOverrideEnabled().
2022-04-04 16:22:25 +09:00
Daniel Rodriguez
99b8fa0cf6
Merge branch 'ent-8458-heatmap-view' into 'develop'
...
Ent 8458 heatmap view
See merge request artica/pandorafms!4695
2022-04-01 07:46:25 +00:00
Daniel Rodriguez
2cc019ea29
Merge branch 'ent-7225-monitorizacion-global-de-discovery-vmware-mediante-tokens' into 'develop'
...
remove extra margin from grid forms in discovery
See merge request artica/pandorafms!4777
2022-03-31 13:43:42 +00:00
Daniel Maya
e796dc52bb
#8458 Change in refresh value
2022-03-31 09:46:30 +02:00
fbsanchez
e70c85fc65
Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor
2022-03-30 15:05:04 +02:00
Daniel Maya
cab85cbfbd
#8458 Fixed errors
2022-03-30 10:21:30 +02:00
fbsanchez
b832fd17e4
update_manager_client => vendor
2022-03-28 12:20:36 +02:00
José González
61713b453a
Added control for ascii characters
2022-03-24 13:53:22 +01:00
fbsanchez
da668a3a93
some style updates
2022-03-23 15:17:43 +01:00
fbsanchez
d938d59263
remove extra margin from grid forms in discovery
2022-03-23 15:02:36 +01:00
José González
a90e31be4f
Fix credential storing with spaces
2022-03-18 14:03:36 +01:00
Daniel Rodriguez
d7598cefa5
Merge branch 'ent-8662-modulos-modulo-padre-no-se-ven-en-tree-view' into 'develop'
...
Clean filtered references for parent modules
See merge request artica/pandorafms!4744
2022-03-15 10:06:18 +00:00
Daniel Rodriguez
185be2ddb8
Merge branch 'ent-8374-12855-giss-agentes-deshabilitados-en-meta' into 'develop'
...
Addedd metaconsole tree view filter for disabled agents
See merge request artica/pandorafms!4725
2022-03-11 11:38:05 +00:00
Daniel Rodriguez
ebdc7e4fce
Merge branch 'ent-8689-Error-500-en-wizard-de-agente' into 'develop'
...
Ent 8689 error 500 en wizard de agente
See merge request artica/pandorafms!4751
2022-03-09 12:57:20 +00:00
Daniel Maya
0e70bc9f67
#8689 Fixed wizard
2022-03-08 18:00:09 +01:00
Daniel Maya
270bb433da
added heatmap ajax and class
2022-03-07 13:11:54 +01:00
José González
89d5b490bf
Clean filtered references for parent modules
2022-03-07 10:45:11 +01:00
Daniel Maya
f34e8fead7
Merge branch 'develop' into ent-8458-heatmap-view
2022-03-07 10:35:26 +01:00
Calvo
05c283642f
Addedd metaconsole tree view filter for disabled agents
2022-02-25 15:37:08 +01:00
Daniel Maya
74996e3cc0
WIP heatmap 2
2022-02-25 09:41:32 +01:00
Calvo
4f3c509bde
Fix credential store ACL, only accces to PM or UM
2022-02-24 17:33:13 +01:00
Daniel Maya
d73fd0450d
Merge branch 'develop' into ent-8458-heatmap-view
2022-02-21 10:18:15 +01:00
fbsanchez
3b99a95368
Quick fix
2022-02-18 13:48:23 +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
Luis
4b1c93d7b3
Treeview not showing notinit agents when filter enabled
2022-02-14 17:55:29 +01:00
Daniel Maya
3c50164270
WIP heatmap
2022-02-11 14:50:57 +01:00
fbsanchez
4d912fbd34
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
2022-02-11 09:55:34 +01:00
Jose Gonzalez
b13b2b144b
Added some fixes
2022-02-09 12:30:48 +01:00
José González
fc4b702db0
Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs'
...
# Conflicts:
# pandora_console/godmode/alerts/configure_alert_template.php
2022-02-08 11:35:01 +00:00
fbsanchez
17be6f3ca5
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
2022-02-02 11:36:14 +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
Daniel Maya
561589423d
Fixed color of fictional node
2022-01-27 12:55:42 +01:00
fbsanchez
b0824e048e
some changes
2022-01-26 18:40:45 +01:00
fbsanchez
81b1454b2e
minor fixes
2022-01-26 17:34:56 +01:00
fbsanchez
9c09f43ad8
fix in recon definition
2022-01-26 11:48:07 +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
4b85e93490
Merge branch 'ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma' into 'develop'
...
Ent 8222 nueva grafica desde la vista de modulos histograma
See merge request artica/pandorafms!4637
2022-01-25 10:28:18 +00: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
Jose Gonzalez
3252832cc7
WIP: Check audit logs
2022-01-20 10:55:23 +01:00
Daniel Barbero Martin
a0a74cf7bb
add new chart histogram
2022-01-18 13:01:49 +01:00
Daniel Maya
e8d3d93f7f
Fixed pandora_black in metaconsole
2022-01-17 10:22:30 +01:00
Daniel Maya
626431f27c
Added check on agents without acl
2022-01-14 09:49:26 +01:00
fbsanchez
2aad6404a2
php8 with php72 support
2022-01-13 13:48:25 +01:00
fbsanchez
32c0229966
php8 review
2022-01-13 12:43:55 +01:00
fbsanchez
8e5a0917ba
php8 review + pdf images b64 fix
2022-01-12 19:43:33 +01:00
fbsanchez
fee3f4ab96
php8 review + mdpf update
2022-01-12 14:22:16 +01:00
fbsanchez
3b6f5bd02f
services php8
2022-01-11 14:30:59 +01:00
fbsanchez
7ebd6a5f74
php8 warnings cleanup
2022-01-11 12:08:41 +01:00
fbsanchez
b731a05bb3
networkmaps php8
2022-01-11 11:24:30 +01:00
fbsanchez
5a761059ea
Networkmap php8 fix
2022-01-11 11:00:54 +01:00
fbsanchez
58ba683005
Super 8
2022-01-10 20:52:29 +01:00
Daniel Rodriguez
8efea9f44c
Merge branch 'ent-7251-no-generar-notificaciones-con-servidores-deshabilitados' into 'develop'
...
Recovered servers fix
See merge request artica/pandorafms!4594
2022-01-03 14:19:57 +00:00
Daniel Rodriguez
3f57c260ba
Merge branch 'ent-8322-Interfaces-no-aplica-los-valores-seleccionados-en-la-configuracion-general' into 'develop'
...
fixed interface wizard selectors
See merge request artica/pandorafms!4576
2021-12-27 14:08:52 +00:00
fbsanchez
757f9b7510
Recovered servers fix
2021-12-16 18:29:27 +01:00
Jose Gonzalez
73c7fea94e
Fixed issue with enterprise feature in community
2021-12-14 12:22:00 +01:00
Jose Gonzalez
4924e0d6bc
Updated audit logs view and added controller
2021-12-14 12:06:20 +01:00
alejandro.campos@artica.es
d3e99b315f
fixed interface wizard selectors
2021-12-09 18:00:39 +01:00
Daniel Rodriguez
69590afef6
Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop'
...
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor
See merge request artica/pandorafms!4557
2021-12-02 10:51:57 +00:00
Daniel Maya
c289f67395
#8307 Added contextmenu in supernet map
2021-11-29 15:54:45 +01:00
Calvo
54755db59b
Control inverse and percentege cannot be selected at same time
2021-11-26 11:55:38 +01:00
Calvo
5464a73a12
Merge remote-tracking branch 'origin/develop' into ent-8303-formularios-en-modulos-para-nueva-funcionalidad-incremento-de-valor
2021-11-24 13:28:36 +01:00
Calvo
4dd931f277
Modules percentage threshold form
2021-11-24 11:33:36 +01:00
Jose Gonzalez
98f519958c
Fix merge
2021-11-23 12:25:58 +01:00
Daniel Barbero Martin
c52e11e91a
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-11-19 08:12:22 +01:00
Daniel Rodriguez
3c71ecfec2
Merge branch 'ent-8069-command-center-anadir-una-notificacion-si-la-cola-de-tareas-de-los-nodos-tiene-un-fallo-o-es' into 'develop'
...
Notifications if syncqueue exceeds limits in MC
See merge request artica/pandorafms!4515
2021-11-18 12:09:06 +00:00
Daniel Rodriguez
908bc22b33
Merge branch 'ent-8052-vista-de-datos-de-modulos-en-agente-tree-view-services-metaconsola' into 'develop'
...
Fix metaconsole services tree view agent module data popup
See merge request artica/pandorafms!4473
2021-11-17 15:15:13 +00:00
Daniel Rodriguez
9ba2169de3
Merge branch 'ent-8239-12653-GUARDIA-No-devuelve-valor-SNMP-Interface-wizard-cuando-se-ejecuta-a-traves-de-pandora-exec-proxy-satelite' into 'develop'
...
Ent 8239 12653 guardia no devuelve valor snmp interface wizard cuando se ejecuta a traves de pandora exec proxy satelite
See merge request artica/pandorafms!4530
2021-11-17 10:20:43 +00:00
Daniel Rodriguez
5264f39065
Merge branch 'ent-7912-12337-Fallo-filtrado-Tree-view-widget-en-Dashboards' into 'develop'
...
Ent 7912 12337 fallo filtrado tree view widget en dashboards
See merge request artica/pandorafms!4503
2021-11-16 13:15:47 +00:00
Daniel Rodriguez
f2b9d1fbd2
Merge branch 'ent-8134-Tree-View-Tags-Falla-la-búsqueda-por-módulos' into 'develop'
...
Ent 8134 tree view tags falla la búsqueda por módulos
See merge request artica/pandorafms!4500
2021-11-16 09:14:02 +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
Daniel Rodriguez
34a8633aae
Merge branch 'ent-7905-bug-visual-agents-alerts-black-theme' into 'develop'
...
Fixed issue with OK label
Closes pandora_enterprise#7905
See merge request artica/pandorafms!4480
2021-11-15 10:09:39 +00:00
alejandro.campos@artica.es
e3ba62b6b6
remove quotes from strings
2021-11-12 10:16:18 +01:00
alejandro.campos@artica.es
293cb43544
fixed missing name and current value in snmp interface wizard when using satellite
2021-11-11 15:32:48 +01:00
alejandro.campos@artica.es
49d9271b4e
fixed missing name and current value in snmp interface wizard when using satellite
2021-11-11 15:25:44 +01:00
alejandro.campos@artica.es
6b724b7747
fixed missing name and current value in snmp interface wizard when using satellite
2021-11-11 15:20:21 +01:00
Daniel Barbero Martin
2d4c949113
add metaconsole calendars special days alerts
2021-11-08 13:07:31 +01: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
Daniel Barbero Martin
cd163a96ef
wip special days alerts
2021-11-04 13:07:17 +01:00
Daniel Barbero Martin
c3f4addb0e
wip special days alerts
2021-11-04 12:33:40 +01:00
Daniel Barbero Martin
f521dec4e2
wip special days alerts
2021-11-04 10:10:11 +01:00
Daniel Barbero Martin
bd75912a0d
wip special days alerts
2021-11-04 09:55:37 +01:00
Daniel Barbero Martin
fdca5e4a78
wip special days alerts
2021-11-03 17:30:54 +01:00
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