54755db59b
Control inverse and percentege cannot be selected at same time
2021-11-26 11:55:38 +01:00
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
33a24533e1
Added new token percentage_warning and percentage_critical to pandoradb_data on tpolicy_modules
2021-11-24 13:27:33 +01:00
8ed3042f9a
Merge branch 'ent-8247-Integracion-con-Integria-Bug-en-selector-de-status-en-creacion-edicion-de-tickets' into 'develop'
...
added resolution field in creation and update operations
See merge request artica/pandorafms!4534
2021-11-24 11:20:18 +00:00
4dd931f277
Modules percentage threshold form
2021-11-24 11:33:36 +01:00
07ef0477af
Merge branch 'ent-8301-Fallo-pandora-manage-pl' into 'develop'
...
minor fix
See merge request artica/pandorafms!4548
2021-11-24 10:23:48 +00:00
98f4bfbcc1
Auto-updated build strings.
2021-11-24 01:00:10 +01:00
e0fec6470d
minor fix
2021-11-23 18:04:34 +01:00
fee6b06a2a
Updated version and build strings.
2021-11-23 11:28:02 +01:00
c096a244f6
Merge branch 'ent-8254-filtro-select-grupo-no-busca-sin-permiso-directo' into 'develop'
...
Select group search filter working on groups' child
See merge request artica/pandorafms!4535
2021-11-23 09:38:22 +00:00
feedce5a61
Auto-updated build strings.
2021-11-23 01:00:18 +01:00
688ec5f7f9
Merge branch 'ent-8144-no-se-muestra-completo-el-nombre-de-dashboard-consola-visual-favorito-en-el-menu' into 'develop'
...
Ent 8144 no se muestra completo el nombre de dashboard consola visual favorito en el menu
See merge request artica/pandorafms!4505
2021-11-22 15:54:05 +00:00
3efcc8d30f
Merge branch 'ent-8146-Bug-en-filtro-de-eventos-de-widget-List-of-latest-events-Dashboard' into 'develop'
...
Ent 8146 bug en filtro de eventos de widget list of latest events dashboard
See merge request artica/pandorafms!4504
2021-11-22 15:53:16 +00:00
eadb06e131
Merge branch 'ent-7787-Debug-modulos-web-corta-urls' into 'develop'
...
Changes in debug_content db field
Closes pandora_enterprise#7787
See merge request artica/pandorafms!4324
2021-11-22 15:51:34 +00:00
60f051dca3
Merge branch 'ent-8143-Buscador-general-Errores-en-resultados-mostrados' into 'develop'
...
fixed general search
See merge request artica/pandorafms!4520
2021-11-22 15:50:25 +00:00
13835582d2
Merge branch 'ent-8210-Bug-al-editar-acciones-ya-configuradas-en-alertas' into 'develop'
...
Ent 8210 bug al editar acciones ya configuradas en alertas
See merge request artica/pandorafms!4536
2021-11-22 12:44:51 +00:00
b8d884008b
Merge branch 'develop' into 'ent-7787-Debug-modulos-web-corta-urls'
...
# Conflicts:
# pandora_console/extras/mr/51.sql
2021-11-22 11:44:06 +00:00
3f395f03dc
Added sql file
2021-11-22 12:33:31 +01:00
192237a452
Merge remote-tracking branch 'origin' into ent-7787-Debug-modulos-web-corta-urls
2021-11-22 12:31:24 +01:00
9474dc9dbc
Auto-updated build strings.
2021-11-22 01:00:09 +01:00
956e1bd82b
Auto-updated build strings.
2021-11-21 01:00:14 +01:00
1751faac96
Auto-updated build strings.
2021-11-20 01:00:24 +01:00
8ce1a500ea
#8210 Fixed dialog
2021-11-19 14:57:56 +01:00
7f534a1a14
Merge branch 'ent-8191-Error-linkado-elementos-mapa-de-servicio' into 'develop'
...
Ent 8191 error linkado elementos mapa de servicio
See merge request artica/pandorafms!4537
2021-11-19 13:04:23 +00:00
7b4c6848f7
Merge branch 'ent-8200-Conteos-incorrectos-vista-tactica-en-FENIX-en-v758' into 'develop'
...
fixed several counts
See merge request artica/pandorafms!4527
2021-11-19 10:46:15 +00:00
c3295b8fd2
#8191 Fixed filter
2021-11-19 11:38:11 +01:00
a70661d94e
Merge branch 'ent-7503-Calendarios-para-dias-especiales' into 'develop'
...
special days template alerts
See merge request artica/pandorafms!4508
2021-11-19 09:43:36 +00:00
6d1e7121d7
Merge branch 'develop' into 'ent-8200-Conteos-incorrectos-vista-tactica-en-FENIX-en-v758'
...
# Conflicts:
# pandora_console/include/functions_tactical.php
2021-11-19 08:59:19 +00:00
e3183d9e56
fix add file list delete files
2021-11-19 08:19:45 +01:00
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
f18a575b2a
Auto-updated build strings.
2021-11-19 01:00:17 +01:00
04e6e875b3
Merge branch 'ent-8168-La-vista-tactica-de-metaconsola-no-tiene-en-cuenta-el-propagate-ACL-de-los-grupos' into 'develop'
...
fixed propagation in agents count
See merge request artica/pandorafms!4529
2021-11-18 16:36:55 +00:00
c47c5e34f6
Merge branch 'ent-7892-problemas-en-despliegue-de-agentes-rcmd_timeout' into 'develop'
...
set deployment_timeout per agent installation file
See merge request artica/pandorafms!4516
2021-11-18 16:34:12 +00:00
69a7af2131
Merge branch 'ent-7799-jerarquia-fiels-alertas-snmp-accion-comando-de-alerta' into 'develop'
...
Ent 7799 jerarquia fiels alertas snmp accion comando de alerta
See merge request artica/pandorafms!4322
2021-11-18 16:31:50 +00:00
649fc829fb
included secondary groups in tactical count queries
2021-11-18 13:35:27 +01:00
5b49372e99
Merge branch 'ent-7839-revision-acl-enterprise-parte-2-introduccion-opciones' into 'develop'
...
Added missing sec related to GET params to ACL enterprise
See merge request artica/pandorafms!4345
2021-11-18 12:14:12 +00:00
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
2562a44d94
Fix duplicated ACL setup update manager
2021-11-18 12:25:14 +01:00
6f7b35a3b4
#8210 Fixed dropdown select2
2021-11-18 11:48:19 +01:00
283dadc72d
Select group search filter working on groups' child
2021-11-18 11:33:34 +01:00
37dacfa499
g,k kjjMerge remote-tracking branch 'origin/develop' into ent-7799-jerarquia-fiels-alertas-snmp-accion-comando-de-alerta
2021-11-18 09:37:31 +01:00
a5cfe3869c
Auto-updated build strings.
2021-11-18 01:00:18 +01:00
c73c0e91f4
Merge branch 'ent-8138-Monitoring-Module-Groups-Falla-la-muestra-de-datos' into 'develop'
...
fix count in module groups view
See merge request artica/pandorafms!4501
2021-11-17 17:20:20 +00:00
06fe1552bf
Enterprise ACL step 2: Add options fix merge
2021-11-17 17:31:43 +01:00
495d8d8db8
Merge branch 'ent-8163-bug-en-item-alert-report-metaconsola' into 'develop'
...
Fix server name item on reporting buider
See merge request artica/pandorafms!4525
2021-11-17 15:15:42 +00:00
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
3fc8e0cf7f
Merge branch 'ent-7994-carrefour-anadir-filtro-en-la-vista-de-custom-field-view-metaconsola' into 'develop'
...
added search capacity to multiple select
See merge request artica/pandorafms!4459
2021-11-17 15:14:31 +00:00
54ef63f6d3
Merge branch 'ent-7918-Cambio-texto-informe-availability-graph' into 'develop'
...
changed text
See merge request artica/pandorafms!4490
2021-11-17 15:12:24 +00:00
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
fd01375efe
Merge branch 'develop' into 'ent-8247-Integracion-con-Integria-Bug-en-selector-de-status-en-creacion-edicion-de-tickets'
...
# Conflicts:
# pandora_console/operation/incidents/configure_integriaims_incident.php
2021-11-17 09:48:16 +00:00
Calvo
Daniel Rodriguez
artica
Daniel Barbero Martin
José González
Jose Gonzalez
Daniel Maya
Alejandro Campos