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

3880 Commits

Author SHA1 Message Date
Vanessa Gil b5cf4a0139 Fixed bug #1736. 2015-01-30 11:05:22 +01:00
artica 3cc2978093 Auto-updated build strings. 2015-01-30 00:01:23 +01:00
mdtrooper f5c9babef3 Uploaded the width size of dialog of licence enterprise 
(cherry picked from commit 8dba02ddf8)
 2015-01-29 16:43:45 +01:00
m-lopez-f d679fdd8d5 Fixed problem with call function and not send all variables 
(cherry picked from commit ecc5046927)
 2015-01-29 16:42:17 +01:00
m-lopez-f 7e13fbc388 Change style en view graph of tree view 2015-01-29 09:39:47 +01:00
artica aaeff742cc Auto-updated build strings. 2015-01-29 00:01:24 +01:00
m-lopez-f 33bf0a4e7b Fixed problem in tree view to metaconsola, not open popup 2015-01-28 11:29:05 +01:00
m-lopez-f fd3e2e8750 Fixed problem with previous commit 
(cherry picked from commit a0eb5728f7)
 2015-01-28 10:35:54 +01:00
m-lopez-f cf90acb05a Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-01-28 10:14:28 +01:00
m-lopez-f 278de27852 Show version server in 'Tactical server information' instead of data 2015-01-28 10:14:19 +01:00
artica e6c8b2866b Auto-updated build strings. 2015-01-28 00:01:21 +01:00
Vanessa Gil b6a5905c52 Fixed bug #1679. 2015-01-27 16:58:30 +01:00
m-lopez-f bc0c11aadd recovery timestamp filter in view module data 2015-01-27 15:45:12 +01:00
m-lopez-f f7b9dbbd7a Fixed problems with view of data when click in binary image in tree view, monitor detail and list of monitors 2015-01-27 15:14:53 +01:00
artica e36b781489 Auto-updated build strings. 2015-01-27 00:01:23 +01:00
artica a30a23e984 Auto-updated build strings. 2015-01-26 00:01:21 +01:00
artica f6b353ff2f Auto-updated build strings. 2015-01-25 00:01:20 +01:00
artica 846ce1978d Auto-updated build strings. 2015-01-24 00:01:22 +01:00
artica cacf12d14c Auto-updated build strings. 2015-01-23 00:01:22 +01:00
m-lopez-f 566aa876c3 fixed error in mysql to login user without AR permisions 2015-01-22 15:36:30 +01:00
mdtrooper 5a8db89588 Changes imprecise names and concepts in SNMP. Ticket: #1688 
(cherry picked from commit 6edf78c2dd)
 2015-01-21 14:49:06 +01:00
artica f4c49fdd09 Auto-updated build strings. 2015-01-21 00:01:20 +01:00
m-lopez-f 5eead8f182 Fixed problem with preview command in 'Configure alert action' 2015-01-20 12:10:06 +01:00
artica a2ba1143e5 Auto-updated build strings. 2015-01-20 00:01:50 +01:00
m-lopez-f 5fd75ba5b6 has changed the way of returning the data in the all_agents api function. 2015-01-19 13:18:23 +01:00
artica dc682572b6 Auto-updated build strings. 2015-01-19 00:01:20 +01:00
artica c13c931b06 Auto-updated build strings. 2015-01-18 00:01:19 +01:00
artica 7d18577a66 Auto-updated build strings. 2015-01-17 00:01:21 +01:00
mdtrooper eca4420fc1 Change the position of tooltip in networkmap open. And updated the jquery.cluetip.js to 0.9.9 and human readble version. TICKET: #1625 
(cherry picked from commit 059140a925)
 2015-01-16 18:14:17 +01:00
mdtrooper 43470ade1a Erased lost debug trace call. 2015-01-16 13:57:13 +01:00
KIKUCHI Koichiro 1cc9937422 Fixed the bug that tree view in meta console does not work properly. 2015-01-16 20:17:12 +09:00
KIKUCHI Koichiro f5e6be1dba Fixed typo 2015-01-16 20:17:11 +09:00
KIKUCHI Koichiro 7cf45f1b8c Small cleanup to prepare for the next changes. 2015-01-16 20:17:11 +09:00
artica 177dcf35a4 Auto-updated build strings. 2015-01-16 00:01:25 +01:00
mdtrooper 0c5f659412 Fixed the get data of module data list view with historic data base set on. TICKET: #1668 
(cherry picked from commit 36e7b29a04)
 2015-01-15 16:39:47 +01:00
