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

4191 Commits

Author SHA1 Message Date
artica d967b4eed9 Auto-updated build strings. 2015-03-18 00:01:12 +01:00
mdtrooper 5f57ca716b Change some code for the future fixed in PHP about the try catch in the includes. TICKET: #1791 (still open thanks PHP) 2015-03-17 16:48:52 +01:00
m-lopez-f e0e531bf05 Add field to custom line widht to custom graph tiquet: #1875 2015-03-17 15:36:24 +01:00
Vanessa Gil 9512be8483 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-17 12:36:28 +01:00
Vanessa Gil 7f542c1093 Fixed bug in event list. 2015-03-17 12:36:10 +01:00
artica a67d1444c9 Auto-updated build strings. 2015-03-17 00:01:10 +01:00
mdtrooper 1b5779eb57 Fixed the bug when the group name is showed instead the icon 2015-03-16 17:47:19 +01:00
mdtrooper 2646d92b86 Added the function 'modules_is_disable_agent' and fixed the show disabled agents in reports into items 'general' 'sla'. 
(cherry picked from commit cf9c53f220)
 2015-03-16 11:59:11 +01:00
m-lopez-f b58bd83523 Fixed problems when filter by 'Specify time range' and lost filter and not show data 2015-03-16 11:58:12 +01:00
m-lopez-f 93a2d15b2c display data changed depending if compare dates or show date directly in the tree view #1976 2015-03-16 11:47:12 +01:00
artica 763f291ee9 Auto-updated build strings. 2015-03-16 00:01:10 +01:00
artica c7beabc9d4 Auto-updated build strings. 2015-03-15 00:01:11 +01:00
artica a0b924218e Auto-updated build strings. 2015-03-14 00:01:12 +01:00
Alejandro Gallardo Escobar 7fda8a296d Now some monitor graphs are shown in 'only average' mode when accessing it from the metaconsole 2015-03-13 14:43:30 +01:00
Alejandro Gallardo Escobar 5a07aabecd Now the monitor graphs of the tree view modules are 'only average' on the metaconsole 2015-03-13 14:18:15 +01:00
Alejandro Gallardo Escobar ba6c8809de Fixed the agent status filter for the strict ACL users 2015-03-13 13:54:09 +01:00
artica 1fb32cfd07 Auto-updated build strings. 2015-03-13 00:01:10 +01:00
Alejandro Gallardo Escobar 24a67be19e Error fixes on the agent counter functions 2015-03-12 17:30:29 +01:00
Vanessa Gil 8e3ccd84bc Fixed bug #1958. 2015-03-12 15:32:33 +01:00
Alejandro Gallardo Escobar 1bea97c9c4 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-03-12 15:08:37 +01:00
Alejandro Gallardo Escobar 59de2a0597 Fixed on the agent counters for the strict ACL users 2015-03-12 15:06:40 +01:00
Alejandro Gallardo Escobar b84bef8547 Fixes on the agent and monitor counter functions 2015-03-12 15:05:54 +01:00
Vanessa Gil 90c4be1b50 Merge branch 'feature/1932' into develop 2015-03-12 13:28:59 +01:00
Vanessa Gil 21d2cae717 Fixed ticket #1932. 2015-03-12 13:28:24 +01:00
mdtrooper acb37f591c Fixed the event with filter EVENT_CRIT_WARNING_OR_CRITICAL in function 'events_get_events'. TICKET: #1909 2015-03-12 12:31:15 +01:00
m-lopez-f 8096cbfa19 Fixed progragate acl tags, children not get tags to father, Tickets #1939 2015-03-12 10:55:06 +01:00
artica db80f1c2b3 Auto-updated build strings. 2015-03-12 00:01:13 +01:00
Alejandro Gallardo Escobar e664e34dbe Now the agent counters have urls in the metaconsole too 2015-03-11 22:04:39 +01:00
Alejandro Gallardo Escobar 89c307bd5d Fixed a status filter error 2015-03-11 21:24:58 +01:00
Alejandro Gallardo Escobar ecb5a4097f A lot of changes into the agents and modules counters 2015-03-11 21:06:16 +01:00
m-lopez-f 7e1b707b64 Changed visual of metaconsole 2015-03-11 15:57:05 +01:00
mdtrooper 674a4f2697 Fixed the lost units in the 'general' item in reports. 
(cherry picked from commit 86424849c6)
 2015-03-11 14:44:07 +01:00
