Commit Graph

9987 Commits

Author SHA1 Message Date
mdtrooper 9bba19235e Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-06-02 19:10:15 +02:00
mdtrooper 11d2b66b30 Fixes for the Oracl€. 2015-06-02 19:10:11 +02:00
Alejandro Gallardo Escobar f905ea1b16 Adapted the changes done by Rober Nelson in the commit e943bf0ada 2015-06-02 18:56:03 +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
Alejandro Gallardo Escobar ade22203c5 Added a new option to the db connection function 2015-06-02 18:03:39 +02:00
Alejandro Gallardo Escobar 6d47307ad2 Fixes for oracle 2015-06-02 18:03:39 +02:00
Alejandro Gallardo Escobar 127f53e8c8 Added the new function "set_when_empty" 2015-06-02 18:03:39 +02:00
artica bdda81b436 Auto-updated build strings. 2015-06-02 00:01:10 +02:00
mdtrooper f2539395c3 Fixes for the Oracl€. 2015-06-01 17:04:02 +02:00
m-lopez-f 988228a90a Fixed problems with snmpwalks, when server have mibs text in hexadeximal-string. Tiquet: #2288
(cherry picked from commit 127daf8fdc)
2015-06-01 15:24:53 +02:00
m-lopez-f 589f054928 Fixed error when selected in bulk actions agents edit any status, show all agents. Tiquet: #2261 2015-06-01 13:41:31 +02:00
mdtrooper 0df14010c9 Fixed the SLA item in the reports into metaconsole when some agents into this is disabled. 2015-06-01 12:47:39 +02:00
mdtrooper fd90f637df Fixed the availability item in the reports into metaconsole when some agents into this is disabled. 2015-06-01 12:09:44 +02:00
mdtrooper 1e71fc56bd Fixes for the Oracl€. 2015-06-01 11:15:54 +02:00
m-lopez-f 84fb973c6f Change privilege in call function to return groups of view this user. Tiquet: #2259
(cherry picked from commit 73ae001a3f)
2015-06-01 10:13:42 +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
mdtrooper 0297e38361 Fixes for the Oracl€. 2015-05-29 16:48:40 +02:00
mdtrooper e4703a6f86 Fixed the function 'oracle_encapsule_fields_with_same_name_to_instructions'. 2015-05-29 16:48:14 +02:00
mdtrooper 2aa7f0994d Fixed the false positive errors with some SQL querys return empty data. 2015-05-29 15:23:52 +02:00
mdtrooper 4a36d18fe8 Fixed the error management in Oracl€. 2015-05-29 15:19:32 +02:00
mdtrooper 5c7b230e9b Merge some changes and fixed from the 'develop' branch. 2015-05-29 14:16:39 +02:00
m-lopez-f 2d646ce620 Fixed problems with list of interfaces in snmp walk wizard of interfaces. Tiquet: #2288
(cherry picked from commit cc861fd3a1)
2015-05-29 10:18:38 +02:00
m-lopez-f 4c4bdc2940 Merge pull request #17 from Robert-Nelson/ipmi-plugin-fix
Thanks
2015-05-29 08:29:57 +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
m-lopez-f b8d10749b0 Changed name of labels menu and options in bulk operations 2015-05-28 13:42:34 +02:00
m-lopez-f 0137ee1e02 Fixed error sql querys in mygrate sql 2015-05-28 12:41:16 +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
m-lopez-f 47a6c973d1 Add more width to select tags in filters events and truncate name. Tiquet: #2015 2015-05-28 10:34:10 +02:00
Junichi Satoh b84b508b48 Improved to be able to define timeout for file transfer programs. 2015-05-28 15:17:39 +09:00
artica 70cc8fbc8f Auto-updated build strings. 2015-05-28 00:01:10 +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
m-lopez-f aba3379d73 Changed images in error login page because don't show with new style. Tiquet: #2233 2015-05-27 12:36:40 +02:00
m-lopez-f 9aecbd29cf Changed image to os bsd
(cherry picked from commit 750f62ccb5)
2015-05-27 10:40:53 +02:00
m-lopez-f c02622bd53 Add order by column Description in Agents detail. Tiquet: #2272 2015-05-27 08:58:50 +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
mdtrooper 1160fd800c Fixed the 'availability' item in report. (Merge from 5d25b7c8e6) 2015-05-26 17:20:34 +02:00
m-lopez-f 527d5079b3 Add option to changed image of service in visualconsole:builder. tiquet:#2175
(cherry picked from commit ca1641a4e0)
2015-05-26 16:01:57 +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