tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-08-03 Ramon Novoa <rnovoa@artica.es> 

* win32/modules/pandora_module_logevent.cc: Get the EventID from the
	  InstanceID. Seems like Microsoft replaced Eventid with InstanceID at
	  some point.

	* pc/pandora_agent.mpi: Fixed some paths.

	* pc/tentacle_client,
	  unix/tentacle_client,
	  shellscript/linux/tentacle_client,
	  shellscript/mac_osx/tentacle_client: Specify the socket type. On some
	  OSs (like certain versions of Solaris) it can't be guessed and results in an error.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6844 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2012-08-03 12:03:59 +00:00
parent b342dbc978
commit ba23ce80c2
7 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_agents/ChangeLog
View File

@ -1,3 +1,17 @@
2012-08-03 Ramon Novoa <rnovoa@artica.es>
* win32/modules/pandora_module_logevent.cc: Get the EventID from the
InstanceID. Seems like Microsoft replaced Eventid with InstanceID at
some point.
* pc/pandora_agent.mpi: Fixed some paths.
* pc/tentacle_client,
unix/tentacle_client,
shellscript/linux/tentacle_client,
shellscript/mac_osx/tentacle_client: Specify the socket type. On some
OSs (like certain versions of Solaris) it can't be guessed and results in an error.
2012-06-21 Ramon Novoa <rnovoa@artica.es>
* win32/bin/pandora_agent.conf,

25
pandora_agents/pc/pandora_agent.mpi
View File

