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

13813 Commits

Author SHA1 Message Date
fbsanchez ba676e13e3 Added autoconfiguration menu 2018-07-23 20:11:35 +02:00
fbsanchez 079b2437b6 Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-23 18:06:02 +02:00
vgilc a5c1caab1f Merge branch '2229-Gestion_de_politicas_desde_API' into 'develop' 
add functions api for policies node

See merge request artica/pandorafms!1626
 2018-07-23 17:31:09 +02:00
daniel 9236285a98 remove functions api to api enterprise because policies is enterprise 2018-07-23 17:04:07 +02:00
vgilc 44ad0c31d5 Merge branch '2248-5730-Añadir-elementos-a-la-vista-de-eventos' into 'develop' 
Add items to the view events

See merge request artica/pandorafms!1623
 2018-07-23 11:22:23 +02:00
daniel f05ba656e1 add functions api for policies node 2018-07-23 08:59:08 +02:00
artica 63cc7aab9c Auto-updated build strings. 2018-07-23 00:01:23 +02:00
artica 435d44a1ca Auto-updated build strings. 2018-07-22 00:01:23 +02:00
artica f67616a807 Auto-updated build strings. 2018-07-21 00:01:27 +02:00
vgilc 749a19eec5 Merge branch 'ent-2076-ue-mejoras-en-gestion-de-politicas-desde-metaconsola' into 'develop' 
Fixed question mark hel header meta

See merge request artica/pandorafms!1625
 2018-07-20 14:43:42 +02:00
fermin831 3c99242508 Improved metaconsole sync (added centralized management) 2018-07-20 14:10:31 +02:00
fermin831 cb0351de99 Fixed question mark hel header meta 2018-07-20 12:29:34 +02:00
artica 0557ecb508 Auto-updated build strings. 2018-07-20 00:01:30 +02:00
manuel.montes b922066a72 Add items to the view events 2018-07-19 18:04:50 +02:00
vgilc 99773177dd Merge branch 'ent-2076-ue-mejoras-en-gestion-de-politicas-desde-metaconsola' into 'develop' 
Resolve "[UE] Mejoras en gestion de politicas desde Metaconsola"

See merge request artica/pandorafms!1604
 2018-07-19 14:22:40 +02:00
fermin831 e762b7322c Fixed detection disabled on serialized ajax get groups and clean call in metaconsole 2018-07-19 13:49:51 +02:00
fermin831 2d45c0b39f Added serialized to groups ajax calls 2018-07-19 11:02:20 +02:00
danielmaya c09a91b284 Added server-name in tautoconfig_rules 2018-07-19 08:35:33 +02:00
artica a21892855a Auto-updated build strings. 2018-07-19 00:01:32 +02:00
fermin831 58d092ec03 Delete unwanted column 2018-07-18 19:21:58 +02:00
fermin831 b6347072c5 Migrate sql meta policies (add id_node) 2018-07-18 19:19:57 +02:00
fermin831 223d13edd5 Change the policy agents to work on serialized way 2018-07-18 14:50:09 +02:00
manuel.montes 0621b5a3ac Fixed in Custom graphs 2018-07-18 13:33:53 +02:00
fbsanchez 5515f409d8 Fixed SLA percent, also using truncate instead round in SLA outputs 2018-07-18 11:10:55 +02:00
artica 9dafb653b4 Auto-updated build strings. 2018-07-18 00:01:27 +02:00
daniel f317f3e736 fixed errors in graph min and max warning and critical for edition module 2018-07-17 11:26:25 +02:00
fermin831 001861b746 Hide policy edition on centralized management on node 2018-07-17 08:51:39 +02:00
artica fc885be510 Auto-updated build strings. 2018-07-17 00:01:27 +02:00
daniel 9e8126542a fixed minor error 2018-07-16 18:15:04 +02:00
daniel 713fbd5368 fixed visual errors and console 2018-07-16 17:01:50 +02:00
artica 74eecf1a96 Auto-updated build strings. 2018-07-16 00:01:21 +02:00
artica 04dfd30f76 Auto-updated build strings. 2018-07-15 00:01:27 +02:00
artica 4a7c329481 Auto-updated build strings. 2018-07-14 00:01:32 +02:00
fermin831 025cc01830 Added missing dependencie in network component 2018-07-13 12:33:24 +02:00
daniel 2c9a613f1b fixed visual erros in metapolicies 2018-07-13 12:30:18 +02:00
fermin831 d0b6c9775f Addapted modules edition to metaconsole 2018-07-13 11:56:37 +02:00
artica 98025188cb Auto-updated build strings. 2018-07-13 00:01:29 +02:00
daniel 23ef9c8f53 Merge remote-tracking branch 'origin/develop' into ent-2076-ue-mejoras-en-gestion-de-politicas-desde-metaconsola 2018-07-12 14:49:59 +02:00
daniel 86c21aea5d merge develop 2018-07-12 13:37:46 +02:00
Ramon Novoa f4847d5347 Add the _rca_ macro to the help files. 2018-07-12 12:37:42 +02:00
fbsanchez fa4446bb91 Fixed min/max absolute values in charts 2018-07-12 12:34:05 +02:00
daniel 78f17b9970 fixed error bbdd new field CPS in tpolicy_modules 2018-07-12 09:48:51 +02:00
artica 8ab387581d Auto-updated build strings. 2018-07-12 00:01:56 +02:00
daniel 000e8b6457 fixed errors in forecast charts 2018-07-11 13:47:00 +02:00
daniel 6d04b2450b fixed baseline graph 2018-07-11 12:33:28 +02:00
vgilc 2625bee2d4 Merge branch '2450-Falsa_representacion_en_graficas_sin_TIP_5' into 'develop' 
fixed minor errors in legend charts

