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

8987 Commits

Author SHA1 Message Date
vgilc 97dcaab99c Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
2611 cache de vista de arbol y vista de grupos

See merge request artica/pandorafms!1744
 2018-09-10 15:43:16 +02:00
daniel 022adeb24d fixed metaconsole tree view popup modules 2018-09-10 15:35:11 +02:00
daniel f123bac915 fixed total counters grouw view 2018-09-10 12:58:10 +02:00
vgilc f0e1d61f6d Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
fixed minor error no agents group view

See merge request artica/pandorafms!1740
 2018-09-10 12:43:26 +02:00
vgilc 683d748b38 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Now is possible to link visual consoles from different nodes to the visual console elements

See merge request artica/pandorafms!1741
 2018-09-10 12:43:06 +02:00
daniel 729fe74758 fixed minor error tree view acl 2018-09-10 12:08:38 +02:00
Alejandro Gallardo Escobar 40ff7b9042 Now is possible to link visual consoles from different nodes to the visual console elements 2018-09-10 11:25:44 +02:00
daniel 3d3670f6f9 fixed minor error no agents group view 2018-09-10 11:13:31 +02:00
daniel 5e9fda93d9 Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos 2018-09-10 09:59:46 +02:00
daniel 68627e80b0 fixed metaconsole group view 2018-09-10 09:55:31 +02:00
artica 003b734f4e Auto-updated build strings. 2018-09-10 00:01:22 +02:00
artica 6ae51b5e34 Auto-updated build strings. 2018-09-09 00:01:23 +02:00
artica cc4de37515 Auto-updated build strings. 2018-09-08 00:01:53 +02:00
daniel 3fa4f44d68 fixed group view 2018-09-07 14:37:22 +02:00
daniel ac0f0536c7 performance improve view groups 2018-09-07 14:19:01 +02:00
danielmaya 39673ed93a Added class modaldeletebutton in pandora.css 2018-09-07 14:15:21 +02:00
artica fb68f3f9b6 Auto-updated build strings. 2018-09-07 00:01:31 +02:00
nramon 6511f67600 Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
improve performance on group view

See merge request artica/pandorafms!1735
 2018-09-06 15:46:21 +02:00
daniel 6072cd3dc9 improve performance on group view 2018-09-06 15:28:22 +02:00
nramon 4e7d641667 Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
fixed performance in group view

See merge request artica/pandorafms!1734
 2018-09-06 10:46:36 +02:00
nramon fdd529ce10 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Nuevos tipos de cálculo de estado en los items con mapa de estado enlazado

See merge request artica/pandorafms!1732
 2018-09-06 10:46:14 +02:00
daniel 81ed14cc34 fixed performance in group view 2018-09-06 09:25:48 +02:00
nramon 8480deebba Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
2611 cache de vista de arbol y vista de grupos

See merge request artica/pandorafms!1733
 2018-09-06 08:18:11 +02:00
artica 647a324368 Auto-updated build strings. 2018-09-06 00:01:26 +02:00
daniel f3a2bda1a5 remove group cache in tree view 2018-09-05 18:31:13 +02:00
daniel 4781809e14 fixed minor error not init agent in tree view node 2018-09-05 18:28:31 +02:00
Alejandro Gallardo Escobar c20942f425 Now the status calculation can be configured for every visual console item 2018-09-05 15:25:19 +02:00
nramon aa98b62e5c Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
fixed errors in tree view

See merge request artica/pandorafms!1710
 2018-09-05 14:44:37 +02:00
daniel 3b0436008a Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos 2018-09-05 14:04:33 +02:00
daniel 82c4adc5c7 convert spaces to tab 2018-09-05 14:01:32 +02:00
daniel 7554906e59 minor refactorization tree view 2018-09-05 13:48:53 +02:00
daniel 51f71d1a07 fixed metaconsole tree view 2018-09-05 11:23:53 +02:00
Alejandro Gallardo Escobar ce6bfb96f1 Minor changes 2018-09-05 10:04:35 +02:00
nramon d91c7c062c Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Nuevos tipos de cálculo de estado en los items con mapa de estado enlazado

See merge request artica/pandorafms!1730
 2018-09-05 10:02:11 +02:00
