tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
17,761 Commits 34 Branches 30 Tags
Commit Graph

17761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alejandro Gallardo Escobar
cc06dfe876 Added a new GIS map source type called WMS 2018-04-27 12:17:42 +02:00
fermin831
1bf0fa6e02 Moved tentacle configuration file 2018-04-27 12:13:01 +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
fermin831
3526ea25f9 Updated windows tentacle to 0.6.2 version 2018-04-27 10:21:07 +02:00
daniel
30dc841bae custom graph 2018-04-27 10:03:05 +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
artica
7252b8f172 Auto-updated build strings. 2018-04-27 00:01:31 +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
fermin831
45daae5b64 Now tentacle server errors are more descriptives 2018-04-26 13:35:05 +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
daniel
2a81703a68 fixed minor error custom graph 2018-04-26 10:24:37 +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
5429ebb8de Removed unreachable host from events responses 2018-04-25 19:04:52 +02:00
fermin831
71d5be46a6 [SLA] Fixed full not init and ignored availability and SLA reports 2018-04-25 16:59:33 +02:00
fermin831
9c9f75152d Added custom confirm dialog to events 2018-04-25 12:34:33 +02:00
fermin831
675e8deb47 Added function display_confirm_dialog with custom dialog 2018-04-25 12:32:58 +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
daniel
3fbd9adc38 fixed graph 2018-04-24 13:19:24 +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
fermin831
112bbac527 Added id to in progress status bin icon (disabled) 2018-04-24 12:11:04 +02:00
fermin831
e09e1c4cd4 Fixed in progress event button in metaconsole and other problems 2018-04-24 11:54:45 +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
fermin831
a21eaafc61 Added in progress button to events list 2018-04-23 18:41:44 +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
daniel
e7a8706434 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/graphs/flot/pandora.flot.js
	pandora_console/include/graphs/functions_flot.php
 2018-04-23 12:21:11 +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