Commit Graph

5776 Commits

Author SHA1 Message Date
Luis e6cf2fe9eb Remove visual console manager extension 2021-01-28 11:57:52 +01:00
fbsanchez bcb2447edb WIP Historical database manager (setup) 2021-01-27 13:03:57 +01:00
fbsanchez c7706a6bfa WIP Historical database manager (setup) 2021-01-27 12:35:37 +01:00
Daniel Rodriguez ccc10abc16 Merge branch 'ent-6643-show-summary-vmware' into 'develop'
Ent 6643 show summary vmware

Closes pandora_enterprise#6643

See merge request artica/pandorafms!3611
2021-01-27 11:20:36 +01:00
Jose Gonzalez d5b99f255a Solved issue 2021-01-26 13:46:12 +01:00
Jose Gonzalez 26a788b2e9 Added control for max agents in groups 2021-01-26 12:35:08 +01:00
Daniel Maya d9f360016b user_list optimization 2021-01-26 09:06:49 +01:00
fbsanchez 192a635599 WIP setup.hdb 2021-01-25 19:29:22 +01:00
Daniel Maya 312a08219c Added disable/enable for discovery task 2021-01-25 13:56:04 +01:00
Jose Gonzalez 38ea74ed11 Updated merge 2021-01-25 13:36:12 +01:00
marcos 74bdab5d00 add status filter on alert list 2021-01-25 11:00:24 +01:00
Daniel Rodriguez 485220a527 Merge branch 'ent-2948-Formulario-para-configuracion-remota-de-server-y-satellite-Proyectos' into 'develop'
implemented new server file editor

See merge request artica/pandorafms!3495
2021-01-25 10:17:35 +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
marcos dc455636d9 add status filter alert list 2021-01-22 14:15:26 +01:00
marcos d9309616c4 updates new filter 2021-01-21 17:13:49 +01:00
Daniel Maya 693a58ef69 Fixed label size 2021-01-21 15:39:29 +01:00
marcos 642258e1a3 add status filter on alert list filter 2021-01-21 13:38:03 +01:00
alejandro-campos 731d486455 changed behavior of All group and fixed acl vulnerability 2021-01-20 18:22:43 +01:00
Jose Gonzalez 91b74fe19f Fixed little issue with the URL 2021-01-20 17:55:11 +01:00
Daniel Maya adf4c988ec Added warning 2021-01-19 16:03:34 +01:00
Daniel Maya 9bb6e7067b removed second head 2021-01-18 16:28:15 +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
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
Daniel Rodriguez 7e0a3baa1e Merge branch 'ent-6893-event-filters-without-name' into 'develop'
Fixed event filter creation with empty name

See merge request artica/pandorafms!3742
2021-01-14 14:43:01 +01:00
daniel a470658543 remove IPAM to extension 2021-01-14 14:42:18 +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
Daniel Rodriguez ed50126b1b Merge branch 'ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery' into 'develop'
Ent 3661 poder elegir dataserver en vmware a traves de discovery

See merge request artica/pandorafms!3683
2021-01-11 15:43:18 +01:00
fbsanchez 6e910f9a68 group select style consistency 2021-01-11 13:09:33 +01:00
fbsanchez b102d42793 minor fix - group containers must be rebuilt... 2021-01-11 13:09:09 +01:00
Jose Gonzalez 199ee732cd Added External tools link 2021-01-11 10:18:52 +01:00
fbsanchez f38ea57c5f group selector updates for report, required 2021-01-08 17:15:23 +01:00
fbsanchez f35ae98e78 Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery 2021-01-08 13:21:58 +01:00
fbsanchez 8f2109003b avoid review for non H&D tasks 2021-01-08 10:31:38 +01:00
fbsanchez 7aedc39f69 Task list status 2021-01-07 13:48:57 +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
fbsanchez 6667b38729 Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico
Conflicts:
	pandora_server/util/pandora_db.pl
2021-01-07 10:42:29 +01:00
Daniel Maya 2781b4ab34 Fixed task list groups 2021-01-05 11:42:34 +01:00
Daniel Rodriguez f528e47cdc Merge branch 'ent-6582-Bug-con-masivas-de-modulos-y-filtro-module-status' into 'develop'
fixed status filter when applying changes to a module of any agent

See merge request artica/pandorafms!3630
2021-01-04 11:16:07 +01:00
Daniel Rodriguez 70fcba1b11 Merge branch 'ent-6765-11050-Bug-en-operaciones-masivas-sobre-modulos-SNMP-v3' into 'develop'
fixed selector

See merge request artica/pandorafms!3644
2021-01-04 11:11:48 +01:00
Daniel Rodriguez b9a2998c49 Merge branch 'ent-6490-Errores-en-edicion-de-acciones-de-alertas' into 'develop'
Ent 6490 errores en edicion de acciones de alertas

See merge request artica/pandorafms!3657
2021-01-04 11:11:16 +01:00
Luis Calvo df9bc6198d Added string exclude filter to events reports 2020-12-29 12:04:09 +01:00
Junichi Satoh 1c8b70d1eb Fixed problem that users with UM in specific groups can assign/delete profiles in other groups. 2020-12-25 17:38:03 +09:00
Luis Calvo f6a1260eef Fixed event filter creation with empty name 2020-12-23 15:33:52 +01:00
Luis Calvo 92f57e6176 Added macros to reports items list 2020-12-23 13:43:54 +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
Jose Gonzalez f8dd8da8c8 Forgotten file 2020-12-18 12:34:39 +01:00
Jose Gonzalez 5f0d686034 Changed Network Tools for External Tools 2020-12-18 12:31:44 +01:00
Luis Calvo a8ab897d44 Fixed tokens htpp_auth user,avoid repetiton 2020-12-17 17:42:53 +01:00
Daniel Rodriguez 30650abaf0 Merge branch 'ent-6628-Titulo-y-subtitulos-borrados-en-la-open' into 'develop'
Ent 6628 titulo y subtitulos borrados en la open

See merge request artica/pandorafms!3669
2020-12-17 17:06:05 +01:00
Daniel Rodriguez 22159a6d69 Merge branch 'ent-6800-campos-no-se-guaerdan-plantillas' into 'develop'
Ent 6800 campos no se guaerdan plantillas