m-lopez-f 8798d946e3 Changed ACL's permission in Networkmaps 
visualization: RR (Report Read)
Edition: RW (Report Write)
Deletion: RW (only yours networkmaps), RM(any of its group, although he did not create it.)
(cherry picked from commit d34ce5aa9e)

Conflicts:
	pandora_console/operation/agentes/networkmap_list.php
 2015-01-15 16:06:49 +01:00
artica b42287f37a Auto-updated build strings. 2015-01-15 00:01:24 +01:00
artica f3d7f0cc39 Auto-updated build strings. 2015-01-14 00:01:22 +01:00
mdtrooper 0e49221878 Added support for policies tags into the function 'tags_get_module_tags'. INCIDENT: #1644 
(cherry picked from commit 512bedda45)
 2015-01-13 12:05:16 +01:00
m-lopez-f a2dff604c8 Fixed small error in translation. 2015-01-13 11:24:48 +01:00
artica 6b0be6ad55 Auto-updated build strings. 2015-01-13 00:01:24 +01:00
mdtrooper e04f94cb02 Fixed the topology networkmaps, sometimes the relationships of agents showed bad 
(cherry picked from commit c726c0f9bd)
 2015-01-12 16:42:24 +01:00
artica cd85a998bb Auto-updated build strings. 2015-01-12 00:01:23 +01:00
artica 1662ae1217 Auto-updated build strings. 2015-01-11 00:01:22 +01:00
artica 414507092d Auto-updated build strings. 2015-01-10 00:01:24 +01:00
artica e26541681f Auto-updated build strings. 2015-01-09 00:01:24 +01:00
Sancho Lerena 00e3fbb849 Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-01-08 19:07:42 +01:00
Sancho Lerena 9fb1e879f3 Solved a problem with autorefresh URL. This fixes problem on refreshing the same URL for a long time (p.e: 4 hours). Problem was the filename was not passed, and this, in someway, makes the whole system to add parameters to the right until it too long and breaks it. 
To avoid other problems, I've added a safe check to see if coming URL contains "index.php" before adding it. Tested on several subcomponents and works.
 2015-01-08 19:05:43 +01:00
artica c51882583e Auto-updated build strings. 2015-01-08 00:01:23 +01:00
artica d316c38ec2 Auto-updated build strings. 2015-01-07 00:01:22 +01:00
artica 34ff08e24c Auto-updated build strings. 2015-01-06 00:01:24 +01:00
artica 6475ce6107 Auto-updated build strings. 2015-01-05 00:01:21 +01:00
artica 3e4a5abf0b Auto-updated build strings. 2015-01-04 00:01:23 +01:00
artica 4c853819c5 Auto-updated build strings. 2015-01-03 00:01:23 +01:00
artica 78312cd43b Auto-updated build strings. 2015-01-02 00:01:22 +01:00
artica 5787b36005 Auto-updated build strings. 2015-01-01 00:01:23 +01:00
Sancho Lerena f45c09259e Fixed calculation of group items in visual maps on linked maps. 
NOTE: this fix must be ported to 6.0 code (has not been ported here because
the code in 6.0 is completely different)
 2014-12-31 16:49:32 +01:00
