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

7006 Commits

Author SHA1 Message Date
mdtrooper e1e64b1a54 Fixed the SLA form editor for to set graphs. TICKET: #2172 2015-04-30 16:48:10 +02:00
m-lopez-f 6f0d4ba1f9 Fixed error when read file in windows, when path containt space, tiquet: #2166 and #2114 
(cherry picked from commit 70bca63bd6)
 2015-04-30 13:45:28 +02:00
m-lopez-f e126b3021c Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-04-30 08:46:58 +02:00
m-lopez-f c3b60812e0 Delete option, in home screen, only in insterprise servers. Tiquet: #2128 2015-04-30 08:46:41 +02:00
artica f5e01b62b2 Auto-updated build strings. 2015-04-30 00:01:35 +02:00
m-lopez-f 1423c27c0e Fixed error to generate url for view help, tiquet: #2158 2015-04-29 09:52:44 +02:00
artica 6a94a83867 Auto-updated build strings. 2015-04-29 00:01:31 +02:00
mdtrooper 402165fd11 Change some styles in the code of report editor for to made more easy the comparation with the template report editor 2015-04-28 14:26:19 +02:00
artica 713d6991be Auto-updated build strings. 2015-04-28 00:01:33 +02:00
mdtrooper 8ec4ef26d7 Added the feature to filter by text the event in report item event_report_group. TICKET: #2066 2015-04-27 16:10:16 +02:00
m-lopez-f ce1fd47c88 Fixed colors of states modules or agents in constant and group modules. Tiquet: #2145 2015-04-27 10:32:22 +02:00
artica 464d554369 Auto-updated build strings. 2015-04-27 00:01:28 +02:00
artica 89bc11775b Auto-updated build strings. 2015-04-26 00:01:28 +02:00
artica 1691406590 Auto-updated build strings. 2015-04-25 00:01:34 +02:00
mdtrooper 0f72fa8bbd Fixed show the widget 'show resume' in the 'availability' item in report. TICKET: #2149 2015-04-24 19:05:17 +02:00
mdtrooper 29f4c1d7e7 Fixed the returning to item editor when it is availability item. TICKET: #2149 2015-04-24 17:17:38 +02:00
mdtrooper 61aa789033 Fixed the lost period in availability item. TICKET: #2149 2015-04-24 17:09:26 +02:00
artica 8cc70e4a68 Auto-updated build strings. 2015-04-24 00:01:33 +02:00
artica 1724c82108 Auto-updated build strings. 2015-04-23 00:01:31 +02:00
m-lopez-f 796e7b1f33 Fixed error in pagination to extension Agents/Modules 
(cherry picked from commit 46e74f1ddd)
 2015-04-22 09:43:59 +02:00
artica 4e6184f46b Auto-updated build strings. 2015-04-22 00:01:49 +02:00
mdtrooper 91c930938e Fixed the lost checkbox to show graphs in the event items in the report (Merge from the commit 3578687aad). 2015-04-21 16:29:53 +02:00
artica 2525927a8f Auto-updated build strings. 2015-04-21 00:01:38 +02:00
mdtrooper 8549dccd52 Fixed the order and hierarchy of groups in group view 2015-04-20 16:24:59 +02:00
mdtrooper 36c5349cf4 Fixed the function mysql_db_get_all_rows_in_table for several fields to order as array 2015-04-20 16:24:08 +02:00
m-lopez-f 781e24f984 Delete order in field Data in monitor detail, tiquet: #2060 2015-04-20 08:46:42 +02:00
artica 7d09174241 Auto-updated build strings. 2015-04-20 00:01:29 +02:00
artica ff54210bed Auto-updated build strings. 2015-04-19 00:01:29 +02:00
artica 9927fa0040 Auto-updated build strings. 2015-04-18 00:01:30 +02:00
artica 847426ddd4 Auto-updated build strings. 2015-04-17 00:01:48 +02:00
mdtrooper c5b5d60d4c Fixed the SLA with a period have a setted a time slots. 2015-04-16 19:20:38 +02:00
mdtrooper f24919fe4b Fixed the history data in boolean and string charts. 2015-04-16 15:38:21 +02:00
m-lopez-f 48a0a167cc Fixed order data to click in show data module in tree view,tiquet: #2080 
(cherry picked from commit 0df919dcdd)
 2015-04-16 15:19:20 +02:00
Ramon Novoa f8a2fbfbf9 Do not displayed advanced filters if custom filters are disabled. Small 
fixes.
 2015-04-16 11:37:31 +02:00
m-lopez-f bf6e9cf4f6 Fixed error when flash_chart is false, colors of pie bad drawn, tiquet: #2107 
(cherry picked from commit db3e276195)
 2015-04-16 10:51:55 +02:00