Closes pandora_enterprise#6800

See merge request artica/pandorafms!3693
2020-12-17 17:00:07 +01:00
daniel 76da033775 fix legend pdf chart verticals 2020-12-17 16:58:20 +01:00
Jose Gonzalez 7d5f4f8f65 WIP: Backup upload 2020-12-17 16:51:05 +01:00
Daniel Rodriguez b75d1149e0 Merge branch 'ent-4025-Cambio-de-contrase-en-user-edit-no-pide-contraseña-actual' into 'develop'
active user password check

See merge request artica/pandorafms!3689
2020-12-17 16:48:26 +01:00
Daniel Rodriguez 15df6c066b Merge branch 'ent-6613-bug-en-filtro-de-network-components-metaconsola' into 'develop'
Ent 6613 bug en filtro de network components metaconsola

See merge request artica/pandorafms!3599
2020-12-17 16:39:49 +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 dc5a0eb5b9 Fix issue with adding agents and modules 2020-12-14 17:33:58 +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 fcf4b6c239 Fixed Agent and module text size 2020-12-10 12:06:56 +01:00
Luis Calvo 8fd46b390f Removed metaconsole empty help links 2020-12-09 16:39:00 +01:00
Daniel Maya 631ebcbc2f Added space in User ID 2020-12-09 15:23:16 +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
fbsanchez b4bb0a1dcf warn while no instances are shown in map quick preview (discovery GCP) 2020-12-09 12:23:49 +01:00
fbsanchez d45a72f355 minor fix PM -> UM for cred access (managemnt) 2020-12-04 13:32:42 +01:00
Daniel Maya 244c4d56d6 Fixed unit 2020-12-04 12:32:38 +01:00
Daniel Maya 369002cb96 inventory alerts 2020-12-04 10:31:22 +01:00
Jose Gonzalez 3fd983fb72 Fix 2020-12-03 15:51:40 +01:00
Daniel Maya 296cb9125e Ent 5316 anadir seccion credential store al menu de discovery 2020-12-03 14:48:12 +01:00
Daniel Rodriguez 9aaae58cc7 Merge branch 'ent-2323-Modo-Debug-instantáneo' into 'develop'
Added QueryResult ui type

See merge request artica/pandorafms!3517
2020-12-03 14:43:44 +01:00
Daniel Barbero Martin d3a3a74ceb Fix item sql query remove fields 2020-12-03 10:31:25 +01:00
Daniel Rodriguez 98c5ef7142 Merge branch 'ent-6619-Remote-code-execution' into 'develop'
fixed security vulnerability

See merge request artica/pandorafms!3591
2020-12-02 17:16:05 +01:00
alejandro-campos 8aa18a1236 active user password check 2020-12-02 16:29:45 +01:00
Jose Gonzalez f2a94b9aa5 Merge 2020-12-02 11:38:22 +01:00
Daniel Rodriguez bd17efa3dd Merge branch 'ent-fix-um-permission' into 'develop'
Fixed UM permission problems.

See merge request artica/pandorafms!3675
2020-12-02 10:16:17 +01:00
Daniel Maya 3a0f14e7bd Ent 5835 9693 error al exportar csv el log view parte 2 2020-12-02 10:13:22 +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
alejandro-campos bb32f40da9 added filter for bulk edition and deletion of modules 2020-12-01 15:50:52 +01:00
Luis aeb7a7e9c6 Add decimal separator to all pandora csv 2020-12-01 11:56:15 +01:00
Junichi Satoh 75e070ebb0 Fixed UM permission problems. 2020-12-01 16:46:09 +09:00
fbsanchez 54d5529599 removed duplicated methods (unified in HTML class) added minor improvements 2020-11-30 17:50:36 +01:00
Daniel Rodriguez f861744229 Merge branch 'ent-6422-10782-Error-entity-en-informe-SQL-query' into 'develop'
SQL query do not need to be cleaned

Closes pandora_enterprise#6422

See merge request artica/pandorafms!3496
2020-11-30 17:26:15 +01:00
Daniel Rodriguez ec91ea7387 Merge branch 'ent-6291-cambio-uso-macros-informes' into 'develop'
Report macros now apply on showing report

See merge request artica/pandorafms!3460
2020-11-30 17:25:22 +01:00
Luis 734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Daniel Rodriguez b334e817b3 Merge branch 'ent-6747-campos-15-a-20-macro-fields-snmp-no-funcionan' into 'develop'
Fix bug with macro fields

Closes pandora_enterprise#6747

See merge request artica/pandorafms!3628
2020-11-30 14:32:14 +01:00
Daniel Rodriguez 3801fffa6e Merge branch 'ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario' into 'develop'
F2 feature

See merge request artica/pandorafms!3493
2020-11-30 14:28:03 +01:00
daniel ff37a43035 fix errors metaconsole, report group settings 2020-11-30 14:27:13 +01:00
Daniel Maya 76ce47fea1 disabled Title (header) in open 2020-11-30 12:48:25 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
marcos 1ce48c812f updated 2fa all user 2020-11-26 18:11:30 +01:00
Daniel Rodriguez d08e60f13a Merge branch 'ent-6741-Vulnerabilidad-SQL-injection' into 'develop'
Fix vulnerability

Closes pandora_enterprise#6741

