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

1368 Commits

Author SHA1 Message Date
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
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
Junichi Satoh 49cdb38f90 Revivied codes to improve ping performance that was degraded in 
Pandora FMS 4.0.
 2015-02-22 23:29:56 +09:00
artica 74cfcfdcd3 Auto-updated build strings. 2015-02-22 00:01:09 +01:00
artica 1e5f01b758 Auto-updated build strings. 2015-02-21 00:01:10 +01:00
artica 61690d89b5 Auto-updated build strings. 2015-02-20 00:01:11 +01:00
artica 5704f03d05 Auto-updated build strings. 2015-02-19 00:01:10 +01:00
artica 1d5bfff3d0 Auto-updated build strings. 2015-02-18 00:01:11 +01:00
artica eb873ef593 Auto-updated build strings. 2015-02-17 00:01:11 +01:00
artica d70c5f5811 Auto-updated build strings. 2015-02-16 00:01:10 +01:00
artica 3078a1dc06 Auto-updated build strings. 2015-02-15 00:01:12 +01:00
artica 76862b1da7 Auto-updated build strings. 2015-02-14 00:01:09 +01:00
mdtrooper 6c715f3940 Fixed the non numeric positions of agents in GIS. TICKET: #944 2015-02-13 12:36:05 +01:00
artica 9c0c22ef01 Auto-updated build strings. 2015-02-13 00:01:10 +01:00
artica fedf122e7b Auto-updated build strings. 2015-02-12 14:52:58 +01:00
artica a1e432ca91 Auto-updated build strings. 2015-02-11 00:01:11 +01:00
Ramón Novoa 077367576b Merge pull request #7 from pandorafms/feature/alert-emails-html 
Envío de emails de acciones de alerta en formato HTML y nueva macro
 2015-02-10 12:18:36 +01:00
artica 7e53d24840 Auto-updated build strings. 2015-02-10 00:01:11 +01:00
Alejandro Gallardo Escobar 0682aef295 Changed the default value for the config token 'console_api_url' 2015-02-09 18:13:13 +01:00
Alejandro Gallardo Escobar bd930fa012 Now the email action send mails in HTML and can use a new macro to get a module graph image 2015-02-09 17:53:59 +01:00
Alejandro Gallardo Escobar 0bbe56c788 Modified the function "pandora_sendmail" to make it more flexible 2015-02-09 17:49:30 +01:00
Alejandro Gallardo Escobar c95401a251 Added new config tokens to make possible the connection to the console api 2015-02-09 17:47:34 +01:00
m-lopez-f 6ed5e86436 Change path of fping to default distro and default path Tiquets #1760 
(cherry picked from commit 9e32d1800f)
 2015-02-09 12:01:34 +01:00
