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

17115 Commits

Author SHA1 Message Date
fbsanchez 526bd5f8c5 Merge remote-tracking branch 'origin/develop' into 2096-shorten_labels_in_hbars 2018-03-23 11:08:48 +01:00
vgilc 546b5af4cf Merge branch '2080-Informe_de_tipo_Network_Interface_con_TIP_no_funciona' into 'develop' 
fixed errors in reports interfaces metaconsole

See merge request artica/pandorafms!1393
 2018-03-23 09:34:15 +01:00
daniel f750d0f49e fixed errors in reports interfaces metaconsole 2018-03-23 08:00:32 +01:00
artica dd59704729 Auto-updated build strings. 2018-03-23 00:01:21 +01:00
Ramon Novoa ae3d8ff9a5 Add a Dockerfile to build the Pandora FMS image. 2018-03-22 15:54:53 +01:00
vgilc 8451bbf9cf Merge branch '2058-migrar-agentes-desde-metaconsola-2' into 'develop' 
2058 migrar agentes desde metaconsola 2

See merge request artica/pandorafms!1391
 2018-03-22 13:53:57 +01:00
vgilc 1501d8ecf5 Merge branch '2030-5422-Esconder-los-campos-de-tipo-password-dentro-de-los-custom-fields-del-agente-2' into 'develop' 
Hide passwords fields data in treeview and events - #2030

See merge request artica/pandorafms!1392
 2018-03-22 13:45:34 +01:00
daniel ad2746e6c3 fixed add help incli 2018-03-22 13:36:24 +01:00
fermin831 db16a797f3 [Secondary Groups] Assign secondary groups by AJAX on agent edit view 2018-03-22 13:34:15 +01:00
daniel 0156bff9e6 fixed error 2018-03-22 13:33:23 +01:00
daniel 55d0ca122b fixed error 2018-03-22 13:28:18 +01:00
daniel 98355f985a merge develop 2018-03-22 13:21:48 +01:00
daniel b61f8d5cdd add new functions cli 2018-03-22 13:18:48 +01:00
enriquecd 078b370cbd Hide passwords fields data in treeview and events - #2030 2018-03-22 13:10:25 +01:00
vgilc f809a013e1 Merge branch '983-API-CLI-posibilidad-de-aplicar-templates-componentes-a-un-agente' into 'develop' 
API and CLI apply template components - #983

See merge request artica/pandorafms!1319
 2018-03-22 12:51:33 +01:00
vgilc 01c695a3fa Merge branch '2101-Comprobar-funciones-de-CLI-creadas-para-el-ticket-de-integria-#4261' into 'develop' 
Check create_web_modules CLI functions - #2101

See merge request artica/pandorafms!1390
 2018-03-22 12:18:07 +01:00
enriquecd dd02b6e2b8 Check create_web_modules CLI functions - #2101 2018-03-22 12:07:08 +01:00
vgilc 19ec892e6b Merge branch '1866-Add-search-bar-to-cluster-agent-aggregator-id_os_100' into 'develop' 
Adapt search bar to cluster id_os 100 - #1866

See merge request artica/pandorafms!1389
 2018-03-22 11:49:08 +01:00
enriquecd dcb33e08b7 Merge branch 'develop' into 983-API-CLI-posibilidad-de-aplicar-templates-componentes-a-un-agente 
Conflicts:
	pandora_server/util/pandora_manage.pl
 2018-03-22 11:11:01 +01:00
enriquecd 632845c9b3 Adapt search bar to cluster id_os 100 - #1866 2018-03-22 11:04:19 +01:00
vgilc 6fd44faad1 Merge branch '2030-5422-Esconder-los-campos-de-tipo-password-dentro-de-los-custom-fields-del-agente' into 'develop' 
Hide password custom fields data in agent custom fileds section - #2030

See merge request artica/pandorafms!1362
 2018-03-22 10:13:33 +01:00
vgilc c8c6c2ad1a Merge branch '1866-Cluster-Añadir-filtro-de-grupos-con-recursión-buscador-de-agentes-a-wizard-en-paso-2' into 'develop' 
Add search bar to cluster agent aggregator - #1866

See merge request artica/pandorafms!1351
 2018-03-22 10:11:43 +01:00
vgilc d5cd5963d7 Merge branch '2081-Enlace-de-ayuda-mal-en-edicion-de-agente' into 'develop' 
Help icon in module creator - #2081

See merge request artica/pandorafms!1388
 2018-03-22 10:10:49 +01:00
vgilc 22d92c6b30 Merge branch '2085-vmware-version-no-actualizada' into 'develop' 
Fixed plugin path in pandora_update_version