See merge request artica/pandorafms!3622
2020-11-26 18:07:20 +01:00
Jose Gonzalez 8c26892e55 Allow add text 2020-11-26 16:58:02 +01:00
marcos af863a45de updates 2020-11-26 16:25:21 +01:00
Jose Gonzalez dbfe52e383 Fix issues with alert fields 2020-11-26 13:39:17 +01:00
fbsanchez df03b77b60 Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo 2020-11-26 12:57:37 +01:00
fbsanchez 146f3b44d9 Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo 2020-11-26 11:30:39 +01:00
marcos c824972c8c updates 2020-11-26 11:02:48 +01:00
Daniel Maya 1cf3381797 Fixed update alert actions 2020-11-26 10:33:32 +01:00
marcos 5476c96941 update fix 2020-11-25 13:40:37 +01:00
marcos e3e9736fc5 show and hide 2020-11-25 13:07:38 +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
marcos 06475d21ce Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-25 11:08:09 +01:00
marcos 73f931d516 show and hide 2fa swtich 2020-11-25 10:50:06 +01:00
Marcos Alconada 481dd07e1b requiered subject on create news 2020-11-25 10:38:38 +01:00
marcos 51322b48d7 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-25 09:31:14 +01:00
Daniel Barbero Martin e30506a21e fix select agents builder inventory reports 2020-11-24 16:48:12 +01:00
alejandro-campos 7931f17144 fixed selector 2020-11-24 14:08:37 +01:00
marcos b42cb5a30f Merge remote-tracking branch 'origin/develop' into ent-6422-10782-Error-entity-en-informe-SQL-query 2020-11-24 08:59:44 +01:00
fbsanchez a767b6c133 Fixes in history db settings and improved pandora_db tool 2020-11-23 20:16:11 +01:00
Daniel Rodriguez 2718558b29 Merge branch 'ent-6398-Poner-ojito-mostrar-passwords' into 'develop'
Ent 6398 poner ojito mostrar passwords

Closes pandora_enterprise#6398

See merge request artica/pandorafms!3488
2020-11-23 16:17:35 +01:00
Daniel Rodriguez ee1c9b6567 Merge branch 'ent-6655-bug-group-creation-existing-name' into 'develop'
Fixed bug allowing updating group with duplicated name

See merge request artica/pandorafms!3593
2020-11-23 16:15:02 +01:00
marcos 5978e46141 add toolkit on sql query report item editor 2020-11-23 13:29:35 +01:00
Daniel Rodriguez 36d63a4869 Merge branch 'ent-6436-la-columna-nombre-es-muy-pequena-discovery-task-list' into 'develop'
Minor fixes discovery tasklist usability

See merge request artica/pandorafms!3506
2020-11-23 10:44:27 +01:00
Daniel Rodriguez e8d628a049 Merge branch 'ent-6175-10434-problemas-con-la-creacion-y-asignacion-de-componentes-locales-en-el-campo-unit' into 'develop'
Ent 6175 10434 problemas con la creacion y asignacion de componentes locales en el campo unit

See merge request artica/pandorafms!3452
2020-11-20 13:23:12 +01:00
Daniel Rodriguez 436a88e2f4 Merge branch 'ent-6758-update-manager-offline-meta-doesnt-work' into 'develop'
Fxed update manager offline missing include

See merge request artica/pandorafms!3634
2020-11-20 10:24:00 +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
Daniel Rodriguez e955bc7b96 Merge branch 'ent-6253-10593-Cambiar-option-ANY-de-las-bulk-operatiosn-por-ALL' into 'develop'
fixed errors in massive operations

See merge request artica/pandorafms!3451
2020-11-19 14:55:53 +01:00
daniel 7d0c31885c fixed errors visual pie charts 2020-11-19 14:53:44 +01:00
Luis Calvo 64ed945a90 Fxed update manager offline missing include 2020-11-19 14:23:12 +01:00
Daniel Barbero Martin b7d4144904 fix remove debug 2020-11-18 17:37:33 +01:00
alejandro-campos 7e2fc669f7 fixed status filter when applying changes to a module of any agent 2020-11-18 16:48:49 +01:00
marcos 13d90bb1c5 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-18 12:05:57 +01:00
Jose Gonzalez e0404d565a Fix vulnerability 2020-11-17 14:49:26 +01:00
Luis Calvo 2ee187ae53 Fixed acl on discovery tasklist 2020-11-16 18:30:23 +01:00
Jose Gonzalez 8baf5df61a Fix visual issue 2020-11-13 14:09:22 +01:00
Jose Gonzalez 2fdd34265f WIP: Backup upload 2020-11-13 13:53:54 +01:00
Jose Gonzalez a049ff1e16 WIP: Backup upload 2020-11-13 13:44:40 +01:00
Jose Gonzalez d623606c0f WIP: Backup upload 2020-11-13 13:38:54 +01:00
Jose Gonzalez 63395dd88f WIP: Backup upload 2020-11-13 13:33:05 +01:00
Jose Gonzalez 1ca65e59d5 WIP: Backup upload 2020-11-13 13:31:13 +01:00
Jose Gonzalez a0a1be254d WIP: Backup upload 2020-11-13 13:28:07 +01:00
Jose Gonzalez 98205973a5 WIP: Backup upload 2020-11-13 11:43:26 +01:00
Jose Gonzalez 08cc67696a WIP: Backup upload 2020-11-13 11:36:06 +01:00
fbsanchez b8437bec79 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-11 11:09:30 +01:00
Daniel Maya ac762469b6 Added trim in search 2020-11-10 13:54:15 +01:00
Daniel Maya ea0e229951 Fixed license expired and license trial 2020-11-10 12:10:25 +01:00
Daniel Rodriguez 01b315de3f Merge branch 'ent-#10872-GUARDIA-Problemas-menus-de-modulos' into 'develop'
added check for element

See merge request artica/pandorafms!3577
2020-11-04 16:40:36 +01:00
Daniel Rodriguez a786f5e132 Merge branch 'ent-6571-failazo-ha-al-perder-hilos' into 'develop'
Added server component status - crash -

See merge request artica/pandorafms!3547
2020-11-04 16:39:28 +01:00
Luis Calvo 31a8eefd2f Fixed bug allowing updating group with duplicated name 2020-11-04 16:22:44 +01:00
fbsanchez b585a4e372 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-03 16:35:25 +01:00
alejandro-campos 241c90f201 fixed security vulnerability 2020-11-03 15:58:53 +01:00
fbsanchez 8202839888 warn while updating user admin > standar 2020-11-03 10:14:17 +01:00
fbsanchez 5ddb3f4421 title for dialog (user form) 2020-11-03 10:11:18 +01:00
fbsanchez 8b01565948 Avoid confirm dialog while profiles are assigned to user 2020-11-03 10:08:23 +01:00
fbsanchez 95ed4c9665 Merge remote-tracking branch 'origin/develop' into ent-6577-creacion-de-usuario-con-global-profile-administrator-no-deberia-necesitar-anadirle-mas-perfiles 2020-11-03 10:02:45 +01:00
Daniel Rodriguez d171d84595 Merge branch 'ent-6678-Bug-en-select-de-nodos-de-TODOS-los-items-en-metaconsola' into 'develop'
Fix combo server in reports builder