artica 63a61eb7fb Auto-updated build strings. 2015-04-15 00:01:31 +02:00
m-lopez-f 25a68b23ed Update maxlenght to password field in use detail editor, tiquet: #2098 2015-04-14 18:21:52 +02:00
artica 64161ac0ce Auto-updated build strings. 2015-04-14 00:01:33 +02:00
Vanessa Gil 85ba0ca1db Ticket #2044. 2015-04-13 17:04:31 +02:00
artica 86de04d923 Auto-updated build strings. 2015-04-13 00:01:28 +02:00
artica 4b1db91c57 Auto-updated build strings. 2015-04-12 00:01:28 +02:00
artica 213da1011e Auto-updated build strings. 2015-04-11 00:01:30 +02:00
mdtrooper bf295a4b58 Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-04-10 01:12:55 +02:00
mdtrooper 6873ecbc29 Some fixes found when merge the new report items into the feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch. 2015-04-10 01:12:38 +02:00
artica 66faff857a Auto-updated build strings. 2015-04-10 00:01:27 +02:00
artica 40b1eca06c Auto-updated build strings. 2015-04-09 00:01:27 +02:00
mdtrooper f06b400e4d Killed some unicorns and arbitrary numbers. This land is for constants. (backport from the develop branch). 2015-04-08 17:45:37 +02:00
mdtrooper 654549f13b Remove a javascript debug trace (backport from develop). 2015-04-08 17:07:18 +02:00
mdtrooper cc135cbead Killed some unicorns and arbitrary numbers. This land is for constants. (backport from the develop branch). 2015-04-08 17:06:55 +02:00
mdtrooper ca2def81ce Remove a javascript debug trace (backport from develop). 2015-04-08 17:03:33 +02:00
artica 08b376fc92 Auto-updated build strings. 2015-04-08 00:01:27 +02:00
mdtrooper 6f71a01b0c Fixed the separator (sometimes it is other) in the ajax call get_agent_modules_json_for_multiple_agents. 2015-04-07 17:11:04 +02:00
mdtrooper 3cdbc74e1c Merge branch 'pandora_5.1' into feature/#2026-NUEVO_TIPO_DE_INFORME_COMPARED_GRAPHS 2015-04-07 15:09:10 +02:00
mdtrooper 4bae03a227 Added the feature of time compare overlapped in the simple graph and simple graph baseline in reports. 2015-04-07 15:03:46 +02:00
artica cf045581e5 Auto-updated build strings. 2015-04-07 00:01:40 +02:00
mdtrooper 38f94086c7 Working in the item availability. 2015-04-06 16:30:30 +02:00
mdtrooper baaf21148e Cleaned source code style. 2015-04-06 15:30:52 +02:00
Vanessa Gil f894656d87 Fixed bug #2062 2015-04-06 15:26:26 +02:00
m-lopez-f 2e51480f58 Add order in parent select in static graph in visual console, Tiquet: #2067 
(cherry picked from commit 790c81a250)
 2015-04-06 10:26:38 +02:00
