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

13428 Commits

Author SHA1 Message Date
artica 418d8b12b7 Updated version and build strings. 2018-04-19 16:05:39 +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
fermin831 32f96c45ba [Events] Added ID to export CSV 2018-04-18 19:50:13 +02:00
fermin831 0b23f25455 [Events] Fixed csv export after secondary groups 2018-04-18 19:47:20 +02:00
fermin831 8fc8c25548 Fixed login query params deletion (now it does not delete) 2018-04-18 17:58:44 +02:00
fermin831 70bf2dd49f Added percentile to custom graphs containers 2018-04-18 16:01:38 +02:00
fermin831 fdc70572ff Fixed module prediction agent creation 2018-04-18 15:00:56 +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 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
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
danielmaya 8f89611d7c Fixed static graph with unknown status in visual map 2018-04-16 10:57:26 +02:00
artica cb5c3016dc Auto-updated build strings. 2018-04-16 00:01:23 +02:00
artica 2ab79ce5e4 Auto-updated build strings. 2018-04-15 00:01:24 +02:00
artica 738b1fdd68 Auto-updated build strings. 2018-04-14 00:01:27 +02:00
fermin831 075a89a8b7 [SLA] Fixed availability graphs and SLA calculation 2018-04-13 15:02:54 +02:00
fermin831 38ea279b96 [Availability graph] Coloured the main data 2018-04-13 14:22:47 +02:00
fermin831 0c537b8178 [SLA] Added the time_downtime and time_unknown like OK time to SLA calculation 2018-04-13 13:22:32 +02:00
fermin831 95980456e9 [SLA] Added define to status (err, ok, downtimes, ignored, unknown and not init) 2018-04-13 10:05:11 +02:00
artica 9f2aa451fb Auto-updated build strings. 2018-04-13 00:01:25 +02:00
fermin831 9a55ee7d2a [SLA] Added priority mode to report style (only interface) 2018-04-12 15:42:53 +02:00
danielmaya 6799f5f504 Added massive edit policy modules 2018-04-12 15:42:39 +02:00
artica 92fb527ff8 Auto-updated build strings. 2018-04-12 00:01:23 +02:00
Alejandro Gallardo Escobar d49cfea9f4 Fixed the static graph status shown into the Metaconsole Visual Maps 2018-04-11 16:38:21 +02:00
fermin831 fb4be3cddf [SLA] Substitute the downplanned color 2018-04-11 16:22:16 +02:00
vgilc 0333accb5b Merge branch '2015-implementacion-de-grupos-secundarios-2' into 'develop' 
Do not use cache only when secondary groups are used in tree view

See merge request artica/pandorafms!1420
 2018-04-11 11:08:57 +02:00
fermin831 1e1e6f5069 Do not use cache only when secondary groups are used in tree view 2018-04-11 11:04:21 +02:00
vgilc e4e814a752 Merge branch '2015-implementacion-de-grupos-secundarios-2' into 'develop' 
Deleted unwanted traces

See merge request artica/pandorafms!1419
 2018-04-11 09:52:37 +02:00
fermin831 28a3d3d8cc Deleted unwanted traces 2018-04-11 09:47:20 +02:00
vgilc a958dc98f3 Merge branch '2015-implementacion-de-grupos-secundarios-2' into 'develop' 
2015 implementacion de grupos secundarios 2

See merge request artica/pandorafms!1418
 2018-04-11 09:09:33 +02:00
artica 1ecfd4669e Auto-updated build strings. 2018-04-11 00:01:26 +02:00
fermin831 8ff29293a5 Avoid to add alert to total count in treeview 2018-04-10 18:20:51 +02:00
fermin831 9c82e3651a Avoid cache tree view 2018-04-10 17:59:34 +02:00
Alejandro Gallardo Escobar d22b2ba588 Bugfix 2018-04-10 11:37:17 +02:00
Alejandro Gallardo Escobar 1fbc8f01cc Added the alerts fired to the popup of the agent selected into the GIS map 2018-04-10 11:04:29 +02:00
artica a67a4288a1 Updated version and build strings. 2018-04-10 10:18:25 +02:00
fermin831 1f79326e97 [Secondary groups] Added SQL changes to migrate scripts 2018-04-10 09:38:00 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios 
Conflicts:
	pandora_console/include/class/Tree.class.php
 2018-04-10 09:29:14 +02:00
artica e2b52a76f7 Auto-updated build strings. 2018-04-10 00:01:23 +02:00
fermin831 678aa02ed7 [Secondary groups] Added hint to node group view 2018-04-09 20:18:37 +02:00
fermin831 4e1f57a43a Hide the realtime statistic group view 2018-04-09 19:47:29 +02:00
fermin831 6310b499be [Secondary groups] Added secondary groups to meta monitor status view 2018-04-09 19:10:19 +02:00
fermin831 361bd23093 [Secondary groups] Added secondary groups to node monitor detail 2018-04-09 18:56:05 +02:00
fermin831 5dec329941 [Secondary groups] Added secondary groups to agent view 2018-04-09 18:23:06 +02:00
Alejandro Gallardo Escobar 6ccf1ef27a The GIS tooltip is now a modal view 2018-04-09 17:19:29 +02:00
Alejandro Gallardo Escobar d1608400f9 Avoid the news search for users without groups 2018-04-09 17:17:01 +02:00
fermin831 f6e03c0faa [Secondary groups] Added secondary groups in some events queries 2018-04-09 17:01:39 +02:00
fermin831 29a4e29cb9 [Secondary groups] Fixed display only secondary agents in tree view 2018-04-09 15:13:01 +02:00
Alejandro Gallardo Escobar 1dc8fec69a Added the number of not validated & critical events to the popup of the agent selected into the GIS map 2018-04-09 13:47:29 +02:00
fermin831 f8d900ee75 [Secondary groups] Fixed select all group on Profiles/Groups assigned 2018-04-09 13:37:55 +02:00
fermin831 8da6eca4ab [Secondary groups] Fixed get agents function to works properly with groups view 2018-04-09 12:40:52 +02:00
fermin831 9972252a3f [Secondary groups] Fixed agent filter on node tree view 2018-04-09 12:40:11 +02:00
fermin831 89181b6f42 [Secondary groups] Added secondary groups to meta tree view 2018-04-09 12:33:03 +02:00
artica 6bf0371a85 Auto-updated build strings. 2018-04-09 00:01:22 +02:00
artica 77f26cf08f Auto-updated build strings. 2018-04-08 00:01:21 +02:00
artica dcd57a421a Auto-updated build strings. 2018-04-07 00:01:33 +02:00
fermin831 310c2a6f15 [Secondary groups] Added secondary groups in tree view 2018-04-06 17:19:03 +02:00
fermin831 4c71450b6a [Secondary Groups] Added secondary agents to metaconsole group view 2018-04-06 14:08:36 +02:00
fermin831 3463cd1ea2 [Secondary Groups] Added secondary agents to node group view 2018-04-06 12:04:08 +02:00
artica f517edca1c Auto-updated build strings. 2018-04-06 00:01:25 +02:00
danielmaya e4f24b2452 Fixed json in audit log 2018-04-05 16:57:26 +02:00
vgilc 6a948c238e Merge branch '1454-Mostrar-o-no-agentes-y-módulos-no-iniciados-en-tree-view' into 'develop' 
Filter by not init agents and modules in tree view - #1454

