Commit Graph

10211 Commits

Author SHA1 Message Date
Robert Nelson 58c3e219c1 Replace macros on single line module_plugin 2015-06-07 18:20:27 -07:00
artica b7bf0dbc3a Auto-updated build strings. 2015-06-08 00:01:10 +02:00
Robert Nelson 7c1ca7444c Merge branch 'develop' into unix-agent-fixes 2015-06-06 21:41:43 -07:00
Robert Nelson 6a42783cdc Pandora unix agent bug fixes
Add additional settings that aren't copied to a broker_agent conf.

Don't reprocess the custom_fields and global macros every time the conf
is searched for a specific item.

Be more specific about the files copied by xml_buffer, ensuring they
have the right name format.
2015-06-06 16:52:02 -07: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
mdtrooper 371aafa3fa Fixes for the Oracl€. 2015-06-05 14:47:50 +02:00
m-lopez-f 1b0d708608 Add tiquet #23 from issues git 2015-06-05 13:45:57 +02:00
mdtrooper 4a86e40ca2 Fixed the PHP Warning about the config var. (manual cherry-pick from e326c8ff20) 2015-06-05 12:52:18 +02:00
m-lopez-f 866cdb908e No show count events group by status(validate,not validate) in statics events. Tiquet: #2306 2015-06-05 10:21:24 +02:00
m-lopez-f d9cd603f43 Merge pull request #23 from Robert-Nelson/spec-fix
Don't remove build machine's pandora_agent.conf
2015-06-05 09:52:09 +02:00
artica 352d0e95ff Auto-updated build strings. 2015-06-05 00:01:09 +02:00
Robert Nelson 123712ef02 Apply sudo config to the right user
Sudo configuration applies to the user running the sudo command not new the
user.
2015-06-04 12:08:47 -07:00
Robert Nelson 6706be269f Don't remove build machine's pandora_agent.conf 2015-06-04 11:55:18 -07:00
artica 4a4f04d833 Auto-updated build strings. 2015-06-04 00:01:10 +02:00
Ramon Novoa 38c90b43d1 Do not draw parent/child relationships in layer 2 maps.
(cherry picked from commit 16c2e10a4f)
2015-06-03 17:21:16 +02:00
Ramon Novoa 8a34944d76 Several improvements to the SNMP layer 2 recon script.
(cherry picked from commit cfd7590efc)
2015-06-03 17:17:26 +02:00
mdtrooper a9675820b9 Fixes for the Oracl€. 2015-06-03 17:00:28 +02:00
Alejandro Gallardo Escobar ce75ea467a Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-06-03 15:57:09 +02:00
Alejandro Gallardo Escobar 33129d89ce Instantiated an object (table) to avoid PHP warnings 2015-06-03 15:56:25 +02:00
mdtrooper 3ca9a23d0a Fixes for the Oracl€. 2015-06-03 15:53:52 +02:00
Junichi Satoh 7785c465fd Added new token examples: transfer_timeout and secondary_transfer_timeout. 2015-06-03 16:41:31 +09:00
Junichi Satoh 97c9358fa0 Improved to be able to define timeout for file transfer programs
in windows agent.
2015-06-03 16:03:27 +09:00
artica 51e76a0289 Auto-updated build strings. 2015-06-03 00:01:12 +02:00
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