artica c235c17ec4 Auto-updated build strings. 2015-04-06 00:01:24 +02:00
artica 3b2f7b04b3 Auto-updated build strings. 2015-04-02 00:01:40 +02:00
mdtrooper 5864d846ba Working in the avaliability item in report. 2015-04-01 15:51:19 +02:00
artica 92ac38f5ab Auto-updated build strings. 2015-04-01 00:01:38 +02:00
mdtrooper 4345ec6fa3 Working in the new type of report availability. 2015-03-31 18:30:51 +02:00
mdtrooper 88115eb9d9 Working in the new type of report availability. 2015-03-31 18:23:33 +02:00
mdtrooper 4749f3255b Starting to make the availability general report 2015-03-31 12:53:21 +02:00
mdtrooper 48ca7ac999 Killed the magical numbers and unicorns. 2015-03-31 10:48:51 +02:00
artica d9fb4b9b1b Auto-updated build strings. 2015-03-29 00:01:29 +01:00
artica 2d974c150a Auto-updated build strings. 2015-03-28 00:01:38 +01:00
artica 79fc4e0520 Auto-updated build strings. 2015-03-27 00:01:28 +01:00
m-lopez-f 400feb5d0c In alert command preview is not array but contain data, create textarea instead of select 2015-03-26 15:48:27 +01:00
artica 8332eb1286 Auto-updated build strings. 2015-03-26 00:01:31 +01:00
artica b6a4c8ba99 Auto-updated build strings. 2015-03-25 00:01:31 +01:00
Ramon Novoa b3f5e76009 Show the translated enterprise string by default on the SNMP console. 2015-03-24 12:59:23 +01:00
m-lopez-f 471492807d same unit to snmp modules when unit not correct to module type, tiquet: #2025 2015-03-24 10:36:02 +01:00
artica 9ecd8e8022 Auto-updated build strings. 2015-03-24 00:01:27 +01:00
Alejandro Gallardo Escobar d36b1c8c40 Returned deleted code 2015-03-23 14:41:23 +01:00
Alejandro Gallardo Escobar dee1e92efe Merge branch 'feature/ticket#1981-Direct-graphs' into pandora_5.1 2015-03-23 14:22:09 +01:00
Alejandro Gallardo Escobar fa9db9010c Added support to show the interface traffic graphs through the metaconsole and improved the ACL 2015-03-23 14:19:46 +01:00
artica 4f4b15fba8 Auto-updated build strings. 2015-03-23 00:01:25 +01:00
artica 9ccf952e86 Auto-updated build strings. 2015-03-22 00:01:22 +01:00
artica f9393f2391 Auto-updated build strings. 2015-03-21 00:01:25 +01:00
Alejandro Gallardo Escobar fbc4460a25 Added support to show the module graphs through the metaconsole and improved the ACL 2015-03-20 19:05:12 +01:00
artica 5ff986520c Auto-updated build strings. 2015-03-20 00:01:23 +01:00
artica cc16ccbecd Auto-updated build strings. 2015-03-19 00:01:25 +01:00
Alejandro Gallardo Escobar f71e4af9e6 Added support to show the module graphs through the metaconsole 2015-03-18 20:31:20 +01:00
Alejandro Gallardo Escobar 050c78a13b Now the metaconsole can show the graphs of their nodes 2015-03-18 20:30:32 +01:00
Alejandro Gallardo Escobar 567b5125bd Adapted the functions to work with the metaconsole 2015-03-18 20:28:59 +01:00
mdtrooper d7a6991fa2 Uploaded the first version of file functions_reporting_html.php 2015-03-18 17:51:47 +01:00
m-lopez-f e5c1982548 Solvented visualization of group in few views, tiquet: #1946 
(cherry picked from commit 912462c71a)
 2015-03-18 11:50:23 +01:00
Alejandro Gallardo Escobar 554fb7aa2c Fixed an SQL error when serving the agent status tooltip 2015-03-18 12:26:45 +01:00
Alejandro Gallardo Escobar d8a2976926 Revert "Fixed an SQL error when serving the agent status tooltip" 
This reverts commit 96389ee94e.
 2015-03-18 12:26:12 +01:00
Alejandro Gallardo Escobar 96389ee94e Fixed an SQL error when serving the agent status tooltip 2015-03-18 12:25:13 +01:00
artica 0db95afb83 Auto-updated build strings. 2015-03-18 00:01:27 +01:00
Alejandro Gallardo Escobar 3bab9b06fe Fixed a PHP syntax error 2015-03-17 16:54:40 +01:00
m-lopez-f e52ace6716 Add field to custom line widht to custom graph tiquet: #1875 
(cherry picked from commit e0e531bf05)
 2015-03-17 15:37:07 +01:00
Alejandro Gallardo Escobar c100dd7ff7 Added a basic gitignore to the pandora console 2015-03-17 14:34:05 +01:00
Alejandro Gallardo Escobar aad9e08700 Removed the the event checkboxes 2015-03-17 14:20:09 +01:00
m-lopez-f f50f8e92a2 Increase maxlenght of field custom raw url, tiquet: #1798 
(cherry picked from commit 41863d37e8)
 2015-03-17 10:13:43 +01:00
artica 5f33b55284 Auto-updated build strings. 2015-03-17 00:01:24 +01:00
mdtrooper c6d62f37c5 Fixed the bug when the group name is showed instead the icon 
(cherry picked from commit 1b5779eb57)
 2015-03-16 17:47:51 +01:00
m-lopez-f 01005de046 Delete includes of javascript because this includes are exists in header, tiquet #1878 
(cherry picked from commit c873fd6993)
 2015-03-16 15:22:53 +01:00
mdtrooper 35a9e7c591 Fixed the massive edition of modules with white spaces in name modules. TICKET: #1832 2015-03-16 12:52:05 +01:00
mdtrooper cf9c53f220 Added the function 'modules_is_disable_agent' and fixed the show disabled agents in reports into items 'general' 'sla'. 2015-03-16 11:58:42 +01:00
m-lopez-f dc1dc7012c display data changed depending if compare dates or show date directly in the tree view #1976 
(cherry picked from commit 93a2d15b2c)
 2015-03-16 11:49:22 +01:00