@ -219,13 +219,12 @@ test
}
FileGroup ::946FC43B-0E32-4C38-86EF-4F9252C67E16 -setup Install -active Yes -platforms {Windows MacOS-X FreeBSD-5-x86 FreeBSD-6-x86 FreeBSD-7-x86 Linux-x86_64 Solaris-x86} -name {Program Files} -parent FileGroups
File ::74FB483D-02A9-4CA5-AF6B-897FF6F8EEFA -name C:/unix/Win32/README.txt -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::4282D826-C085-4323-A6EC-02FEEFB6FD9A -name C:/unix/Win32/build.log -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::43176DF7-40DE-4FB6-9C20-EEA6B31B48E5 -name C:/unix/Win32/LICENSE.txt -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::2364D85D-8AA3-4E02-810E-F3B6A5DCAECE -name C:/unix/Win32/logo.png -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::427FFDE3-6338-44E3-AD2E-3B6830D1B518 -name C:/unix/Win32/pandora.ico -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::E44CD4DE-9C3C-41CD-AEB0-36FB2D92FF5C -type dir -name C:/unix/Win32/collections -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::479BA3FD-4351-4249-9C4C-0B243F989E34 -type dir -name C:/unix/Win32/help -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::74FB483D-02A9-4CA5-AF6B-897FF6F8EEFA -name C:/pc/Win32/README.txt -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::43176DF7-40DE-4FB6-9C20-EEA6B31B48E5 -name C:/pc/Win32/LICENSE.txt -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::2364D85D-8AA3-4E02-810E-F3B6A5DCAECE -name C:/pc/Win32/logo.png -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::427FFDE3-6338-44E3-AD2E-3B6830D1B518 -name C:/pc/Win32/pandora.ico -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::E44CD4DE-9C3C-41CD-AEB0-36FB2D92FF5C -type dir -name C:/pc/Win32/collections -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::479BA3FD-4351-4249-9C4C-0B243F989E34 -type dir -name C:/pc/Win32/help -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::B9DB0F09-4F51-4349-BBCE-CEC2929D4BEB -name how_to_keys.html -parent 479BA3FD-4351-4249-9C4C-0B243F989E34
File ::7A07618C-C4F2-4205-86F1-C1821FCE3363 -name how_to_keys_es.html -parent 479BA3FD-4351-4249-9C4C-0B243F989E34
File ::9F7FBD1D-DE5B-437E-AFA8-F0BBAA7253FE -type dir -name images -parent 479BA3FD-4351-4249-9C4C-0B243F989E34
@ -236,13 +235,13 @@ File ::29997A2D-80CD-441C-8C8E-269C8ECB3446 -name 4.jpg -parent 9F7FBD1D-DE5B-43
File ::85AB8A2E-8519-4FA7-B52B-2E8028696499 -name 5.jpg -parent 9F7FBD1D-DE5B-437E-AFA8-F0BBAA7253FE
File ::5C973186-2A75-4751-944E-55D8AC13E4A1 -name 6.jpg -parent 9F7FBD1D-DE5B-437E-AFA8-F0BBAA7253FE
File ::19E564FC-6B4F-42FF-ACFB-5647E91469D0 -name logo.png -parent 9F7FBD1D-DE5B-437E-AFA8-F0BBAA7253FE
File ::42154E2C-F1FD-4FC9-868A-9BF53FA5FB8F -type dir -name C:/unix/Win32/scripts -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::42154E2C-F1FD-4FC9-868A-9BF53FA5FB8F -type dir -name C:/pc/Win32/scripts -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::341BE15C-5C7B-45DB-94FB-E1031C223C99 -name delete_at_job.bat -parent 42154E2C-F1FD-4FC9-868A-9BF53FA5FB8F
File ::9DABE374-8A64-444F-9CA6-805C379C1706 -name install_service_restart.bat -parent 42154E2C-F1FD-4FC9-868A-9BF53FA5FB8F
File ::A9925DBE-4F9F-49AD-ABC9-E665128C3A22 -name restart_pandora_agent.bat -parent 42154E2C-F1FD-4FC9-868A-9BF53FA5FB8F
File ::CFC21362-07A9-415D-BD11-4C4CA8BB9B12 -name start_pandora_agent.bat -parent 42154E2C-F1FD-4FC9-868A-9BF53FA5FB8F
File ::CBD78E1E-816D-470F-A882-08153AD5B393 -name stop_pandora_agent.bat -parent 42154E2C-F1FD-4FC9-868A-9BF53FA5FB8F
File ::599BFDA0-E458-44A4-9A97-050AB01AB3B4 -type dir -name C:/unix/Win32/util -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::599BFDA0-E458-44A4-9A97-050AB01AB3B4 -type dir -name C:/pc/Win32/util -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::F2A3D33B-B3FF-4A7D-9496-6C14C9B5A208 -name cmp.exe -parent 599BFDA0-E458-44A4-9A97-050AB01AB3B4
File ::C7F38CCB-153B-4116-8E4D-E18F676F47DC -name cut.exe -parent 599BFDA0-E458-44A4-9A97-050AB01AB3B4
File ::96300D98-FC92-4A62-9B1C-AD27B7E0FCC0 -name date.exe -parent 599BFDA0-E458-44A4-9A97-050AB01AB3B4
@ -354,9 +353,9 @@ File ::33D3D1F6-F31E-441D-A1AB-4A9D6BA59677 -name UCD-SNMP-MIB-OLD.txt -parent 8
File ::34A0348B-675A-40B8-917E-CB1B9C1830F1 -name UCD-SNMP-MIB.inc -parent 829CDA91-2153-4522-AD9E-07D8544B3B15
File ::EBAB5AE4-95D1-45D2-B976-D29AEFCC57B0 -name UCD-SNMP-MIB.txt -parent 829CDA91-2153-4522-AD9E-07D8544B3B15
File ::9C60938E-BD0D-4B99-8472-41E24A442233 -name UDP-MIB.txt -parent 829CDA91-2153-4522-AD9E-07D8544B3B15
File ::248B6A9D-F58F-4BF0-9F54-14CB85BB53AA -name C:/unix/Win32/pandora_agent.conf -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::E605A153-3209-4358-B1C8-4D2D1565168C -type dir -name C:/unix/Win32/temp -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::9F229062-84B4-4E40-9612-4CB06A071E45 -name C:/unix/Win32/PandoraAgent.exe -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::248B6A9D-F58F-4BF0-9F54-14CB85BB53AA -name C:/pc/Win32/pandora_agent.conf -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::E605A153-3209-4358-B1C8-4D2D1565168C -type dir -name C:/pc/Win32/temp -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
File ::9F229062-84B4-4E40-9612-4CB06A071E45 -name C:/pc/Win32/PandoraAgent.exe -parent 946FC43B-0E32-4C38-86EF-4F9252C67E16
Component ::FB96078B-BA3C-498C-8C20-B01C1F28ACA9 -setup Install -active Yes -platforms {Windows FreeBSD-5-x86 FreeBSD-6-x86 FreeBSD-7-x86 Linux-x86_64 Solaris-x86} -name {Default Component} -parent Components
SetupType ::A87C1A6B-ED26-4B07-8736-750725FF34E4 -setup Install -active Yes -platforms {Windows FreeBSD-5-x86 FreeBSD-6-x86 FreeBSD-7-x86 Linux-x86_64 Solaris-x86} -name Typical -parent SetupTypes
@ -2217,7 +2216,7 @@ Windows,UseUncompressedBinaries
{No}
Windows,WindowsIcon
{C:\unix\Win32\pandora.ico}
{C:\pc\Win32\pandora.ico}
ZipArchive,Active
{No}

