Commit Graph

16187 Commits

Author SHA1 Message Date
vgilc 1cf4a3c3d0 Merge branch '1463-Gráficas-combinadas-dev' into 'develop'
Fixed reporting custom graph

See merge request artica/pandorafms!1191
2017-12-18 13:19:58 +01:00
danielmaya b65d649750 Fixed reporting custom graph 2017-12-18 13:12:29 +01:00
artica ee1b915735 Auto-updated build strings. 2017-12-18 00:01:13 +01:00
artica 925eb1cf72 Auto-updated build strings. 2017-12-17 00:01:13 +01:00
artica 7a0617ccce Auto-updated build strings. 2017-12-16 00:01:13 +01:00
artica 671ac77e44 Auto-updated build strings. 2017-12-15 00:01:16 +01:00
vgilc beb7550a0c Merge branch '1412-Filtro-por-más-campos-en-Manage-agents' into 'develop'
Fix os sorting in manage agents when use pagination - #1412

See merge request artica/pandorafms!1188
2017-12-14 17:37:06 +01:00
enriquecd 0473bda9b5 Fix os sorting in manage agents when use pagination - #1412 2017-12-14 17:28:33 +01:00
vgilc 9a96103164 Merge branch '1257-Traducciones-consola-open' into 'develop'
Change texts in pandora - #1257

See merge request artica/pandorafms!1062
2017-12-14 15:56:54 +01:00
vgilc 5620ab4944 Merge branch '1680-safe-output-wmi-username' into 'develop'
Decode HTML entities in the WMI username.

See merge request artica/pandorafms!1186
2017-12-14 15:55:47 +01:00
vgilc 9ee705f438 Merge branch '1703-carrefour-metaconsola-anadir-el-campo-enlace-externo-a-la-pantalla-de-inicio-de-usuarios' into 'develop'
add new field external link login user

See merge request artica/pandorafms!1183
2017-12-14 15:55:13 +01:00
vgilc 31c7456bd2 Merge branch '1698-Calculo-de-estado-erroneo-en-consolas-visuales-Carrefour-2' into 'develop'
Visual console status calculate errors / 2 - #1698

See merge request artica/pandorafms!1185
2017-12-14 15:53:52 +01:00
Ramon Novoa bdb53d0ae3 Decode HTML entities in the WMI username.
Ref pandora_enterprise#1680.
2017-12-14 15:48:43 +01:00
enriquecd db9dc114fb Visual console status calculate errors / 2 - #1698 2017-12-14 15:14:46 +01:00
daniel bec91f39cc add new field external link login user 2017-12-14 13:28:46 +01:00
vgilc 9c942cd7b8 Merge branch '1698-Calculo-de-estado-erroneo-en-consolas-visuales-Carrefour' into 'develop'
Visual console status calculate errors - #1698

See merge request artica/pandorafms!1182
2017-12-14 12:52:10 +01:00
enriquecd 585da6de6b Visual console status calculate errors - #1698 2017-12-14 12:42:21 +01:00
vgilc a35f57fdd2 Merge branch '1483-Cuadro_de_umbrales_rev2' into 'develop'
fixed minor error

See merge request artica/pandorafms!1180
2017-12-14 10:32:33 +01:00
daniel 08797d9cc9 fixed minor error 2017-12-14 10:21:24 +01:00
artica 3598f13687 Auto-updated build strings. 2017-12-14 00:01:16 +01:00
vgilc a90fa27fa5 Merge branch '1632-Pandora_FMS_charts' into 'develop'
1632 pandora fms charts

See merge request artica/pandorafms!1179
2017-12-13 17:53:38 +01:00
daniel d7d1cfe81b Merge branch 'develop' into 1632-Pandora_FMS_charts 2017-12-13 17:18:36 +01:00
daniel 4a1a0ae8b7 fixed errors in graphs 2017-12-13 17:17:45 +01:00
vgilc 009f2c1b54 Merge branch '1382-Ordenar-elementos-custom-graphs-4606-2-fix' into 'develop'
Fix custom graph builder order bar - #1382