artica 580900438f Auto-updated build strings. 2015-03-16 00:01:25 +01:00
artica c8c8e98d34 Auto-updated build strings. 2015-03-15 00:01:26 +01:00
artica f1769c6dbe Auto-updated build strings. 2015-03-14 00:01:28 +01:00
artica 36fa98dd1c Auto-updated build strings. 2015-03-13 00:01:25 +01:00
mdtrooper dc90f7899f Fixed the event with filter EVENT_CRIT_WARNING_OR_CRITICAL in function 'events_get_events'. TICKET: #1909 
(cherry picked from commit acb37f591c)
 2015-03-12 12:33:14 +01:00
artica cb1a5098d3 Auto-updated build strings. 2015-03-12 00:01:26 +01:00
mdtrooper 86424849c6 Fixed the lost units in the 'general' item in reports. 2015-03-11 14:43:05 +01:00
mdtrooper 3e31951c46 Fixed the item 'general' in reports. TICKET: #1902 2015-03-11 11:43:34 +01:00
artica 8b035abb93 Auto-updated build strings. 2015-03-11 00:01:25 +01:00
mdtrooper b7264f61c3 Fixed the preview alert action in the form editor. TICKET: #1944 2015-03-10 15:13:14 +01:00
mdtrooper ce108bb54c Fixed. Added lost result message in the api call create tag 
(cherry picked from commit 2798b2230a)
 2015-03-10 12:36:26 +01:00
Alejandro Gallardo Escobar 32d63c66d7 Fixed the missing counters of total agents 2015-03-10 13:10:55 +01:00
artica e4f219e0f1 Auto-updated build strings. 2015-03-10 00:01:27 +01:00
mdtrooper f475dc80bd Fixed the update of alert command usability. 2015-03-09 16:17:57 +01:00
mdtrooper 1141127a34 Show group name instead the icon in metaconsole. TICKET: #1501 2015-03-09 15:08:26 +01:00
mdtrooper 80bd7b0db2 Fixed the lines in visualmaps with service items. TICKET: #1896 2015-03-09 13:12:05 +01:00
mdtrooper 2692659a7a Fixed, now the tab of remote configuration is not visible. TICKET: #1884 
(cherry picked from commit 37bff59e85)
 2015-03-09 12:09:02 +01:00
artica 112cfc280c Auto-updated build strings. 2015-03-09 00:01:24 +01:00
artica 0e90739b28 Auto-updated build strings. 2015-03-08 00:01:24 +01:00
artica c510bf992c Auto-updated build strings. 2015-03-07 00:01:28 +01:00
artica cfe79ab8ab Auto-updated build strings. 2015-03-06 00:01:24 +01:00
mdtrooper 681b27fa2c Added in setup visual a check for to show the group as text. Ticket: #1501 
(cherry picked from commit bda09a22e1)

Conflicts:
	pandora_console/include/functions_config.php
 2015-03-05 14:55:42 +01:00
artica b3c11373d7 Auto-updated build strings. 2015-03-05 00:01:23 +01:00
artica b234f6fb27 Auto-updated build strings. 2015-03-04 00:01:24 +01:00
Alejandro Gallardo Escobar dbae94b764 Fixed an error by adding better error checks 2015-03-03 15:38:04 +01:00
Alejandro Gallardo Escobar 867b10151b Fixed an error which relaxed the requirements to retrieve network interfaces 
(cherry picked from commit 8f9db39176)
 2015-03-03 14:51:37 +01:00
artica 45589d7489 Auto-updated build strings. 2015-03-03 00:01:25 +01:00
Alejandro Gallardo Escobar 9cda617600 The network interfaces table now accepts the 'ifOperStatus' modules with more types 
The types are remote_snmp_proc, remote_icmp_proc, remote_tcp_proc and generic_proc.
(cherry picked from commit 3da480908b)
 2015-03-02 16:12:40 +01:00