See merge request artica/pandorafms!1397
 2018-04-05 16:35:12 +02:00
enriquecd fa82f45d7d Fix not init counters final - #1454 2018-04-05 16:11:24 +02:00
artica 4b36d86e48 Auto-updated build strings. 2018-04-05 00:01:24 +02:00
fermin831 c88e6e703a [Secondary groups] Fixed duplicated agents in group view and agent detail 2018-04-04 11:17:08 +02:00
artica f863184454 Auto-updated build strings. 2018-04-04 00:01:24 +02:00
fbsanchez dcaae924fc Decreased limit to reduceText call in some graphs 2018-04-03 16:41:21 +02:00
fermin831 e2d61d5794 [Secondary groups] Added update cache on server 2018-04-03 15:36:33 +02:00
vgilc 2b608bf914 Merge branch '2080-Informe_de_tipo_Network_Interface_con_TIP_no_funciona_3' into 'develop' 
fixed minor error fullscale in report interfaces metaconsole

See merge request artica/pandorafms!1406
 2018-04-03 13:05:25 +02:00
daniel cac55053e3 fixed minor error fullscale in report interfaces metaconsole 2018-04-03 12:42:54 +02:00
danielmaya 7327998985 Fixed raw_text undefined in networkmap 2018-04-03 12:25:51 +02:00
vgilc b92ec56140 Merge branch '1878-Cluster-Añadir-opciones-de-permisos-ACL-para-clster-view-y-que-no-aparezca-grupo-all-en-el-creador-de-clusters-4' into 'develop' 
Fix cluster ACL - #1878

See merge request artica/pandorafms!1400
 2018-04-03 09:48:42 +02:00
vgilc c006ee227f Merge branch '2026-Quitar-el-parpadeo-del-reloj-digital-fix' into 'develop' 
Not blink separatos points in visual console digital clock - #2026

See merge request artica/pandorafms!1401
 2018-04-03 09:35:58 +02:00
vgilc 90280fd943 Merge branch '2030-Esconder-los-campos-de-tipo-password-dentro-de-los-custom-fields-del-agente-4' into 'develop' 
Hide password custom fields in agent view - #2030

See merge request artica/pandorafms!1399
 2018-04-03 09:35:22 +02:00
vgilc 3b418faeb2 Merge branch '2098-5480-Error-SQL-vista-de-informes-por-informes-creados-a-través-wizard' into 'develop' 
Fix reports made by wizard - #2098

See merge request artica/pandorafms!1402
 2018-04-03 09:34:51 +02:00
artica 337822a608 Auto-updated build strings. 2018-04-03 00:01:22 +02:00
daniel c2ba4e20db fixed minor error report network interfaces nodo 2018-04-02 12:23:47 +02:00
artica 1ab18d6c2d Auto-updated build strings. 2018-04-02 00:01:21 +02:00
artica 4e5d2477ac Auto-updated build strings. 2018-04-01 00:01:22 +02:00
artica 727b69462a Auto-updated build strings. 2018-03-31 00:01:21 +02:00
artica 7976e0461f Auto-updated build strings. 2018-03-30 00:01:21 +02:00
artica 9ea7dc0dbb Auto-updated build strings. 2018-03-29 00:01:22 +02:00
enriquecd 5418bbd099 Fix reports made by wizard - #2098 2018-03-28 18:54:15 +02:00
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
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
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
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
fermin831 db16a797f3 [Secondary Groups] Assign secondary groups by AJAX on agent edit view 2018-03-22 13:34:15 +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
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 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
vgilc d60a0dbc02 Merge branch '1922-Error-en-paginado-de-eventos-dev' into 'develop' 
Fixed module filter in view events

See merge request artica/pandorafms!1314
 2018-03-22 09:59:07 +01:00
vgilc 6b49624bc9 Merge branch 'ent-1965-5340-Bug-Visualizacion-elementos-Consola-Visual' into 'develop' 
[Visual Console] Changed simple select by group select in restricted group…

See merge request artica/pandorafms!1369
 2018-03-22 09:58:37 +01:00
vgilc f8d58cbe1f Merge branch 'ent-1971-error-en-validacion-de-alertas' into 'develop' 
[Alerts view] Fixed validation in alerts view

See merge request artica/pandorafms!1371
 2018-03-22 09:57:58 +01:00
vgilc 9e4d8e12b3 Merge branch 'ent-1978-5343-Bugs-SQL-Graphs-Custom-Reports' into 'develop' 
[Pie charts] Adding more space in legend

See merge request artica/pandorafms!1366
 2018-03-22 09:57:28 +01:00