artica 6c9316c1c8 Auto-updated build strings. 2014-12-31 00:01:25 +01:00
artica 3de6bf507f Auto-updated build strings. 2014-12-30 00:01:22 +01:00
artica 104152fced Auto-updated build strings. 2014-12-29 00:01:22 +01:00
artica 63923fbdf0 Auto-updated build strings. 2014-12-28 00:01:22 +01:00
artica ffa9d279e1 Auto-updated build strings. 2014-12-27 00:01:22 +01:00
artica f078d9470a Auto-updated build strings. 2014-12-26 00:01:22 +01:00
artica 2ae374b616 Auto-updated build strings. 2014-12-25 00:01:21 +01:00
artica f6bedfb5eb Auto-updated build strings. 2014-12-24 00:01:25 +01:00
artica e28d708838 Auto-updated build strings. 2014-12-23 00:01:22 +01:00
artica 7693babf9d Auto-updated build strings. 2014-12-22 00:01:23 +01:00
artica 5e59f21741 Auto-updated build strings. 2014-12-21 00:01:22 +01:00
artica a880bd471f Auto-updated build strings. 2014-12-20 00:01:21 +01:00
artica a214c8917e Auto-updated build strings. 2014-12-19 00:01:23 +01:00
pandora-release 416d72d332 Updated version and build strings for the 5.1SP2 release. 2014-12-18 15:31:21 +01:00
artica e9fe321729 Auto-updated build strings. 2014-12-18 00:01:25 +01:00
artica 99b92dba6c Auto-updated build strings. 2014-12-17 00:01:22 +01:00
artica f242c5b587 Auto-updated build strings. 2014-12-16 00:01:20 +01:00
artica 41eabe19d3 Auto-updated build strings. 2014-12-13 00:01:26 +01:00
artica a7c39dbed2 Auto-updated build strings. 2014-12-12 00:01:23 +01:00
mdtrooper 8a73b90b77 Fixed the bar charts with all values equal to 0. 
(cherry picked from commit 1aa58804f0)
 2014-12-11 13:50:08 +01:00
artica 5fa9e252c0 Auto-updated build strings. 2014-12-11 00:01:21 +01:00
artica d500f583b3 Auto-updated build strings. 2014-12-10 00:01:24 +01:00
artica 9bb7206e5a Auto-updated build strings. 2014-12-08 00:01:22 +01:00
artica 8380c96078 Auto-updated build strings. 2014-12-07 00:01:21 +01:00
artica 59eb30212f Auto-updated build strings. 2014-12-06 00:01:22 +01:00
artica 54ce53e098 Auto-updated build strings. 2014-12-05 00:01:22 +01:00
mdtrooper b711dcdd34 Fixed the count of ok agents in the group view into the treeview 2014-12-04 16:31:00 +01:00
mdtrooper 70616b04cb Fixed the duplicated function. 2014-12-04 14:45:29 +01:00
mdtrooper bd9edbd3b7 Fixed the acl tags with groups without tags. Ticket: #1611 
(cherry picked from commit 668d029047)
 2014-12-04 13:04:14 +01:00
artica 452693e9df Auto-updated build strings. 2014-12-04 00:01:23 +01:00
Vanessa Gil 8ddde7be20 Fixed several bugs with acl tags. 2014-12-03 10:35:58 +01:00
artica 371413b25a Auto-updated build strings. 2014-12-03 00:01:22 +01:00
mdtrooper 7f4d642679 Added the lost fields for item group in the editor. 
(cherry picked from commit a3e6b09758)
 2014-12-02 11:45:12 +01:00
artica 8b284ebab5 Auto-updated build strings. 2014-12-02 00:01:22 +01:00
mdtrooper 1a24cacbb3 Fixed the not init agents in the tree group view. Ticket: #1584 
(cherry picked from commit 28f68531a1)
 2014-12-01 16:38:30 +01:00
mdtrooper 37a6fa76ab Fixed the group view for agents not init. Ticket: #1584 
(cherry picked from commit 62c38c8a9f2ff160ab1dc312d43e55d4cdbb1369)
 2014-12-01 13:56:10 +01:00