mdtrooper 380cddc4d4 Fixed the icons of menu on combined charts. TICKET: #1869 2015-03-02 13:12:50 +01:00
mdtrooper 2215a299b5 Added metaconsole restore DB in the ajax to get list module detail 2015-03-02 12:02:26 +01:00
mdtrooper eea8e0d8ae Fixed the connection to node in metaconsole when show the data module dialog. TICKET: #1870 2015-03-02 11:40:45 +01:00
artica 4aa7c9eab0 Auto-updated build strings. 2015-03-02 00:01:22 +01:00
artica 86ec23d93c Auto-updated build strings. 2015-03-01 00:01:25 +01:00
artica ba4ac6f04d Auto-updated build strings. 2015-02-28 00:01:23 +01:00
mdtrooper 9711204289 Fixed the javascript for the plugin. TICKET: #1854 2015-02-27 15:05:31 +01:00
artica ca3b54f509 Auto-updated build strings. 2015-02-27 00:01:24 +01:00
Alejandro Gallardo Escobar ef0323d060 Fixed the footer error (I hope that) 2015-02-26 20:21:12 +01:00
Alejandro Gallardo Escobar 2ff3782262 Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-02-26 19:47:39 +01:00
Alejandro Gallardo Escobar 3b3277fbba Error fixes 2015-02-26 19:47:21 +01:00
Alejandro Gallardo Escobar f011da23d3 Error fixes 2015-02-26 19:20:27 +01:00
Alejandro Gallardo Escobar 9527a8e9b8 The interfaces graph popup now appears properly in the metaconsole 2015-02-26 18:36:34 +01:00
mdtrooper 6897e421d8 Fixed the last value for general and exception of reportings 2015-02-26 17:52:32 +01:00
Alejandro Gallardo Escobar 008eddeebb Now the snmp interfaces table appear in the agent detail view of the tree view. Error fixes 2015-02-26 16:48:17 +01:00
mdtrooper 199ff770da Fixed the create new remote user in Active Directory (enterprise). TICKET: #1845 
(cherry picked from commit 7b08fb47c1)
 2015-02-26 12:28:16 +01:00
artica e0131eae65 Auto-updated build strings. 2015-02-26 00:01:22 +01:00
mdtrooper 5857e8bca7 Fixed the tree for the nodes with dot characters server. 2015-02-25 19:28:39 +01:00
mdtrooper 757e0988e8 Fixed the inverse intervals in massive edition of modules. TICKET: #1831 
(cherry picked from commit 8ed021b64d)
 2015-02-25 11:40:08 +01:00
artica 364e897c6b Auto-updated build strings. 2015-02-25 00:01:23 +01:00
artica 12dacaa9cb Auto-updated build strings. 2015-02-24 00:01:25 +01:00
mdtrooper 6446d9d93e Fixed the string module data in reports of items 'general'. #1819 
(cherry picked from commit 609802eb44)
 2015-02-23 15:15:38 +01:00
mdtrooper 30a05aa62f Added the option 'last value' for the items 'general' and 'exception' in reports. TICKET: #1819 
(cherry picked from commit 0952b96b49)

Conflicts:
	pandora_console/include/javascript/pandora.js
 2015-02-23 13:45:16 +01:00
mdtrooper 42d90c5793 Fixed the situations when the period is not init. 
(cherry picked from commit 8d214486e6)

Conflicts:
	pandora_console/include/ajax/module.php
 2015-02-23 12:12:43 +01:00
artica 4a144bf98e Auto-updated build strings. 2015-02-23 00:01:26 +01:00
artica a4108d266e Auto-updated build strings. 2015-02-22 00:01:24 +01:00
artica 114caf3faa Auto-updated build strings. 2015-02-21 00:01:26 +01:00
Alejandro Gallardo Escobar 2b8b2d5d7d Fixed the normal and not init agent counters 2015-02-20 13:13:40 +01:00
artica 25d1cb0478 Auto-updated build strings. 2015-02-20 00:01:26 +01:00
Alejandro Gallardo Escobar e7ea96b710 Removed some items without templates support from the templates item type select 
(cherry picked from commit cf1d04d5f4)
 2015-02-19 20:43:49 +01:00
mdtrooper 15c93c3bd9 Fixed the ajax calls with timepicker in other languages instead english. 2015-02-19 18:33:42 +01:00
mdtrooper dac81d2640 Fixed the menu buttons in charts. TICKET: #1818 2015-02-19 12:52:03 +01:00
artica 16461cf8ad Auto-updated build strings. 2015-02-19 00:01:23 +01:00
mdtrooper af5b7e062c Fixed period was undefined sometimes in ajax call to get list of module data dialog. 2015-02-18 18:33:37 +01:00
Alejandro Gallardo Escobar 02e57e20e5 Fixes ticket #1816. Now the SNMP interface wizard retrieves the interfaces ips properly 
(cherry picked from commit 2999c76fa8)
 2015-02-18 15:08:03 +01:00