See merge request artica/pandorafms!1609
 2018-07-11 08:50:05 +02:00
artica 1df52459a6 Auto-updated build strings. 2018-07-11 00:01:28 +02:00
daniel fce669ae21 fixed minor errors in legend charts 2018-07-10 17:53:19 +02:00
fermin831 aaf8173b8a Added is_central_policies function 2018-07-10 17:49:46 +02:00
daniel b36bf868b1 fixed minor error 2018-07-10 16:13:17 +02:00
daniel 73a5a63956 fixed errors delete modules sla_value and sla for services 2018-07-10 16:12:14 +02:00
alejandro-campos 6ec4787c38 added order filters to events table 2018-07-10 15:11:18 +02:00
daniel e24b10ad74 fixed minor error debugPrint in function graph 2018-07-10 14:40:48 +02:00
artica 49afdcb4fd Auto-updated build strings. 2018-07-10 00:01:27 +02:00
daniel 4c7c248671 Merge remote-tracking branch 'origin/develop' into 2226-Analisis_de_causa_raiz_en_alertas_mediante_los_servicios 2018-07-09 09:44:33 +02:00
daniel 69852a1c2a mejora el rendimiento en consulta sql 2018-07-09 09:23:19 +02:00
vgilc 49ed21b93d Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos-pandorafms3' into 'develop' 
Reverse changes for non-administrators users

See merge request artica/pandorafms!1603
 2018-07-09 08:54:03 +02:00
vgilc a573f69593 Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos-pandorafms2' into 'develop' 
Reverse changes for non-administrators users

See merge request artica/pandorafms!1600
 2018-07-09 08:53:51 +02:00
artica f86465bcf3 Auto-updated build strings. 2018-07-09 00:01:23 +02:00
artica c6390f683e Auto-updated build strings. 2018-07-08 00:01:22 +02:00
artica d30559fffc Auto-updated build strings. 2018-07-07 00:01:26 +02:00
Alejandro Gallardo Escobar de58fe7b90 Fixes 2018-07-06 14:03:05 +02:00
manuel.montes 0d7acdc574 Reverse changes for non-administrators users 2018-07-06 12:02:34 +02:00
daniel c26a50e838 fixed errors in graphs 2018-07-06 11:56:38 +02:00
manuel.montes 9f9728fd03 Reverse changes for non-administrators users 2018-07-06 10:22:57 +02:00
vgilc 8d639b031e Merge branch 'ent-2405-recuento-y-paginado-vista-agent-detail' into 'develop' 
Fixed filter count in agent detail.

See merge request artica/pandorafms!1591
 2018-07-06 09:40:15 +02:00
artica 48e3c547c9 Auto-updated build strings. 2018-07-06 00:01:26 +02:00
vgilc f244dd79be Merge branch '2450-Falsa_representación_en_graficas_sin_TIP' into 'develop' 
2450 falsa representación en graficas sin tip

See merge request artica/pandorafms!1593
 2018-07-05 12:05:09 +02:00