artica 243e24e56e Auto-updated build strings. 2018-03-22 00:01:23 +01:00
enriquecd f5e8d4f90f Help icon in module creator - #2081 2018-03-21 19:18:24 +01:00
fermin831 26da63610a [Secondary Groups] Change secondary groups from selected to non selected in agent edit view 2018-03-21 18:32:14 +01:00
enriquecd d21ca7eb5f Add API cluster functions - #2007 2018-03-21 18:20:59 +01:00
danielmaya 364daa8579 Added group_id in cron job(mr and migrate) 2018-03-21 16:51:08 +01:00
fermin831 efe420edfb [Secondary groups] Added view in agent edition 2018-03-21 16:27:01 +01:00
vgilc 928113bf4c Merge branch '2090-Cambio-id_os-a-100-a-sistema-operativo-asociado-a-cluster' into 'develop' 
Fix cluster id_os bug - #2090

See merge request artica/pandorafms!1384
 2018-03-21 15:49:06 +01:00
fbsanchez 835e791ef1 Fixed label shortener in hbar 2018-03-21 13:40:15 +01:00
artica 199b81a79c Auto-updated build strings. 2018-03-21 00:01:22 +01:00
fermin831 2cc1f04ced [Secondary groups] Modified configure user to manage secondary groups 2018-03-20 16:51:41 +01:00
enriquecd 19b566d4c2 Fix cluster id_os bug - #2090 2018-03-20 15:42:37 +01:00
enriquecd a7531bbcb3 Fix migrate clusters id_os bug - #1748 2018-03-20 15:34:23 +01:00
fermin831 f493583fee [Secondary Groups] Added tagent_secondary_group table and tusuario_perfil.is_secondary field 2018-03-20 13:29:17 +01:00
artica 972e394a8e Auto-updated build strings. 2018-03-20 00:01:22 +01:00
enriquecd 43e374f454 Fix id_os 100 cluster - #1748 2018-03-19 19:09:45 +01:00
enriquecd 8690aa908a Cluster monitoring 2 - #2007 2018-03-19 10:05:29 +01:00
artica 25efa085ce Auto-updated build strings. 2018-03-19 00:01:29 +01:00
artica c4ddcc9332 Auto-updated build strings. 2018-03-18 00:01:21 +01:00
artica ea5ef0bc42 Auto-updated build strings. 2018-03-17 00:01:23 +01:00
daniel d881e0028d fixed errors detected SLA 2018-03-16 12:03:51 +01:00
artica a17c7c3e34 Auto-updated build strings. 2018-03-16 00:01:21 +01:00
fermin831 1001240cf4 [SNMP] Fixed translation of custom mibs, added custom description data and change style of OID details 2018-03-15 16:03:46 +01:00
fermin831 458938b751 Fixed mr 13 2018-03-15 14:32:51 +01:00
fermin831 e9932daf19 [Tree view] Substitute items by groups 2018-03-15 12:06:07 +01:00
artica 270a43fbeb Auto-updated build strings. 2018-03-15 00:01:23 +01:00
fermin831 a8cb366508 [Alerts view] Fixed validation in alerts view 2018-03-14 17:24:34 +01:00
enriquecd 2663cc1be5 Translations 720 - #1670 2018-03-14 13:59:44 +01:00
fermin831 690ad81a62 [Visual Console] Changed simple select by group select in restricted group advanced fieldin static graph 2018-03-14 13:31:54 +01:00
fermin831 0c3b6fbf83 [Visual console] Fixed icon preview 2018-03-14 10:25:27 +01:00
vgilc 387280e97f Merge branch '1873-autoprovisionamiento-de-agentes' into 'develop' 
1873 autoprovisionamiento de agentes

See merge request artica/pandorafms!1342
 2018-03-14 09:12:07 +01:00
artica fb56ebfbff Auto-updated build strings. 2018-03-14 00:01:25 +01:00
fermin831 d38df88c79 [Pie charts] Adding more space in legend 2018-03-13 19:07:31 +01:00
Ramon Novoa 42107017bf Merge remote-tracking branch 'origin/develop' into 1873-autoprovisionamiento-de-agentes 2018-03-13 18:40:51 +01:00
Ramon Novoa 560f18f3a2 Add tables for agent provisioning to the schema. 2018-03-13 18:01:04 +01:00
vgilc 8af4272152 Merge branch '1923-Migrar_agentes_desde_metaconsola' into 'develop' 
1923 migrar agentes desde metaconsola

See merge request artica/pandorafms!1364
 2018-03-13 17:47:52 +01:00