artica d486faa7b2 Auto-updated build strings. 2015-02-18 00:01:25 +01:00
Ramon Novoa 7330bcb287 Show the company name in the license setup. 2015-02-17 16:07:34 +01:00
mdtrooper 8b232ead56 Fixed with a 'work around' in io_safe_output for the SQL items in the reports. 2015-02-17 15:09:22 +01:00
m-lopez-f 6b5ab72c05 Fixed problems with count agents, the agents with state is 'not init' count as normal state 2015-02-17 12:08:07 +01:00
artica 122302cb59 Auto-updated build strings. 2015-02-17 00:01:28 +01:00
artica 02220aa08b Auto-updated build strings. 2015-02-16 00:01:26 +01:00
artica 7d09d6257f Auto-updated build strings. 2015-02-15 00:01:28 +01:00
artica 31e1574482 Auto-updated build strings. 2015-02-14 00:01:23 +01:00
mdtrooper ab12b4456a Fixed the snmp wizard for uptime and added unit octets. TICKET: #1742 
(cherry picked from commit 584d00f321)
 2015-02-13 15:34:21 +01:00
mdtrooper f19f971273 Fixed typo error 
(cherry picked from commit 45e558eb57)
 2015-02-13 12:57:54 +01:00
artica f18956a69d Auto-updated build strings. 2015-02-13 00:01:24 +01:00
artica 88aa17c37c Auto-updated build strings. 2015-02-12 14:53:14 +01:00
mdtrooper ac819525d5 Fixed SQL inyections. 
(cherry picked from commit 79037566bc0c222391f4f2e9cdabc64907ed7a7b)
 2015-02-11 17:21:47 +01:00
mdtrooper dbf3bedd3a Added a checks of PHP enviorement in Update Manager. 2015-02-11 15:40:22 +01:00
m-lopez-f 2bfe4d4263 Fixed problem when return false instead of data, variable not change and enter a infinite bucle 
(cherry picked from commit 70b95d7f1eec8107602cc5617cc6604d3a0ca0ed)
 2015-02-11 09:56:43 +01:00
artica b0ef182bd3 Auto-updated build strings. 2015-02-11 00:01:25 +01:00
mdtrooper f3ddb8193e Fixed the functions to get agents not normal or not init in cases of agents with normal status and some modules not init. TICKET: #1791 
(cherry picked from commit 51c901f3845c3b4dab809e672a3ca7e93a61fddc)

Conflicts:
	pandora_console/include/functions_groups.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/group_view.php
 2015-02-10 18:27:18 +01:00
mdtrooper 6fac4670d1 Added the proxy configuration in the update manager. 
(cherry picked from commit 3b0f84778488958f9c4cb12cfda35d4b6a5528aa)

Conflicts:
	pandora_console/include/functions_config.php
 2015-02-10 16:43:17 +01:00
m-lopez-f b2ede858f2 Fixed problem with delete maps when user is admin and have all permisions and other user have RM and RW and delete with RW rule 2015-02-10 15:04:02 +01:00
m-lopez-f a6807034eb Fixed problems with export data when type equals csv, export less data Tiquet: #1756 2015-02-10 13:17:04 +01:00
mdtrooper 92fdd8f9bd Added more checks in the update manager. 
(cherry picked from commit 36ccfaabe00ecea85c312d6eb60662548ff77cd6)
 2015-02-10 12:55:22 +01:00
artica b41dd94fad Auto-updated build strings. 2015-02-10 00:01:25 +01:00
artica 45ff71690f Auto-updated build strings. 2015-02-09 00:01:23 +01:00
artica d1f0c48d6e Auto-updated build strings. 2015-02-08 00:01:23 +01:00
artica 2483b53c5d Auto-updated build strings. 2015-02-07 00:01:25 +01:00
mdtrooper 70cd9406f8 Added check for the profile is used by admin users before to delete. TICKET: #1753 
(cherry picked from commit 0d1491225b)
 2015-02-06 18:03:17 +01:00
m-lopez-f c21f16f923 Fixed problem with search between dates. No select correct data. Tickets #1767 2015-02-06 16:11:21 +01:00
m-lopez-f 1aebacf6da Lost filter when send filter form Tickets #1778 2015-02-06 15:35:04 +01:00
m-lopez-f 142f6a5387 Fixed problems with user without all permissions and all groups enter in view events Tickets #1776 2015-02-06 15:11:14 +01:00
mdtrooper d49a895833 Fixed the lost 'server_name' in the monitor view in a node console. 
(cherry picked from commit f1701f32c9)
 2015-02-06 14:44:45 +01:00
mdtrooper ea8854b8d7 Fixed the user home page as dashboard for Pandora 5.1 . TICKET: #1561 2015-02-06 14:24:14 +01:00
mdtrooper 06f0e895d8 Fixed the links of extension 'agents modules' when it is setted the ACL enterprise. TICKET: #1780 
(cherry picked from commit 544fe1c36c)
 2015-02-06 13:16:37 +01:00