daniel 2829ddd8dd clean main tree class code 2018-09-05 09:54:28 +02:00
artica 05d0bb0f5d Auto-updated build strings. 2018-09-05 00:01:26 +02:00
Alejandro Gallardo Escobar 9e085758af Minor fix 2018-09-04 17:52:05 +02:00
Alejandro Gallardo Escobar 36247d391f Merge branch 'develop' into ent-2588-service-like-visual-console-status 2018-09-04 17:25:23 +02:00
Alejandro Gallardo Escobar 21bad5330b Bug fix 2018-09-04 17:24:03 +02:00
Alejandro Gallardo Escobar 22696a0fc6 Added new modes to calculate the status of the linked visual maps 2018-09-04 17:23:42 +02:00
daniel 718401467d put tree view in separate files 2018-09-04 11:51:36 +02:00
artica 60360d8764 Auto-updated build strings. 2018-09-04 00:01:27 +02:00
enriquecd f4551faff0 Add intracom generic functions - #2541 2018-09-03 18:02:18 +02:00
nramon a84b1af4af Merge branch '2390-Añadir-en-filtro-de-eventos-todos-los-campos-posibles-de-búsqueda-dev' into 'develop' 
Added source, comment and id_extra in event filter

See merge request artica/pandorafms!1722
 2018-09-03 15:47:36 +02:00
artica b52661054d Auto-updated build strings. 2018-09-03 00:01:24 +02:00
artica 06b36965a2 Auto-updated build strings. 2018-09-02 00:01:23 +02:00
artica 97c562163e Auto-updated build strings. 2018-09-01 00:01:24 +02:00
danielmaya 5b30aa5560 Added source, comment and id_extra in event filter 2018-08-31 16:25:12 +02:00
daniel 41761bc525 fixed tree view tags 2018-08-31 13:33:22 +02:00
daniel e5fec6b303 Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos 2018-08-31 10:56:04 +02:00
daniel 3334138cb4 fixed tree view SO 2018-08-31 10:51:17 +02:00
daniel fb7def14af fixed tree view counter second level and module group view 2018-08-31 09:09:54 +02:00
artica 43a7d4973b Auto-updated build strings. 2018-08-31 00:01:28 +02:00
daniel 6a124487a4 fixed module tree view 2018-08-30 12:23:35 +02:00
artica 9d35a66ad3 Auto-updated build strings. 2018-08-30 00:01:25 +02:00
daniel b346e4dca9 refactorized group tree view 2018-08-29 13:55:50 +02:00
daniel 90d686a7ab fixed error in acl groups tree view 2018-08-29 09:16:07 +02:00
artica 91bdb0094a Auto-updated build strings. 2018-08-29 00:01:26 +02:00
daniel 59e405c2b3 disabled modules search in tree view 2018-08-28 15:24:35 +02:00
daniel 5079c59b88 Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos 2018-08-28 12:53:18 +02:00
daniel f9af750f47 fixed counters group tree view 2018-08-28 12:52:57 +02:00
vgilc 75d3d38bec Merge branch '2667-Añadir-ayuda-online-en-la-seccion-de-etiqueta-de-texto-de-una-consola-visual' into 'develop' 
fixed text errors in visual console macros' help text

See merge request artica/pandorafms!1717
 2018-08-28 10:41:44 +02:00
alejandro-campos 3b7b54cb68 fixed text errors in visual console macros' help text 2018-08-28 10:31:24 +02:00
vgilc 7a6c3c16ec Merge branch '1920_Informe_de_alertas' into 'develop' 
Fixed alert report date

See merge request artica/pandorafms!1715
 2018-08-28 10:30:23 +02:00
artica 7c37a7d2ee Auto-updated build strings. 2018-08-28 00:01:27 +02:00
samucarc 9915518b8e Fixed alert report date 2018-08-27 18:00:44 +02:00
vgilc a741e37f23 Merge branch '2667-Añadir-ayuda-online-en-la-seccion-de-etiqueta-de-texto-de-una-consola-visual' into 'develop' 
2667 añadir ayuda online en la seccion de etiqueta de texto de una consola visual

See merge request artica/pandorafms!1713
 2018-08-27 09:18:03 +02:00
vgilc 7f38e8273f Merge branch '2597_Errata_en_cluster' into 'develop' 
Fixed visual error