See merge request artica/pandorafms!3589
2020-10-30 14:43:38 +01:00
Daniel Rodriguez 946c548244 Merge branch 'ent-6626filtros-de-eventos-personalizados-no-guardia-varios-apartados' into 'develop'
Primeras modificaciones del filtro de eventos

See merge request artica/pandorafms!3585
2020-10-30 14:42:41 +01:00
Daniel Barbero Martin f1080757a0 Fix combo server in reports builder 2020-10-30 13:30:59 +01:00
fbsanchez 326d1dac49 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-10-30 10:38:30 +01:00
fbsanchez 20fa959a0c Merge remote-tracking branch 'origin/develop' into ent-6577-creacion-de-usuario-con-global-profile-administrator-no-deberia-necesitar-anadirle-mas-perfiles
Conflicts:
	pandora_console/godmode/users/configure_user.php
2020-10-29 17:26:05 +01:00
fbsanchez 8e09a30a05 WIP Networklink POC 2020-10-29 17:20:16 +01:00
Marcos Alconada f8511de008 fixed error 6495 2020-10-29 16:39:00 +01:00
Marcos Alconada b972bc627a Update event_edit_filter.php 2020-10-29 15:04:53 +01:00
marcos 6bcca915ba resuelto el error que vaciaba el module search 2020-10-29 14:57:54 +01:00
Daniel Rodriguez 4f3e09c6c3 Merge branch 'ent-6488-URL-creación-de-agentes-sin-redireccionar-se-crea-agente-con-grupo-0' into 'develop'
Ent 6488 url creación de agentes sin redireccionar se crea agente con grupo 0

See merge request artica/pandorafms!3541
2020-10-29 13:43:10 +01:00
Daniel Rodriguez d5a57156dc Merge branch 'ent-6487-visual-console-favourites-page-constantly-reloads' into 'develop'
Fix continous reload page cased by automatic form submit

See merge request artica/pandorafms!3561
2020-10-29 13:22:10 +01:00
Daniel Rodriguez 8144d3bc95 Merge branch 'ent-6497-bug-en-item-group-alert-report-seleccionando-el-grupo-all' into 'develop'
Forced recursion while selecting All group - group_alert_report

See merge request artica/pandorafms!3543
2020-10-29 12:40:43 +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 Rodriguez 5ae4330121 Merge branch 'ent-6555-No-hay-mensaje-de-aviso-al-eliminar-perfil-del-usuario-en-metaconsola-da-error' into 'develop'
Ent 6555 no hay mensaje de aviso al eliminar perfil del usuario en metaconsola da error

See merge request artica/pandorafms!3551
2020-10-29 12:21:57 +01:00
fbsanchez 6112b3e932 minor fix 2020-10-29 10:55:07 +01:00
Daniel Rodriguez 7a776cd270 Merge branch 'ent-6469-entities-componentes-remotos' into 'develop'
Ent 6469 entities componentes remotos

Closes pandora_enterprise#6469

See merge request artica/pandorafms!3569
2020-10-28 17:15:59 +01:00
Daniel Rodriguez 8a47210dd5 Merge branch 'ent-6531-Bug-en-item-Simple-graph-de-informes-metaconsola' into 'develop'
fixed error report selector modules in metaconsole

See merge request artica/pandorafms!3544
2020-10-28 15:18:22 +01:00
Marcos Alconada 94cfd51501 Ent 6512 error en acls de alertas 2020-10-28 11:41:30 +01:00
Daniel Rodriguez fa9f4bca95 Merge branch 'ent-6580-bug-en-la-edicion-de-grupos-asignando-como-padre-a-si-mismo' into 'develop'
exclude branch from select_for_Groups given group_id

See merge request artica/pandorafms!3550
2020-10-28 11:19:05 +01:00
fbsanchez f744261821 minor fix 2020-10-27 16:03:35 +01:00
Daniel Barbero Martin 2b2acefa31 Snmp and WMI in recon task move open 2020-10-27 15:02:05 +01:00
alejandro-campos 315e522b2e added check for element 2020-10-27 12:01:38 +01:00
Jose Gonzalez be09fb8a29 Fixed code error 2020-10-26 10:36:43 +01:00
Jose Gonzalez 7ff518f4aa Solved issues with entities 2020-10-26 10:34:31 +01:00
Luis Calvo f3de0540fc Fix continous reload page cased by automatic form submit 2020-10-22 19:56:13 +02:00
alejandro-campos cd52b30eb5 visual fixes 2020-10-22 15:47:39 +02:00
fbsanchez f2143545b3 Able to create users without profile assignment 2020-10-22 13:35:42 +02:00
alejandro-campos def59508ae changed behavior of all group acl check and fixed acl vulnerabilities 2020-10-22 12:00:44 +02:00
Daniel Maya 335e74c26b Fixed warning message in metaconsole 2020-10-22 09:53:59 +02:00
fbsanchez ea87392bc1 minor fix 2020-10-21 17:03:46 +02:00
fbsanchez bfa5b81ee8 Added server component status - crash - 2020-10-21 14:03:46 +02:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
Daniel Barbero Martin 73ff2cff9d fixed error report selector modules in metaconsole 2020-10-20 18:30:53 +02:00
fbsanchez 4babcbe647 Forced recursion while selecting All group - group_alert_report 2020-10-20 18:25:04 +02:00
Daniel Maya 3c95d17482 Fixed new_agent 2020-10-20 16:15:42 +02:00
marcos 53362f6424 update branch 2020-10-13 15:04:33 +02:00
fbsanchez db716d6b1e Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo 2020-10-13 13:54:51 +02:00
Daniel Rodriguez 5ad265cbc8 Merge branch 'ent-6456-error-critico-operaciones-masivas-grupo-0' into 'develop'
Fix unhandled extra-options in group selector inclusions

See merge request artica/pandorafms!3518
2020-10-09 10:23:18 +02:00
Daniel Rodriguez b6ee1a9434 Merge branch 'ent-6432-No-funciona-el-envio-de-mails-by-default' into 'develop'
fixed email test

