Commit Graph

1368 Commits

Author SHA1 Message Date
artica f18ff9ea12 Auto-updated build strings. 2015-07-10 00:01:20 +02:00
artica 01c05f77f3 Auto-updated build strings. 2015-07-09 00:01:21 +02:00
artica 8b6d8e1cd2 Auto-updated build strings. 2015-07-08 00:01:15 +02:00
mdtrooper fc04efc82f Re-added the errors logs when load enterprise file in server. 2015-07-07 16:28:48 +02:00
fermin831 da773b98a1 When an alert is forced, all actions configured for that module
are executed without seeing times fired
2015-07-07 11:41:41 +02:00
artica aaea9ef42d Auto-updated build strings. 2015-07-07 00:01:18 +02:00
artica 55b5bbcfa3 Auto-updated build strings. 2015-07-06 00:01:10 +02:00
artica 91ba095c90 Auto-updated build strings. 2015-07-05 00:01:10 +02:00
artica 8062934760 Auto-updated build strings. 2015-07-04 00:01:16 +02:00
Ramon Novoa c4c9bfdb1a Fixed the queuing of metaconsole service modules. 2015-07-03 17:02:10 +02:00
artica 2976a794d5 Auto-updated build strings. 2015-07-02 00:01:20 +02:00
artica b2af250070 Auto-updated build strings. 2015-07-01 00:01:46 +02:00
Ramon Novoa 1c719b3bde Fixes for the metaconsole's plug-in server. 2015-06-30 16:34:07 +02:00
artica 3928421049 Auto-updated build strings. 2015-06-30 00:01:26 +02:00
artica d5380c67dd Auto-updated build strings. 2015-06-29 00:01:13 +02:00
artica 5394f3cc2c Auto-updated build strings. 2015-06-28 00:01:09 +02:00
artica 5e09c2bbf5 Auto-updated build strings. 2015-06-27 00:01:13 +02:00
artica cc58757d2e Auto-updated build strings. 2015-06-26 00:01:16 +02:00
artica 0ed704cc68 Auto-updated build strings. 2015-06-25 00:01:14 +02:00
artica 2569a46879 Auto-updated build strings. 2015-06-24 00:01:19 +02:00
artica 277223def5 Auto-updated build strings. 2015-06-23 00:01:14 +02:00
artica 06c10bcc6a Auto-updated build strings. 2015-06-22 00:01:11 +02:00
artica 71283133f6 Auto-updated build strings. 2015-06-21 00:01:09 +02:00
artica f62058639a Auto-updated build strings. 2015-06-20 00:01:12 +02:00
artica daa3c44a0d Auto-updated build strings. 2015-06-19 00:01:15 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
artica 3eabe512b4 Auto-updated build strings. 2015-06-18 00:01:10 +02:00
artica 4fff8ffe88 Auto-updated build strings. 2015-06-17 00:01:21 +02:00
Alejandro Gallardo Escobar c437797ef7 Fixes for oracle 2015-06-16 15:07:33 +02:00
artica c7f6c17eb7 Auto-updated build strings. 2015-06-16 00:01:12 +02:00
artica b0dbffd0c1 Auto-updated build strings. 2015-06-15 00:01:09 +02:00
artica be56f5d6da Auto-updated build strings. 2015-06-14 00:01:10 +02:00
artica 7ecc100a1d Auto-updated build strings. 2015-06-13 00:01:13 +02:00
artica 764b85c1a1 Auto-updated build strings. 2015-06-12 00:01:14 +02:00
artica 936264d337 Auto-updated build strings. 2015-06-11 00:01:12 +02:00
Alejandro Gallardo Escobar 9867fb6bd7 Fixes to improve the oracle compatibility 2015-06-10 12:10:24 +02:00
artica 28f10174d4 Auto-updated build strings. 2015-06-10 00:01:12 +02:00
Alejandro Gallardo Escobar 03e97f49d5 Improvements on the oracle compatibility 2015-06-09 12:43:48 +02:00
artica a8aa6f18d6 Auto-updated build strings. 2015-06-09 00:01:14 +02:00
Alejandro Gallardo Escobar 75ea601e67 Added the function "get_db_rows" and fixed other functions to improve their compatibility with annoying databases 2015-06-08 18:32:49 +02:00
artica b7bf0dbc3a Auto-updated build strings. 2015-06-08 00:01:10 +02:00
artica 096a17be2e Auto-updated build strings. 2015-06-07 00:01:09 +02:00
artica efa871b22b Auto-updated build strings. 2015-06-06 00:01:09 +02:00
artica 352d0e95ff Auto-updated build strings. 2015-06-05 00:01:09 +02:00
artica 4a4f04d833 Auto-updated build strings. 2015-06-04 00:01:10 +02:00
artica 51e76a0289 Auto-updated build strings. 2015-06-03 00:01:12 +02:00
Alejandro Gallardo Escobar 8fbe1175b5 Merge remote-tracking branch 'origin/develop' into features/oracle
Conflicts resolved:
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/include/config_process.php
	pandora_console/pandoradb.data.oracle.sql