fermin831 ff2098bb7f [Autoprovision] Removed agents_count column from tprovisioning 2018-03-13 17:29:39 +01:00
danielmaya 9fa26f9fcb Changes in networkmap_links_to_js_links 2018-03-13 16:40:49 +01:00
fbsanchez 9b9b46ac65 1923 added new tables to MR and migrate sql script 2018-03-13 16:38:09 +01:00
fbsanchez ed282c6a9b 1923 Added required methods for migrationserver 2018-03-13 16:35:13 +01:00
daniel a3dceac0a0 Merge remote-tracking branch 'origin/develop' into 1923-Migrar_agentes_desde_metaconsola 2018-03-13 16:00:44 +01:00
fermin831 9b60d94d59 [Autoprovision] Changed hostname by alias in database 2018-03-13 13:39:30 +01:00
enriquecd 753d10920a Hide password custom fields data in agent custom fileds section - #2030 2018-03-13 12:46:27 +01:00
artica af5d70bd7d Updated version and build strings. 2018-03-13 11:06:33 +01:00
artica 24ff4014ff Auto-updated build strings. 2018-03-13 00:01:27 +01:00
fbsanchez 7d58734ef2 MigrationServer aux util 2018-03-12 19:39:28 +01:00
daniel c8118c2e08 fixed minor error 2018-03-12 19:31:24 +01:00
fermin831 775f2b1a55 [Console images] Added toggle images 2018-03-12 17:57:18 +01:00
fermin831 74f899736f [Snapshots] Fixed snapshots in metaconsole. Changed functionallity but preserve all way to work 2018-03-12 15:17:59 +01:00
daniel 2fdc520a36 Merge remote-tracking branch 'origin/develop' into 1923-Migrar_agentes_desde_metaconsola 2018-03-12 13:07:34 +01:00
artica a66a7fde49 Auto-updated build strings. 2018-03-12 00:01:29 +01:00
artica 6235fc381a Auto-updated build strings. 2018-03-11 00:01:29 +01:00
artica 4af8841c29 Auto-updated build strings. 2018-03-10 00:01:37 +01:00
daniel 2605064c02 minor change 2018-03-09 15:33:51 +01:00
danielmaya 64b62edd90 Fixed shorten axis units 2018-03-09 10:18:02 +01:00
artica 5a13db5a18 Auto-updated build strings. 2018-03-09 00:01:42 +01:00
fermin831 f0dbb78950 [Autoprovision] Added order and removed type from tprovisioning 2018-03-08 14:22:10 +01:00
artica f3f0d7771c Updated version and build strings. 2018-03-08 12:26:57 +01:00
daniel 1f3b95f6d1 check problems migration 2018-03-08 12:09:03 +01:00
enriquecd 97bcaec720 Not blink separator dots for digital clocks - #2026 2018-03-08 11:58:31 +01:00
artica 05fab2100d Updated version and build strings. 2018-03-08 09:47:20 +01:00
artica 89da7843ee Auto-updated build strings. 2018-03-08 00:01:34 +01:00
vgilc 5335b69b61 Merge branch '1776-3833-no-aparecen-eventos-en-la-aplicacion-de-android-v6' into 'pandora_6.0' 
Resolve "[ #3833] No aparecen Eventos en la aplicación de android v6"

See merge request artica/pandorafms!1352

(cherry picked from commit 6b7a22e47c)

c7e7ea1e Removed unwanted output from the api.php responses
 2018-03-07 16:54:18 +01:00
enriquecd 9a4ea41942 Add search bar to cluster agent aggregator - #1866 2018-03-07 16:18:35 +01:00
artica a0eff331c5 Auto-updated build strings. 2018-03-07 00:01:39 +01:00
enriquecd 80fb004c96 Fix visual console list groups filter - #2011 2018-03-06 17:07:02 +01:00
danielmaya dc5a8b8425 Fixed refresh in metaconsole 2018-03-06 13:13:40 +01:00
artica 98b2aa2c8e Auto-updated build strings. 2018-03-06 00:01:36 +01:00
fermin831 cd74015b95 [Autoprovision] Create tprovisioning and tprovisioining rules tables 2018-03-05 12:39:56 +01:00
vgilc efdb784ffd Merge branch 'ent-2009-Backgrounds-Consola-Visual-azul' into 'develop' 
[Visual console] Added background images

See merge request artica/pandorafms!1343
 2018-03-05 12:05:18 +01:00
vgilc 88d000379a Merge branch 'fix-modules_selection_mode_changes_not_update_module_list' into 'develop' 
Make change of "modules selection mode" in scheduled downtime editor updates module list

See merge request artica/pandorafms!1334
 2018-03-05 09:15:30 +01:00
artica a01d65fb89 Auto-updated build strings. 2018-03-05 00:01:32 +01:00
artica 5db4a03117 Auto-updated build strings. 2018-03-04 00:01:30 +01:00
artica a3c3b1c699 Auto-updated build strings. 2018-03-03 00:01:43 +01:00
fermin831 33e76d176a [Visual console] Added background images 2018-03-02 14:21:18 +01:00
fermin831 af6f251995 [ACL] Now only RM can delete custom graphs 2018-03-02 13:14:48 +01:00
daniel 78bb12f015 fixed errors select all agent where module common 2018-03-02 12:55:03 +01:00
fermin831 28755d90a0 [Tree View] Fixed snapshot preview in metaconsole 2018-03-02 10:58:37 +01:00
vgilc 2b2c99cc42 Merge branch 'ent-1941-sql-charts' into 'develop' 
Ent 1941 sql charts

See merge request artica/pandorafms!1331
 2018-03-02 10:15:03 +01:00
KIKUCHI Koichiro a63a107f10 Cast $idAgents to array to prevent PHP warning 2018-03-02 17:33:19 +09:00
fermin831 d7cbcd012f [SQL Graph reports] Added dynamic height configuration option 2018-03-02 09:27:29 +01:00
artica 6f04665c72 Auto-updated build strings. 2018-03-02 00:01:32 +01:00
vgilc f42151710b Merge branch '1994-Fallo-en-la-paginación-de-las-consolas-visuales' into 'develop' 
Fix pagination in visual console list - #1994

See merge request artica/pandorafms!1335
 2018-03-01 17:28:33 +01:00
fermin831 52e6503018 [Vertical Bar Charts] Fixed strpos check 2018-03-01 17:07:55 +01:00
fermin831 b6688dda1c [SQL charts reports] Added top n report to set the maximum number of elements 2018-03-01 16:49:50 +01:00
enriquecd beac30513d Ad id_os cluster to tconfig_os - #2001 2018-03-01 16:17:26 +01:00
fermin831 6e62f4c023 [SQL Graphs] Added Max items form to top_n_value db column 2018-03-01 15:55:58 +01:00
enriquecd 095a703c6c Fix pagination in visual console list - #1994 2018-03-01 15:50:34 +01:00
fermin831 4719742ba2 [Pie Charts] Maximized the number of elements 2018-03-01 13:19:58 +01:00
fermin831 287d28de4e [Vertical Bar Charts] Preserve order after truncate label 2018-03-01 13:16:36 +01:00
fermin831 3359870c2f [SQL Charts] Added limit elements and some improves 2018-03-01 13:11:11 +01:00
fermin831 98b57ef642 [SQL charts] Added breadcrumbs to sql charts 2018-03-01 12:41:17 +01:00
fermin831 d0bf68888e [SQL charts] Fixed SQL vertical chart 2018-03-01 12:02:08 +01:00
KIKUCHI Koichiro 022eddf43f Make change of "modules selection mode" updates module list 2018-03-01 19:56:38 +09:00
enriquecd 38c6099664 Fix advanced options section in donut grpahs of visual consoles - #1899 2018-03-01 10:39:54 +01:00
daniel 738776ef7e merge develop 2018-03-01 10:13:55 +01:00
daniel 815e9c6759 fixed errors graph 2018-03-01 09:46:52 +01:00
vgilc bb313fc6c6 Merge branch '1844-Fixed-header-pisa-el-contenido-de-la-página' into 'develop' 
Change fixed header and fixed menu positions - #1844