See merge request artica/pandorafms!3504
2020-10-08 20:01:33 +02:00
fbsanchez a4b2e38ffc Fix unhandled extra-options in group selector inclusions 2020-10-08 16:41:26 +02:00
fbsanchez 5a5fb6eeea Allow define time start greater than time end in weekly planed downtimes 2020-10-07 14:49:46 +02:00
fbsanchez 2ba412cb55 Minor fixes discovery tasklist usability 2020-10-07 10:29:43 +02:00
daniel 40864eee6b add new token to report 2020-10-07 09:34:43 +02:00
marcos 848f60229a updates on 2FA all users feature 2020-10-06 17:02:58 +02:00
alejandro-campos 2915a3bd35 fixed email test 2020-10-06 11:07:46 +02:00
daniel 1b5ccfb20a Add new token chart fit to content 2020-10-05 17:03:30 +02:00
Daniel Rodriguez e403c781ea Merge branch 'ent-5822-prueba-concepto-modal-selector-de-grupos' into 'develop'
Group selection improvement

See merge request artica/pandorafms!3450
2020-10-05 13:11:23 +02:00
marcos e5fe9d5c29 feature 2FA_all_users 2020-10-05 12:29:51 +02:00
daniel 48831b5032 add new options char 2020-10-05 12:04:46 +02:00
fbsanchez 27c2fa0860 minor fix 2020-10-05 11:52:41 +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 a5d5a45cac add render graph to reports 2020-10-02 14:16:55 +02:00
alejandro-campos 3956fb1d2f implemented new server file editor 2020-10-01 17:39:34 +02:00
fbsanchez b07d24ed25 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
Conflicts:
	pandora_console/include/functions_api.php
	pandora_console/operation/events/events.php
2020-09-30 18:38:27 +02:00
fbsanchez 95f58776c8 fixes group selection 2020-09-30 17:47:44 +02:00
marcos f8666adf0f F2 feature 2020-09-30 14:20:57 +02:00
Daniel Rodriguez 311186a70a Merge branch 'ent-6328-Consola-movil-imagenes-rotas' into 'develop'
fixed mobile console donut charts

See merge request artica/pandorafms!3470
2020-09-30 13:19:06 +02:00
fbsanchez b7c2913071 Avoid create agent if no group is selected 2020-09-29 15:49:10 +02:00
fbsanchez d73c215b91 Avoid create agent if no group is selected 2020-09-29 15:48:20 +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
Jose Gonzalez 6a21a668bf Added control for reveal passwords 2020-09-29 09:44:20 +02:00
fbsanchez f69166bd53 Updates style width group selector 2020-09-28 18:04:46 +02:00
fbsanchez 029a447e70 gcp minor fixes 2020-09-28 13:55:26 +02:00
Luis ef043a169a Increased number of max macro data fields from 15 to 20 2020-09-25 10:47:36 +02:00
Daniel Rodriguez 4880cbd29b Merge branch 'ent-6134-cambio-visual-en-checkbox-de-informes' into 'develop'
Ent 6134 cambio visual en checkbox de informes

See merge request artica/pandorafms!3448
2020-09-23 14:07:07 +02:00
Daniel Rodriguez f8bfd6c99b Merge branch 'ent-6119-cambiar-critical-warning-status-por-critical-warning-threshold' into 'develop'
Ent 6119 cambiar critical warning status por critical warning threshold

See merge request artica/pandorafms!3423
2020-09-23 14:06:09 +02:00
Daniel Maya a07f1d891f Ent 6262 um operaciones masivas 2020-09-23 11:36:15 +02:00
Daniel Rodriguez 12bc9e2b4e Merge branch 'ent-6195-10482-entities-en-tabla-de-auditoria' into 'develop'
Ent 6195 10482 entities en tabla de auditoria

See merge request artica/pandorafms!3411
2020-09-23 09:38:29 +02:00
Marcos Alconada 48e19f3b59 add condition 2020-09-22 12:15:05 +02:00
Daniel Rodriguez 422b0ac71d Merge branch 'ent-6050-tamano-de-la-ventana-de-front-page-for-custom-reports-muy-pequeno-en-los-visual-styles' into 'develop'
Ent 6050 tamano de la ventana de front page for custom reports muy pequeno en los visual styles

See merge request artica/pandorafms!3446
2020-09-22 11:11:26 +02:00
Daniel Rodriguez cc62975202 Merge branch 'ent-6118-create-user-user-id' into 'develop'
Ent 6118 create user user

See merge request artica/pandorafms!3444
2020-09-22 10:09:59 +02:00
Daniel Barbero Martin c6165fbdee fixed mobile console donut charts 2020-09-21 15:13:07 +02:00
Daniel Rodriguez d450213b95 Merge branch 'ent-6322-10688-edicion-usuarios-tecla-intro-borra-perfil' into 'develop'
Avoid deleting profiles while pressing enter in user details (management)

See merge request artica/pandorafms!3456
2020-09-18 14:35:32 +02:00
fbsanchez adceae8dda minor fixes 2020-09-18 09:40:26 +02:00
Daniel Rodriguez 0d19f500b1 Merge branch 'ent-6153-AADCM-Reset-counter-for-non-sustained-alerts' into 'develop'
checkd option by default on creation

See merge request artica/pandorafms!3454
2020-09-18 09:27:22 +02:00
Daniel Rodriguez 957eae39f7 Merge branch 'ent-6169-10444-Bulk-Operations-sobre-modulo-SNMP-no-funciona' into 'develop'
fix snmp version update

See merge request artica/pandorafms!3426
2020-09-18 09:25:46 +02:00
fbsanchez 4fb69f343a minor fix 2020-09-17 19:32:28 +02:00
fbsanchez 5c511bb88e Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 2020-09-17 16:57:56 +02:00
fbsanchez bc166dfba2 module custom id in event list + minor fixes 2020-09-17 16:51:23 +02:00
Daniel Rodriguez 4c8414cda5 Merge branch 'ent-4292-TinyMCE-status-bar' into 'develop'
Solved issue with TinyMCE status bar. Now can view it properly

