Commit Graph

1916 Commits

Author SHA1 Message Date
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
Robert Nelson c286283594 Fail gracefully if ipmi-sensors error 2015-05-28 20:22:44 -07:00
artica 16fa2ec329 Auto-updated build strings. 2015-05-29 00:01:13 +02:00
Ramon Novoa 8af3ae3fdb Updated the Tentacle server to version 0.5.0. 2015-05-28 16:56:38 +02:00
Ramón Novoa 01327ba01f Merge pull request #15 from Robert-Nelson/ipmi-recon
Fix IPMI recon script so that it works with new style custom fields
2015-05-28 12:26:14 +02:00
artica 70cc8fbc8f Auto-updated build strings. 2015-05-28 00:01:10 +02:00
Robert Nelson 8a3d4ef204 Simplify eventmask parsing 2015-05-26 22:07:32 -07:00
Robert Nelson aeb66d4e27 Fix missing first and last module
This fixes a bug from the old code ignoring the headers.

It also tweaks the module name and sets the units field.
2015-05-26 18:35:17 -07:00
Robert Nelson 6cb383b2e1 Merge branch 'develop' into ipmi-recon 2015-05-26 16:49:54 -07:00
Robert Nelson 664fa1cdfe Add warning and critical thresholds 2015-05-26 16:28:00 -07:00
artica eacb7300de Auto-updated build strings. 2015-05-27 00:01:14 +02:00
Robert Nelson 63a580fcfb Fix bug that causes bogus agents to be created if freeipmi isn't installed
If freeipmi isn't installed or problems occur running ipmiping then an agent
is created for every address tested.
2015-05-26 12:12:39 -07:00
Robert Nelson e943bf0ada Fix IPMI recon script so that it works with new style custom fields
Updates the IPMI recon script to pass parameters to the IPMI plugin using the
new style custom fields.

Add a field for specifying additonal options to ipmi-sensors.  This is required
for IPMI v2.0 devices and when using accounts with restricted privileges.

Fix some types in the description for the recon script.

Fix a bug where the recon script never completed and kept processing the subnet
over and over due to an incorrect exit condition in the loop.

Change the packet count and timeout passed to ipmiping.  The previous values
required 9 seconds per address polled.  This meant it took almost 40 minutes
to scan one 256 address subnet.
2015-05-26 11:01:17 -07: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
Junichi Satoh 64a595cd4d Fixed error with open source version (without enterprise). 2015-05-20 16:38:49 +09: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 55d1b04f74 Removed some conflictive characters 2015-05-14 12:16:54 +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
Ramon Novoa 2322b07c77 Read dbengine from pandora_server.conf before connecting to the DB. 2015-05-12 16:30:05 +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