artica c5ff45fdc2 Auto-updated build strings. 2014-12-01 00:01:20 +01:00
artica 4ccddc353f Auto-updated build strings. 2014-11-30 00:01:22 +01:00
artica dd4c255d8d Auto-updated build strings. 2014-11-29 00:01:22 +01:00
mdtrooper ce6aaa0d9d Fix the ACL tags in the edit module view. Ticket: #1602 2014-11-28 16:35:28 +01:00
mdtrooper 33b1393a6c Fixed the lost id_group in the items on visualmap. Ticket #1586 2014-11-28 12:20:04 +01:00
artica 62db9425f4 Auto-updated build strings. 2014-11-28 00:01:21 +01:00
artica c07bca3a8b Auto-updated build strings. 2014-11-27 00:01:21 +01:00
artica 8fab316319 Auto-updated build strings. 2014-11-26 00:01:22 +01:00
Vanessa Gil c219cc30d6 Fixed several bugs in event list. 2014-11-25 16:35:03 +01:00
mdtrooper 9b53a1c86e Fixed the lost hash user in the links from metaconsole to the nodes. 2014-11-25 14:06:13 +01:00
artica a42947ea3a Auto-updated build strings. 2014-11-25 00:01:22 +01:00
artica 834dc88da5 Auto-updated build strings. 2014-11-24 00:01:21 +01:00
artica 4c5ac26de5 Auto-updated build strings. 2014-11-23 00:01:20 +01:00
artica 61473a0cd8 Auto-updated build strings. 2014-11-22 00:01:23 +01:00
artica 752b90a2d8 Auto-updated build strings. 2014-11-21 00:01:22 +01:00
Vanessa Gil 8c2a19fc53 Fixed bug in event list. 2014-11-20 15:33:28 +01:00
artica a8a68335b8 Auto-updated build strings. 2014-11-20 00:02:03 +01:00
artica ebc65666fd Auto-updated build strings. 2014-11-19 00:01:22 +01:00
Alejandro Gallardo Escobar 78d1bfc6eb Fixed the agent module sla array data for the slicebar 2014-11-18 18:22:57 +01:00
Vanessa Gil 049daed117 Fixed bus. Tickets #1562, #1556. 2014-11-18 11:41:42 +01:00
artica d160d2b3c7 Auto-updated build strings. 2014-11-18 00:01:26 +01:00
Alejandro Gallardo Escobar 531b73b240 Removed some graphs on the sla reports 2014-11-17 18:33:21 +01:00
Alejandro Gallardo Escobar 5e77115127 Minor changes on the function "reporting_get_planned_downtimes_intervals" call 2014-11-17 18:33:13 +01:00
artica 25f4b56502 Auto-updated build strings. 2014-11-17 00:01:24 +01:00
artica 3d2a41ef7a Auto-updated build strings. 2014-11-16 00:01:24 +01:00
artica 79892c9c9c Auto-updated build strings. 2014-11-15 00:01:25 +01:00
artica 8f005a5130 Auto-updated build strings. 2014-11-14 00:01:23 +01:00
Alejandro Gallardo Escobar 61045bc444 Now the only average value of the simple graphs can be deactivated 2014-11-13 20:10:01 +01:00
artica 1ef6fa36c5 Auto-updated build strings. 2014-11-13 00:01:19 +01:00
artica afdcafe9cc Auto-updated build strings. 2014-11-12 00:01:25 +01:00
artica 48e9bc3600 Auto-updated build strings. 2014-11-11 00:01:20 +01:00
artica cb4675c277 Auto-updated build strings. 2014-11-10 00:01:21 +01:00
artica 3a6ff7c6df Auto-updated build strings. 2014-11-09 00:01:23 +01:00
Junichi Satoh 3fb6f8c8ba Updated japanese translations. 2014-11-08 10:58:27 +09:00
artica 6ec47401af Auto-updated build strings. 2014-11-08 00:01:22 +01:00
Alejandro Gallardo Escobar dbf20069cd Improved some SLA functions to stop the calculations when the module id is invalid 2014-11-07 12:45:09 +01:00
artica ce0385ba90 Auto-updated build strings. 2014-11-07 00:01:23 +01:00
Alejandro Gallardo Escobar 15f038b1a4 Fixed the error messages of the planned downtimes queries 2014-11-06 17:37:40 +01:00
mdtrooper b0b57fdb2c Fixed the javascript for hide the dinamic macros with this property setted. TICKET #1545 
(cherry picked from commit 1fdcacf29f)
 2014-11-06 16:44:22 +01:00