m-lopez-f 76a1e25726 Fixed problems with filter, this lost when change the page in data view in 'Tree View' 2015-02-06 11:09:41 +01:00
artica af236b3a4f Auto-updated build strings. 2015-02-06 00:01:22 +01:00
mdtrooper baab5164e2 Fixed the error message in the check syntax of plugin registration plugin. 
(cherry picked from commit db8bf349c3)
 2015-02-05 17:17:56 +01:00
mdtrooper 39efadf123 Fixed the status of agent with some not-init modules. TICKET: #1761 2015-02-05 14:51:45 +01:00
Hirofumi Kosaka e031cd68c1 Added new APIs: get_module_properties and get_module_properties_by_name. 
These functions share the field name tables with get_tree_agents.
 2015-02-05 14:55:26 +09:00
artica 3d6f7c2936 Auto-updated build strings. 2015-02-05 00:01:22 +01:00
m-lopez-f ded628da3e Fixed problem in view of 'Tree view' with large data length. Reopen T#1748 2015-02-04 13:10:08 +01:00
m-lopez-f bf663a93c2 changed the form of display data in Agents/modules, show only agents enabled and agents with modules are same gruop module to selected in form 2015-02-04 11:13:20 +01:00
artica 7fac2f71ac Auto-updated build strings. 2015-02-04 00:01:22 +01:00
m-lopez-f 6613f57e81 Changed page no access 2015-02-03 13:45:10 +01:00
m-lopez-f 05c0acecba Changed page no access 
(cherry picked from commit aa2d0edde2)
 2015-02-03 13:36:02 +01:00
mdtrooper 060dd23561 Fixed the graph for string module data. TICKET: #1749 
(cherry picked from commit 5d14e8802d)
 2015-02-03 12:43:54 +01:00
artica 54c906b4a8 Auto-updated build strings. 2015-02-03 00:01:23 +01:00
mdtrooper 12f23163cd Fixed PHP warnings. 
(cherry picked from commit 760de99427)
 2015-02-02 14:19:04 +01:00
m-lopez-f c83b07c5e9 Add width in table view data in tree view 
(cherry picked from commit 2ae253a3e0)
 2015-02-02 10:25:10 +01:00
m-lopez-f 18939f4249 Fixed align in view table data in tree view 2015-02-02 10:19:53 +01:00
artica 00bf41aeea Auto-updated build strings. 2015-02-02 00:01:21 +01:00
artica bbcd17cf69 Auto-updated build strings. 2015-02-01 00:01:21 +01:00
artica 974d38438e Auto-updated build strings. 2015-01-31 00:01:56 +01:00
Vanessa Gil 93386c458f Fixed bug when checking acls to delete events. Ticket #1737. 2015-01-30 15:47:57 +01:00
m-lopez-f 10993ef0f5 Change visual in 'Tactical server information' in third column 2015-01-30 13:12:04 +01:00
m-lopez-f d00233e7c4 Fixed problems with absolete paths 
(cherry picked from commit f1cd6b36a6)
 2015-01-30 11:50:52 +01:00
m-lopez-f a7ad4c9b60 Fixed problems with export audit log to csv when no data to show 
(cherry picked from commit bddc05e21d)
 2015-01-30 11:49:47 +01:00
Vanessa Gil fe89572a43 Fixed bug #1733. 2015-01-30 11:29:56 +01:00
Vanessa Gil b5cf4a0139 Fixed bug #1736. 2015-01-30 11:05:22 +01:00
m-lopez-f f1f1e7ba94 Change order to show info in 'Tactical server information' about data server 2015-01-30 10:07:16 +01:00
artica 3cc2978093 Auto-updated build strings. 2015-01-30 00:01:23 +01:00
mdtrooper 27d455ce4e Added a checkboxes in the list of elements for to make more easy the deletion of item in visual map. TICKET: #1687 
(cherry picked from commit bfc1c60ee8)

Conflicts:
	pandora_console/godmode/reporting/visual_console_builder.elements.php
 2015-01-29 17:02:37 +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 443440f998 Fixed alert command previews in 'Configure alert action' when variable contained a double or single quotes 2015-01-29 13:40:19 +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 913dce186d Fixed problem in tree view with servername containt dot, tree not expand 
Problem in loadSubTree in search field with id X

(cherry picked from commit 080f98e549)
 2015-01-28 11:58:09 +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
m-lopez-f 5de1c78f24 add links in agent name and alert name 
(cherry picked from commit a3698f1b45)
 2015-01-23 12:23:13 +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