daniel 0dd39f1f00 fixed errors in graph slice for uncompresed 2018-07-05 11:52:52 +02:00
artica d1f8aa31fd Auto-updated build strings. 2018-07-05 00:01:27 +02:00
fbsanchez 23a9cf7842 Minor fixes 2018-07-04 19:59:31 +02:00
fbsanchez c800061bc2 Autoconfiguration v1 2018-07-04 18:39:06 +02:00
fbsanchez 9e028873be Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-04 18:38:36 +02:00
danielmaya b186c82a7b Fixed json in functions_api 2018-07-04 15:57:08 +02:00
artica 0ab4ef50c5 Auto-updated build strings. 2018-07-04 00:01:24 +02:00
vgilc 610ec8fd66 Merge branch '2075-Proteccion_en_cascada_de_servicios_2' into 'develop' 
fixed errors cps in meta and others

See merge request artica/pandorafms!1585
 2018-07-03 16:50:48 +02:00
vgilc 6c695999e8 Merge branch '2416-Popup-feo-y-erroneo-editor-de-modulos' into 'develop' 
changed width of changing snmp module name alert popup

See merge request artica/pandorafms!1589
 2018-07-03 14:03:29 +02:00
fermin831 d1eaef6f6d Fixed filter count in agent detail. 2018-07-03 13:22:23 +02:00
manuel.montes 54a74c43d0 Remove the 'All Groups' option in non-administrators users 2018-07-03 13:11:00 +02:00
alejandro-campos 0cf3aa2e78 changed width of changing snmp module name alert popup 2018-07-03 12:50:28 +02:00
fbsanchez f430b8998f Added DB changes to support ProvisioningServer 2 2018-07-03 12:01:37 +02:00
daniel e765e4fe08 Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios_2 2018-07-03 08:55:41 +02:00
artica 95678f706b Auto-updated build strings. 2018-07-03 00:01:23 +02:00
daniel 0f9b7d13ee fixed errors cps in meta and others 2018-07-02 17:14:31 +02:00
vgilc 0040837f4b Merge branch 'ent-2375-servidores-sin-referenciar' into 'develop' 
Fixed new servers (migration and autoprovision) icons

See merge request artica/pandorafms!1564
 2018-07-02 09:48:28 +02:00
artica 61668b4cd7 Auto-updated build strings. 2018-07-02 00:01:25 +02:00
artica 960bc8db31 Auto-updated build strings. 2018-07-01 00:01:26 +02:00
artica bf72f8ec3e Auto-updated build strings. 2018-06-30 00:01:30 +02:00
slerena 6da5736a4b Merge branch '2354-Fallo-grafico-tarta-consola-visual' into 'develop' 
Changed function that gets pie graphs module data to print no data to show message in such case

See merge request artica/pandorafms!1581
 2018-06-29 15:44:29 +02:00
slerena 56ff8706a5 Merge branch '2396-fallo-acl-en-vista-de-cluster' into 'develop' 
2396-fallo-acl-en-vista-de-cluster

See merge request artica/pandorafms!1582
 2018-06-29 15:43:42 +02:00
slerena 5095ddaf3f Merge branch '2285-La-ordenacion-de-elementos-en-las-custom-graph-no-se-aplica-en-las-graficas' into 'develop' 
fixed bug when ordering module list in custom graphs

See merge request artica/pandorafms!1583
 2018-06-29 15:37:11 +02:00
alejandro-campos c400b261ff changed size of changing snmp module name alert popup 2018-06-29 14:57:40 +02:00
alejandro-campos ae1f7a4814 fixed bug when ordering module list in custom graphs 2018-06-29 14:35:49 +02:00
manuel.montes 5436c64800 Merge branch '2396-fallo-acl-en-vista-de-cluster' of https://brutus.artica.lan:8081/artica/pandorafms into 2396-fallo-acl-en-vista-de-cluster 2018-06-29 08:52:46 +02:00
artica d41df8335c Auto-updated build strings. 2018-06-29 00:01:29 +02:00
alejandro-campos 05f38eb9e1 Changed function that gets pie graphs module data to print no data to show message in such case 2018-06-28 18:28:18 +02:00
manuel.montes 4f23407ea8 Fixed for group All 2018-06-28 17:03:02 +02:00
daniel 1b1bc4aa2e add new column evaluate_sla into table tservice 2018-06-28 13:34:55 +02:00
artica 73dca0446c Auto-updated build strings. 2018-06-28 00:01:34 +02:00
slerena ce61639101 Merge branch '2413-No-se-ven-graficas-en-informes-de-avg-ni-min-value' into 'develop' 
fixed bug to draw charts in custom reports

