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

6670 Commits

Author SHA1 Message Date
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