See merge request artica/pandorafms!1328
 2018-03-01 09:24:42 +01:00
vgilc 6e601cf298 Merge branch 'ent-1900-Pagina-de-ayuda-de-Macros-alertas' into 'develop' 
[Console help] Fixed and revisted alert macros

See merge request artica/pandorafms!1329
 2018-03-01 09:23:52 +01:00
artica ddbe016266 Auto-updated build strings. 2018-03-01 00:01:47 +01:00
fermin831 6c6c9625fc [Console help] Fixed and revisted alert macros 2018-02-28 19:22:31 +01:00
enriquecd 18f3020785 Change fixed header and fixed menu positions - #1844 2018-02-28 19:02:54 +01:00
vgilc 5ef9e08770 Merge branch '1908-No-se-muestran-correctamente-las-gráficas-en-valores-con-decimales-dev' into 'develop' 
Fixed graph precision

See merge request artica/pandorafms!1327
 2018-02-28 15:59:17 +01:00
vgilc 9fb5341dd0 Merge branch '1868-Cluster-Filtrar-lista-y-creador-de-clusters-partir-de-los-grupos-accesibles-por-el-usuario' into 'develop' 
Filter clusters by groups - #1868

See merge request artica/pandorafms!1326
 2018-02-28 15:56:21 +01:00
danielmaya 610c5a5147 Updated MR and current_package_enterprise 2018-02-28 15:45:58 +01:00
danielmaya 9d36887a02 Fixed graph precision 2018-02-28 14:33:22 +01:00
enriquecd 8fce51a816 Filter clusters by groups - #1868 2018-02-28 14:32:35 +01:00
fermin831 e37768097f [Visual] Refixed help images on node 2018-02-28 12:16:43 +01:00
fermin831 6093f6a0d8 [Metaconsole] Fixed img broken links on metaconsole 2018-02-28 12:08:15 +01:00
vgilc 99d5da9dd3 Merge branch 'ent-1695-carrefour-pandora-fms-console-metaconsole-tree-view-conteo-de-los-elementos' into 'develop' 
[Console Tree view] Added counter

See merge request artica/pandorafms!1321
 2018-02-28 10:35:35 +01:00
vgilc b9f09f0f4f Merge branch 'ent-1768-4966-Se-ven-grupos-vacios-en-el-tree-view-cuando-tienen-parent' into 'develop' 
[Console Tree view] Removed empty childs

See merge request artica/pandorafms!1320
 2018-02-28 10:34:52 +01:00
vgilc 9f026a0b77 Merge branch '1988-Bug-Últimos-eventos-en-Vista-táctica-dev' into 'develop' 
Fixed list of latest events in tactical view

See merge request artica/pandorafms!1323
 2018-02-28 10:32:23 +01:00
danielmaya 7c5756a726 Fixed list of latest events in tactical view 2018-02-28 10:15:32 +01:00
daniel 3910b455ca fixed errors 2018-02-28 10:02:06 +01:00
daniel 7b47ea4c32 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-28 08:47:44 +01:00
daniel 51f22413a8 fixed errors in graphs 2018-02-28 08:46:51 +01:00
artica 789f908b08 Auto-updated build strings. 2018-02-28 00:01:39 +01:00
daniel d2390528ac fixed errors in graphs 2018-02-27 16:28:00 +01:00
fermin831 80ecb6f366 [Console Tree view] Added counter 2018-02-27 11:46:28 +01:00
fermin831 3fc010135b [Console Tree view] Removed empty childs 2018-02-27 11:04:49 +01:00
vgilc 85bc975606 Merge branch '1962-No-aparecen-las-alertas-en-la-vista-de-agente-dev' into 'develop' 
Fixed tags in alert list

See merge request artica/pandorafms!1318
 2018-02-27 09:39:46 +01:00
artica 892d17f65c Auto-updated build strings. 2018-02-27 00:02:10 +01:00
enriquecd 3ee2f8615f API and CLI apply template components - #983 2018-02-26 19:10:53 +01:00
danielmaya 25bed4d5c2 Fixed tags in alert list 2018-02-26 13:42:28 +01:00
vgilc 68886285bf Merge branch 'ent-1889-5231-no-se-ven-custom-graphs-con-ACL-Enterprise-habilitada' into 'develop' 
[Console Enterprise ACL] Added graph view to Reporting->Custom Graphs text name

See merge request artica/pandorafms!1316
 2018-02-26 13:13:44 +01:00
fermin831 7d84b3445d [Console ACL] Fixed permission on agent view when order arrows or search button is clicked 2018-02-26 12:59:26 +01:00
fermin831 37dfdc9021 [Console Enterprise ACL] Added graph view to Reporting->Custom Graphs text name 2018-02-26 11:15:11 +01:00
vgilc 7be55b4427 Merge branch '1735-Faltan-campos-en-edición-de-módulos-en-operaciones-masivas' into 'develop' 
Add new fileds to massive module edition - #1735

See merge request artica/pandorafms!1295
 2018-02-26 10:42:55 +01:00
vgilc d15c5b4519 Merge branch '1903-Autenticacion-erronea-en-modulos-web-Cepsa-2' into 'develop' 
Change web module options for curl commandos - #1903

See merge request artica/pandorafms!1304
 2018-02-26 10:41:59 +01:00
vgilc 362194c042 Merge branch 'ent-1875-no-se-pueden-borrar-macros-de-plugins-(server)' into 'develop' 
[Console Plugins][Console Recon Scripts] Fixed deletion macro

