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

4529 Commits

Author SHA1 Message Date
mdtrooper c004c2c1b6 Fixed the 'simple_graph' item in metaconsole reports. TICKET: #2249 2015-05-22 17:05:17 +02:00
mdtrooper 8107a78791 Added support to metaconsole in function 'events_get_group_events' 2015-05-22 17:04:23 +02:00
m-lopez-f a19e4cdbf5 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-22 14:33:56 +02:00
m-lopez-f 62ff5eaef4 Add new macro Events response, tiquet:#2253 2015-05-22 14:33:43 +02:00
mdtrooper f009758e93 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-22 12:31:49 +02:00
mdtrooper 2fe85510a7 Fixed PHP Warnings. 2015-05-22 12:31:33 +02:00
Alejandro Gallardo Escobar 6a533969ef Improved the element concatenation 2015-05-22 11:05:53 +02:00
artica 0ea32ce1dc Auto-updated build strings. 2015-05-22 00:01:13 +02:00
m-lopez-f 400cc3c587 If possible selected None own in owner event, tiquet: #2250 2015-05-21 15:23:37 +02:00
Alejandro Gallardo Escobar 33867fcc80 Fixed the function "events_get_count_events_validated" 2015-05-21 13:28:17 +02:00
mdtrooper 5eb372a7ff Moved the function 'reporting_get_stats_servers' to the correct file 2015-05-21 12:31:45 +02:00
mdtrooper 1cb3399425 Fixed PHP Warnings and PHP notices (The PHP version 5.3.4 (the PHP version in new CentOS) and uppers are very noisy.) 2015-05-21 12:18:40 +02:00
Alejandro Gallardo Escobar 5695611ba5 Added an order field to the group events query for oracle 2015-05-21 12:18:31 +02:00
Alejandro Gallardo Escobar b584f94b10 Successfully fixed and simplified the evil query of grouped events 2015-05-21 12:01:22 +02:00
artica bb934257e6 Auto-updated build strings. 2015-05-21 00:01:13 +02:00
Alejandro Gallardo Escobar 3176cdfaee Minor fixes 2015-05-20 17:37:39 +02:00
mdtrooper a0dbe00f92 Some fixes in the new code of report (html) 2015-05-20 13:11:41 +02:00
m-lopez-f 1d01bd6853 Fixed problems with value pure in visual console in meta,tiquet: #2202 2015-05-20 11:50:30 +02:00
artica 0dc669178b Auto-updated build strings. 2015-05-20 00:01:17 +02:00
Alejandro Gallardo Escobar 143243636c Error fixes related with the improved oracle compatibility 2015-05-19 19:21:05 +02:00
Alejandro Gallardo Escobar 837667b441 Removed the information about the defined alerts for the metaconsole (again) 2015-05-19 19:20:09 +02:00
Alejandro Gallardo Escobar 137acdb232 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/include/functions_reporting.php
 2015-05-19 19:16:35 +02:00
mdtrooper f2683594b5 Fixes in the new code of reports. 2015-05-19 17:36:47 +02:00
Ramon Novoa c32c167b6e Ask for the old password before letting a user renew his password. 
(cherry picked from commit 0840c20764)
 2015-05-19 11:38:30 +02:00
artica 2896fb5324 Auto-updated build strings. 2015-05-19 00:01:15 +02:00
Alejandro Gallardo Escobar 7e67287ee0 Fixed errors related with the oracle compatibility 2015-05-18 19:06:21 +02:00
Alejandro Gallardo Escobar b8f2daf6fa Improved the functions that return a value 2015-05-18 19:05:22 +02:00
Alejandro Gallardo Escobar f7867e3ce0 Fixed errors related with the oracle compatibility 2015-05-18 18:33:31 +02:00
Alejandro Gallardo Escobar 24aa40a726 Fixed errors related with the oracle compatibility 2015-05-18 18:08:14 +02:00
Alejandro Gallardo Escobar c5d80cd104 Added history database support to the function '*_get_value_filter' 2015-05-18 18:05:09 +02:00
mdtrooper 0a9ae10a8f Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-05-18 16:25:22 +02:00
mdtrooper 36467aaa5e Working in the refactoring the code of reports. Removed the xml code. 2015-05-18 14:49:02 +02:00
Ramon Novoa 2b698e5f35 Added a missing include. 
(cherry picked from commit 641600c9ef)
 2015-05-18 11:06:23 +02:00