mdtrooper 01e6fd70a1 Fixed the item 'general' in reports. TICKET: #1902 
(cherry picked from commit 3e31951c46)
 2015-03-11 11:44:23 +01:00
m-lopez-f 6986fe0993 Changed visual of metaconsole 2015-03-11 11:31:46 +01:00
artica 1767993c84 Auto-updated build strings. 2015-03-11 00:01:11 +01:00
Vanessa Gil 041e9c00bc Fixed bug #1913. 2015-03-10 17:09:31 +01:00
mdtrooper db6e59c9bb Fixed the preview alert action in the form editor. TICKET: #1944 
(cherry picked from commit b7264f61c3)

Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/configure_alert_action.php
 2015-03-10 15:38:56 +01:00
Alejandro Gallardo Escobar de78ae6542 Fixed the agents ok counter for strict acl users 2015-03-10 14:30:27 +01:00
mdtrooper 2798b2230a Fixed. Added lost result message in the api call create tag 2015-03-10 12:35:31 +01:00
Alejandro Gallardo Escobar e7f55390a1 Removed debug traces 2015-03-10 13:37:10 +01:00
mdtrooper 6c6a866047 Fixed the user with strict acl tags does show any tag when the groups has not any tag. TICKET: #1921 2015-03-10 11:13:46 +01:00
artica ac6d1c424b Auto-updated build strings. 2015-03-10 00:01:13 +01:00
Alejandro Gallardo Escobar d0dff23658 Added tag/group filter support to the metaconsole 2015-03-09 21:12:57 +01:00
Alejandro Gallardo Escobar 79b77a6ecf Error fixes (again) 2015-03-09 20:43:41 +01:00
Alejandro Gallardo Escobar eab7e8dc66 Error fixes 2015-03-09 20:41:23 +01:00
Alejandro Gallardo Escobar d04d44c518 Added an alias to the "html_debug_print" function 2015-03-09 20:20:37 +01:00
Alejandro Gallardo Escobar d8ead991c8 Error fixes 2015-03-09 20:19:55 +01:00
Alejandro Gallardo Escobar 4e76794f90 Minor fix 2015-03-09 19:37:29 +01:00
Alejandro Gallardo Escobar 756cf4cbf7 Added the posibility to filter by 1 group or tag. Useful when accessing the tree view from the group view 2015-03-09 19:29:45 +01:00
m-lopez-f e38f31caaa Changed visual of metaconsole 2015-03-09 16:33:27 +01:00
mdtrooper 18fd20c078 Show group name instead the icon in metaconsole. TICKET: #1501 
(cherry picked from commit 1141127a34)
 2015-03-09 15:14:33 +01:00