2015-06-02 18:08:46 +02:00
artica bdda81b436 Auto-updated build strings. 2015-06-02 00:01:10 +02:00
artica 306c7f016a Auto-updated build strings. 2015-06-01 00:01:09 +02:00
artica 528c9f79f0 Auto-updated build strings. 2015-05-31 00:01:09 +02:00
artica e4c9b07266 Auto-updated build strings. 2015-05-30 00:01:11 +02:00
artica 16fa2ec329 Auto-updated build strings. 2015-05-29 00:01:13 +02:00
artica 70cc8fbc8f Auto-updated build strings. 2015-05-28 00:01:10 +02:00
artica eacb7300de Auto-updated build strings. 2015-05-27 00:01:14 +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
artica c0bc11e50a Auto-updated build strings. 2015-05-26 00:02:12 +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
artica 0ea32ce1dc Auto-updated build strings. 2015-05-22 00:01:13 +02:00
artica bb934257e6 Auto-updated build strings. 2015-05-21 00:01:13 +02:00
artica 0dc669178b Auto-updated build strings. 2015-05-20 00:01:17 +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
Alejandro Gallardo Escobar 60c486c62f Resolved a pair of errors caused by undefined variables 2015-05-19 16:04:35 +02:00
artica 2896fb5324 Auto-updated build strings. 2015-05-19 00:01:15 +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 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
m-lopez-f 9cebf8ee34 This is more effective code from fixed bug, tiquet: #2216
(cherry picked from commit 4a52fcff58)
2015-05-13 10:15:44 +02:00
m-lopez-f dc5deadcd4 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2015-05-13 09:44:52 +02:00
m-lopez-f 4c7e526494 Fixed problems with generate custom events with alerts. Tiquet: #2216 2015-05-13 09:44:43 +02:00
artica 7d8fe9508b Auto-updated build strings. 2015-05-13 00:01:15 +02:00
Alejandro Gallardo Escobar 17c3de2b2f Fixes related with the oracle support 2015-05-12 18:19:08 +02:00
artica d771989313 Auto-updated build strings. 2015-05-12 00:01:12 +02:00
Alejandro Gallardo Escobar b853d29c33 Little fix related with the oracle support 2015-05-11 21:22:27 +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
artica 3973044aa1 Auto-updated build strings. 2015-05-08 00:01:13 +02:00
artica 4b7047d9a8 Auto-updated build strings. 2015-05-07 00:01:14 +02:00
artica 6f308321d4 Auto-updated build strings. 2015-05-06 00:01:12 +02:00
Ramon Novoa 550f834e34 Oracle related fixes. 2015-05-05 15:34:03 +02:00
Ramon Novoa 615231eafd More Oracle related fixes. 2015-05-05 11:57:50 +02:00
Ramon Novoa 6255d5c3bf Several fixes to support Oracle. 2015-05-05 11:20:41 +02:00
artica 5dc2b6be17 Auto-updated build strings. 2015-05-05 00:01:14 +02:00
Alejandro Gallardo Escobar b78dbf1c0d Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-04 16:44:40 +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
Ramon Novoa a487fa011e Execute all previously run actions when an alert recovers. 2015-04-30 13:47:02 +02:00
Ramon Novoa 38b1f4dc8f Fixed the string quotation character for Oracle. 2015-04-30 10:51:47 +02:00
artica 0ce49f40b4 Auto-updated build strings. 2015-04-30 00:01:15 +02:00
artica fd00915457 Auto-updated build strings. 2015-04-29 00:01:11 +02:00
artica 3ee1cfacd9 Auto-updated build strings. 2015-04-28 00:01:15 +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
artica 7dbf60d4ef Auto-updated build strings. 2015-04-24 00:01:13 +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
artica 7812f2a965 Auto-updated build strings. 2015-04-22 00:01:28 +02:00
artica d6e7abe8c6 Auto-updated build strings. 2015-04-21 00:01:16 +02:00
artica 4e0e988508 Auto-updated build strings. 2015-04-20 00:01:10 +02:00
artica 1f06f8ec92 Auto-updated build strings. 2015-04-19 00:01:10 +02:00
artica d7b6fb05b4 Auto-updated build strings. 2015-04-18 00:01:11 +02:00
Alejandro Gallardo Escobar 968c179c0c Merge branch 'develop' into feature/meta-agent-cache 2015-04-17 16:16:48 +02:00
artica 332c5b0af5 Auto-updated build strings. 2015-04-17 00:01:30 +02:00
Alejandro Gallardo Escobar e0165a4ab3 Merge branch 'develop' into feature/meta-agent-cache 2015-04-16 14:23:34 +02:00
Alejandro Gallardo Escobar 190e105baa Merge branch 'develop' into feature/meta-agent-cache 2015-04-16 13:40:42 +02:00
Ramon Novoa 79afef8cf8 Added support for metaconsole servers. 2015-04-16 11:35:20 +02:00
artica df42c4715f Auto-updated build strings. 2015-04-15 00:01:11 +02:00
artica 5533100ac4 Auto-updated build strings. 2015-04-14 00:01:14 +02:00
Alejandro Gallardo Escobar 8e733cf019 Merge branch 'develop' into feature/meta-agent-cache 2015-04-13 12:54:39 +02:00
artica 4498d1f842 Auto-updated build strings. 2015-04-13 00:01:09 +02:00
artica a171f76ff2 Auto-updated build strings. 2015-04-12 00:01:09 +02:00
artica ec514cd27e Auto-updated build strings. 2015-04-11 00:01:12 +02:00
artica 7286bd012f Auto-updated build strings. 2015-04-10 00:01:10 +02:00
artica 9353bdcdcb Auto-updated build strings. 2015-04-09 00:01:11 +02:00
artica da36f04a1a Auto-updated build strings. 2015-04-08 00:01:10 +02:00
Ramon Novoa 45ff0d0b6a Merge branch 'develop' into feature/meta-agent-cache 2015-04-06 15:26:51 +02:00
Ramon Novoa 71def9a7fb Implemented an agent cache for the metaconsole. 2015-04-06 15:26:26 +02:00
artica 3cd52be7e9 Auto-updated build strings. 2015-04-06 00:01:07 +02:00
artica 1d21b164b8 Auto-updated build strings. 2015-03-29 00:01:09 +01:00
artica c29c47dc09 Auto-updated build strings. 2015-03-27 00:01:12 +01:00
Ramon Novoa cb29e3564d Added tag related functions to the CLI. 2015-03-26 13:41:27 +01:00
artica 7acba25778 Auto-updated build strings. 2015-03-26 00:01:14 +01:00
artica 9994e08d7a Auto-updated build strings. 2015-03-25 00:01:13 +01:00
KIKUCHI Koichiro 77354a886e Fixed master server queries:
* safe_input is required for server_name
* Fixed wrong server_type specified in NetworkServer
2015-03-24 19:28:46 +09:00
artica 9915e22a11 Auto-updated build strings. 2015-03-24 00:01:11 +01:00
artica 683f8b500c Auto-updated build strings. 2015-03-23 00:01:10 +01:00
artica f9b652867a Auto-updated build strings. 2015-03-22 00:01:09 +01:00
artica 9a9102d0ea Auto-updated build strings. 2015-03-21 00:01:11 +01:00
artica a4084db68d Auto-updated build strings. 2015-03-20 00:01:07 +01:00
artica b5eed86c42 Auto-updated build strings. 2015-03-19 00:01:10 +01:00
Ramon Novoa cb845a0a9b Merged Junichi's patch and added support for setting the number of ICMP
packets.

(cherry picked from commit d4f8af2a56)
2015-03-18 16:28:54 +01:00
artica d967b4eed9 Auto-updated build strings. 2015-03-18 00:01:12 +01:00
hkosaka f37f9daf33 Read SNMPLOG with buffering in order to handle multi-line Traps. 2015-03-17 15:40:28 +09:00
artica a67d1444c9 Auto-updated build strings. 2015-03-17 00:01:10 +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
artica 1fb32cfd07 Auto-updated build strings. 2015-03-13 00:01:10 +01:00
artica db80f1c2b3 Auto-updated build strings. 2015-03-12 00:01:13 +01:00
artica 1767993c84 Auto-updated build strings. 2015-03-11 00:01:11 +01:00
artica ac6d1c424b Auto-updated build strings. 2015-03-10 00:01:13 +01:00