See merge request artica/pandorafms!1577
 2018-06-27 18:13:03 +02:00
slerena 8f294cfe47 Merge branch '2411-Eventos-custom-fields' into 'develop' 
changed selectboxes width to fit length of the fields

See merge request artica/pandorafms!1575
 2018-06-27 18:12:15 +02:00
slerena 905e6bfc56 Merge branch '2075-Proteccion_en_cascada_de_servicios' into 'develop' 
2075 proteccion en cascada de servicios

See merge request artica/pandorafms!1578
 2018-06-27 18:10:41 +02:00
alejandro-campos 25d252a8a4 fixed bug to draw charts in custom reports 2018-06-27 17:24:40 +02:00
daniel 65eb4744a1 fixed boolean graph no zoom 2018-06-27 16:17:17 +02:00
daniel 85897315cd cascade protection services 2018-06-27 15:03:46 +02:00
alejandro-campos 2a2a322f55 changed selectboxes width to fit length of the fields 2018-06-27 11:10:47 +02:00
artica f4ef0110b2 Auto-updated build strings. 2018-06-27 00:01:31 +02:00
slerena 415f23ea14 Merge branch 'ent-2334-intracom-snmp-trap-forwarding-improvement' into 'develop' 
Recover critical status the SNMPTrap on SNMP console actions

See merge request artica/pandorafms!1567
 2018-06-26 22:40:02 +02:00
slerena b40770b944 Merge branch '2036-Cambiar-color-de-la-marca-de-Quiet' into 'develop' 
Image for mode Quiet changed to blue - #2036

See merge request artica/pandorafms!1573
 2018-06-26 22:37:50 +02:00
daniel 84f1cf95eb Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios 
Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php
 2018-06-26 13:44:16 +02:00
daniel 998eacc630 fixed minor errors in graph remove avgOnly 2018-06-26 13:26:37 +02:00
daniel 76cd718262 add cps for agent, module, policies and bulk opertaion 2018-06-26 13:23:12 +02:00
tatiana.llorente@artica.es 965c6c839b Image for mode Quiet changed to blue - #2036 2018-06-26 12:31:23 +02:00
artica b1b486143f Auto-updated build strings. 2018-06-26 00:01:30 +02:00
slerena c0cd577fb4 Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos' into 'develop' 
Fixed bug in pandorafms

See merge request artica/pandorafms!1523
 2018-06-25 19:05:26 +02:00
slerena 40d7ef4fcb Merge branch 'ent-2281-5786-paratus-crear-modulos-snmp-proc-con-la-api' into 'develop' 
Modified set create_snmp_module to permit create remote_snmp_proc modules

See merge request artica/pandorafms!1563
 2018-06-25 19:04:49 +02:00
slerena 7c7f593425 Merge branch '2357-Problema-side-menu' into 'develop' 
Fixed submenu2 in functions_menu.php

See merge request artica/pandorafms!1533
 2018-06-25 19:03:11 +02:00
slerena 0520fba0f8 Merge branch '2330-No-funciona-seleccionar-todos-los-objetos-en-plantillas-de-módulos' into 'develop' 
Fixed checkbox select in manage_network_templates.php

See merge request artica/pandorafms!1516
 2018-06-25 19:02:48 +02:00
slerena 2284d6d3fa Merge branch 'ent-2320-pete-grupos-secundarios' into 'develop' 
Fixed secondary groups configuration in agent creation

See merge request artica/pandorafms!1545
 2018-06-25 19:01:58 +02:00
slerena 053f037d0d Merge branch '2312-No-funciona-búsqueda-en-consolas-visuales-dev' into 'develop' 
Changed permission AW for VR in visual console

See merge request artica/pandorafms!1537
 2018-06-25 19:01:21 +02:00
slerena 17cb7337f5 Merge branch '2300-Eventos-de-respuesta-personalizada' into 'develop' 
Fixed bug in ajax/events.php

See merge request artica/pandorafms!1561
 2018-06-25 19:00:58 +02:00
slerena 082e9c6185 Merge branch '1781-Animación-visual-para-ventanas-modales-de-ayuda-2' into 'develop' 
Add visual animation to popup modal windows - #1781

See merge request artica/pandorafms!1284
 2018-06-25 18:59:34 +02:00
