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

13575 Commits

Author SHA1 Message Date
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
vgilc e40bbbd24d Merge branch 'update-console-translation-for-japanese' into 'develop' 
Updated Japanese translation.

See merge request artica/pandorafms!1521
 2018-06-11 15:37:34 +02:00
daniel abad4f4f4b fixed minor errorstime graphs 2018-06-11 15:35:04 +02:00
daniel adf9e4d1fe fixed minor errors 2018-06-11 13:53:10 +02:00
daniel b25332d014 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-11 08:24:07 +02:00
Junichi Satoh 5d727a1e8f Updated Japanese translation. 2018-06-11 15:02:42 +09:00
artica 10e95bf447 Auto-updated build strings. 2018-06-10 00:01:23 +02:00
artica 14dd0e222b Auto-updated build strings. 2018-06-09 00:01:27 +02:00
fermin831 eda5898031 [API ACL] More setters 2018-06-08 15:20:15 +02:00
daniel f85a8b513a fixed errors 2018-06-08 14:30:15 +02:00
manuel.montes 17b2b01e7a Fixed select in modificar_agente.php 2018-06-08 14:09:59 +02:00
danielmaya 7dfd3fcfa1 changes in tdatabase 2018-06-08 13:21:33 +02:00
daniel eb7cdc7c90 fixed errors in graph delete to image pdf 2018-06-08 08:58:18 +02:00
artica 937cfb7d1e Auto-updated build strings. 2018-06-08 00:01:27 +02:00
Fermin 9bf6102ac6 [ACL API] Added ACL in some set functions 2018-06-07 19:45:54 +02:00
Fermin 054b915846 [ACL API] Fixed get planned_downtimes_items and added ACL to more the rest of get functions 2018-06-07 13:11:40 +02:00
Fermin 2e1bb2ac9c Merge branch 'develop' into 2290-seguridad-en-la-api 
Conflicts:
	pandora_console/include/functions_api.php
 2018-06-07 11:38:37 +02:00
Fermin 2a9a7b931a Fixed visualconsole status modules and agents in metaconsole 2018-06-07 10:03:27 +02:00
daniel 7834869977 fixed water mark in graphs 2018-06-07 09:15:45 +02:00
artica 18e047d25e Auto-updated build strings. 2018-06-07 00:01:25 +02:00
fermin831 b3bdd5d492 [API ACL] More get functions (2) 2018-06-06 19:39:57 +02:00
fermin831 7f2d583f63 [API ACL] More get functions 2018-06-06 19:04:06 +02:00
daniel 867e00c50d fixed minor error 2018-06-06 18:00:44 +02:00
daniel ea6f96e96b fixed minor error api 2018-06-06 17:53:52 +02:00
daniel d7da009804 fixed errors in graphs 2018-06-06 17:23:32 +02:00
fermin831 0afd436cea [ACL API] Added ACL to some get api calls and refactorized agent count 2018-06-06 15:04:30 +02:00
daniel badfd83b0d 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
 2018-06-06 11:57:02 +02:00
daniel 89a481c452 fixed errors in graphs 2018-06-06 11:18:39 +02:00
artica 3fbdd3d026 Auto-updated build strings. 2018-06-06 00:01:25 +02:00
manuel.montes 4281824555 Fixed jquery in pandora_console/general/main_menu.php 2018-06-05 16:23:30 +02:00
danielmaya f8aa351987 Fixed line graph and box item when exporting visual consoles 2018-06-05 15:14:27 +02:00
vgilc 9cd95e2a48 Merge branch '2154-Fallo-de-visualización-al-crear-y-eliminar-grupos-de-agentes' into 'develop' 
2154 fallo de visualización al crear y eliminar grupos de agentes

See merge request artica/pandorafms!1502
 2018-06-05 11:11:57 +02:00
vgilc a69550f79e Merge branch 'fix-warnings-with-php72' into 'develop' 
Fixed warnings and some icons are not shown correctly with php7.2.

See merge request artica/pandorafms!1490
 2018-06-05 10:26:40 +02:00
vgilc ede1a3e091 Merge branch 'fix-error-with-php72' into 'develop' 
Fixed error and white screen with php7.2.

See merge request artica/pandorafms!1515
 2018-06-05 10:26:10 +02:00
manuel.montes d4aae1c4c1 Fixed checkbox select in manage_network_templates.php 2018-06-05 10:11:44 +02:00
vgilc 6152e93a9e Merge branch '1973-Entities-en-op-masivas-plugins' into 'develop' 
Implement function io_safe_output

See merge request artica/pandorafms!1499
 2018-06-05 09:44:00 +02:00
vgilc 2be81f76b9 Merge branch '2196-Menús-fijados-y-Classic-menu-hace-cosas-raras' into 'develop' 
Fixed menu with top property

See merge request artica/pandorafms!1501
 2018-06-05 09:42:01 +02:00
Junichi Satoh 5142112ae5 Fixed error and white screen with php7.2. 2018-06-05 11:34:19 +09:00
artica db4ce74311 Auto-updated build strings. 2018-06-05 00:01:23 +02:00