mdtrooper 34b3557e9e Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-05-18 10:46:27 +02:00
artica 94fc0c72bb Auto-updated build strings. 2015-05-18 00:01:11 +02:00
artica 26c2e22b1c Auto-updated build strings. 2015-05-17 00:01:09 +02:00
artica dd60a6ad3f Auto-updated build strings. 2015-05-16 00:01:10 +02:00
artica c1fffcfc4f Auto-updated build strings. 2015-05-15 00:01:15 +02:00
Alejandro Gallardo Escobar eb965ff7da Fixed the data retrieving with oracle databases 2015-05-14 17:57:59 +02:00
mdtrooper 4387c36bbf Some fixed for the enterprise PDF reports. 2015-05-14 17:26:49 +02:00
mdtrooper 98d9032034 Some fixed for the enterprise PDF reports. 2015-05-14 16:21:04 +02:00
mdtrooper 60d301944d Some fixed for the enterprise PDF reports. 2015-05-14 15:52:55 +02:00
mdtrooper fadeaef80a Some fixed for the enterprise PDF reports. 2015-05-14 13:17:59 +02:00
Alejandro Gallardo Escobar d212fd5543 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-14 11:09:37 +02:00
artica d199846972 Auto-updated build strings. 2015-05-14 00:01:11 +02:00
mdtrooper e005a352ab Some fixes for the enterprise PDF reports. 2015-05-13 13:55:54 +02:00
artica 7d8fe9508b Auto-updated build strings. 2015-05-13 00:01:15 +02:00
mdtrooper 9e75cce59f Some changes and fixed for the reports in PDF. 2015-05-12 18:18:48 +02:00
m-lopez-f 27013cb6e7 Fixed generate data and visual of visual console when user used wizard, tiquet: #2196 2015-05-12 16:46:42 +02:00
mdtrooper 7ce25e9627 Some changes and fixed for the reports in PDF. 2015-05-12 16:41:08 +02:00
m-lopez-f b6c49949e4 Revert "Fixed generate data and visual of visual console when user used wizard, tiquet: #2196" 
Problems with funcionality of visualconsole

This reverts commit 43bd6e0109.
 2015-05-12 12:09:07 +02:00
m-lopez-f 43bd6e0109 Fixed generate data and visual of visual console when user used wizard, tiquet: #2196 2015-05-12 11:08:43 +02:00
artica d771989313 Auto-updated build strings. 2015-05-12 00:01:12 +02:00
Alejandro Gallardo Escobar e3ccfb95fe Refactored to fix some errors and improve the scalability 2015-05-11 20:54:23 +02:00
Alejandro Gallardo Escobar f0fe255f48 Added functions to process sql scripts to add data to the pandora database 2015-05-11 14:17:08 +02:00
Alejandro Gallardo Escobar e47af5993f Minor fix 2015-05-11 14:16:44 +02:00
artica 1cc02b9013 Auto-updated build strings. 2015-05-11 00:01:11 +02:00
artica a815e04f07 Auto-updated build strings. 2015-05-10 00:01:12 +02:00
artica 7c6934ff39 Auto-updated build strings. 2015-05-09 00:01:11 +02:00
m-lopez-f 9921304417 Fixed problems withs path in windows, tiquets: #2153,#2114 2015-05-08 09:51:53 +02:00
artica 3973044aa1 Auto-updated build strings. 2015-05-08 00:01:13 +02:00
mdtrooper def5a597a2 Fixed the image for the 'simple_graph' in the enterprise pdf reports. 2015-05-07 17:05:50 +02:00
m-lopez-f a43bfd5d5a Delete order by Data column in main data agent. tiquet: #2060 2015-05-07 08:53:37 +02:00
artica 4b7047d9a8 Auto-updated build strings. 2015-05-07 00:01:14 +02:00
mdtrooper 0ec32cc826 Fixed the PHP Warnings about the re-start the session. 
(cherry picked from commit 1a035873dc)
 2015-05-06 18:43:10 +02:00
mdtrooper 1a035873dc Fixed the PHP Warnings about the re-start the session. 2015-05-06 18:42:42 +02:00
mdtrooper c46bdc5087 Fixed the lost value for the config max_file_size. 
(cherry picked from commit d2e57f2ec8)
 2015-05-06 18:29:20 +02:00
mdtrooper d2e57f2ec8 Fixed the lost value for the config max_file_size. 2015-05-06 18:28:46 +02:00
mdtrooper 73e0a74a1a Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting.php
 2015-05-06 17:02:40 +02:00
mdtrooper c7108cce46 Changes in the code for the report in the dashboard. 2015-05-06 16:31:10 +02:00
mdtrooper 94313bb249 Fixed the lost default parameter in the function. 2015-05-06 16:28:57 +02:00
mdtrooper 249e2e730d Working in the refactoring the code of reports (SLA_services). 2015-05-06 13:24:29 +02:00
m-lopez-f f5b26f69e6 Add unit to legend left in graph of interface information, tiquet: #2194 
(cherry picked from commit 277eb655a1)
 2015-05-06 13:04:45 +02:00