See merge request artica/pandorafms!2910
2020-09-17 15:14:33 +02:00
fbsanchez 867fccf604 Custom id improvements 2020-09-17 14:38:01 +02:00
Daniel Rodriguez 536e24d09e Merge branch 'ent-6288-No-se-puede-generar-Log-Report-item-en-informes' into 'develop'
fix agents selector check

See merge request artica/pandorafms!3433
2020-09-17 12:45:36 +02:00
Jose Gonzalez 0e3c10a698 Merge 2020-09-17 10:35:18 +02:00
Daniel Rodriguez 4174d9910f Merge branch 'ent-6279-vulnerabilidades-XSS' into 'develop'
Ent 6279 vulnerabilidades xss

See merge request artica/pandorafms!3445
2020-09-17 10:17:11 +02:00
Jose Gonzalez b97014f577 Cleaned traces 2020-09-16 17:40:18 +02:00
Jose Gonzalez 9ac9a75658 Fixed mistake with update in os list 2020-09-16 14:47:33 +02:00
Daniel Rodriguez 81cdfdbaa1 Merge branch 'ent-6289-Item-import-text-from-url-tiene-que-ser-items-de-la-ruta-de-consola-si-no-falla' into 'develop'
added warning message

See merge request artica/pandorafms!3442
2020-09-16 13:32:37 +02:00
alejandro-campos 8a6920a973 minor change 2020-09-16 11:43:53 +02:00
Luis Calvo fae8070e29 Report macros now apply on showing report 2020-09-15 19:57:52 +02:00
fbsanchez 589d9c1d7c minor fixes 2020-09-14 17:48:38 +02:00
fbsanchez d86d0ff090 Avoid deleting profiles while pressing enter in user details (management) 2020-09-14 17:42:04 +02:00
alejandro-campos 5bd208a95c checkd option by default on creation 2020-09-14 13:43:18 +02:00
manuel.montes a70fc200b7 Fixed bug in unit field 2020-09-14 09:27:01 +02:00
alejandro-campos 77e465fff9 fixed errors in massive operations 2020-09-11 14:35:32 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
manuel.montes 4b531a96c2 Changed checkbox switch 2020-09-10 17:48:07 +02:00
manuel.montes eaa4924a0f Fixed visual bug 2020-09-09 17:16:25 +02:00
Jose Gonzalez 58f521e8b5 Avoid XSS in Edit OS form. 2020-09-09 15:28:11 +02:00
Jose Gonzalez 99bb0eb809 Avoid XSS in Remote components form. 2020-09-09 14:44:19 +02:00
manuel.montes bcf5d3ca05 Fixed visual bug 2020-09-09 14:32:02 +02:00
Jose Gonzalez 8f477b1833 Avoid XSS in List of special days. Added control for only show help tip if description has data 2020-09-09 12:49:43 +02:00
Jose Gonzalez de49530fd1 Avoid XSS in User management 2020-09-09 11:58:09 +02:00
alejandro-campos 77496bd5a2 added warning message 2020-09-09 09:35:21 +02:00
alejandro-campos c4e192f7f7 fix agents selector check 2020-09-04 13:54:07 +02:00
alejandro-campos d4b44d33a0 fix snmp version update 2020-09-01 17:39:25 +02:00
Marcos Alconada f75a0a98f1 add condition in UM if group equals 0 2020-09-01 13:26:10 +02:00
manuel.montes 05fadd167d Changed names 2020-09-01 12:30:55 +02:00
daniel fe8e7b7d0c Add new filter search actions 2020-08-31 12:48:00 +02:00
daniel b96cade165 new options 24x7 sla,availavility reports 2020-08-31 12:33:41 +02:00
manuel.montes f477919433 Fixed entities in query 2020-08-28 13:56:15 +02:00
Jose Gonzalez 5565d839c3 Merge remote-tracking branch 'origin/develop' into ent-6093-error-fields-en-alertas-snmp 2020-08-26 09:00:35 +02:00
Jose Gonzalez 516de686cf Fixed issue 2020-08-25 15:03:19 +02:00
Jose Gonzalez 1b14d83fd4 Added None value 2020-08-25 10:58:26 +02:00
Daniel Rodriguez 0512149ee4 Merge branch 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' into 'develop'
Ent 6102 edicion nombre sincronizacion alertas metaconsola

See merge request artica/pandorafms!3364
2020-08-20 14:43:17 +02:00
Marcos Alconada 77142a0c1a fixed vulnerability 2020-08-14 11:42:49 +02:00
Marcos Alconada 86bfcbcd90 changes on user list 2020-08-12 13:20:53 +02:00
José González 85d8e1f796 Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
# Conflicts:
#   pandora_console/extras/mr/40.sql
#   pandora_console/godmode/alerts/configure_alert_template.php
2020-08-07 13:17:41 +02:00
Daniel Rodriguez 1ab4e89a14 Merge branch 'ent-6036-Error-en-edicion-de-acciones-de-alerta' into 'develop'
fix empty check condition

See merge request artica/pandorafms!3359
2020-08-07 09:46:09 +02:00
Daniel Rodriguez a123eaa18c Merge branch 'ent-5609-link-to-credential-store-from-remote-module-creation' into 'develop'
Added link to credential store from module creation

See merge request artica/pandorafms!3363
2020-08-07 09:45:43 +02:00
Daniel Rodriguez ef73e7a73c Merge branch 'ent-6099-bug-al-duplicar-modulo' into 'develop'
resolved error with duplucated modules

See merge request artica/pandorafms!3357
2020-08-07 09:42:08 +02:00
Luis 7b09c1e943 Ent 6029 meta groups delete bug 2020-08-07 09:40:46 +02:00
Daniel Rodriguez bfe504b3be Merge branch 'ent-6053-error-envio-informe-mail-vista-informes' into 'develop'
Fixed report sendmail success message

