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
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
artica d486faa7b2 Auto-updated build strings. 2015-02-18 00:01:25 +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 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
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
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
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 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
artica af236b3a4f Auto-updated build strings. 2015-02-06 00:01:22 +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
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
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 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 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