slerena 99271a4822 Merge branch '1797-Menú-desplegable-de-gráficas-miniaturizado' into 'develop' 
fixed resize in stat_win.php

See merge request artica/pandorafms!1503
 2018-06-25 18:59:09 +02:00
slerena 8320e5cc53 Merge branch '2128-Botón-de-"Crear-complementos-de-red"-en-SNMP-browser' into 'develop' 
Fixed the online-style of submit

See merge request artica/pandorafms!1496
 2018-06-25 18:58:17 +02:00
slerena c0e63bd1a0 Merge branch '2346-Pequeño-fallo-Consola-VIsual' into 'develop' 
Fixed visual bug

See merge request artica/pandorafms!1566
 2018-06-25 18:57:13 +02:00
slerena 2576d32471 Merge branch '2341-Pequeño-fallo-visual-Real-time-Graph' into 'develop' 
Fixed bug in realtime_graphs.php

See merge request artica/pandorafms!1543
 2018-06-25 18:56:24 +02:00
slerena 79131b938e Merge branch '2410Opción-show-in-two-columns-en-informes' into 'develop' 
Deleted 'show in two columns' option

See merge request artica/pandorafms!1569
 2018-06-25 18:55:47 +02:00
slerena aa540614dd Merge branch 'ent-2409-Agregar-agentes-en-concreto-en-Mapas-Gis' into 'develop' 
Fixed add particular agents to GIS layers

See merge request artica/pandorafms!1568
 2018-06-25 18:55:17 +02:00
slerena b80dc2b1bb Merge branch 'ent-2404-agentes-repetidos-en-el-tree-view-en-los-grupos-secundarios' into 'develop' 
Fixed tree view meta secondary groups repeated agents

See merge request artica/pandorafms!1559
 2018-06-25 18:54:52 +02:00
slerena e2f9e25dd9 Merge branch '2396-fallo-acl-en-vista-de-cluster' into 'develop' 
Fixed bug in cluster view

See merge request artica/pandorafms!1571
 2018-06-25 18:54:26 +02:00
slerena 5d6a10a7a0 Merge branch 'ent-2388-TMB-operacion-masiva-de-eventos-en-proceso' into 'develop' 
Added in progres selected button to events view

See merge request artica/pandorafms!1565
 2018-06-25 18:54:00 +02:00
slerena dddde8fba1 Merge branch '2194-IDs-de-SO-en-Manage-agents' into 'develop' 
Fixed select in modificar_agente.php

See merge request artica/pandorafms!1520
 2018-06-25 18:52:38 +02:00
slerena 288a751417 Merge branch 'pandora_enterprise#2419' into 'develop' 
Added regex to LDAP advanced permissions

See merge request artica/pandorafms!1570
 2018-06-25 18:51:15 +02:00
daniel 7dc60b65a2 Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios 2018-06-25 15:46:36 +02:00
daniel eaf5abd476 fixed keep alive bool type module 100 2018-06-25 15:35:12 +02:00
daniel 6be7881514 fixed error in zoom graphs boolean 2018-06-25 15:09:57 +02:00
daniel ff934e28fa fixed minor error 2018-06-25 15:09:01 +02:00
daniel 36293cba3a Revert "fixed error ingraph bool zoom" 
This reverts commit 1ca35be41e.
 2018-06-25 15:07:12 +02:00
daniel 1ca35be41e fixed error ingraph bool zoom 2018-06-25 15:05:07 +02:00
manuel.montes 6f25c229e3 Fixed bug in cluster view 2018-06-25 12:35:39 +02:00
daniel e39b03511d Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios 2018-06-25 08:29:45 +02:00
artica 17e5c39a67 Auto-updated build strings. 2018-06-25 00:01:24 +02:00
artica 5d4a4eebc4 Auto-updated build strings. 2018-06-24 00:01:25 +02:00
Kike 7ed5077c01 Added regex to LDAP advanced permissions 2018-06-23 14:24:32 +02:00
artica b467eea16b Auto-updated build strings. 2018-06-23 00:01:25 +02:00
daniel 92fbc86ed9 add cascade protection in services 2018-06-22 14:59:17 +02:00
fermin831 dcb73f844e Revert "Revert "Recover critical status the SNMPTrap on SNMP console actions"" 
This reverts commit 16cff75242.
 2018-06-22 13:37:36 +02:00
fermin831 2719cadc61 Revert "Fixed agents display on GIS maps" 
This reverts commit 6a53e924bb.
 2018-06-22 13:37:17 +02:00