See merge request artica/pandorafms!1176
2017-12-13 13:17:46 +01:00
enriquecd d0d0f8b229 Fix custom graph builder order bar - #1382 2017-12-13 13:08:41 +01:00
vgilc 7362f45ef8 Merge branch '1463-Series-sintéticas-dev' into 'develop'
1463 series sintéticas dev

See merge request artica/pandorafms!1175
2017-12-13 12:05:43 +01:00
danielmaya 43e697a1cb Added hint in field Add summatory series 2017-12-13 11:50:15 +01:00
danielmaya 85ac142c6c Updated functions_graph and fixed percentil issue 2017-12-13 10:38:08 +01:00
danielmaya 1d3efb9d9e Updated functions_graph 2017-12-13 10:37:42 +01:00
danielmaya 61b33221bf Added check modules and series 2017-12-13 10:37:23 +01:00
Daniel Maya e01f00ac3d code backup 2017-12-13 10:36:08 +01:00
artica 1b32a4da7c Auto-updated build strings. 2017-12-13 00:01:14 +01:00
vgilc 6a0acb05f1 Merge branch '1684-Autenticacion-por-LDAP-con-mas-de-1000-usuarios-dev' into 'develop'
Added ldapsearch system command

See merge request artica/pandorafms!1173
2017-12-12 14:20:22 +01:00
vgilc 02378cbea2 Merge branch 'ent-1687-no-mostrar-valor-de-modulos-keepalive-en-static-graphs-carrefour' into 'develop'
keepalive modules are boolean too (console function fix)

See merge request artica/pandorafms!1170
2017-12-12 09:01:14 +01:00
artica 3d233645c5 Auto-updated build strings. 2017-12-12 00:01:14 +01:00
danielmaya 741df27ba0 Added ldapsearch system command 2017-12-11 17:19:52 +01:00
vgilc df2fa6a48f Merge branch '1679-carrefour-Auto-loginhash-existing-session' into 'develop'
Carrefour auto loginhash existing session - #1679

See merge request artica/pandorafms!1172
2017-12-11 16:45:28 +01:00
enriquecd b6b0c8532d Carrefour auto loginhash existing session - #1679 2017-12-11 16:30:09 +01:00
fermin831 84ff86fede keepalive modules are boolean too (console function fix) 2017-12-11 15:47:38 +01:00
artica 6b76392a60 Auto-updated build strings. 2017-12-11 00:01:12 +01:00
artica 4734283cd8 Auto-updated build strings. 2017-12-10 00:01:11 +01:00
artica e1583f1903 Auto-updated build strings. 2017-12-09 00:01:11 +01:00
artica 3804c3f826 Auto-updated build strings. 2017-12-08 00:01:13 +01:00
vgilc 2031baf2b4 Merge branch 'ent-621-automonitorizacion-del-servidor-usa-comandos-de-otro-sistema-operativo-2' into 'develop'
Fixed disk_free on Windows automonitorization

See merge request artica/pandorafms!1169
2017-12-07 16:34:43 +01:00
fermin831 b51c239f3e Fixed disk_free on Windows automonitorization 2017-12-07 14:11:38 +01:00
vgilc 240759cc87 Merge branch 'qfix' into 'develop'
Minor fix

See merge request artica/pandorafms!1168
2017-12-07 12:22:11 +01:00
fbsanchez b6d2bdcc71 Minor fix 2017-12-07 12:04:22 +01:00
artica 633cb5a39c Auto-updated build strings. 2017-12-07 00:01:14 +01:00
artica 044d54a76f Auto-updated build strings. 2017-12-06 00:01:15 +01:00
vgilc 5b5ed2c45b Merge branch '1657-Agentes-en-crítico-salen-como-desconocido-en-GIS-dev' into 'develop'
Fixed Unkwon Icon in GIS

See merge request artica/pandorafms!1147
2017-12-05 16:55:06 +01:00