artica 6f308321d4 Auto-updated build strings. 2015-05-06 00:01:12 +02:00
mdtrooper c2fdcbb1d8 Working in the refactoring the code of reports (SLA_monthly). 2015-05-05 13:15:10 +02:00
artica 5dc2b6be17 Auto-updated build strings. 2015-05-05 00:01:14 +02:00
Alejandro Gallardo Escobar 65a425859e Error fixes 2015-05-04 21:18:38 +02:00
Alejandro Gallardo Escobar c02f3bacf4 Error fixes related with the improved oracle compatibility 2015-05-04 20:11:03 +02:00
Alejandro Gallardo Escobar 7ae97fa48b Added a new function to sort an associative array by key 2015-05-04 20:10:13 +02:00
Alejandro Gallardo Escobar c95f70dde7 Error fixes related with the improved oracle compatibility 2015-05-04 18:27:23 +02:00
Alejandro Gallardo Escobar a98be1cad9 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-04 17:28:42 +02:00
Alejandro Gallardo Escobar b78dbf1c0d Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-04 16:44:40 +02:00
m-lopez-f c2ce4fddf4 fixed distance to show box data to graph in agent view, tiquet: #2161 2015-05-04 16:34:25 +02:00
m-lopez-f 6b974efe19 Merge branch 'feature/NewView' into develop 2015-05-04 15:45:34 +02:00
m-lopez-f 0b59266a61 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-04 15:45:17 +02:00
m-lopez-f 6241ae13d6 Add new option, when is active data of modules type is proc, show ok or fail. Tiquet: #1996 2015-05-04 15:44:37 +02:00
Alejandro Gallardo Escobar 57a9d4615c Renamed a table due to the character limitation in oracle 2015-05-04 14:41:40 +02:00
Ramon Novoa cf6a26a0b5 Fixed a call to enterprise_include_once (was called before 
ENTERPRISE_DIR was set).
 2015-05-04 14:15:35 +02:00