manuel.montes 02822bcfd6 Deleted 'show in two columns' option 2018-06-22 13:36:38 +02:00
fermin831 e19f116637 Fixed add particular agents to GIS layers 2018-06-22 13:33:04 +02:00
fermin831 16cff75242 Revert "Recover critical status the SNMPTrap on SNMP console actions" 
This reverts commit 8ef8f31f67.
 2018-06-22 13:30:10 +02:00
fermin831 6a53e924bb Fixed agents display on GIS maps 2018-06-22 13:28:39 +02:00
artica 0a61a5f5d3 Auto-updated build strings. 2018-06-22 00:01:24 +02:00
fermin831 8ef8f31f67 Recover critical status the SNMPTrap on SNMP console actions 2018-06-21 19:27:33 +02:00
manuel.montes 09ed3fa7c3 Fixed visual bug 2018-06-21 14:21:22 +02:00
daniel 17b726d7a0 changes bd for mr, schema and migrate and update tocken mr 2018-06-21 14:15:27 +02:00
artica f40e3883ec Auto-updated build strings. 2018-06-21 00:01:26 +02:00
fermin831 288d2bafb6 Added in progres selected button to events view 2018-06-20 18:56:44 +02:00
fermin831 251c308d8c Fixed new servers (migration and autoprovision) icons 2018-06-20 18:31:52 +02:00
fermin831 1ccd7d1fd7 Modified set create_snmp_module to permit create remote_snmp_proc modules 2018-06-20 17:07:13 +02:00
artica c97530a4ee Updated version and build strings. 2018-06-20 15:19:39 +02:00
Ramon Novoa dc103988ae Fix the current enterprise package number. 2018-06-20 15:18:50 +02:00
Ramon Novoa 7a026bd1c0 Update the MR version. 2018-06-20 14:40:47 +02:00
manuel.montes 11dc746eca Fixed bug in ajax/events.php 2018-06-20 13:31:23 +02:00
nramon cf38c82653 Merge branch '2294-requisitos-api-cluster' into 'develop' 
Minor fixes in api responses

See merge request artica/pandorafms!1560
 2018-06-20 13:03:11 +02:00
fbsanchez d0796a3e09 Minor fixes in api responses 2018-06-20 12:58:46 +02:00
slerena 5efc2d220e Merge branch '2294-requisitos-api-cluster' into 'develop' 
Fixed some acl issues in cluster api methods

See merge request artica/pandorafms!1557
 2018-06-20 12:33:27 +02:00
nramon d960d6f89b Merge branch '2290-seguridad-en-la-api-3' into 'develop' 
2290 seguridad en la api 3

See merge request artica/pandorafms!1556
 2018-06-20 12:23:55 +02:00
fbsanchez 1f06a15d7c Fixed get_cluster_status 2018-06-20 12:20:34 +02:00
fbsanchez ed5381ec69 Merge remote-tracking branch 'origin/develop' into 2294-requisitos-api-cluster 2018-06-20 12:20:13 +02:00
slerena 293fbce674 Merge branch '1827-Graficas-TIP-eje-x-dev' into 'develop' 
fixed minor error default graph for pdf or email 320

See merge request artica/pandorafms!1558
 2018-06-20 12:15:16 +02:00
fermin831 a072cd34de Fixed tree view meta secondary groups repeated agents 2018-06-20 12:09:32 +02:00
daniel 2ae0dc6c52 fixed minor error default graph for pdf or email 320 2018-06-20 11:54:03 +02:00
fbsanchez b75ee89397 Fixed some acl issues in cluster api methods 2018-06-20 11:49:15 +02:00
fermin831 85f84f4211 [API ACL] Fixed meta create_event 2018-06-20 11:46:57 +02:00
slerena 1948cdd3e4 Merge branch '1827-Graficas-TIP-eje-x-dev' into 'develop' 
1827 graficas tip eje x dev

See merge request artica/pandorafms!1555
 2018-06-20 11:36:58 +02:00
daniel aa4f13d17a fixed errors in graphs 2018-06-20 11:31:43 +02:00
artica 2c6ad942cb Auto-updated build strings. 2018-06-20 00:01:24 +02:00
fermin831 56042f596d [ACL API] Fixed groups in event validations 2018-06-19 19:53:54 +02:00
fbsanchez 73567f1859 Trying to adjust graph render sizes 2018-06-19 19:19:38 +02:00
fbsanchez b625f2e5c8 Changed GET to POST in web2image 2018-06-19 19:07:36 +02:00
danielmaya 4214577eea Added new token for static graph height 2018-06-19 18:27:04 +02:00
slerena 41d57dd18a Merge branch 'ent-1859-database-changes' into 'develop' 
Added a new inventory module to the database