artica 596eabfe1e Auto-updated build strings. 2014-11-06 00:01:24 +01:00
hkosaka fe6f4cb74e Added new API (delete_module_template_by_names). 2014-11-05 17:27:33 +09:00
artica 61ed43d9fc Auto-updated build strings. 2014-11-04 00:01:19 +01:00
artica 44ddad17cf Auto-updated build strings. 2014-11-03 00:01:19 +01:00
artica b5691eb0f6 Auto-updated build strings. 2014-11-02 00:01:18 +01:00
artica 21391ba2e6 Auto-updated build strings. 2014-11-01 00:01:18 +01:00
artica 2afcca719d Auto-updated build strings. 2014-10-31 00:01:22 +01:00
Vanessa Gil 8263b2c476 Updated translations. 2014-10-30 14:54:24 +01:00
artica 631ab0b19a Auto-updated build strings. 2014-10-30 00:01:19 +01:00
pandora-release 5625e40fa4 Auto-updated build strings. 2014-10-29 11:10:09 +01:00
pandora-release 88a471d261 Updated version and build strings for the 5.1SP1 release. 2014-10-28 16:08:36 +01:00
artica 6618aa3cba Auto-updated build strings. 2014-10-28 00:01:10 +01:00
artica 0c6e82c445 Auto-updated build strings. 2014-10-27 00:01:08 +01:00
artica cb22c57e08 Auto-updated build strings. 2014-10-26 00:01:08 +02:00
artica a02e944c09 Auto-updated build strings. 2014-10-25 00:01:10 +02:00
Alejandro Gallardo Escobar cd6908e1e0 Minor change on the newsboard width 2014-10-24 13:00:57 +02:00
mdtrooper 9d330d6ac1 Fixed the io_safe_output for to use hex html entity for the character º. TICKET: #1495 2014-10-24 12:05:29 +02:00
mdtrooper 48337e10d2 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-10-24 11:02:55 +02:00
artica a915d257f8 Auto-updated build strings. 2014-10-24 00:01:10 +02:00
pandora-release 0ea41826e8 Updated version and build strings. 2014-10-23 16:45:00 +02:00
Alejandro Gallardo Escobar d4cfc1fb68 Improved the performance of the planned downtimes queries 2014-10-23 13:01:00 +02:00
artica 561dc80c1d Auto-updated build strings. 2014-10-23 00:01:10 +02:00
mdtrooper 24f34c0044 Added new constant 'ERR_AUTH' 2014-10-22 12:56:40 +02:00
Alejandro Gallardo Escobar 4cf9bfc17a Merge branch 'feature/history-db-optimization' into develop 2014-10-22 12:04:26 +02:00
Alejandro Gallardo Escobar ef1839b2df Modified a bunch of functions to choose when the history db should be used and when not 2014-10-22 12:00:14 +02:00
Alejandro Gallardo Escobar 54d5f9047b Added the function "db_search_in_history_db" 2014-10-22 11:52:54 +02:00
Junichi Satoh 4f73374e23 Updated help. 2014-10-22 18:32:47 +09:00
artica 1bfc7968c1 Auto-updated build strings. 2014-10-22 00:01:09 +02:00
mdtrooper 96e66a9c89 Updated the list of module macros in the helps 2014-10-21 14:38:17 +02:00
mdtrooper 9771e258cb Updates the styles of calendar widget 2014-10-21 11:17:16 +02:00
artica 8e98886e5d Auto-updated build strings. 2014-10-21 00:01:10 +02:00
Alejandro Gallardo Escobar 51f6de7186 Added the 'pure' parameter to the URLs of the function "reporting_get_stats_modules_status" 2014-10-20 17:18:24 +02:00
Alejandro Gallardo Escobar e0c4fb6143 Error fixes on the function "graph_monitor_wheel" 2014-10-20 16:56:01 +02:00
Alejandro Gallardo Escobar 5423b96cf3 Fixed an error on the function "groups_get_tree" 2014-10-20 16:55:02 +02:00
mdtrooper 7f2098b449 Added function 'modules_get_agent_group' 2014-10-20 16:45:47 +02:00
mdtrooper 2471ca6375 Into the function 'tags_check_acl' fixed check for profile all with some tag. And added function 'tags_check_acl_by_module' 2014-10-20 16:45:47 +02:00
Alejandro Gallardo Escobar 6f6e1c3d9f Added the function "openURLTagWindow" 2014-10-20 13:11:38 +02:00
artica cb934305ab Auto-updated build strings. 2014-10-20 00:01:08 +02:00
artica 4ed1cb8f3d Auto-updated build strings. 2014-10-19 00:01:09 +02:00
artica 6a95eeaa5d Auto-updated build strings. 2014-10-18 00:01:11 +02:00
artica fd56c5cf37 Auto-updated build strings. 2014-10-17 00:01:08 +02:00
mdtrooper f774408d52 Fixes the colors in calendar widget. Thanks Carla for advises 2014-10-16 17:06:50 +02:00
artica c5610a870d Auto-updated build strings. 2014-10-16 00:01:10 +02:00
Alejandro Gallardo Escobar 1d439710e7 Merge branch 'feature/ticket#825-MobileEnterpriseACL' into develop 2014-10-15 18:15:36 +02:00
Alejandro Gallardo Escobar 8c8b410214 Added a special behaviour when the section is 'mobile' to get the Pandora FMS mobile sections 2014-10-15 18:14:56 +02:00
pandora-release 585a10c2cd Updated version and build strings. 2014-10-15 17:06:30 +02:00
Alejandro Gallardo Escobar c3fa2dd561 Fixed performance errors related with the planned downtimes functions 2014-10-15 14:52:00 +02:00
artica 27a4c6f7d8 Auto-updated build strings. 2014-10-15 00:01:10 +02:00
Alejandro Gallardo Escobar f2ef7bffa4 Improvements on the function "grafico_db_agentes_purge" 2014-10-14 13:18:42 +02:00
hkosaka c6c76f51d1 Updated get tree_agents API to get group_description, group_contact and group_other. 2014-10-14 11:42:39 +09:00
artica eda5b15aba Auto-updated build strings. 2014-10-14 00:01:09 +02:00
Alejandro Gallardo Escobar 879e9a9cdc Finally, the pie graph legend has auto width and allow to click the graph below 2014-10-13 18:51:21 +02:00
mdtrooper 8348c9f5fc Fixed the show plugin parameters field into the policy module form. 2014-10-13 16:59:57 +02:00
Alejandro Gallardo Escobar aa7bd77757 Fixes on the functions "graphic_module_events" and "get_statwin_graph_statistics" 2014-10-13 15:50:35 +02:00
Alejandro Gallardo Escobar 0d7cb4a275 Fixed an error on the function "flot_area_graph" 2014-10-13 14:13:31 +02:00
mdtrooper 6eef76ef23 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-10-13 11:33:38 +02:00
mdtrooper 85c18eb1d7 Fixed PHP warnings in the function 'menu_get_sec_pages' 2014-10-13 11:33:14 +02:00
artica 74014b27ee Auto-updated build strings. 2014-10-13 00:01:08 +02:00
artica 0aed457744 Auto-updated build strings. 2014-10-12 00:01:07 +02:00
artica 43ef19b550 Auto-updated build strings. 2014-10-11 00:01:10 +02:00
Alejandro Gallardo Escobar 92ac5cc9b1 Fixes on the SLA report items 2014-10-10 16:07:57 +02:00
mdtrooper 91104f329b Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-10-10 14:43:58 +02:00
mdtrooper ee41133005 Rewrote some parts of code of function ui_pagination. Ticket #1407 2014-10-10 14:42:50 +02:00
artica abcc67055f Auto-updated build strings. 2014-10-10 00:01:10 +02:00
Alejandro Gallardo Escobar cb926cdd6c Error fixes on the report SLA item 2014-10-09 19:56:06 +02:00
mdtrooper 5224704085 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-10-09 19:04:39 +02:00
mdtrooper 66df47e973 Disabled the check of ACL in the agents into visualmap. For avoid very slow visualmaps in Pandoras with ACL tags 2014-10-09 19:04:21 +02:00
Alejandro Gallardo Escobar 55313c42f5 Error fixes on the report SLA item 2014-10-09 18:57:10 +02:00