See merge request artica/pandorafms!1312
 2018-02-26 10:38:50 +01:00
vgilc 2313c4165e Merge branch '1933-TMB-eventos-varios' into 'develop' 
Fixed permission checks in event_acl

See merge request artica/pandorafms!1303
 2018-02-26 10:32:17 +01:00
vgilc 3f7e6f7ed3 Merge branch 'ent-1964-5331-error-de-ACLs-en-custom-graphs' into 'develop' 
Ent 1964 5331 error de ac ls en custom graphs

See merge request artica/pandorafms!1315
 2018-02-26 10:31:22 +01:00
vgilc 60575a6296 Merge branch '1942-Se-pierde-contenido-SQL-al-editar-dev' into 'develop' 
Fixed SQL report

See merge request artica/pandorafms!1313
 2018-02-26 10:23:24 +01:00
vgilc e129ebed37 Merge branch '1865-Selección-de-grupos-vista-de-agente/módulos-dev' into 'develop' 
1865 selección de grupos vista de agente/módulos dev

See merge request artica/pandorafms!1309
 2018-02-26 10:18:38 +01:00
vgilc b630eea754 Merge branch '1890-Operaciones-masivas-de-modulo-error-al-cambiar-unidad-dev' into 'develop' 
Fixed unit in bulk operations

See merge request artica/pandorafms!1300
 2018-02-26 10:18:11 +01:00
vgilc 45c500d2b1 Merge branch '1932-Filtrado-de-modulo-no-inicializados-operaciones-masivas-dev' into 'develop' 
Fixed status filter in bulk operation (modules)

See merge request artica/pandorafms!1308
 2018-02-26 10:14:42 +01:00
vgilc 1c56f18dd8 Merge branch '1921-Informe-de-tipo-Datos-Históricos-no-devuelve-info-de-base-de-datos-histórico-dev' into 'develop' 
Fixed connection to historical db

See merge request artica/pandorafms!1305
 2018-02-26 10:12:36 +01:00
fermin831 3b19d34bdc pandora_console/godmode/reporting/create_container.php 2018-02-26 10:12:29 +01:00
fermin831 058bdbe0d9 [Console] Fixed function users_can_manage_group_all 2018-02-26 10:12:14 +01:00
daniel 6b80ce6967 Merge remote-tracking branch 'origin/develop' into 1826-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-26 08:36:31 +01:00
artica 4b9dd69a0f Auto-updated build strings. 2018-02-26 00:01:52 +01:00
artica 6eb5f20d17 Auto-updated build strings. 2018-02-25 00:02:06 +01:00
artica 4dae0c97c0 Auto-updated build strings. 2018-02-24 00:01:59 +01:00
danielmaya 0fc33f3fa2 Fixed module filter in view events 2018-02-23 14:38:26 +01:00
daniel 40aa1a1175 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-23 14:31:30 +01:00
daniel 688acb8a4b fixed error graphs 2018-02-23 14:31:00 +01:00
artica effe16a275 Auto-updated build strings. 2018-02-23 00:01:27 +01:00
danielmaya a386fc9441 Fixed SQL report 2018-02-22 17:38:13 +01:00
fermin831 cef3cb2ae0 [Console Plugins][Console Recon Scripts] Fixed deletion macro 2018-02-22 16:13:25 +01:00
artica e752e26ee3 Auto-updated build strings. 2018-02-22 00:01:52 +01:00
daniel f69fb8a5f9 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-21 14:00:14 +01:00
daniel 41e55aa80f fixed minor error recorn view 2018-02-21 12:23:52 +01:00
daniel 4b654bd87d fixed errors grapgh 2018-02-21 11:54:24 +01:00
artica b4416c3c8a Updated version and build strings. 2018-02-20 16:40:43 +01:00
danielmaya d8ad6d514e Deleted console.log 2018-02-20 11:42:08 +01:00
danielmaya 17a1f8f390 Fixed group and agents filter in agents/modules 2018-02-20 11:36:30 +01:00
danielmaya 43ce57d5ed Fixed status filter in bulk operation (modules) 2018-02-20 10:03:23 +01:00
vgilc 3b94629f8f Merge branch '1403-Añadir-relojes-a-consolas-visuales-4622-com1-final' into 'develop' 
Change visual console digital clock colors - #1403

See merge request artica/pandorafms!1307
 2018-02-20 09:55:50 +01:00
artica cc088314b8 Auto-updated build strings. 2018-02-20 00:01:14 +01:00
enriquecd 9a525f3b2e Change visual console digital clock colors - #1403 2018-02-19 19:17:53 +01:00
danielmaya 17586472c8 Fixed connection to historical db 2018-02-19 12:04:02 +01:00
fbsanchez 49f1ad38e7 Event ACL check: Fix case multiple tags 2018-02-19 11:44:35 +01:00
fbsanchez 33089f2ff2 Minor fix in sql query 2018-02-19 11:34:07 +01:00
daniel 25242e19d4 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-19 09:32:42 +01:00
daniel 8be776e3ea fixed errrors graphs 2018-02-19 09:31:45 +01:00
artica 87ffae2d88 Auto-updated build strings. 2018-02-19 00:01:12 +01:00
artica fe1b911f02 Auto-updated build strings. 2018-02-18 00:01:12 +01:00
artica 5e6bcd34d8 Auto-updated build strings. 2018-02-17 00:01:14 +01:00
enriquecd 1a50cdf950 Change web module options for curl commandos - #1903 2018-02-16 15:35:46 +01:00
fbsanchez 407fbf450f Fixed permission checks in event_acl 
Added event response macro _group_custom_id_
 2018-02-16 15:09:37 +01:00
daniel b6798bf31c update flot.js 2018-02-16 13:41:31 +01:00
daniel d7a8283994 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-16 13:14:45 +01:00
artica 12ef611493 Auto-updated build strings. 2018-02-16 00:01:13 +01:00
fbsanchez df0480d12a Fixed dbuncompress short unknown events 2018-02-15 11:19:44 +01:00
vgilc e83201c457 Merge branch '1877-Cluster-Nuevo-diseño-del-cluster-view' into 'develop' 
Change cluster view design - #1877