Alejandro Gallardo Escobar c6f74233f0 Removed debug traces 2015-03-09 14:25:00 +01:00
Alejandro Gallardo Escobar 20dc72424a Improved and fixed the functions to count the agents 2015-03-09 13:50:41 +01:00
m-lopez-f 59cfc6bdc7 Changed visual of metaconsole 2015-03-09 09:56:44 +01:00
m-lopez-f 64c25571ed Changed visual of metaconsole 2015-03-09 09:52:36 +01:00
artica 6e4f1d3ba9 Auto-updated build strings. 2015-03-09 00:01:09 +01:00
artica f7a169122f Auto-updated build strings. 2015-03-08 00:01:08 +01:00
artica e0eec05ce5 Auto-updated build strings. 2015-03-07 00:01:11 +01:00
Ramon Novoa 0c0c823118 Merge branch 'feature/password-encryption' into develop 2015-03-06 17:10:25 +01:00
mdtrooper 178db6316b Fixed the counts and other things in the tactical view in metaconsole. TICKET: #1886 2015-03-06 16:58:21 +01:00
m-lopez-f 13bcd6bcb1 Changed visual of metaconsole 2015-03-06 14:37:38 +01:00
m-lopez-f 58722a5891 Changed visual of metaconsole 2015-03-06 12:28:05 +01:00
Alejandro Gallardo Escobar c9a56639a7 Now in strict mode the agent counters are realtime 2015-03-06 13:52:40 +01:00
Alejandro Gallardo Escobar e879757760 The module count functions now can be filtered with an agent id 2015-03-06 13:51:17 +01:00
Alejandro Gallardo Escobar 3c600fe29d Added a new constant: 'AGENT_MODULE_STATUS_ALL' 2015-03-06 13:45:54 +01:00
Alejandro Gallardo Escobar bf70b9bfba Minor fix 2015-03-06 11:58:46 +01:00
artica a68512ae0c Auto-updated build strings. 2015-03-06 00:01:10 +01:00
Alejandro Gallardo Escobar 7959675309 Fixed hierarchy errors when the user has the strict ACL enabled 2015-03-05 19:43:19 +01:00
Alejandro Gallardo Escobar c2e6977051 Critical ACL fixes 2015-03-05 19:42:11 +01:00
m-lopez-f 29a58006db Fixed php include error 2015-03-05 10:55:17 +01:00
artica 878bffbe22 Auto-updated build strings. 2015-03-05 00:01:10 +01:00
Alejandro Gallardo Escobar 84677400d4 Fixed an ACL propagation error on the counter functions 2015-03-04 20:32:10 +01:00
Alejandro Gallardo Escobar dd4e7af344 Fixed a PHP fatal error 2015-03-04 19:53:39 +01:00
Alejandro Gallardo Escobar 6d59a78fc9 Fixed the functions "tags_get_user_module_and_tags" and "tags_get_all_user_agents" 2015-03-04 18:31:12 +01:00
Ramon Novoa 4e4eb4df87 Merge branch 'develop' into feature/password-encryption 2015-03-04 15:39:37 +01:00
Alejandro Gallardo Escobar b79d572959 Fixed an SQL error 2015-03-04 13:35:52 +01:00
mdtrooper 7e7e40dd02 Re-added lost function 'tags_get_module_policy_tags'. TICKET: #1881 2015-03-04 11:39:25 +01:00
artica 066f91e30f Auto-updated build strings. 2015-03-04 00:01:10 +01:00
Alejandro Gallardo Escobar edc7e94189 Fixed an error by adding better error checks 2015-03-03 15:34:41 +01:00
Alejandro Gallardo Escobar 8f9db39176 Fixed an error which relaxed the requirements to retrieve network interfaces 2015-03-03 14:51:19 +01:00
artica 009135d28a Auto-updated build strings. 2015-03-03 00:01:10 +01:00
Alejandro Gallardo Escobar b782ef9924 Error fixes 2015-03-02 20:51:24 +01:00
Ramon Novoa df651810d4 Added support for password encryption to the Pandora FMS Console. 2015-03-02 17:30:19 +01:00
Alejandro Gallardo Escobar 3da480908b 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.
 2015-03-02 14:57:28 +01:00
mdtrooper 52e3926c71 Fixed the icons of menu on combined charts. TICKET: #1869 
(cherry picked from commit 380cddc4d4)
 2015-03-02 13:13:27 +01:00
mdtrooper ea8662c7bc Fixed the connection to node in metaconsole when show the data module dialog. TICKET: #1870 
(cherry picked from commit eea8e0d8ae)
 2015-03-02 11:41:32 +01:00