See merge request artica/pandorafms!3353
2020-08-07 09:37:10 +02:00
Luis 35f231ac8c Restored alert actions help (needed for macros) 2020-08-07 09:36:43 +02:00
Luis 20addda9fe Fixed missing ckbox custom graphs 2020-08-07 09:35:27 +02:00
marcos 248c5936b6 fixed error with filter form 2020-08-07 09:19:46 +02:00
marcos bb2fb0c631 Merge remote-tracking branch 'origin/develop' into ent-6099-bug-al-duplicar-modulo 2020-08-07 08:47:11 +02:00
Daniel Maya cbc8630dfc Ent 5206 9287 exportacion a csv con dato con muchos decimales y miles trae confusion 2020-07-23 16:52:24 +02:00
Daniel Maya 9f2e722787 Ent 6034 improvement of the um profile 2020-07-23 13:26:39 +02:00
daniel 2c535bb747 Fixed labels mode classic 2020-07-21 15:06:41 +02:00
Daniel Rodriguez 7d69cbe65d Merge branch 'ent-5907-bug-status-modulo-prediccion' into 'develop'
Solved issue with thresholds in prediction modules

Closes pandora_enterprise#5907

See merge request artica/pandorafms!3293
2020-07-21 10:48:06 +02:00
Daniel Rodriguez 51f2db16cb Merge branch 'ent-5587-no-tiene-en-cuenta-las-acciones-default-filtrar-alertas' into 'develop'
Changed query for get default actions in templates

Closes pandora_enterprise#5587

See merge request artica/pandorafms!3320
2020-07-20 07:54:08 +02:00
Daniel Rodriguez 249e4a737a Merge branch 'ent-5806-post-process-genera-lineas-repetidas' into 'develop'
Changed nothing option for avoid duplicates

Closes pandora_enterprise#5806

See merge request artica/pandorafms!3297
2020-07-20 07:52:48 +02:00
Daniel Rodriguez 8915492323 Merge branch 'ent-6004-error-visual-en-el-filtrado-de-componentes-en-metaconsola' into 'develop'
fixed visual error tag meta

See merge request artica/pandorafms!3318
2020-07-20 07:51:57 +02:00
Daniel Rodriguez 100db2d4db Merge branch 'ent-5920-Fallo-al-pinchar-en-visual-console-manager-en-metaconsola' into 'develop'
Fixed error link builder in VC

See merge request artica/pandorafms!3275
2020-07-16 12:11:51 +02:00
daniel f3ad52e0fa Ent 5532 edicion creacion de templates acciones comandos modo centralizado 2020-07-13 12:23:46 +02:00
Daniel Rodriguez 492c7f90cf Merge branch 'ent-5670-no-aparecen-los-valores-introducidos-al-crear-una-platilla-de-alerta' into 'develop'
fixed error

See merge request artica/pandorafms!3321
2020-07-13 11:13:24 +02:00
Alejandro Fraguas fbb251f358 Merge branch 'ent-5468-parsear-campos-exec-server-por-si-hay-espacios-sobre-todo-ip' into 'develop'
Ent 5468 parsear campos exec server por si hay espacios sobre todo ip

See merge request artica/pandorafms!3334
2020-07-13 10:54:42 +02:00
daniel c0661fc1b7 fixed legend max 10 modules for chart 2020-07-13 10:02:56 +02:00
Daniel Rodriguez 8b24faa129 Merge branch 'ent-2002-Remote-component-centralizado' into 'develop'
Blocked create and update of remote component group when meta has centralized management

Closes pandora_enterprise#2002

See merge request artica/pandorafms!3272
2020-07-10 10:11:25 +02:00
José González f3d1a80252 Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
# Conflicts:
#   pandora_console/extras/mr/40.sql (solved)
2020-07-10 08:19:07 +02:00
fbsanchez 009d5c7bc0 Merge remote-tracking branch 'origin/develop' into ent-6000-operaciones-masivas-de-servicios 2020-07-09 16:51:50 +02:00
Alejandro Fraguas df9ab22fc1 Merge branch 'ent-6012-servicios-dinamicos' into 'develop'
MR change smart services

See merge request artica/pandorafms!3316
2020-07-08 18:01:16 +02:00
Daniel Rodriguez 8925821a2b Merge branch 'ent-6045-snmp-alert-field-10-se-borra' into 'develop'
Fixed minor bug field10 param

See merge request artica/pandorafms!3346
2020-07-08 11:04:47 +02:00
Jose Gonzalez 5e039adb26 Solve the issue for alerts, os names and tags 2020-07-07 11:05:19 +02:00
Luis Calvo 37a97cd2ad Added link to credential store from module creation 2020-07-07 10:26:19 +02:00
fbsanchez cf26293a33 WIP massive services 2020-07-06 19:35:31 +02:00
alejandro-campos 0ef7ff1198 fix empty check condition 2020-07-06 14:35:22 +02:00
fbsanchez 534aa8c7c5 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 2020-07-06 14:31:55 +02:00
marcos 4ad7735dd7 resolved error with duplucated modules 2020-07-06 10:09:36 +02:00
Luis Calvo 76d724321f Fixed report sendmail success message 2020-07-03 14:18:30 +02:00
alejandro-campos 63df6c15f0 Merge branch 'develop' into ent-6030-Problema-codificacion 2020-07-01 16:39:00 +02:00
Luis Calvo 88d72b3d66 Fixed minor bug field10 param 2020-07-01 14:41:31 +02:00
manuel.montes 5502ee6b01 Fixed bug in module manage meta 2020-07-01 10:16:55 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
2020-06-30 17:04:33 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
Daniel Maya db452f41f5 Added trim in address 2020-06-26 10:11:41 +02:00
Alejandro Fraguas 02bffc7e0d Merge branch 'ent-5935-Logs-de-la-consola-refactorizacion' into 'develop'
changed console and audit log locations

See merge request artica/pandorafms!3278
2020-06-25 15:28:13 +02:00
daniel 36e57ddd1d New report last value 2020-06-25 12:18:37 +02:00
fbsanchez a8671078f1 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
Conflicts:
	pandora_console/install.php
2020-06-25 11:25:43 +02:00
Daniel Rodriguez 5aef38dd72 Merge branch 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles' into 'develop'
fixes in reports front page default setup