See merge request artica/pandorafms!1381
 2018-03-22 10:10:25 +01:00
vgilc 9e276aa8a2 Merge branch '2026-5413-Quitar-el-parpadeo-del-reloj-digital' into 'develop' 
Not blink separator dots for digital clocks - #2026

See merge request artica/pandorafms!1356
 2018-03-22 10:04:04 +01:00
vgilc 7f30b63e98 Merge branch 'ent-2045-5325-Bug-Descripcion-MIBS' into 'develop' 
[SNMP] Fixed translation of custom mibs, added custom description data and…

See merge request artica/pandorafms!1375
 2018-03-22 10:03:16 +01:00
vgilc 9e72b6c190 Merge branch '2067-Informe_de_SLA_muestra_datos_en_not_init_al_inicio_del_grafico' into 'develop' 
fixed errors detected SLA

See merge request artica/pandorafms!1377
 2018-03-22 10:02:46 +01:00
vgilc c5af972aeb Merge branch '1598-Cron-jobs-y-permisos-dev' into 'develop' 
Added group_id in cron job(mr and migrate)

See merge request artica/pandorafms!1386
 2018-03-22 10:01:53 +01:00
vgilc d60a0dbc02 Merge branch '1922-Error-en-paginado-de-eventos-dev' into 'develop' 
Fixed module filter in view events

See merge request artica/pandorafms!1314
 2018-03-22 09:59:07 +01:00
vgilc 6b49624bc9 Merge branch 'ent-1965-5340-Bug-Visualizacion-elementos-Consola-Visual' into 'develop' 
[Visual Console] Changed simple select by group select in restricted group…

See merge request artica/pandorafms!1369
 2018-03-22 09:58:37 +01:00
vgilc f8d58cbe1f Merge branch 'ent-1971-error-en-validacion-de-alertas' into 'develop' 
[Alerts view] Fixed validation in alerts view

See merge request artica/pandorafms!1371
 2018-03-22 09:57:58 +01:00
vgilc 9e4d8e12b3 Merge branch 'ent-1978-5343-Bugs-SQL-Graphs-Custom-Reports' into 'develop' 
[Pie charts] Adding more space in legend

See merge request artica/pandorafms!1366
 2018-03-22 09:57:28 +01:00
vgilc 3d268b7de4 Merge branch 'ent-2053-5455-BADXML-por-tener-etiquetas-XML-en-logs' into 'develop' 
Ent 2053 5455 badxml por tener etiquetas xml en logs

See merge request artica/pandorafms!1376
 2018-03-22 09:54:36 +01:00
artica 243e24e56e Auto-updated build strings. 2018-03-22 00:01:23 +01:00
enriquecd f5e8d4f90f Help icon in module creator - #2081 2018-03-21 19:18:24 +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
enriquecd d21ca7eb5f Add API cluster functions - #2007 2018-03-21 18:20:59 +01:00
fbsanchez 5e3cf3162a CLI example check/get server_address 2018-03-21 16:58:42 +01:00
danielmaya 364daa8579 Added group_id in cron job(mr and migrate) 2018-03-21 16:51:08 +01:00
fermin831 efe420edfb [Secondary groups] Added view in agent edition 2018-03-21 16:27:01 +01:00
vgilc 928113bf4c Merge branch '2090-Cambio-id_os-a-100-a-sistema-operativo-asociado-a-cluster' into 'develop' 
Fix cluster id_os bug - #2090

See merge request artica/pandorafms!1384
 2018-03-21 15:49:06 +01:00
fbsanchez 835e791ef1 Fixed label shortener in hbar 2018-03-21 13:40:15 +01:00
artica 199b81a79c Auto-updated build strings. 2018-03-21 00:01:22 +01:00
fermin831 2cc1f04ced [Secondary groups] Modified configure user to manage secondary groups 2018-03-20 16:51:41 +01:00
enriquecd 19b566d4c2 Fix cluster id_os bug - #2090 2018-03-20 15:42:37 +01:00
vgilc cf67530fa8 Merge branch '1748-Sistema-de-gestión-de-Clusters-migrate-id_os' into 'develop' 
Fix migrate clusters id_os bug - #1748

See merge request artica/pandorafms!1383
 2018-03-20 15:41:38 +01:00
enriquecd a7531bbcb3 Fix migrate clusters id_os bug - #1748 2018-03-20 15:34:23 +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
fbsanchez 4aa57b2366 Fixed plugin path in pandora_update_version 2018-03-20 11:59:53 +01:00
artica 972e394a8e Auto-updated build strings. 2018-03-20 00:01:22 +01:00