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

17110 Commits

Author SHA1 Message Date
daniel 3fbd9adc38 fixed graph 2018-04-24 13:19:24 +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
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
vgilc 1bc89ecd10 Merge branch '2126-Bloqueo-o-error-de-acceso-a-usuarios-sin-permisos-dev' into 'develop' 
Added profile check in login

See merge request artica/pandorafms!1433
 2018-04-18 11:08:32 +02:00
danielmaya 0cf5cc4b1a Added profile check in login 2018-04-18 10:54:51 +02:00
fermin831 38fc81da52 Replace ellipsis character in Linux inventory plugin 2018-04-18 10:34:19 +02:00
danielmaya e6dc7799c8 Fixed issue in dashboard with firefox 2018-04-18 10:30:24 +02:00
artica 3c8914a331 Auto-updated build strings. 2018-04-18 00:01:29 +02:00
fermin831 3a47c3a8fb [Visual console] Update position when change advanced options 2018-04-17 19:08:30 +02:00
vgilc bb2b086364 Merge branch '1905-Conteos-y-paginacion-incorrecta-en-vista-de-eventos-dev' into 'develop' 
Added checking user tags in event list

See merge request artica/pandorafms!1428
 2018-04-17 16:26:31 +02:00
vgilc 2f2db81263 Merge branch '2054-Operaciones-masivas-de-edición-de-módulos-de-una-politica-dev' into 'develop' 
Added massive edit policy modules

See merge request artica/pandorafms!1423
 2018-04-17 16:26:02 +02:00
vgilc 77a8e5f856 Merge branch '2178-Herencia-de-estado-de-consolas-visuales-dev' into 'develop' 
Fixed static graph with unknown status in visual map

See merge request artica/pandorafms!1424
 2018-04-17 16:24:51 +02:00
vgilc 725bbb7d2d Merge branch '2179-Permisos-avanzados-de-LDAP-dev' into 'develop' 
Fixed atributtes ldap

See merge request artica/pandorafms!1425
 2018-04-17 16:24:20 +02:00
vgilc 12451fa63b Merge branch 'ent-2104-gis-tooltip-improvements' into 'develop' 
Ent 2104 gis tooltip improvements

See merge request artica/pandorafms!1414
 2018-04-17 16:23:38 +02:00
vgilc 981fa839b5 Merge branch 'ent-1793-Etiquetas-de-las-graficas-con-decimales' into 'develop' 
Fixed Y-axis label decimals

See merge request artica/pandorafms!1429
 2018-04-17 16:23:12 +02:00
vgilc 778be05874 Merge branch 'ent-1902-sql-error' into 'develop' 
Elimina un error SQL al obtener noticias

See merge request artica/pandorafms!1415
 2018-04-17 16:22:44 +02:00
vgilc d0458e0194 Merge branch 'ent-2102-graph-error' into 'develop' 
Ent 2102 - Error SQL Graphs meta

See merge request artica/pandorafms!1416
 2018-04-17 16:22:19 +02:00
vgilc 4e102e12da Merge branch 'ent-2129-Ventana-SNMP-walk-muy-pequena' into 'develop' 
Fixed size snmp walk modal

See merge request artica/pandorafms!1427
 2018-04-17 16:21:15 +02:00
vgilc 7367eb7d29 Merge branch '2073-revision-del-sla' into 'develop' 
2073 revision del sla

See merge request artica/pandorafms!1379
 2018-04-17 16:20:37 +02:00
vgilc 51df9802f7 Merge branch 'ent-2112-Error-ACLs-en-los-Graph-Container' into 'develop' 
[Graph container] Display only the containers group can see (ACL)

See merge request artica/pandorafms!1426
 2018-04-17 16:19:58 +02:00
vgilc 775501a11b Merge branch 'ent-2161-metaconsole-static-graph-status-bug' into 'develop' 
Fixed the static graph status into the Metaconsole Visual Maps

See merge request artica/pandorafms!1421
 2018-04-17 16:19:07 +02:00
fermin831 4d78256937 Fixed Y-axis label decimals 2018-04-17 11:54:52 +02:00
danielmaya 70bf27f48a Added checking user tags in event list 2018-04-17 10:10:18 +02:00
artica bc251e58df Auto-updated build strings. 2018-04-17 00:01:28 +02:00
fermin831 c889e5138e Fixed size snmp walk modal 2018-04-16 18:14:08 +02:00
fermin831 c1e463824b [Graph container] Display only the containers group can see (ACL) 2018-04-16 17:37:27 +02:00
danielmaya ee115f1d0e Fixed atributtes ldap 2018-04-16 17:17:59 +02:00
fermin831 03c7e96ee2 Removed unwanted code 2018-04-16 12:27:00 +02:00
fermin831 a190bd992b [SLA] Modified availability SLA to include priority modes 2018-04-16 12:25:02 +02:00