3
pandora_agents/pc/tentacle_client
View File

@ -299,7 +299,8 @@ sub start_client {
# Connect to server
$t_socket = IO::Socket::INET->new (
PeerAddr => $t_address,
PeerPort => $t_port,
PeerPort => $t_port,
Type => SOCK_STREAM
);
if (! defined ($t_socket)) {

3
pandora_agents/shellscript/linux/tentacle_client
View File

@ -299,7 +299,8 @@ sub start_client {
# Connect to server
$t_socket = IO::Socket::INET->new (
PeerAddr => $t_address,
PeerPort => $t_port,
PeerPort => $t_port,
Type => SOCK_STREAM
);
if (! defined ($t_socket)) {

3
pandora_agents/shellscript/mac_osx/tentacle_client
View File

@ -299,7 +299,8 @@ sub start_client {
# Connect to server
$t_socket = IO::Socket::INET->new (
PeerAddr => $t_address,
PeerPort => $t_port,
PeerPort => $t_port,
Type => SOCK_STREAM
);
if (! defined ($t_socket)) {

3
pandora_agents/unix/tentacle_client
View File

@ -299,7 +299,8 @@ sub start_client {
# Connect to server
$t_socket = IO::Socket::INET->new (
PeerAddr => $t_address,
PeerPort => $t_port,
PeerPort => $t_port,
Type => SOCK_STREAM
);
if (! defined ($t_socket)) {

6
pandora_agents/win32/modules/pandora_module_logevent.cc
View File

@ -239,7 +239,7 @@ Pandora_Module_Logevent::getLogEvents (list<string> &event_list, unsigned char d
// Retrieve the event description
getEventDescription (pevlr, description);
if (description == "") {
if (description[0] == '\0') {
strcpy (description, "N/A");
}
@ -356,7 +356,7 @@ Pandora_Module_Logevent::getEventDescription (PEVENTLOGRECORD pevlr, char *messa
exe_file_path_end = ((char *) exe_file_path) + _MAX_PATH * sizeof (TCHAR);
while (1) {
// Load the DLL
// Load the DLL
module = LoadLibraryEx (dll_start, 0, DONT_RESOLVE_DLL_REFERENCES);
if(module == NULL) {
pandoraDebug("LoadLibraryEx error %d. Exe file path %s.", GetLastError(), exe_file_path);
@ -401,7 +401,7 @@ Pandora_Module_Logevent::filterEvent (PEVENTLOGRECORD pevlr, string description)
LPCSTR source_name;
// Event ID filter
if (this->id > 0 && this->id != pevlr->EventID) {
if (this->id > 0 && this->id != (pevlr->EventID & 0x3FFFFFFF)) {
return -1;
}