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
fermin831 1bf0fa6e02 Moved tentacle configuration file 2018-04-27 12:13:01 +02:00
fermin831 3526ea25f9 Updated windows tentacle to 0.6.2 version 2018-04-27 10:21:07 +02:00
fermin831 f49e280b13 Copied tentacle server to other localizations 2018-04-27 09:32:53 +02:00
fermin831 1fa309516f Added all configuration options and a sample configuration file of tentacle server 2018-04-27 09:26:56 +02:00
fermin831 979e7fa8b5 Added parse configuration file to tentacle server 2018-04-26 15:43:47 +02:00
vgilc 830a2090fb Merge branch '2219-Query_satura_base_de_datos_NT' into 'develop' 
tags secondary groups patch

See merge request artica/pandorafms!1452
 2018-04-26 15:11:43 +02:00
nramon 21f6c7e650 Merge branch '2134-Fallos-en-las-relaciones-de-nodos,-el-regreso-2-dev' into 'develop' 
Fixed issue in networkmap

See merge request artica/pandorafms!1453
 2018-04-26 12:42:27 +02:00
danielmaya 03b5cbdb62 Fixed issue in networkmap 2018-04-26 12:29:11 +02:00
daniel ddf1c3a3db tags secondary groups patch 2018-04-26 10:54:03 +02:00
nramon 50357c6b83 Merge branch '2134-Fallos-en-las-relaciones-de-nodos,-el-regreso-dev' into 'develop' 
Fixed repeated relationships in networkmap

See merge request artica/pandorafms!1451
 2018-04-26 10:46:20 +02:00
danielmaya 708cd1020b Fixed repeated relationships in networkmap 2018-04-26 10:40:16 +02:00
vgilc 4afc0e2d17 Merge branch '2073-revision-del-sla-2' into 'develop' 
[SLA] Fixed full not init and ignored availability and SLA reports

See merge request artica/pandorafms!1449
 2018-04-26 09:13:07 +02:00
artica edacc90226 Auto-updated build strings. 2018-04-26 00:01:26 +02:00
fermin831 71d5be46a6 [SLA] Fixed full not init and ignored availability and SLA reports 2018-04-25 16:59:33 +02:00
artica ec61441587 Auto-updated build strings. 2018-04-25 00:01:32 +02:00
vgilc af719123c9 Merge branch '2211-minor-change-in-mysql-plugin' into 'develop' 
Added mysql plugin to update_version

See merge request artica/pandorafms!1448
 2018-04-24 16:09:00 +02:00
vgilc 456253228d Merge branch '2210-Error_en_el_informe_general_de_la_metaconsola' into 'develop' 
fixed errors in function alias in metaconsole

See merge request artica/pandorafms!1447
 2018-04-24 15:30:02 +02:00
fbsanchez 0a0c3f61c8 Added mysql plugin to update_version 2018-04-24 15:28:08 +02:00
daniel ef9d31adfd fixed errors in function alias in metaconsole 2018-04-24 13:23:45 +02:00
vgilc 30889074af Merge branch '2134-Fallos-en-las-relaciones-de-nodos-dev' into 'develop' 
Fixed duplicate relationships in networkmap

See merge request artica/pandorafms!1446
 2018-04-24 12:21:26 +02:00
danielmaya 118f32e12e Fixed duplicate relationships in networkmap 2018-04-24 10:28:34 +02:00
artica de2b583583 Auto-updated build strings. 2018-04-24 00:01:30 +02:00
vgilc 3de5c50ce1 Merge branch 'ent-1859-groups-deletion-confirm-message' into 'develop' 
Added a new confirm message when trying to delete groups with children

See merge request artica/pandorafms!1445
 2018-04-23 16:50:51 +02:00
Alejandro Gallardo Escobar 4239b669f2 Added a new confirm message when trying to delete groups with children 2018-04-23 16:26:35 +02:00
vgilc 5ea4b84e97 Merge branch '1980-error-en-dashboards-con-custom-graphs-dev-3' into 'develop' 
Fixed unloaded includes in interface graphs

See merge request artica/pandorafms!1444
 2018-04-23 15:55:54 +02:00
fermin831 cfbe80669a Fixed unloaded includes in interface graphs 2018-04-23 15:48:17 +02:00
vgilc 522684ad22 Merge branch '2007-Monitorizacion_de_cluster_fase_2_get_cluster_status' into 'develop' 
Change id_os number refence and add get_cluster status function in api and CLI - #2007

