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

16873 Commits

Author SHA1 Message Date
fermin831 310c2a6f15 [Secondary groups] Added secondary groups in tree view 2018-04-06 17:19:03 +02:00
fermin831 4c71450b6a [Secondary Groups] Added secondary agents to metaconsole group view 2018-04-06 14:08:36 +02:00
fermin831 3463cd1ea2 [Secondary Groups] Added secondary agents to node group view 2018-04-06 12:04:08 +02:00
fermin831 a724851a4d [Secondary groups] Added secondary groups to Windows agent 2018-04-05 11:02:19 +02:00
fermin831 d0c34e2ce7 [Secondary groups] Added secondary groups to linux agent and server 2018-04-04 16:05:18 +02:00
fermin831 c024fec509 [Secondary groups] Fixed single secondary group update meta cache 2018-04-04 13:07:45 +02:00
fermin831 c88e6e703a [Secondary groups] Fixed duplicated agents in group view and agent detail 2018-04-04 11:17:08 +02:00
fermin831 d36ab81d6c Merge branch '2015-implementacion-de-grupos-secundarios' of https://192.168.50.5:8081/artica/pandorafms into 2015-implementacion-de-grupos-secundarios 
Conflicts:
	pandora_console/pandoradb.sql
 2018-04-03 15:39:40 +02:00
fermin831 e2d61d5794 [Secondary groups] Added update cache on server 2018-04-03 15:36:33 +02:00
fermin831 5ffa396177 [Secondary Groups] Added tmetaconsole_agent_secondary_group table 2018-04-03 12:31:57 +02:00
fermin831 2839388e9e [Secondary Groups] More events fixes 2018-03-27 18:07:43 +02:00
fermin831 4d78b28d17 [Secondary Groups] Fixed grouped agents events in node 2018-03-27 17:53:11 +02:00
fermin831 e3341c98ce [Secondary Groups] Fixed agent graph agent status 2018-03-27 17:02:41 +02:00
fermin831 88375a2460 [Secondary groups] Fixed some problems in agent view 2018-03-27 16:38:17 +02:00
fermin831 c96b883614 [Secondary groups] Fixed agent view to include secondary agents 2018-03-26 12:52:37 +02:00
fermin831 db16a797f3 [Secondary Groups] Assign secondary groups by AJAX on agent edit view 2018-03-22 13:34:15 +01:00
fermin831 26da63610a [Secondary Groups] Change secondary groups from selected to non selected in agent edit view 2018-03-21 18:32:14 +01:00
fermin831 efe420edfb [Secondary groups] Added view in agent edition 2018-03-21 16:27:01 +01:00
fermin831 2cc1f04ced [Secondary groups] Modified configure user to manage secondary groups 2018-03-20 16:51:41 +01:00
fermin831 f493583fee [Secondary Groups] Added tagent_secondary_group table and tusuario_perfil.is_secondary field 2018-03-20 13:29:17 +01:00
artica 972e394a8e Auto-updated build strings. 2018-03-20 00:01:22 +01:00
vgilc 8d3683d71b Merge branch '1748-Sistema-de-gestión-de-Clusters-fix-id-os' into 'develop' 
Fix id_os 100 cluster - #1748

See merge request artica/pandorafms!1380
 2018-03-19 19:15:19 +01:00
enriquecd 43e374f454 Fix id_os 100 cluster - #1748 2018-03-19 19:09:45 +01:00
artica 25efa085ce Auto-updated build strings. 2018-03-19 00:01:29 +01:00
artica c4ddcc9332 Auto-updated build strings. 2018-03-18 00:01:21 +01:00
artica ea5ef0bc42 Auto-updated build strings. 2018-03-17 00:01:23 +01:00
artica a17c7c3e34 Auto-updated build strings. 2018-03-16 00:01:21 +01:00
vgilc 5e9a90183c Merge branch 'fix-mr-13' into 'develop' 
Fixed mr 13

See merge request artica/pandorafms!1374
 2018-03-15 15:29:20 +01:00
fermin831 458938b751 Fixed mr 13 2018-03-15 14:32:51 +01:00
vgilc c0cc6bbb5e Merge branch '1873-autoprovisionamiento-de-agentes' into 'develop' 
Added missing constants for two servers.

See merge request artica/pandorafms!1373
 2018-03-15 12:50:11 +01:00
Ramon Novoa 9bdc23077c Added missing constants for two servers. 2018-03-15 12:41:30 +01:00
vgilc 5fc4e30c6d Merge branch 'ent-1695-carrefour-pandora-fms-console-metaconsole-tree-view-conteo-de-los-elementos' into 'develop' 
[Tree view] Substitute items by groups

See merge request artica/pandorafms!1372
 2018-03-15 12:26:49 +01:00
fermin831 e9932daf19 [Tree view] Substitute items by groups 2018-03-15 12:06:07 +01:00
artica 270a43fbeb Auto-updated build strings. 2018-03-15 00:01:23 +01:00
vgilc 663e5da6ae Merge branch '1670-Traducciones-setup' into 'develop' 
Translations 720 - #1670

See merge request artica/pandorafms!1370
 2018-03-14 14:10:36 +01:00
enriquecd 2663cc1be5 Translations 720 - #1670 2018-03-14 13:59:44 +01:00
vgilc 4ba8b86bfd Merge branch 'ent-2052-previsualizador-iconos-roto' into 'develop' 
[Visual console] Fixed icon preview

See merge request artica/pandorafms!1368
 2018-03-14 10:33:36 +01:00
fermin831 0c3b6fbf83 [Visual console] Fixed icon preview 2018-03-14 10:25:27 +01:00
vgilc 387280e97f Merge branch '1873-autoprovisionamiento-de-agentes' into 'develop' 
1873 autoprovisionamiento de agentes

See merge request artica/pandorafms!1342
 2018-03-14 09:12:07 +01:00
artica fb56ebfbff Auto-updated build strings. 2018-03-14 00:01:25 +01:00
Ramon Novoa 42107017bf Merge remote-tracking branch 'origin/develop' into 1873-autoprovisionamiento-de-agentes 2018-03-13 18:40:51 +01:00
Ramon Novoa 560f18f3a2 Add tables for agent provisioning to the schema. 2018-03-13 18:01:04 +01:00
Ramon Novoa 21f8194f0d Add a new agent provisioning server (enterprise). 2018-03-13 17:52:34 +01:00
Ramon Novoa b63a1c4ce8 Remove debugging messages. 2018-03-13 17:52:34 +01:00
vgilc 8af4272152 Merge branch '1923-Migrar_agentes_desde_metaconsola' into 'develop' 
1923 migrar agentes desde metaconsola

See merge request artica/pandorafms!1364
 2018-03-13 17:47:52 +01:00
fermin831 ff2098bb7f [Autoprovision] Removed agents_count column from tprovisioning 2018-03-13 17:29:39 +01:00
fbsanchez a6c5a0b046 Moved MigrationServer to enterprise servers load 2018-03-13 17:26:44 +01:00
vgilc 04ae61e9e2 Merge branch '1743-Nodos-ficticios-establecen-relaciones-solos-en-los-mapas-de-red-dev' into 'develop' 
Changes in networkmap_links_to_js_links

See merge request artica/pandorafms!1365
 2018-03-13 17:05:51 +01:00
danielmaya 9fa26f9fcb Changes in networkmap_links_to_js_links 2018-03-13 16:40:49 +01:00
fbsanchez 9b9b46ac65 1923 added new tables to MR and migrate sql script 2018-03-13 16:38:09 +01:00