See merge request artica/pandorafms!1301
 2018-02-15 09:42:46 +01:00
artica d90c6ef778 Auto-updated build strings. 2018-02-15 00:01:13 +01:00
enriquecd b51dc73cd6 Change cluster view design - #1877 2018-02-14 18:37:27 +01:00
danielmaya 32fa032faa Fixed unit in bulk operations 2018-02-14 12:41:32 +01:00
danielmaya a0c01ed57d Added safe_output for password in ldap 2018-02-14 10:57:08 +01:00
vgilc ef3ec1238a Merge branch '1867-errores-en-vista-de-eventos-con-usuario-con-tags-tmb' into 'develop' 
Fix avoid unexistent tag in tevent acl check

See merge request artica/pandorafms!1297
 2018-02-14 08:49:14 +01:00
artica 4fbf0820a4 Auto-updated build strings. 2018-02-14 00:01:13 +01:00
fbsanchez 1a986fccf6 Fixed SQL error on unscaped parameter 2018-02-13 17:34:09 +01:00
fbsanchez 92287916eb Fix avoid unexistent tag in tevent acl check 2018-02-13 16:48:36 +01:00
enriquecd a6b28cb40e Fix MR - #1748 2018-02-13 15:59:30 +01:00
enriquecd 7f7916a18d Add new fileds to massive module edition - #1735 2018-02-13 12:29:55 +01:00
artica 77392c70fc Updated version and build strings. 2018-02-13 11:51:11 +01:00
danielmaya a801ba4ac8 Fixed issue with copy and delete visual console 2018-02-13 11:40:43 +01:00
vgilc 4eafda8b15 Merge branch '1853-Modulos-DISABLED-en-critical-dev' into 'develop' 
Fixed disabled agent in bulk operations

See merge request artica/pandorafms!1292
 2018-02-13 09:35:39 +01:00
artica ab10cec7ba Auto-updated build strings. 2018-02-13 00:01:13 +01:00
danielmaya 95c92efc6f Fixed disabled agent in bulk operations 2018-02-12 17:14:54 +01:00
daniel b419f71e7c fixed error in acl combined profile 2018-02-12 16:10:29 +01:00
daniel 7bc9a6cfb5 graph 2018-02-12 13:29:25 +01:00
daniel 2417cae01d Merge branch 'develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-12 12:47:53 +01:00
daniel fabe14b7ea fixed error acl 2018-02-12 12:38:28 +01:00
daniel 615c61bfb2 fixed error acl perm PM in view agent 2018-02-12 11:14:04 +01:00
vgilc 8c7c3b2c09 Merge branch '1867-Errores_en_vista_de_eventos_con_usuario_con_tags' into 'develop' 
fixed error show events

See merge request artica/pandorafms!1287
 2018-02-12 08:52:04 +01:00
artica be4509cbf1 Auto-updated build strings. 2018-02-10 00:01:14 +01:00
daniel 74a8212032 fixed error show events 2018-02-09 14:20:49 +01:00
vgilc cdaa9e54e6 Merge branch '1571-Auditoría-del-sistema-información-de-los-cambios--4850-com1' into 'develop' 
Fix system log - #1571

See merge request artica/pandorafms!1286
 2018-02-09 08:31:23 +01:00
artica a6451d01e2 Auto-updated build strings. 2018-02-09 00:01:15 +01:00
enriquecd 75d48ef5fe Fix system log - #1571 2018-02-08 18:22:12 +01:00
daniel 3e0edcfda8 fixed errors in automatic combined graph meta with TIP 2018-02-08 17:07:54 +01:00
vgilc a5a6371270 Merge branch '1782-Esos-mapas-dev' into 'develop' 
Fixed colour bug in interface link

See merge request artica/pandorafms!1283
 2018-02-08 16:27:54 +01:00
danielmaya eb38025b19 Fixed colour bug in interface link 2018-02-08 16:20:29 +01:00
daniel af9e11ffca reconfigure charts 2018-02-08 15:47:12 +01:00
fbsanchez 571ed36276 Fixed image handle in data view 2018-02-08 14:17:08 +01:00
artica 4aab64be3d Auto-updated build strings. 2018-02-08 00:01:15 +01:00
vgilc 7d27d5f9a7 Merge branch '1403-Añadir-relojes-a-consolas-visuales-com1' into 'develop' 
Add clocks to visual console - #1403

See merge request artica/pandorafms!1145
 2018-02-07 17:14:09 +01:00
enriquecd a04f941a55 Merge branch 'develop' into 1403-Añadir-relojes-a-consolas-visuales-com1 
Conflicts:
	pandora_console/include/styles/pandora.css
 2018-02-07 17:02:15 +01:00
enriquecd 3b1c9e16a5 Fix pandroid index page - #1837 2018-02-07 16:56:21 +01:00
vgilc 7fd534c68f Merge branch 'MR-Sistema-de-gestión-de-Clusters' into 'develop' 
MR 12 clusters - #1748

See merge request artica/pandorafms!1280
 2018-02-07 15:41:43 +01:00
vgilc 9531984eac Merge branch '1748-Sistema-de-gestión-de-Clusters' into 'develop' 
1748 sistema de gestión de clusters

See merge request artica/pandorafms!1279
 2018-02-07 15:41:29 +01:00
enriquecd c0ee22dbd9 MR 12 clusters - #1748 2018-02-07 15:19:17 +01:00
vgilc f71135a08e Merge branch '1634-Static-graphs-siempre-muestran-5-decimales-tooltip' into 'develop' 
Change data precision visual styles token tooltip - #1634

See merge request artica/pandorafms!1278
 2018-02-07 13:59:57 +01:00
