Commit Graph

17911 Commits

Author SHA1 Message Date
fermin831 13ad7b4fc7 Fixed group all alert templates visualization 2018-08-13 11:24:32 +02:00
vgilc 3b6af4485f Merge branch '2573-Graficas_no_se_muestran_bien_Consola_visual-2' into 'develop'
Fixed bullet charts (7 pixels for tickline)

See merge request artica/pandorafms!1679
2018-08-13 11:09:34 +02:00
fermin831 9d4297356e Fixed bullet charts (7 pixels for tickline) 2018-08-13 10:59:38 +02:00
vgilc 9dd9ad71a8 Merge branch '2609-cambios-en-la-forma-de-gestionar-grupos-secundarios-en-la-vista-de-usuario' into 'develop'
2609 cambios en la forma de gestionar grupos secundarios en la vista de usuario

See merge request artica/pandorafms!1665
2018-08-13 10:28:14 +02:00
vgilc 9df412ca72 Merge branch '2415-plantillas-de-consola-visual-eu-comm' into 'develop'
2415 plantillas de consola visual eu comm

See merge request artica/pandorafms!1677
2018-08-13 08:21:16 +02:00
artica aba54d65fa Auto-updated build strings. 2018-08-13 00:01:21 +02:00
artica 29c8a54e57 Auto-updated build strings. 2018-08-12 00:01:24 +02:00
artica f6382725dd Auto-updated build strings. 2018-08-11 00:01:25 +02:00
fbsanchez 8f329698d0 Vconsole templates, fixed permissions 2018-08-10 18:16:31 +02:00
vgilc fd1811bee6 Merge branch 'ent-2620-no-se-puede-acceder-graficas-de-modulo-desde-la-meta' into 'develop'
Fixed agents_get_agentmodule_group to search only in tagente table

See merge request artica/pandorafms!1675
2018-08-10 13:10:14 +02:00
fermin831 8be030b7da Fixed agents_get_agentmodule_group to search only in tagente table 2018-08-10 12:55:04 +02:00
vgilc 77825c7b2c Merge branch 'fix/pandora_enterprise#2593-server-signals' into 'develop'
Check and restart server threads if necessary.

See merge request artica/pandorafms!1674
2018-08-10 11:42:06 +02:00
Ramon Novoa 9a9956296f Check and restart server threads if necessary.
Ref pandora_enterprise#2593.
2018-08-10 11:35:27 +02:00
vgilc c6acf4abe2 Merge branch '572-extensionode-self-assestment' into 'develop'
fix bug in pandora_diag.php

See merge request artica/pandorafms!1673
2018-08-10 11:22:51 +02:00
vgilc 7515cc6529 Merge branch '2635-6317-graficas-combinadas' into 'develop'
Added thresholds to comb/interface graphs

See merge request artica/pandorafms!1672
2018-08-10 11:11:07 +02:00
manuel.montes bb8fc7a765 fix bug in pandora_diag.php 2018-08-10 10:41:18 +02:00
artica e1904878b5 Auto-updated build strings. 2018-08-10 00:01:24 +02:00
fbsanchez 6142fa1b05 Added thresholds to comb/interface graphs 2018-08-09 16:33:29 +02:00
vgilc 367a1e121f Merge branch '572-extensionode-self-assestment' into 'develop'
572 extensionode self assestment

See merge request artica/pandorafms!1671
2018-08-09 13:37:00 +02:00
manuel.montes 2c72ec54b8 Update self-assestment 2018-08-09 13:08:08 +02:00
fermin831 58c293809f Added Execution_Time module to self monitoring agent 2018-08-09 11:27:02 +02:00
artica 50b4c45652 Auto-updated build strings. 2018-08-09 00:01:24 +02:00
vgilc 506beefca4 Merge branch 'ent-2610-cambios-en-vista-de-eventos-grupos-secundarios' into 'develop'
Ent 2610 cambios en vista de eventos grupos secundarios