See merge request artica/pandorafms!1552
 2018-06-19 18:23:44 +02:00
slerena c168ad1be0 Merge branch '2290-seguridad-en-la-api-3' into 'develop' 
[API ACL] Fixed the rest of reopened node API ACL fails

See merge request artica/pandorafms!1554
 2018-06-19 17:18:39 +02:00
fermin831 0d2ee35e0f [API ACL] Fixed the rest of reopened node API ACL fails 2018-06-19 17:05:23 +02:00
slerena b56cb02761 Merge branch '2290-seguridad-en-la-api-3' into 'develop' 
2290 seguridad en la api 3

See merge request artica/pandorafms!1546
 2018-06-19 16:23:09 +02:00
fermin831 2fc6b86251 [ACL API] Undo refix 2018-06-19 16:14:25 +02:00
Alejandro Gallardo Escobar faccbec12d Added a new inventory module to the database 2018-06-19 15:55:33 +02:00
nramon 3614e5caeb Merge branch '1827-Graficas-TIP-eje-x-no-mantiene-ratio-dev' into 'develop' 
Fixed graph with https

See merge request artica/pandorafms!1551
 2018-06-19 15:04:42 +02:00
danielmaya 9bff4f28f4 Fixed graph with https 2018-06-19 15:00:39 +02:00
Alejandro Gallardo Escobar 04aad98871 Added the database changes for the custom fields of the remote inventory modules 2018-06-19 13:49:36 +02:00
fermin831 c11a8b3d2e Merge branch 'develop' into 2290-seguridad-en-la-api-3 2018-06-19 13:38:13 +02:00
fermin831 a5112929fd [API ACL] Fixed get agent_module_last_value (and related) and get policies 2018-06-19 13:37:37 +02:00
nramon 28b84be756 Merge branch '2294-requisitos-api-cluster' into 'develop' 
Modified functions api

See merge request artica/pandorafms!1548
 2018-06-19 11:32:06 +02:00
artica 8d39712be4 Auto-updated build strings. 2018-06-19 00:01:25 +02:00
fbsanchez e0fa002cd2 Modified functions api 2018-06-18 21:11:53 +02:00
fermin831 fec5299179 Fixed secondary groups configuration in agent creation 2018-06-18 13:46:13 +02:00
danielmaya 14f4070558 Changed link to phantomjs configuration 2018-06-18 13:22:20 +02:00
manuel.montes 7da00bca8a Fixed bug in realtime_graphs.php 2018-06-18 11:12:38 +02:00
nramon 72f9bc754c Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' 
1827 graficas tip eje x no mantiene ratio

See merge request artica/pandorafms!1542
 2018-06-18 10:48:34 +02:00
artica b29dd4eb8a Auto-updated build strings. 2018-06-18 00:01:21 +02:00
artica a47f7b7e97 Auto-updated build strings. 2018-06-17 00:01:21 +02:00
artica 2926c7789e Auto-updated build strings. 2018-06-16 00:01:21 +02:00
artica 76bc8ad280 Auto-updated build strings. 2018-06-15 00:01:24 +02:00
daniel 651347897c fixed minor error add link phantomjs 2018-06-14 20:15:04 +02:00
daniel 7d4a29cbe2 fixed errors in meta and windows 2018-06-14 19:19:58 +02:00
daniel 9e229e6228 fixed minor errors 2018-06-14 18:14:54 +02:00
daniel 80ddcbe1b6 fixed security error phantomjs 2018-06-14 16:47:23 +02:00
fermin831 d3c0b0473f Fixed module functions ACL check 2018-06-14 16:04:50 +02:00
daniel 85570dedba Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-14 12:17:31 +02:00
daniel 46c23f9deb fixed minor errors in graphs: tree, labels, tocken meta 2018-06-14 12:17:16 +02:00
vgilc 3a4f3a38be Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' 
1827 graficas tip eje x no mantiene ratio

See merge request artica/pandorafms!1538
 2018-06-14 10:12:05 +02:00
