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

17137 Commits

Author SHA1 Message Date
enriquecd 09d712d1ab Not blink separatos points in visual console digital clock - #2026 2018-03-28 18:42:59 +02:00
enriquecd 4378dc48ad Fix cluster ACL - #1878 2018-03-28 18:37:59 +02:00
enriquecd 52b61933df Hide password custom fields in agent view - #2030 2018-03-28 18:14:15 +02:00
enriquecd 87ed7f9cf7 Not blick separator points in visual console digital clock - #2026 2018-03-28 17:30:31 +02:00
enriquecd 8d39ae54fa Filter by not init agents and modules in tree view - #1454 2018-03-28 17:07:57 +02:00
artica 94936a46e9 Auto-updated build strings. 2018-03-28 00:01:22 +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
vgilc e8e8b0ac03 Merge branch '2041-No-funcionan-mapas-de-red-dev' into 'develop' 
Fixed target and source undefined

See merge request artica/pandorafms!1396
 2018-03-27 17:32:22 +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
danielmaya 8b3ec8146d Fixed target and source undefined 2018-03-27 16:36:26 +02:00
vgilc 985a7eec97 Merge branch '2110-EXT-5521-Error-al-subir-colecciones-2' into 'develop' 
Fix api collection function include - #2110

See merge request artica/pandorafms!1395
 2018-03-27 08:41:55 +02:00
artica ac2638ceea Auto-updated build strings. 2018-03-27 00:01:22 +02:00
enriquecd 9bb7ba475e Fix api collection function include - #2110 2018-03-26 18:34:52 +02:00
fermin831 c96b883614 [Secondary groups] Fixed agent view to include secondary agents 2018-03-26 12:52:37 +02:00
vgilc eec1e044c3 Merge branch '1922-error-paginado-eventos-meta-dev' into 'develop' 
Added tmetaconsole_agent in function agents_get_alias

See merge request artica/pandorafms!1394
 2018-03-26 12:38:51 +02:00
danielmaya e83c3bb5aa Added tmetaconsole_agent in function agents_get_alias 2018-03-26 12:03:25 +02:00
artica 999edad737 Auto-updated build strings. 2018-03-26 00:01:20 +02:00
artica b2ed2fbe45 Auto-updated build strings. 2018-03-25 00:01:20 +01:00
artica c91e71569c Auto-updated build strings. 2018-03-24 00:01:24 +01:00
vgilc 4371551a1b Merge branch '2096-shorten_labels_in_hbars' into 'develop' 
Fixed label shortener in hbar

See merge request artica/pandorafms!1385
 2018-03-23 11:18:54 +01:00
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