Commit Graph

5404 Commits

Author SHA1 Message Date
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
fbsanchez f38ea57c5f group selector updates for report, required 2021-01-08 17:15:23 +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 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
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
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 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
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
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 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 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 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
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