Ramon Novoa f16ba3e1da Updated the alert-matches help files with documentation from the Wiki. 2015-05-04 10:55:59 +02:00
artica b9ace11dda Auto-updated build strings. 2015-05-04 00:01:09 +02:00
artica 8c2851cf7f Auto-updated build strings. 2015-05-03 00:01:08 +02:00
artica 88bb073bca Auto-updated build strings. 2015-05-02 00:01:10 +02:00
artica 2ef016b06e Auto-updated build strings. 2015-05-01 00:01:12 +02:00
Alejandro Gallardo Escobar 1121fbd8b7 Fixed problems related with the oracle compatibility 2015-04-30 20:11:07 +02:00
m-lopez-f 70bca63bd6 Fixed error when read file in windows, when path containt space, tiquet: #2166 and #2114 2015-04-30 13:44:16 +02:00
Alejandro Gallardo Escobar 64466e4557 Error fix 2015-04-30 12:46:43 +02:00
Alejandro Gallardo Escobar 3264c65ef8 Fixed some problems with oracle compatibility 2015-04-30 12:35:42 +02:00
artica 0ce49f40b4 Auto-updated build strings. 2015-04-30 00:01:15 +02:00
mdtrooper 3a74ee9f15 Working in the refactoring the code of reports (SLA). 2015-04-29 19:05:06 +02:00
mdtrooper 5c2b0c0549 Working in the refactoring the code of reports (top_n). 2015-04-29 16:14:39 +02:00
Alejandro Gallardo Escobar 4008b12add Error fixes related with the improved oracle compatibility 2015-04-29 15:31:46 +02:00
artica fd00915457 Auto-updated build strings. 2015-04-29 00:01:11 +02:00
m-lopez-f c50bbb7eea Change login and styles 2015-04-28 15:29:15 +02:00
Ramon Novoa 484a5c1c2c Added missing help files. 2015-04-28 14:59:57 +02:00
m-lopez-f e093853691 Merge branch 'develop' into feature/NewView 2015-04-28 11:37:27 +02:00
artica 3ee1cfacd9 Auto-updated build strings. 2015-04-28 00:01:15 +02:00
mdtrooper bc9918707a Working in the refactoring the code of reports (event_report_group) and added the filter by text. TICKET: #2066 2015-04-27 13:42:03 +02:00
m-lopez-f 90d6ea15cf Merge branch 'develop' into feature/NewView 2015-04-27 10:12:45 +02:00
artica 9ef920de5f Auto-updated build strings. 2015-04-27 00:01:09 +02:00
artica 5e6c70b9d0 Auto-updated build strings. 2015-04-26 00:01:08 +02:00
artica 576aed5356 Auto-updated build strings. 2015-04-25 00:01:14 +02:00
Alejandro Gallardo Escobar 33fac67ed9 Merge remote-tracking branch 'origin/develop' into feature/meta-agent-cache 2015-04-24 18:11:31 +02:00
Alejandro Gallardo Escobar b0f5724248 Removed the information about the defined alerts for the metaconsole 2015-04-24 18:10:50 +02:00
mdtrooper 55dc1a278e Working in the refactoring the code of reports (event_report_module). 2015-04-24 14:24:17 +02:00
m-lopez-f 63354c0188 Add new images to login and changed login 2015-04-24 13:45:13 +02:00
mdtrooper 24e0c6430b Working in the refactoring the code of reports (inventory_changes). 2015-04-24 13:07:50 +02:00
mdtrooper 78267bcda4 Working in the refactoring the code of reports (inventory). 2015-04-24 11:51:46 +02:00
artica 7dbf60d4ef Auto-updated build strings. 2015-04-24 00:01:13 +02:00
Alejandro Gallardo Escobar 1ae9ee0810 Added support to retrieve agents from the new table of the metaconsole 2015-04-23 21:14:24 +02:00
Alejandro Gallardo Escobar a4431d63a7 Improved the code maintenance and added support to retrieve agents from the new table of the metaconsole 2015-04-23 21:12:24 +02:00
m-lopez-f b2ef7bc304 Changed visual of any views 2015-04-23 17:52:16 +02:00
Alejandro Gallardo Escobar 8a348c2411 Merge remote-tracking branch 'origin/develop' into feature/meta-agent-cache 2015-04-23 15:02:27 +02:00
artica 13b7d4a414 Auto-updated build strings. 2015-04-23 00:01:12 +02:00
m-lopez-f 3d2adc315e Change siual of view in any view 2015-04-22 16:46:08 +02:00
mdtrooper 201e4dcd8a Working in the refactoring the code of reports (agent_module). 2015-04-22 16:32:24 +02:00
mdtrooper 38ae50eb90 Working in the refactoring the code of reports (exception). 2015-04-22 13:00:08 +02:00
m-lopez-f a7117fca61 Changed visual and changed images 2015-04-22 09:51:34 +02:00
m-lopez-f b39d21b034 Merge branch 'develop' into feature/NewView 2015-04-22 09:48:45 +02:00
artica 7812f2a965 Auto-updated build strings. 2015-04-22 00:01:28 +02:00
m-lopez-f 50282ad121 Change image in print warning and add new images and chenge images 2015-04-21 18:03:08 +02:00
mdtrooper 1a41cc4973 Working in the refactoring the code of reports (group_report). 2015-04-21 17:27:21 +02:00
m-lopez-f dc09a9a14e Change visual and add new images 2015-04-21 17:26:20 +02:00
m-lopez-f 05c47bcafe Merge branch 'develop' into feature/NewView 2015-04-21 17:13:58 +02:00
Alejandro Gallardo Escobar 311fd99811 Improvements on the performance for the metaconsole 2015-04-21 14:01:10 +02:00
Alejandro Gallardo Escobar 90d5d3cae3 Changed an ajax call from synchronous to asynchronous 2015-04-21 13:58:28 +02:00
mdtrooper 6b13110b5b Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-21 13:18:56 +02:00
Vanessa Gil 0bdf9c4404 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-04-21 10:48:48 +02:00
Vanessa Gil 291704ea66 Update translations. 2015-04-21 10:48:25 +02:00
m-lopez-f 896e6329c8 Fixed problems with title when open graph in tree view in meta and nodo, tiquet: #2077 2015-04-21 10:44:50 +02:00
artica d6e7abe8c6 Auto-updated build strings. 2015-04-21 00:01:16 +02:00
m-lopez-f f52caebda3 Fixed error to replace character in tree view to data dialog 2015-04-20 17:44:21 +02:00
mdtrooper cd0d2c68e5 Fixed the function mysql_db_get_all_rows_in_table for several fields to order as array 
(cherry picked from commit 36c5349cf4)
 2015-04-20 16:26:05 +02:00
m-lopez-f dbfc273de9 Fixed error javascript 2015-04-20 15:48:17 +02:00
m-lopez-f 32582e5017 add title in dialog in tree view and change image in header 2015-04-20 12:31:04 +02:00
m-lopez-f 28522a1918 Add new images 2015-04-20 10:42:27 +02:00
m-lopez-f ebe95af69e Add title when open visual data in treeview and status monitor, tiquet: #2077 2015-04-20 10:40:42 +02:00
artica 4e0e988508 Auto-updated build strings. 2015-04-20 00:01:10 +02:00
Junichi Satoh b4dbefaf66 Updated help. 2015-04-19 17:06:05 +09:00
Junichi Satoh ece9cdb4b3 Updated help. 2015-04-19 13:48:46 +09:00
artica 1f06f8ec92 Auto-updated build strings. 2015-04-19 00:01:10 +02:00