See merge request artica/pandorafms!1698
 2018-08-27 09:17:23 +02:00
vgilc 69545d7ed8 Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios' into 'develop' 
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios

See merge request artica/pandorafms!1708
 2018-08-27 09:10:00 +02:00
vgilc a2ecec29cc Merge branch 'ent-2661-fallos-al-sincronizar-la-configuracion-de-la-metaconsola-en-el-nodo' into 'develop' 
Revert "Improved metaconsole sync (added centralized management)"

See merge request artica/pandorafms!1696
 2018-08-27 09:08:15 +02:00
artica 930a939764 Auto-updated build strings. 2018-08-27 00:01:22 +02:00
artica 6a99bb9aec Auto-updated build strings. 2018-08-26 00:01:22 +02:00
artica f345c01e3e Auto-updated build strings. 2018-08-25 00:01:25 +02:00
daniel e6a42f45be removed unwanted code 2018-08-24 12:55:09 +02:00
daniel fbe4e15ca7 fixed filter tree view 2018-08-24 12:54:22 +02:00
alejandro-campos 5f593df22a minor fix in visual maps macros help text 2018-08-24 09:19:48 +02:00
alejandro-campos a9ac4462a5 added help dialog in visual console editor 2018-08-24 09:15:10 +02:00
artica 733be2d8ba Auto-updated build strings. 2018-08-24 00:01:24 +02:00
daniel 9df565fae1 fixed metaconsole on performance changes 2018-08-23 16:33:20 +02:00
daniel 24f7dbd420 added cache to function agents_get_all_groups_agent 2018-08-23 14:50:19 +02:00
daniel 3e71513e4e performance tree view node 2018-08-23 14:49:09 +02:00
daniel aef428c405 Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos 2018-08-23 14:48:25 +02:00
artica 80cec1aadb Auto-updated build strings. 2018-08-23 00:01:29 +02:00
daniel 1f0b65eca6 fixed errors in tree view 2018-08-22 16:23:52 +02:00
artica 99858d3371 Auto-updated build strings. 2018-08-22 00:01:27 +02:00
fermin831 0a70284eaa [Secondary groups] Group report and adapted group_stat table to secondary groups 2018-08-21 13:34:52 +02:00
fermin831 399c9c2d58 [Secondary groups] Fixed agent/modules view 2018-08-21 13:33:16 +02:00
vgilc 281dbb4784 Merge branch '2664-No_funcionan_Automatic_Combined_Graphs_en_Metaconsola' into 'develop' 
fixed error automatic combined graph

See merge request artica/pandorafms!1707
 2018-08-21 10:58:57 +02:00
daniel 8e845d2948 fixed error automatic combined graph 2018-08-21 10:54:36 +02:00
vgilc 69513fdc63 Merge branch '2609-cambios-en-la-forma-de-gestionar-grupos-secundarios-en-la-vista-de-usuario-3' into 'develop' 
Added secondary groups and no hierarchy documentation

See merge request artica/pandorafms!1700
 2018-08-21 08:34:53 +02:00
fermin831 4d44fcb512 Added secondary groups documentation 2018-08-21 08:27:46 +02:00
artica e518135adf Auto-updated build strings. 2018-08-21 00:01:24 +02:00
daniel fac1b3b616 fixed error for each agent report metaconsole 2018-08-20 17:28:14 +02:00
daniel 271466fb66 fixed errors automatic combined graph report metaconsole 2018-08-20 13:52:01 +02:00
vgilc 7b9fe9573e Merge branch 'ent-2335-gis-group-items' into 'develop' 
Bug fixes on the GIS map layer configuration

See merge request artica/pandorafms!1697
 2018-08-20 12:42:48 +02:00
artica ad6a3d69e8 Auto-updated build strings. 2018-08-20 00:01:20 +02:00
artica c79b06e43c Auto-updated build strings. 2018-08-19 00:01:22 +02:00
artica 693f9617ac Auto-updated build strings. 2018-08-18 00:01:26 +02:00
fermin831 90e3a423c4 Added secondary groups and no hierarchy documentation 2018-08-17 15:45:59 +02:00
Alejandro Gallardo Escobar 1de746ab69 Fixed a problem with the autocomplete agent cache 2018-08-17 15:03:24 +02:00