Commit Graph

762 Commits

Author SHA1 Message Date
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
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 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 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
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
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