enriquecd ae471bb9f2 Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters 2018-02-07 13:52:44 +01:00
enriquecd f4b36a941c Change data precision visual styles token tooltip - #1634 2018-02-07 13:32:55 +01:00
enriquecd 6851af5943 Show correct info in visual console static graphs tooltips - #1634 2018-02-07 12:46:29 +01:00
artica 520e968500 Auto-updated build strings. 2018-02-07 00:01:14 +01:00
enriquecd 16f5b047d6 Filter config_prepare_session when use F5 balancer - #1882 2018-02-06 17:10:59 +01:00
enriquecd 5c0f0de1e4 Add module critical instructions when create an event - #1862 2018-02-06 16:01:32 +01:00
vgilc 26de4f6517 Merge branch 'ent-1644-fallo-en-ayuda-de-agent-mode' into 'develop' 
Fixed module definition help and add autodisable mode to bulk operations

See merge request artica/pandorafms!1129
 2018-02-06 12:17:14 +01:00
fermin831 d625652f9a Removed unwanted git merge traces (sorry) 2018-02-06 12:06:21 +01:00
fermin831 378186cadf Merge branch 'develop' into ent-1644-fallo-en-ayuda-de-agent-mode 
Conflicts:
	pandora_console/include/help/en/help_module_definition.php
	pandora_console/include/help/es/help_module_definition.php
	pandora_console/include/help/ja/help_module_definition.php
 2018-02-06 12:01:33 +01:00
vgilc fe4b1da1e3 Merge branch '1709-REDIRIS-Permitir-cambiar-links-en-pantalla-de-login' into 'develop' 
Make help and support links in login page customizables - #1709

See merge request artica/pandorafms!1201
 2018-02-06 11:57:23 +01:00
vgilc ae9db8bfd8 Merge branch '1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1' into 'develop' 
Change system audit log extended info to table format with change info - #1571

See merge request artica/pandorafms!1115
 2018-02-06 11:56:48 +01:00
vgilc b6d145992c Merge branch '1699-Ordenar-alfabéticamente-los-grupos-de-agentes' into 'develop' 
Alphabetic order in group selects - #1699

See merge request artica/pandorafms!1197
 2018-02-06 11:56:17 +01:00
vgilc 6194f84f13 Merge branch '1403-Db-changes-for-clocks-in-visual-console-MR' into 'develop' 
MR 12 changes for animation clock ticket - #1403

See merge request artica/pandorafms!1274
 2018-02-06 11:02:05 +01:00
vgilc acd1d97a94 Merge branch '1403-Añadir-relojes-a-consolas-visuales-4622-com1-dbchanges' into 'develop' 
Db changes for clocks in visual console - #1403

See merge request artica/pandorafms!1150
 2018-02-06 11:01:45 +01:00
enriquecd 65dccd3935 MR 12 changes for cnimation clock ticket - #1403 2018-02-06 10:52:49 +01:00
enriquecd ab24c3bf80 Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-02-06 10:46:59 +01:00
enriquecd bf1ad29b6b Merge branch 'develop' into 1699-Ordenar-alfabéticamente-los-grupos-de-agentes 
Conflicts:
	pandora_console/include/functions_users.php
 2018-02-06 10:43:33 +01:00
danielmaya fb39c1e39b Updated current_package_enterprise 719 and MR12 2018-02-06 10:27:07 +01:00
vgilc 0f01fcbd20 Merge branch 'Gráficas-generadas-en-Dynamic-dev' into 'develop' 
Added type graph selection in container graph

See merge request artica/pandorafms!1113
 2018-02-06 09:55:36 +01:00
danielmaya aea9d6ae36 resolved conflicts with containers and added mr12 2018-02-06 09:21:07 +01:00
artica be5adb4635 Auto-updated build strings. 2018-02-06 00:01:13 +01:00
vgilc 024367d601 Merge branch '1758-Error-tamaño-al-crear-elemento-de-imagen-en-consola-visual-dev' into 'develop' 
Fixed element size of type icon, group and static graph

See merge request artica/pandorafms!1247
 2018-02-05 16:39:02 +01:00
vgilc 48b6dc56fd Merge branch '1676-Tags-y-vista-de-alertas-2' into 'develop' 
Show all alerts when select all tags filter - #1676

See merge request artica/pandorafms!1271
 2018-02-05 15:57:40 +01:00
vgilc 160daa836c Merge branch 'develop' into '1758-Error-tamaño-al-crear-elemento-de-imagen-en-consola-visual-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2018-02-05 15:55:56 +01:00
vgilc ce43dd91d8 Merge branch '1301-Macro-para-nombre-de-evento-dev' into 'develop' 
Added _event_description_ in help_alert_macros.php

See merge request artica/pandorafms!1110
 2018-02-05 15:42:14 +01:00
enriquecd 064a9d58b9 Show all alerts when select all tags filter - #1676 2018-02-05 15:30:28 +01:00
danielmaya da8c1e4f46 resolved conflicts 2018-02-05 09:41:27 +01:00
artica b819f76c58 Auto-updated build strings. 2018-02-05 00:01:13 +01:00
artica 084bea27cc Auto-updated build strings. 2018-02-04 00:01:13 +01:00
artica 0614e5a492 Auto-updated build strings. 2018-02-03 00:01:14 +01:00
enriquecd d59289db62 Change builder style - #1748 2018-02-02 14:56:33 +01:00
enriquecd 47f0a90cab Show not init monitors - #1748 2018-02-02 14:10:03 +01:00
enriquecd 768e6e605f Fix bugs - #1748 2018-02-02 13:05:36 +01:00
daniel 63e5d23288 change xasis to time 2018-02-02 12:25:23 +01:00
danielmaya 1f47f2f1a9 Added refresh in cluster_view 2018-02-02 11:49:53 +01:00
artica 3c6e71dbed Auto-updated build strings. 2018-02-02 00:01:18 +01:00
enriquecd 88fddf3032 Add permissions - #1748 2018-02-01 17:49:37 +01:00
enriquecd e1669ded9d Change branch to enterprise - #1748 2018-02-01 11:35:23 +01:00
enriquecd 389c6aeada Change last update text when not init - #1748 2018-02-01 10:54:17 +01:00
enriquecd 4858213fd1 Add tcp port to AA modules - #1748 2018-02-01 10:42:11 +01:00