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

17007 Commits

Author SHA1 Message Date
vgilc 65c122c301 Merge branch '2015-implementacion-de-grupos-secundarios' into 'develop' 
2015 implementacion de grupos secundarios

See merge request artica/pandorafms!1382
 2018-04-10 09:56:40 +02:00
fermin831 2ffcecc5b5 [Secondary groups] Added secondary_groups to agents config file 2018-04-10 09:49:58 +02:00
fermin831 1f79326e97 [Secondary groups] Added SQL changes to migrate scripts 2018-04-10 09:38:00 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios 
Conflicts:
	pandora_console/include/class/Tree.class.php
 2018-04-10 09:29:14 +02:00
artica e2b52a76f7 Auto-updated build strings. 2018-04-10 00:01:23 +02:00
fermin831 678aa02ed7 [Secondary groups] Added hint to node group view 2018-04-09 20:18:37 +02:00
fermin831 4e1f57a43a Hide the realtime statistic group view 2018-04-09 19:47:29 +02:00
fermin831 6310b499be [Secondary groups] Added secondary groups to meta monitor status view 2018-04-09 19:10:19 +02:00
fermin831 361bd23093 [Secondary groups] Added secondary groups to node monitor detail 2018-04-09 18:56:05 +02:00
fermin831 5dec329941 [Secondary groups] Added secondary groups to agent view 2018-04-09 18:23:06 +02:00
fermin831 f6e03c0faa [Secondary groups] Added secondary groups in some events queries 2018-04-09 17:01:39 +02:00
fermin831 29a4e29cb9 [Secondary groups] Fixed display only secondary agents in tree view 2018-04-09 15:13:01 +02:00
fermin831 f8d900ee75 [Secondary groups] Fixed select all group on Profiles/Groups assigned 2018-04-09 13:37:55 +02:00
fermin831 8da6eca4ab [Secondary groups] Fixed get agents function to works properly with groups view 2018-04-09 12:40:52 +02:00
fermin831 9972252a3f [Secondary groups] Fixed agent filter on node tree view 2018-04-09 12:40:11 +02:00
fermin831 89181b6f42 [Secondary groups] Added secondary groups to meta tree view 2018-04-09 12:33:03 +02:00
vgilc 4d9ebb90b1 Merge branch '2101-Comprobar-funciones-de-CLI-ceadas-el-de-integria-4261-fix-wiki' into 'develop' 
Fix create web module cli function - #2101

See merge request artica/pandorafms!1412
 2018-04-09 11:56:22 +02:00
enriquecd 11182e9989 Merge branch 'develop' into 2101-Comprobar-funciones-de-CLI-ceadas-el-de-integria-4261-fix-wiki 
Conflicts:
	pandora_server/util/pandora_manage.pl
 2018-04-09 11:48:56 +02:00
artica 6bf0371a85 Auto-updated build strings. 2018-04-09 00:01:22 +02:00
artica 77f26cf08f Auto-updated build strings. 2018-04-08 00:01:21 +02:00
artica dcd57a421a Auto-updated build strings. 2018-04-07 00:01:33 +02:00
fermin831 310c2a6f15 [Secondary groups] Added secondary groups in tree view 2018-04-06 17:19:03 +02:00
enriquecd 48c04fbaaa Fix create web module cli function - #2101 2018-04-06 15:54:48 +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
artica f517edca1c Auto-updated build strings. 2018-04-06 00:01:25 +02:00
vgilc bc9ec22bf8 Merge branch '2120-Formato-JSON-en-audit-log-dev' into 'develop' 
Fixed json in audit log

See merge request artica/pandorafms!1411
 2018-04-05 17:16:50 +02:00
danielmaya e4f24b2452 Fixed json in audit log 2018-04-05 16:57:26 +02:00
vgilc 19eef35614 Merge branch '1454-Mostrar-o-no-agentes-y-módulos-no-iniciados-en-tree-view-final' into 'develop' 
Fix not init counters in trre - #1454

See merge request artica/pandorafms!1410
 2018-04-05 16:35:25 +02:00
vgilc 6a948c238e Merge branch '1454-Mostrar-o-no-agentes-y-módulos-no-iniciados-en-tree-view' into 'develop' 
Filter by not init agents and modules in tree view - #1454

See merge request artica/pandorafms!1397
 2018-04-05 16:35:12 +02:00
enriquecd c8c522b357 Fix not init counters in trre - #1454 2018-04-05 16:13:30 +02:00
enriquecd fa82f45d7d Fix not init counters final - #1454 2018-04-05 16:11:24 +02:00
fermin831 a724851a4d [Secondary groups] Added secondary groups to Windows agent 2018-04-05 11:02:19 +02:00
artica 4b36d86e48 Auto-updated build strings. 2018-04-05 00:01:24 +02:00
fermin831 d0c34e2ce7 [Secondary groups] Added secondary groups to linux agent and server 2018-04-04 16:05:18 +02:00
vgilc c4aa6141e4 Merge branch '1801-migrado-cambios-jmx' into 'develop' 
1801 migrado cambios jmx

See merge request artica/pandorafms!1408
 2018-04-04 15:22:58 +02:00
fbsanchez 35357683cb Merge remote-tracking branch 'origin/develop' into 1801-migrado-cambios-jmx 2018-04-04 13:41:01 +02:00
fbsanchez 18ea8e42a5 Pandora JMX plugin added to version control OUM 2018-04-04 13:39:48 +02:00
fermin831 c024fec509 [Secondary groups] Fixed single secondary group update meta cache 2018-04-04 13:07:45 +02:00
vgilc f2d5f01d64 Merge branch '2101-Comprobar-funciones-de-CLI-creadas-para-el-ticket-de-integria-3' into 'develop' 
Fix create_web and create_policy_web CLI functions - #2101

See merge request artica/pandorafms!1409
 2018-04-04 12:22:59 +02:00
enriquecd 47b611469d Fix create_web and create_policy_web CLI functions - #2101 2018-04-04 12:06:10 +02:00
fermin831 c88e6e703a [Secondary groups] Fixed duplicated agents in group view and agent detail 2018-04-04 11:17:08 +02:00
artica f863184454 Auto-updated build strings. 2018-04-04 00:01:24 +02:00
fbsanchez 8a4ee8f28d PluginTools pseudo control for as_agent/server_plugin 2018-04-03 18:22:38 +02:00
fbsanchez 7c202cbb81 PluginTools minor fix in log message 2018-04-03 17:14:11 +02:00
fbsanchez 63e644d88a Minor fix 2018-04-03 17:12:31 +02:00
vgilc fcec4b8b70 Merge branch '2125-Error_en_graficas_v721' into 'develop' 
Decreased limit to reduceText call in some graphs

See merge request artica/pandorafms!1407
 2018-04-03 17:10:02 +02:00
fbsanchez dcaae924fc Decreased limit to reduceText call in some graphs 2018-04-03 16:41:21 +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