tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,989 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

17989 Commits

Author SHA1 Message Date
fermin831 62617e609c [Secondary groups] Fixed group agents and group events in events filter 2018-08-08 13:17:03 +02:00
fermin831 4315cef4c9 [Secondary groups] Fixed modules permissions in some views 2018-08-08 11:49:54 +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
daniel 06c436e5bf add new tocken zoom graph visual styles 2018-08-03 10:01:04 +02:00
vgilc 7390905f07 Merge branch '2043-fallos-en-la-visualizacion-de-snapshots' into 'develop' 
2043 fallos en la visualizacion de snapshots

See merge request artica/pandorafms!1656
 2018-08-03 09:01:09 +02:00
vgilc d84a945daa Merge branch 'ent-2555-fix-incremental-realtime-charts' into 'develop' 
Fix incremental realtime charts

See merge request artica/pandorafms!1658
 2018-08-03 09:00:31 +02:00
vgilc ea22ed90e0 Merge branch 'ent-2498-6126-plugin-grep_log-crea-badxml' into 'develop' 
Fixed XML inside logs in grep_log plugins

See merge request artica/pandorafms!1657
 2018-08-03 08:59:51 +02:00
artica 392b5bc935 Auto-updated build strings. 2018-08-03 00:01:25 +02:00
Alejandro Gallardo Escobar f5304af062 Removed unused code which was causing an error 2018-08-02 14:59:56 +02:00
fermin831 d0b5d6ae29 Fixed XML inside logs in grep_log plugins 2018-08-02 14:59:52 +02:00
Alejandro Gallardo Escobar 568484cf6e Fixed the incremental mode of the realtime charts and overall improvements 2018-08-02 14:59:10 +02:00
fermin831 5e6eca8e51 Added ACL to snapshot view 2018-08-02 14:32:12 +02:00
fermin831 c1269ca23f Refactorized snapshot link on meta 2018-08-02 13:42:39 +02:00
fermin831 7b22caaea8 Fixed warning 2018-08-02 13:41:56 +02:00
vgilc fdedc78b24 Merge branch '2415-Plantillas_de_Consola_visual' into 'develop' 
2415 plantillas de consola visual

See merge request artica/pandorafms!1652
 2018-08-02 13:22:26 +02:00
vgilc 58aecc9039 Merge branch '2598-Error-de-permisos-en-acciones-de-alertas-dev' into 'develop' 
Fixed permissions in alert_actions

See merge request artica/pandorafms!1655
 2018-08-02 13:08:54 +02:00
daniel c78ac2f4d5 fixed minor error 2018-08-02 13:07:40 +02:00
daniel c3413bbf62 fixed minor error 2018-08-02 13:06:43 +02:00
fermin831 18800feaae Refactorized snapshot link on node 2018-08-02 13:02:33 +02:00
fermin831 ca67bd632e Removed Oracle and Posgre code 2018-08-02 12:56:43 +02:00
danielmaya a9bb538e1a Fixed permissions in alert_actions 2018-08-02 12:47:42 +02:00
daniel 9d5004efbf fixed minor error 2018-08-02 11:07:22 +02:00
daniel ef2ff49504 mv enterprise visual console template 2018-08-02 11:03:13 +02:00
daniel d5f0429390 mv enterprise templates visual console 2018-08-02 10:57:00 +02:00
vgilc 22ffd8d1e5 Merge branch '2389-Ordenar-eventos-por-campo' into 'develop' 
added order filters to events table

See merge request artica/pandorafms!1608
 2018-08-02 10:55:33 +02:00
alejandro-campos 01656f2e76 conflict resolution on branch 2389-Ordenar-eventos-por-campo 2018-08-02 10:27:31 +02:00