artica b797b900ce Auto-updated build strings. 2015-03-02 00:01:07 +01:00
artica e1382980bf Auto-updated build strings. 2015-03-01 00:01:09 +01:00
artica 805d930972 Auto-updated build strings. 2015-02-28 00:01:10 +01:00
mdtrooper 166c4fe504 Fixed the javascript of form editor of module plugin. TICKET: #1854 2015-02-27 15:07:32 +01:00
artica 1b637a8d13 Auto-updated build strings. 2015-02-27 00:01:11 +01:00
Alejandro Gallardo Escobar 34d944aab0 Error fixes 2015-02-26 19:49:08 +01:00
mdtrooper 84a0e2baaf Fixed the last value for general and exception of reportings 
(cherry picked from commit 6897e421d8)
 2015-02-26 17:53:39 +01:00
Alejandro Gallardo Escobar 0a4414960b Error fixes 2015-02-26 19:16:29 +01:00
Alejandro Gallardo Escobar d331c29403 The interfaces graph popup now appears properly in the metaconsole 2015-02-26 18:57:29 +01:00
Alejandro Gallardo Escobar ce946fff3c The interfaces graph popup now appears properly in the metaconsole 2015-02-26 18:55:17 +01:00
mdtrooper 7b08fb47c1 Fixed the create new remote user in Active Directory (enterprise). TICKET: #1845 2015-02-26 12:27:18 +01:00
artica c7ab4b86f2 Auto-updated build strings. 2015-02-26 00:01:09 +01:00
mdtrooper 0919eb4fce Fixed PHP Warning lost constant about collections 2015-02-25 12:26:37 +01:00
artica ab75abf7e0 Auto-updated build strings. 2015-02-25 00:01:09 +01:00
artica 2b7c3e2450 Auto-updated build strings. 2015-02-24 00:01:10 +01:00
mdtrooper 609802eb44 Fixed the string module data in reports of items 'general'. #1819 2015-02-23 15:13:21 +01:00
Alejandro Gallardo Escobar e6be7e7143 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-02-23 15:36:14 +01:00
Alejandro Gallardo Escobar abd115d99c Fixed an error on the module graph popup 2015-02-23 15:36:07 +01:00
mdtrooper 0952b96b49 Added the option 'last value' for the items 'general' and 'exception' in reports. TICKET: #1819 2015-02-23 13:43:26 +01:00
mdtrooper 8d214486e6 Fixed the situations when the period is not init. 2015-02-23 12:11:13 +01:00
artica aad27ee76d Auto-updated build strings. 2015-02-23 00:01:10 +01:00
Junichi Satoh 308c538dd7 Updated help. 2015-02-22 15:50:29 +09:00
artica 74cfcfdcd3 Auto-updated build strings. 2015-02-22 00:01:09 +01:00
artica 1e5f01b758 Auto-updated build strings. 2015-02-21 00:01:10 +01:00
Alejandro Gallardo Escobar a82062d9b7 Fixed the not init agent counter 2015-02-20 13:27:00 +01:00
Alejandro Gallardo Escobar 8cb7719e63 Fixed the agents counter functions 2015-02-20 12:43:09 +01:00
Alejandro Gallardo Escobar b7d76f6c9a Fixed the function to get the agents ok counter 2015-02-20 12:22:32 +01:00
artica 61690d89b5 Auto-updated build strings. 2015-02-20 00:01:11 +01:00
Alejandro Gallardo Escobar cf1d04d5f4 Removed some items without templates support from the templates item type select 2015-02-19 20:41:13 +01:00
mdtrooper c11a81dbef Fixed the ajax calls with timepicker in other languages instead english. 
(cherry picked from commit 15c93c3bd9)

Conflicts:
	pandora_console/include/ajax/module.php
 2015-02-19 18:37:12 +01:00