daniel 9d2f069d20 fixed font and font-family 2018-06-14 10:02:26 +02:00
artica d7f59d4fd3 Auto-updated build strings. 2018-06-14 00:01:24 +02:00
daniel fc970b9b8e fixed minor error 2018-06-13 19:22:22 +02:00
daniel 05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
danielmaya 9af4b25f31 Changed permission AW for VR in visual console 2018-06-13 17:28:03 +02:00
vgilc 822fc05258 Merge branch '2042-HA_cluster-dev' into 'develop' 
2042 ha cluster dev

See merge request artica/pandorafms!1524
 2018-06-13 16:14:29 +02:00
danielmaya 6f689f0d0e Added mr 17 and update migrate 2018-06-13 15:39:31 +02:00
daniel 92204c4ec2 fixed minor error alert phantomjs 2018-06-13 11:55:05 +02:00
daniel 7fe88d761e remove setup resolution graph 2018-06-13 11:32:03 +02:00
daniel ef95d9c68c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-13 11:03:51 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
artica 7a26aa3b38 Auto-updated build strings. 2018-06-13 00:01:26 +02:00
manuel.montes c8b5ecad06 Fixed submenu2 in functions_menu.php 2018-06-12 17:41:46 +02:00
artica e4461273ab Updated version and build strings. 2018-06-12 17:28:15 +02:00
daniel e07da64c5d fixed minor errors size stat-win 2018-06-12 16:54:45 +02:00
daniel 57503a2d3b Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-12 16:37:57 +02:00
daniel dfc43a35ab fixed errors grid black in vbars and hbars 2018-06-12 16:37:41 +02:00
vgilc d42d8a2fd7 Merge branch 'ent-2010-error-de-ACLs-en-custom-graphs-y-reports-2' into 'develop' 
Always group All in custom reports and custom graphs

See merge request artica/pandorafms!1528
 2018-06-12 15:56:09 +02:00
daniel 25942907cf Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-12 15:46:41 +02:00
daniel 2d6fa8d0e0 fixed errors graphs 2018-06-12 15:46:05 +02:00
fermin831 68ae6e3112 Always group All in custom reports and custom graphs 2018-06-12 13:06:42 +02:00
enriquecd 632fc26be2 Thermometer graph only for intracom - #2214 2018-06-12 12:39:05 +02:00
vgilc 2ff7e496bd Merge branch '2294-Requisitos-API-cluster-3' into 'develop' 
Add mode 1 and empty ip on create agent by API  new_cluster, and get cluster items by API - #2294

See merge request artica/pandorafms!1526
 2018-06-12 12:32:31 +02:00
vgilc 24ec62b807 Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' 
fixed errors agent access and other fix

See merge request artica/pandorafms!1525
 2018-06-12 12:13:46 +02:00
enriquecd fd368aec86 Add mode 1 and empty ip on create agent by API new_cluster, and get cluster items by API - #2294 2018-06-12 12:08:57 +02:00
daniel 6eba3250da fixed errors agent access and other fix 2018-06-12 12:08:04 +02:00
vgilc fdbe03ef83 Merge branch 'ent-639-add-user-defined-timezones' into 'develop' 
Add user defined timezones

See merge request artica/pandorafms!1462
 2018-06-12 10:20:31 +02:00
danielmaya f9be72b34a added image 2018-06-12 10:14:59 +02:00
Alejandro Gallardo Escobar a258dc7e43 Fixed a message 2018-06-12 10:04:33 +02:00
vgilc c389661057 Merge branch '2290-seguridad-en-la-api' into 'develop' 
2290 seguridad en la api

See merge request artica/pandorafms!1513
 2018-06-12 09:09:26 +02:00
artica 5574ddd205 Auto-updated build strings. 2018-06-12 00:01:39 +02:00
fermin831 2150f58ec0 [API ACL] Metaconsole functions 2018-06-11 18:39:19 +02:00
manuel.montes bcd937b1ba Fixed bug in pandorafms 2018-06-11 17:42:12 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
fermin831 c949ab3dc7 Merge branch 'develop' into 2290-seguridad-en-la-api 
Conflicts:
	pandora_console/include/functions_api.php
 2018-06-11 15:55:48 +02:00
vgilc 5e1c88cd45 Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' 
fixed minor errorstime graphs

See merge request artica/pandorafms!1522
 2018-06-11 15:39:58 +02:00
fermin831 e3fbef309b [API ACL] Added ACL to set functions 2018-06-11 15:39:58 +02:00