See merge request artica/pandorafms!1670
2018-08-08 15:05:25 +02:00
fermin831 01b8ec8acb Deleted some unwanted traces 2018-08-08 13:20:15 +02:00
fermin831 62617e609c [Secondary groups] Fixed group agents and group events in events filter 2018-08-08 13:17:03 +02:00
vgilc 323599f50e Merge branch 'pandora_enterprise#2333-intracom-snmp-trap-buffer-subsystem' into 'develop'
Add support for trap data coming from XML files.

See merge request artica/pandorafms!1667
2018-08-08 11:40:48 +02:00
vgilc 3333c33c0b Merge branch 'fix/pandora_exec_quotemeta' into 'develop'
Do not use quotemeta to escape arguments on win32.

See merge request artica/pandorafms!1668
2018-08-08 11:38:47 +02:00
nramon c6dc5f9ee2 Merge branch 'develop' into 'pandora_enterprise#2333-intracom-snmp-trap-buffer-subsystem'
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
2018-08-08 11:27:56 +02:00
Ramon Novoa 90dd961fa1 Do not use quotemeta to escape arguments on win32.
Ref pandora_enterprise#2625.
2018-08-08 11:24:50 +02:00
Ramon Novoa 736fa2650d Add a plug-in to read traps from snmptrapd's log. 2018-08-08 10:59:12 +02:00
Ramon Novoa 892185a8ca Style fix. 2018-08-08 10:09:48 +02:00
fermin831 10a4268bbc Implemented no_hierarchy profile in users_et_groups function 2018-08-08 09:26:07 +02:00
Ramon Novoa 27d1d1d745 Add support for trap data coming from XML files.
Ref pandora_enterprise#2333.
2018-08-08 09:08:08 +02:00
artica c6eef38ae8 Auto-updated build strings. 2018-08-08 00:01:22 +02:00
vgilc 687c2ebc90 Merge branch 'ent-2394-fix-api-info' into 'develop'
Fix the api info call

See merge request artica/pandorafms!1666
2018-08-07 13:14:17 +02:00
Alejandro Gallardo Escobar 2778239a0f Fix the api info call 2018-08-07 13:03:53 +02:00
fermin831 188733962f Changed is_secondary by no_hierarchy on tusuario_perfil table 2018-08-07 08:31:40 +02:00
artica e614e3ecec Auto-updated build strings. 2018-08-07 00:01:22 +02:00
artica 1367d0e57e Auto-updated build strings. 2018-08-06 00:01:22 +02:00
artica e5e97a304b Auto-updated build strings. 2018-08-05 00:01:21 +02:00
artica 517c98cf1a Auto-updated build strings. 2018-08-04 00:01:25 +02:00
vgilc 80121c4689 Merge branch 'ent-2532-6107-6239-bug-ACL' into 'develop'
Fixed ACL enterprise in home screen

See merge request artica/pandorafms!1664
2018-08-03 15:09:44 +02:00
fermin831 d8d18e422e Fixed ACL enterprise in home screen 2018-08-03 14:22:26 +02:00
vgilc f8eb5d5d00 Merge branch '2573-Graficas_no_se_muestran_bien_Consola_visual' into 'develop'
fixed error in visual console width and heigth custom graph

See merge request artica/pandorafms!1662
2018-08-03 13:07:31 +02:00
daniel 4bab741454 fixed error in visual console width and heigth custom graph 2018-08-03 11:58:45 +02:00
vgilc ab3998e097 Merge branch '2600-Error-al-crear-servicio-en-meta-dev' into 'develop'
Fixed create services

See merge request artica/pandorafms!1661
2018-08-03 11:35:56 +02:00
vgilc 1d607834dc Merge branch '2389-Ordenar-eventos-por-campo' into 'develop'
implemented sort filter to event view custom fields

See merge request artica/pandorafms!1660
2018-08-03 10:50:56 +02:00
vgilc 9a39b6340e Merge branch '2449-Quejas_por_el_comportamiento_del_zoom' into 'develop'
add new tocken zoom graph visual styles

See merge request artica/pandorafms!1659
2018-08-03 10:50:16 +02:00
danielmaya a9e162a199 Fixed create services 2018-08-03 10:49:01 +02:00
alejandro-campos 097661d82b implemented sort filter to event view custom fields 2018-08-03 10:38:53 +02:00