artica 6a69e6ed7a Auto-updated build strings. 2015-02-09 00:01:09 +01:00
artica c1825dc960 Auto-updated build strings. 2015-02-08 00:01:08 +01:00
artica bedfe0fc81 Auto-updated build strings. 2015-02-07 00:01:10 +01:00
artica 55569ab805 Auto-updated build strings. 2015-02-06 00:01:09 +01:00
artica be30e33266 Auto-updated build strings. 2015-02-05 00:01:09 +01:00
mdtrooper 3a589d43a0 Fixed Perl Warning with undefined var 2015-02-04 14:07:09 +01:00
artica 93ce434915 Auto-updated build strings. 2015-02-04 00:01:10 +01:00
artica b8307eba4a Auto-updated build strings. 2015-02-03 00:01:10 +01:00
artica 50c150d492 Auto-updated build strings. 2015-02-02 00:01:07 +01:00
artica c867c556e5 Auto-updated build strings. 2015-02-01 00:01:08 +01:00
artica 62aa56ec1e Auto-updated build strings. 2015-01-31 00:01:42 +01:00
Ramon Novoa 52758574b7 Update the server's version. Fixes ticket #1739. 2015-01-30 19:32:35 +01:00
artica 4ad250b464 Auto-updated build strings. 2015-01-30 00:01:09 +01:00
artica f09576a13b Auto-updated build strings. 2015-01-29 00:01:11 +01:00
artica 070d03b86a Auto-updated build strings. 2015-01-28 00:01:08 +01:00
artica f0091e2dc1 Auto-updated build strings. 2015-01-27 00:01:10 +01:00
artica 0e70a8899a Auto-updated build strings. 2015-01-26 00:01:08 +01:00
artica 78553ae902 Auto-updated build strings. 2015-01-25 00:01:08 +01:00
artica 7fd3da065f Auto-updated build strings. 2015-01-24 00:01:09 +01:00
artica ac99cc4910 Auto-updated build strings. 2015-01-23 00:01:09 +01:00
artica f4b66cee1a Auto-updated build strings. 2015-01-21 00:01:07 +01:00
artica 863739eb7b Auto-updated build strings. 2015-01-20 00:01:37 +01:00
artica 28585a2e39 Auto-updated build strings. 2015-01-19 00:01:06 +01:00
artica 3d8e45f918 Auto-updated build strings. 2015-01-18 00:01:07 +01:00
artica d7d2bc8439 Auto-updated build strings. 2015-01-17 00:01:08 +01:00
artica f9a8bd5004 Auto-updated build strings. 2015-01-16 00:01:11 +01:00
artica dddd986e63 Auto-updated build strings. 2015-01-15 00:01:10 +01:00
artica bbc15b6db9 Auto-updated build strings. 2015-01-14 00:01:09 +01:00
Ramon Novoa b88c52ccba Added support for multiple master servers. 2015-01-13 10:56:56 +01:00
artica 77d54785c8 Auto-updated build strings. 2015-01-13 00:01:10 +01:00
artica 23503831cd Auto-updated build strings. 2015-01-12 00:01:09 +01:00
artica 2068beed5c Auto-updated build strings. 2015-01-11 00:01:08 +01:00
artica e3562c2c34 Auto-updated build strings. 2015-01-10 00:01:11 +01:00
artica d71e225b8c Auto-updated build strings. 2015-01-09 00:01:12 +01:00
artica 39a35e1f79 Auto-updated build strings. 2015-01-08 00:01:09 +01:00
artica ea9a01e2ae Auto-updated build strings. 2015-01-07 00:01:08 +01:00
artica 74b62dfa10 Auto-updated build strings. 2015-01-06 00:01:11 +01:00
Ramon Novoa d3309d2f98 Added support for absolute incremental data. 2015-01-05 16:38:07 +01:00
artica 489b5ed490 Auto-updated build strings. 2015-01-05 00:01:09 +01:00
artica 1b00ebf065 Auto-updated build strings. 2015-01-04 00:01:09 +01:00
artica 7d40e724bd Auto-updated build strings. 2015-01-03 00:01:10 +01:00
artica 7970807cdc Auto-updated build strings. 2015-01-02 00:01:09 +01:00
artica 8e1adf056e Auto-updated build strings. 2015-01-01 00:01:09 +01:00
artica d43069f83e Auto-updated build strings. 2014-12-31 00:01:11 +01:00
artica dfaa83d7ae Auto-updated build strings. 2014-12-30 00:01:09 +01:00
artica 38aa48d0f6 Auto-updated build strings. 2014-12-29 00:01:08 +01:00
artica 49714efb4d Auto-updated build strings. 2014-12-28 00:01:08 +01:00
artica f36ed28710 Auto-updated build strings. 2014-12-27 00:01:09 +01:00
artica 084e6f3ba0 Auto-updated build strings. 2014-12-26 00:01:08 +01:00
artica ef53d67667 Auto-updated build strings. 2014-12-25 00:01:08 +01:00
artica 56f1207dd3 Auto-updated build strings. 2014-12-24 00:01:12 +01:00
artica 7601599a21 Auto-updated build strings. 2014-12-23 00:01:09 +01:00
artica 874ec431f4 Auto-updated build strings. 2014-12-22 00:01:09 +01:00
artica 8191bc0aca Auto-updated build strings. 2014-12-21 00:01:09 +01:00
artica dd4b1e0b4a Auto-updated build strings. 2014-12-20 00:01:09 +01:00
artica 3cda932b04 Auto-updated build strings. 2014-12-19 00:01:11 +01:00
artica edce8f5558 Auto-updated build strings. 2014-12-18 00:01:11 +01:00
artica d868c8bb82 Auto-updated build strings. 2014-12-17 00:01:08 +01:00