Alejandro Gallardo Escobar cd20ae0d2f Now the function "tags_get_user_module_and_tags" returns all group ids when the group is the 'All' group 2015-02-19 20:15:37 +01:00
Alejandro Gallardo Escobar 684c99aa0c Now the group filter of the groups networkmap works properly 2015-02-19 19:24:38 +01:00
Alejandro Gallardo Escobar 2bf3887bd7 A lot of ACL fixes 2015-02-19 19:09:36 +01:00
Alejandro Gallardo Escobar 74839f5489 Removed some unused functions 2015-02-19 19:07:40 +01:00
mdtrooper 66feffb0f7 Fixed the menu buttons in charts. TICKET: #1818 
(cherry picked from commit dac81d2640)
 2015-02-19 12:52:41 +01:00
artica 5704f03d05 Auto-updated build strings. 2015-02-19 00:01:10 +01:00
artica 1d5bfff3d0 Auto-updated build strings. 2015-02-18 00:01:11 +01:00
mdtrooper ce93888308 Fixed the io_safe_output function when the string has html entities defined by user 2015-02-17 14:57:22 +01:00
artica eb873ef593 Auto-updated build strings. 2015-02-17 00:01:11 +01:00
mdtrooper 0473856048 Killing pink unicorns and magic numbers. 2015-02-16 18:37:16 +01:00
artica d70c5f5811 Auto-updated build strings. 2015-02-16 00:01:10 +01:00
artica 3078a1dc06 Auto-updated build strings. 2015-02-15 00:01:12 +01:00
artica 76862b1da7 Auto-updated build strings. 2015-02-14 00:01:09 +01:00
mdtrooper 45e558eb57 Fixed typo error 2015-02-13 12:57:28 +01:00
m-lopez-f 872eeb0d05 Fixed problems with open visual data en tree view when console isn't metaconsole 2015-02-13 09:50:11 +01:00
artica 9c0c22ef01 Auto-updated build strings. 2015-02-13 00:01:10 +01:00
artica fedf122e7b Auto-updated build strings. 2015-02-12 14:52:58 +01:00
Alejandro Gallardo Escobar a7f086c675 Error fix 2015-02-12 13:15:46 +01:00
artica a1e432ca91 Auto-updated build strings. 2015-02-11 00:01:11 +01:00
mdtrooper a265ec3383 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 2015-02-10 18:24:00 +01:00
Alejandro Gallardo Escobar 658bb921e7 Improved the help 2015-02-10 19:06:19 +01:00
mdtrooper 6c1d958f73 Added the proxy configuration in the update manager. 2015-02-10 16:40:44 +01:00
mdtrooper 8968505812 Added more checks in the update manager. 2015-02-10 12:54:51 +01:00
artica 7e53d24840 Auto-updated build strings. 2015-02-10 00:01:11 +01:00
mdtrooper 2842970c83 Added feature of custom post process values. TICKET: #1743 2015-02-09 19:35:03 +01:00
artica 6a69e6ed7a Auto-updated build strings. 2015-02-09 00:01:09 +01:00
artica c1825dc960 Auto-updated build strings. 2015-02-08 00:01:08 +01:00
artica bedfe0fc81 Auto-updated build strings. 2015-02-07 00:01:10 +01:00
Alejandro Gallardo Escobar e32e563447 Minor changes on the module_graph function 2015-02-06 14:09:57 +01:00
Alejandro Gallardo Escobar d3151557f7 Now the api can return a string with a module graph encoded in base64 2015-02-06 13:48:59 +01:00
artica 55569ab805 Auto-updated build strings. 2015-02-06 00:01:09 +01:00
mdtrooper e943a84b96 Fixed the status of agent with some not-init modules. TICKET: #1761 
(cherry picked from commit 39efadf123)
 2015-02-05 14:52:51 +01:00
Hirofumi Kosaka 1fe60927b0 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:44:23 +09:00
artica be30e33266 Auto-updated build strings. 2015-02-05 00:01:09 +01:00