Commit Graph

1247 Commits

Author SHA1 Message Date
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
Ramon Novoa 862c25a85b Added an option to configure the interval before a module becomes
unknown.
2015-03-09 16:12:14 +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
artica a68512ae0c Auto-updated build strings. 2015-03-06 00:01:10 +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
artica 878bffbe22 Auto-updated build strings. 2015-03-05 00:01:10 +01:00
Ramon Novoa 4e4eb4df87 Merge branch 'develop' into feature/password-encryption 2015-03-04 15:39:37 +01:00
artica 066f91e30f Auto-updated build strings. 2015-03-04 00:01:10 +01:00
artica 009135d28a Auto-updated build strings. 2015-03-03 00:01:10 +01:00
Ramon Novoa 3a6f885b15 Added support for password encryption to the Pandora FMS Server. 2015-03-02 17:30:19 +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
artica 1b637a8d13 Auto-updated build strings. 2015-02-27 00:01:11 +01:00
artica c7ab4b86f2 Auto-updated build strings. 2015-02-26 00:01:09 +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
artica aad27ee76d Auto-updated build strings. 2015-02-23 00:01:10 +01:00