Commit Graph

17874 Commits

Author SHA1 Message Date
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
fbsanchez 4968ff3878 Included library from enterprise 2018-08-02 10:07:47 +02:00
fbsanchez a51851cc79 Moved vconsole templates to enterprise 2018-08-02 09:35:16 +02:00
artica d06c0ebffe Auto-updated build strings. 2018-08-02 00:01:23 +02:00
vgilc 86122be7e7 Merge branch '2488-ue-plugin-updates' into 'develop'
Added extra compat. to print_module (plugintools)

See merge request artica/pandorafms!1620
2018-08-01 15:20:55 +02:00
vgilc fcda8f56f9 Merge branch '2460-tu-zona-horaria-es-distinta-pero-igual' into 'develop'
fixed bug: when system timezone is equal to your timezone, dont show the…

See merge request artica/pandorafms!1645
2018-08-01 15:20:08 +02:00
fbsanchez 9924c7877a Weird fix agentmodule retrieval proc. 2018-08-01 15:17:58 +02:00
vgilc 6e2af64746 Merge branch 'ent-2394-fix-api-info-html-encoded-chars' into 'develop'
Remove html encoded characters from the product name when returning the info using the API

See merge request artica/pandorafms!1646
2018-08-01 15:13:51 +02:00
vgilc 1baf56159e Merge branch 'ent-2567-no-se-muestran-las-graficas-con-permisos-para-secundary-group' into 'develop'
Fixed acl in module graph view

See merge request artica/pandorafms!1653
2018-08-01 15:12:41 +02:00
vgilc cce7af9c37 Merge branch '2397-No-se-ve-la-gráfica-de-eventos-de-la-pantalla-de-cluster-dev' into 'develop'
Fixed event graph in cluster view

See merge request artica/pandorafms!1651
2018-08-01 15:08:43 +02:00
vgilc ce18002ae5 Merge branch '2385-Siguen-fallando-los-mapas-en-la-metaconsola-dev' into 'develop'
Fixed node connection in visual_map

See merge request artica/pandorafms!1637
2018-08-01 15:06:27 +02:00
vgilc 44411c4628 Merge branch '2432-Edición-módulos-snmpv3-en-operaciones-masivas-dev' into 'develop'
Fixed edit snmp modules in bulk

See merge request artica/pandorafms!1642
2018-08-01 15:05:50 +02:00
vgilc 1e71f93bba Merge branch '2537-Error-al-editar-módulos-con-tags-dev' into 'develop'
Fixed tags_check_acl when standar user have 'any' tag

See merge request artica/pandorafms!1647
2018-08-01 15:04:43 +02:00
vgilc cd98a5a414 Merge branch '2433-Los_datos_reportados_por_generic_data_string_aparecen_sin_saltos_de_linea_y_la_vista_ampliada_falla' into 'develop'
fixed error data string show

See merge request artica/pandorafms!1643
2018-08-01 14:56:23 +02:00
vgilc 8af71bfc35 Merge branch '2424-Bug_umbrales_graficas' into 'develop'
fixed minor error

See merge request artica/pandorafms!1644
2018-08-01 14:55:18 +02:00