Commit Graph

9941 Commits

Author SHA1 Message Date
mdtrooper 5c7b230e9b Merge some changes and fixed from the 'develop' branch. 2015-05-29 14:16:39 +02:00
Alejandro Gallardo Escobar 185a101132 Removed a require of a deleted file 2015-05-27 16:02:22 +02:00
Alejandro Gallardo Escobar 09998429b7 Modified the alert messages the system stores in the user session 2015-05-27 16:01:52 +02:00
Alejandro Gallardo Escobar 584000691c Added a new folder to the gitignore 2015-05-26 13:35:34 +02:00
Alejandro Gallardo Escobar 5906f6dd44 Re-fixed the agents filter 2015-05-26 12:07:13 +02:00
Alejandro Gallardo Escobar d7801c2933 Merge remote-tracking branch 'origin/develop' into features/oracle
Conflicts resolved:
	pandora_console/extensions/module_groups.php
	pandora_console/godmode/reporting/graph_builder.graph_editor.php
	pandora_console/operation/events/events_list.php
2015-05-26 10:29:38 +02:00
m-lopez-f 45b22fe78a Changed text in notice of update console, tiquet: #2209 2015-05-26 09:41:31 +02:00
artica c0bc11e50a Auto-updated build strings. 2015-05-26 00:02:12 +02:00
Alejandro Gallardo Escobar 760bc4a308 Many fixes, most of it related with the oracle support 2015-05-25 19:54:11 +02:00
Alejandro Gallardo Escobar 23b199d7cd Fixed the function 'events_create_event' for oracle databases 2015-05-25 19:53:20 +02:00
Alejandro Gallardo Escobar 163fcd1e09 Now the PL/SQL function 'INSERT_ID' returns the inserted id properly 2015-05-25 19:52:27 +02:00
mdtrooper 991c406a70 Fixed the 'group_report' item in metaconsole reports. TICKET: #2249 2015-05-25 16:29:51 +02:00
mdtrooper 2f23441516 Fixed the 'inventory' and 'inventory_changes' items in metaconsole reports. TICKET: #2249 2015-05-25 16:01:33 +02:00
mdtrooper 22ce2d8902 Fixed the 'group_configuration' and 'agent_configuration' items in metaconsole reports. TICKET: #2249 2015-05-25 13:39:27 +02:00
mdtrooper 81a0a217b5 Fixed PHP Warnings 2015-05-25 13:31:10 +02:00
mdtrooper e401dfa8bd Fixed the 'event_report_agent', 'event_report_group' and 'event_report_module' items in metaconsole reports. TICKET: #2249 2015-05-25 13:02:22 +02:00
m-lopez-f 2061130825 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-25 12:55:33 +02:00
m-lopez-f 86db63f4f9 Fixed problems with name of dynamic's worksmap. tiquet: #2207 2015-05-25 12:55:18 +02:00
mdtrooper d943fa5b78 Fixed the 'alert_report_agent', 'alert_report_group' and 'alert_report_module' item in metaconsole reports. TICKET: #2249 2015-05-25 12:46:32 +02:00
m-lopez-f d3277b5039 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-25 11:58:17 +02:00
m-lopez-f 6dc62eccce Fixed problems with new code, not view unit in graph, tiquet: 2194
(cherry picked from commit 2df8fab33a)
2015-05-25 11:58:01 +02:00
mdtrooper c713046edf Fixed the 'sql' item in metaconsole reports. TICKET: #2249 2015-05-25 11:19:25 +02:00
m-lopez-f c8d152c9cf Fixed error, when type modules is Asyncronous type, tiquet: #2193
(cherry picked from commit 7efff21816)
2015-05-25 10:45:21 +02:00
artica f51a36fd3d Auto-updated build strings. 2015-05-25 00:01:11 +02:00
artica 94e24f461a Auto-updated build strings. 2015-05-24 00:01:10 +02:00
artica 37361f53ae Auto-updated build strings. 2015-05-23 00:01:13 +02:00
mdtrooper d2b094061a Fixed the 'monitor_report' item in metaconsole reports. TICKET: #2249 2015-05-22 18:02:41 +02:00
mdtrooper 29743cfa74 Fixed the 'projection_graph' item in metaconsole reports. TICKET: #2249 2015-05-22 17:55:06 +02:00
mdtrooper 10efebee28 Removed 'SLA_services' item in metaconsole reports. TICKET: #2249 2015-05-22 17:51:43 +02:00
Alejandro Gallardo Escobar c5ca1a263c Fixed the filter management (load, save and update) 2015-05-22 17:48:58 +02:00
mdtrooper cd62f8c91f Fixed the 'max_value', 'min_value', 'avg_value', 'sumatory', 'MTTR', 'MTBF', 'TTO', 'TTRT' items in metaconsole reports. TICKET: #2249 2015-05-22 17:43:27 +02:00
mdtrooper 9f48e5eaa1 Fixed the 'custom_graph' item in metaconsole reports. TICKET: #2249 2015-05-22 17:37:07 +02:00
mdtrooper 3a213df637 Fixed PHP Warnings 2015-05-22 17:28:44 +02:00
mdtrooper 3ee4194d11 Fixed the 'simple_baseline_graph' item in metaconsole reports. TICKET: #2249 2015-05-22 17:25:56 +02:00
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
mdtrooper fcd6927efb Fixed the empty list of events. 2015-05-22 15:00:06 +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
Alejandro Gallardo Escobar 7555963297 Now the user can delete filters with an empty name 2015-05-22 14:12:01 +02:00
mdtrooper 83967d3526 Fixed PHP Warnings 2015-05-22 13:22:12 +02:00
mdtrooper 3d32d5645e Fixed the event list when it is setted the replication, now the info message show again. 2015-05-22 13:10:05 +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
m-lopez-f 50044050e1 Fixed problems with not variable initialized, tiquet: #2238 2015-05-22 12:13:22 +02:00
Alejandro Gallardo Escobar 36180716ee Error fixes 2015-05-22 11:14:40 +02:00
Alejandro Gallardo Escobar 6a533969ef Improved the element concatenation 2015-05-22 11:05:53 +02:00
Alejandro Gallardo Escobar 11d673b803 Added a type and a function to get the 'LISTAGG' functionality returning a CLOB instead a VARCHAR2(4000) 2015-05-22 11:04:05 +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