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

9317 Commits

Author SHA1 Message Date
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
mdtrooper dba729a272 Fixed the lines in visualmaps with service items. TICKET: #1896 
(cherry picked from commit 80bd7b0db2)

Conflicts:
	pandora_console/operation/visual_console/public_console.php
	pandora_console/operation/visual_console/render_view.php
 2015-03-09 13:16:53 +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
mdtrooper 37bff59e85 Fixed, now the tab of remote configuration is not visible. TICKET: #1884 2015-03-09 12:08:26 +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
hkosaka 0bebde2ac5 As a workaround to prevent that pandora_server fails to start tentacle_server for proxy mode. 2015-03-09 16:04:20 +09: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 84de8b6a45 Fixed error php 2015-03-06 15:16:56 +01:00
m-lopez-f a926ab1e64 Fixed error php 2015-03-06 15:14:10 +01:00
m-lopez-f 13bcd6bcb1 Changed visual of metaconsole 2015-03-06 14:37:38 +01:00
m-lopez-f f3b1351f8d Fixed error php 2015-03-06 13:49:04 +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
Ramon Novoa 91c72f8331 Check for negative time increments in inc modules. 2015-03-05 16:48:25 +01:00
Ramon Novoa 73636d1422 Do not change the server_threshold from the SNMP Server, since that 
affects other servers too!

(cherry picked from commit ce9e337cb3)
 2015-03-05 16:21:32 +01:00
Alejandro Gallardo Escobar b87e359050 Now the tags filter appear properly. Fixes ticket #1889 2015-03-05 13:20:55 +01:00
Ramón Novoa cc1e745295 Merge pull request #9 from uchida/follow-linux-standard-base-exit-codes 
Follow Linux Standard Base exit codes for init script actions
 2015-03-05 11:16:50 +01:00
m-lopez-f 29a58006db Fixed php include error 2015-03-05 10:55:17 +01:00
Akihiro Uchida 8f0312ac98 Add IF NOT EXISTS keywords to prevent an error when the table already exists 2015-03-05 13:21:05 +09:00
Akihiro Uchida 03e40817b0 Keep Linux Standard Base compatibility on non-SuSE platform 2015-03-05 11:43:31 +09:00
Akihiro Uchida 84485d8f85 Keep Linux Standard Base Compatibility on SuSE Linux 2015-03-05 11:43:21 +09:00
Akihiro Uchida 1f3bfe115c Fix style for a pandora_server sysvinit script 2015-03-05 11:43:08 +09: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
Akihiro Uchida fad89150ee Change function name in pandoralog 2015-03-05 01:44:59 +09:00
Akihiro Uchida 83e5287613 Extend getAgentNameFromCmdExec timeout to 60s 2015-03-05 01:43:39 +09: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
Ramón Novoa 7357216155 Merge pull request #8 from uchida/remember-agent_name_cmd-result-in-xml-header 
Remember agent_name_cmd result in xml header
 2015-03-04 15:25:59 +01:00
mdtrooper 50bbdf5590 Fixed the lost config data in modules from policy when update something in the module. TICKET: #1874 2015-03-04 14:55:44 +01:00
Alejandro Gallardo Escobar b79d572959 Fixed an SQL error 2015-03-04 13:35:52 +01:00
Akihiro Uchida ce6d76eabc Separate getAgentNameCmdExec from getCoordinatesFromCmdExec 2015-03-04 20:36:43 +09:00
Akihiro Uchida 9ff9a41494 Extend getCoordinatesFromCmdExec timeout to 500 ms to make consistent with timeout for WaitForSingleObject 2015-03-04 20:18:47 +09:00
mdtrooper 7e7e40dd02 Re-added lost function 'tags_get_module_policy_tags'. TICKET: #1881 2015-03-04 11:39:25 +01:00
Akihiro Uchida 1b2eff4438 Remember the agent_name_cmd result in xml header 2015-03-04 14:07:44 +09:00
artica 066f91e30f Auto-updated build strings. 2015-03-04 00:01:10 +01:00
mdtrooper 9df5a23bf5 Merge branch 'changes_snmp_remote-pending_to_check' into develop 2015-03-03 17:04:15 +01:00