Commit Graph

17130 Commits

Author SHA1 Message Date
artica ab1ca78340 Auto-updated build strings. 2018-05-02 00:01:34 +02:00
artica d6a7ca198d Auto-updated build strings. 2018-05-01 00:01:23 +02:00
vgilc ecaf360d9d Merge branch 'fixed-csv-export-events-secondary-groups-2' into 'develop'
Change the extension of CSV events file to .csv

See merge request artica/pandorafms!1463
2018-04-30 16:04:56 +02:00
fermin831 7162241ef9 Change the extension of CSV events file to .csv 2018-04-30 15:55:15 +02:00
vgilc af19eb2037 Merge branch '2007-Monitorizacion-de-cluster-fase-2-MR15-2' into 'develop'
Fix MR - #2007

See merge request artica/pandorafms!1461
2018-04-30 15:15:21 +02:00
enriquecd d76f8f6c76 Fix MR - #2007 2018-04-30 14:59:35 +02:00
vgilc b8956ea3af Merge branch '2007-Monitorizacion-de-cluster-fase-2-migrate-mr' into 'develop'
drop agents foreign keys in tcluster tables - #2007

See merge request artica/pandorafms!1460
2018-04-30 13:16:48 +02:00
enriquecd 6affae9872 drop agents foreign keys in tcluster tables - #2007 2018-04-30 13:06:08 +02:00
vgilc 8f3c1c9c56 Merge branch 'ent-1624-extension-chrome-de-eventos-desactualizada-2' into 'develop'
Changed version and description in Event Chrome Extensions

See merge request artica/pandorafms!1458
2018-04-30 12:48:43 +02:00
vgilc 1fdb90f075 Merge branch 'fixed-csv-export-events-secondary-groups' into 'develop'
[Events] Fixed csv export after secondary groups

See merge request artica/pandorafms!1459
2018-04-30 12:47:53 +02:00
fermin831 57c928ec8a [Events] Fixed csv export after secondary groups 2018-04-30 12:38:29 +02:00
fermin831 41e66a271f Changed version and description in Event Chrome Extensions 2018-04-30 12:12:49 +02:00
artica 235f20ef86 Auto-updated build strings. 2018-04-30 00:01:56 +02:00
artica 9b1d62f999 Auto-updated build strings. 2018-04-29 00:02:00 +02:00
artica a1fa3a4ee8 Auto-updated build strings. 2018-04-28 00:01:34 +02:00
vgilc 3855e4c378 Merge branch '2225-Vista_de_monitores_no_filtra_por_grupo_Metaconsola' into 'develop'
fixed minor error in monitors view metaconsole filter group

See merge request artica/pandorafms!1457
2018-04-27 12:04:43 +02:00
nramon d44b079785 Merge branch '2007-Monitorizacion-de-cluster-fase-2-API-CLI' into 'develop'
Change API and flags in cluster manager - #2007

See merge request artica/pandorafms!1456
2018-04-27 11:37:56 +02:00
daniel 27aa2a4632 fixed minor error in monitors view metaconsole filter group 2018-04-27 11:07:54 +02:00
enriquecd d92dc1a2b0 Change API and flags in cluster manager - #2007 2018-04-27 11:06:29 +02:00
artica 7252b8f172 Auto-updated build strings. 2018-04-27 00:01:31 +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