m-lopez-f dffce9c2dc Delete shortcut of remote configuration in agents 2015-01-22 14:57:09 +01:00
m-lopez-f 315aaf1816 removed debug line is uploaded in another commit 2015-01-21 15:29:46 +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
m-lopez-f 770a6d4528 Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-01-21 13:12:58 +01:00
m-lopez-f 2b592755ac Add filter group module in general view of agents 2015-01-21 13:12:41 +01:00
mdtrooper c2af060e62 Uploaded lost change from yesterday. Added the text in the snmp console view 
(cherry picked from commit a7c386b258)
 2015-01-21 12:46:30 +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
m-lopez-f b215eefdf1 Fixed problems when ordering, Filters in 'Monitor detail' were lost. 2015-01-20 09:25:45 +01:00
m-lopez-f 3646d46f02 Change name field in custom events from Criticity to Severity. 2015-01-20 09:12:12 +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
m-lopez-f 6e6e8ede9e Added erased when a plugin is also deleted in the policies. 
(cherry picked from commit e4e15af3ef)
 2015-01-19 10:53:25 +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
m-lopez-f 07d6404a2a Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-01-16 14:44:46 +01:00
m-lopez-f 070e9f6e00 Fixed problem with create agent and not asigned ip address 
create record in taddress and ip is ''

(cherry picked from commit 5d0bc28dc8)
 2015-01-16 14:44:20 +01:00
mdtrooper 43470ade1a Erased lost debug trace call. 2015-01-16 13:57:13 +01:00
m-lopez-f a36b399b1f Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-01-16 13:10:16 +01:00
m-lopez-f 5c86b34adc Fixed error creating the url in, en Reporting>>Visual Console>>Show link to public Visual Console 2015-01-16 13:09:42 +01:00
mdtrooper a91cde0748 Fixed the PHP warning with undefined var. TICKET: #1552 
(cherry picked from commit 5a5abe8e53)
 2015-01-16 13:04:48 +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
m-lopez-f 9e14c5fb20 Change help hint in Create user in field 'Global Profile' 2015-01-16 12:10:14 +01: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 f9b35d6f56 fixed little problem 2015-01-15 16:29:57 +01:00
m-lopez-f 40c7c3b967 Error with cherry-pick, upload other change of push '8798d94' 2015-01-15 16:26:16 +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
m-lopez-f 90d600a238 Fixed permissions error when validating alerts. 2015-01-15 09:44:02 +01:00
artica b42287f37a Auto-updated build strings. 2015-01-15 00:01:24 +01:00
m-lopez-f 670611a162 changed visual form 2015-01-14 16:46:05 +01:00
m-lopez-f 261b4cd564 has been added to select other ips agent and improved form. 2015-01-14 15:39:15 +01:00
m-lopez-f 7424e37fa0 Changed text 'Module macros' to 'Custom macros' 2015-01-14 12:14:30 +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 cebaaeba8e Merge branch 'pandora_5.1' of https://github.com/pandorafms/pandorafms into pandora_5.1 2015-01-13 11:25:15 +01:00
m-lopez-f a2dff604c8 Fixed small error in translation. 2015-01-13 11:24:48 +01:00
m-lopez-f 824d62a4f8 Revert "changed the text of the tooltips of the variables" 
This reverts commit d518e222a0.
 2015-01-13 11:23:24 +01:00
m-lopez-f d518e222a0 changed the text of the tooltips of the variables 2015-01-13 11:20:57 +01:00
m-lopez-f 56a2fca966 Fixed small error in translation 2015-01-13 11:13:04 +01:00
m-lopez-f 757b065fd2 Added new tooltip to the field filter in SNMP-> SNMP Filters-> create 2015-01-13 11:09:37 +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
m-lopez-f f37c9ab4c4 Add data to string variables to correct the problem when ordering. 2015-01-12 16:32:04 +01:00
m-lopez-f 607af5eb1e Change the variables in the array so that they can be translated 2015-01-12 15:54:30 +01:00
m-lopez-f 51d45f0db0 Add combox filter in search form, view: Manage Agents in Admistration 2015-01-12 15:31:14 +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
mdtrooper a08e5651b6 Added info dialog with the modules and components that lock a server plugin 
(cherry picked from commit 9367a8bdc9)
 2014-12-12 15:05:48 +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
Alejandro Gallardo Escobar 35714cca35 Now the tree view tabs keep the 'pure' status 2014-12-04 17:49:08 +01:00
Alejandro Gallardo Escobar 0933a829ba Improved the agent info bubble returned via ajax. Ticket #1612 2014-12-04 16:41:05 +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 cc2cba8dc5 Fixed the acl tags with groups without tags. Ticket: #1611 2014-12-04 13:05:40 +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