See merge request artica/pandorafms!1443
 2018-04-23 14:44:09 +02:00
enriquecd b4b6852e27 Change id_os number refence and add get_cluster status function in api and CLI - #2007 2018-04-23 13:52:16 +02:00
artica d90c78ad9d Auto-updated build strings. 2018-04-23 00:01:25 +02:00
artica 1dc4b4554a Auto-updated build strings. 2018-04-22 00:01:25 +02:00
artica 1cf7efb86b Auto-updated build strings. 2018-04-21 00:01:35 +02:00
vgilc fa8f087d57 Merge branch '2007-Monitorizacion-de-cluster-fase-2-cli-2' into 'develop' 
Add cli cluster functions - #2007

See merge request artica/pandorafms!1413
 2018-04-20 10:32:26 +02:00
vgilc 5512fd3bb1 Merge branch '2007-Monitorizacion-de-cluster-fase-2-API' into 'develop' 
Add API cluster functions - #2007

See merge request artica/pandorafms!1387
 2018-04-20 10:32:14 +02:00
vgilc 5ee01aa70f Merge branch '2007-Monitorizacion-de-cluster-fase-2' into 'develop' 
Cluster monitoring 2 - #2007

See merge request artica/pandorafms!1378
 2018-04-20 10:31:57 +02:00
enriquecd d78c8daf5b Merge branch 'develop' into 2007-Monitorizacion-de-cluster-fase-2-cli-2 
Conflicts:
	pandora_server/util/pandora_manage.pl
 2018-04-20 10:19:16 +02:00
enriquecd 676835ddc8 Merge branch 'develop' into 2007-Monitorizacion-de-cluster-fase-2-API 
Conflicts:
	pandora_console/include/functions_api.php
 2018-04-20 10:10:33 +02:00
vgilc 1cb423fcfe Merge branch 'ent-1793-Etiquetas-de-las-graficas-con-decimales-2' into 'develop' 
Modified round decimals to avoid round string values

See merge request artica/pandorafms!1441
 2018-04-20 08:26:36 +02:00
nramon 0e003f9807 Merge branch '2126-Bloqueo-o-error-de-acceso-a-usuarios-sin-permisos-dev-2' into 'develop' 
Permit login with admin users without profiles

See merge request artica/pandorafms!1440
 2018-04-20 08:19:13 +02:00
artica 235c1cee6c Auto-updated build strings. 2018-04-20 00:01:27 +02:00
fermin831 d6a695f793 Modified round decimals to avoid round string values 2018-04-19 19:17:04 +02:00
fermin831 cd2f97d941 Permit login with admin users without profiles 2018-04-19 18:05:47 +02:00
artica 418d8b12b7 Updated version and build strings. 2018-04-19 16:05:39 +02:00
vgilc 5435cfa7bd Merge branch '1980-error-en-dashboards-con-custom-graphs-dev-2' into 'develop' 
Fixed agent view graphs (stat_win.php entry point)

See merge request artica/pandorafms!1439
 2018-04-19 14:41:15 +02:00
fermin831 bc2c92807a Fixed agent view graphs (stat_win.php entry point) 2018-04-19 13:15:13 +02:00
artica ee0d890361 Auto-updated build strings. 2018-04-19 00:01:25 +02:00
vgilc 14467eb3ac Merge branch '2189-Mapa-de-red-Falla-Wajahat-dev' into 'develop' 
Fixed issue when target = -1 in networkmap

See merge request artica/pandorafms!1434
 2018-04-18 16:26:43 +02:00
danielmaya ecb483af1a Fixed issue when target = -1 in networkmap 2018-04-18 14:51:38 +02:00
vgilc 292612f765 Merge branch 'ent-2121-Consolas-visuales-no-aplica-las-coordenadas-5539' into 'develop' 
[Visual console] Update position when change advanced options

See merge request artica/pandorafms!1430
 2018-04-18 11:12:29 +02:00
vgilc f7ae6f78b1 Merge branch '1980-error-en-dashboards-con-custom-graphs-dev' into 'develop' 
Fixed issue in dashboard with firefox

See merge request artica/pandorafms!1431
 2018-04-18 11:11:35 +02:00
vgilc b2dadfbda8 Merge branch 'ent-2118-EXT-5537-Fallo-al-procesar-XML-de-Inventario-en-el-Dataserver' into 'develop' 
Replace ellipsis character in Linux inventory plugin

See merge request artica/pandorafms!1432
 2018-04-18 11:10:13 +02:00