See merge request artica/pandorafms!3250
2020-06-24 12:43:23 +02:00
Manuel Montes 549a17a428 Ent 5470 se duplican los sistemas operativos 2020-06-23 14:45:04 +02:00
Alejandro Campos 9ce4c90456 Merge branch 'develop' into 'ent-5186-Texto-HTML-plano-en-apartado-de-los-reports-en-visual-styles'
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
2020-06-23 10:04:24 +02:00
alejandro-campos cec16d01b8 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-23 09:56:21 +02:00
Alejandro Campos a81e4acbb7 Merge branch 'develop' into 'ent-6030-Problema-de-codificacion'
# Conflicts:
#   pandora_console/include/functions_config.php
2020-06-23 09:28:21 +02:00
alejandro-campos 6520ad2107 Added setup token 2020-06-23 09:21:15 +02:00
Alejandro Fraguas 7be71080eb Merge branch 'ent-5959-xxs-special-day' into 'develop'
ignore keys xss special days

See merge request artica/pandorafms!3323
2020-06-22 09:37:07 +02:00
Alejandro Fraguas 487ab4e86a Merge branch 'ent-5956-xss-manage-agent-group' into 'develop'
ignore keys on xss manage angent groups

See merge request artica/pandorafms!3322
2020-06-22 09:25:05 +02:00
alejandro-campos d64ff918d6 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:22:28 +02:00
alejandro-campos 1243968872 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:12:52 +02:00
marcos 1f4de3ee4d ignore keys xss special days 2020-06-19 10:53:14 +02:00
marcos 415a8aa8b6 ignore keys on xss manage angent groups 2020-06-19 10:44:43 +02:00
marcos 40c0d4ea09 fixed error 2020-06-18 17:09:22 +02:00
Jose Gonzalez 1805a0910e Changed query for get default actions in templates 2020-06-18 16:53:32 +02:00
marcos f3de739a7c fixed visual error tag meta 2020-06-18 15:30:55 +02:00
Luis 28da2b9afb Ent 5473 report template inventory 2020-06-18 13:19:04 +02:00
Alejandro Fraguas dbdf5edd0c Merge branch 'ent-636-Campos-Target-IP-y-Export-target-en-politicas' into 'develop'
Changed target ip selector in WMI server policy modules

See merge request artica/pandorafms!3186
2020-06-17 17:49:12 +02:00
alejandro-campos 9f4fed57b1 Merge branch 'develop' into ent-636-Campos-Target-IP-y-Export-target-en-politicas 2020-06-17 15:27:14 +02:00
fbsanchez 430facd704 Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle
Conflicts:
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Recon/Base.pm
2020-06-17 14:00:07 +02:00
fbsanchez 55f10fc640 Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
	pandora_server/lib/PandoraFMS/Recon/Base.pm
2020-06-17 13:41:09 +02:00
fbsanchez 225b82233c Merge remote-tracking branch 'origin/develop' into ent-5778-9834-db2-para-discovery 2020-06-17 10:13:28 +02:00
fbsanchez 1eea17f9b9 Merge remote-tracking branch 'origin/develop' into ent-5527-cambio-discovery-sap-para-hacerlo-personalizable 2020-06-15 17:41:53 +02:00
Alejandro Fraguas 495b13f387 Merge branch 'ent-5959-xxs-special-day' into 'develop'
fixed vulnerability on special days

See merge request artica/pandorafms!3286
2020-06-15 12:14:42 +02:00
Alejandro Fraguas 80774e9942 Merge branch 'ent-5956-xss-manage-agent-group' into 'develop'
fixed security error on manage agent group

See merge request artica/pandorafms!3288
2020-06-15 10:33:50 +02:00
Alejandro Fraguas 62ce710b5b Merge branch 'ent-5954-XSS-Tags' into 'develop'
Control vulnerable fields

Closes pandora_enterprise#5954

See merge request artica/pandorafms!3283
2020-06-15 10:02:20 +02:00
Alejandro Fraguas af8326c042 Merge branch 'ent-5952-XSS-Netscan' into 'develop'
fix XSS

See merge request artica/pandorafms!3282
2020-06-15 09:33:08 +02:00
Daniel Rodriguez 146879ee8d Merge branch 'ent-5856-Se-pierde-filtro-al-paginar-en-REPORTS' into 'develop'
Fixed errors filter search with pagination

See merge request artica/pandorafms!3226
2020-06-15 08:29:14 +02:00
fbsanchez b4219472f2 Merge remote-tracking branch 'origin/develop' into ent-5778-9834-db2-para-discovery 2020-06-11 14:55:36 +02:00
fbsanchez 057fcea724 DB2 discovery 2020-06-11 14:53:34 +02:00
Daniel Rodriguez d3a34c5f00 Merge branch 'ent-5779-open-aviso-de-exclusividad-de-enterprise-en-bulk-operations' into 'develop'
Fix #5779

See merge request artica/pandorafms!3233
2020-06-11 14:03:14 +02:00
Daniel Rodriguez a8328bd4f1 Merge branch 'ent-5568-case-insensitive-para-el-buscador-de-usuarios' into 'develop'
Ent 5568 case insensitive para el buscador de usuarios

See merge request artica/pandorafms!3244
2020-06-11 14:00:52 +02:00
Jose Gonzalez da52e0f739 Changed nothing option for avoid duplicates 2020-06-10 16:00:23 +02:00
Jose Gonzalez 599445ad4d Solved issue with thresholds in prediction modules 2020-06-09 16:05:24 +02:00
marcos b3a270d0b3 fixed security error on manage agent group 2020-06-09 12:43:58 +02:00
marcos 9ddfde1774 fixed error with update event comments 2020-06-09 12:02:31 +02:00
marcos cfe30d5b7d fixed vulnerability on special days 2020-06-09 10:37:11 +02:00
alejandro-campos 442b40ad97 Merge branch 'develop' into ent-636-Campos-Target-IP-y-Export-target-en-politicas 2020-06-09 09:30:16 +02:00
Jose Gonzalez 120b78b5c5 Control vulnerable fields 2020-06-08 17:36:32 +02:00
alejandro-campos 754023f908 fix XSS 2020-06-08 17:12:33 +02:00
fbsanchez 11dbe46a96 Allowed toggled rows 2020-06-08 15:23:09 +02:00
alejandro-campos ab61cf1fc5 changed console and audit log locations 2020-06-08 10:48:48 +02:00
Alejandro Fraguas a8bf9843ee Merge branch 'ent-5728-bug-standard-users-pandora-administrator' into 'develop'
Fixed user list for UM

See merge request artica/pandorafms!3241
2020-06-08 10:46:37 +02:00