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

2011-09-01 Vanessa Gil <vanessa.gil@artica.es> 

* win32/pandora_windows_service.php: Add information about the parent agent name to xml file.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4878 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2011-09-01 14:37:57 +00:00
parent 792cfdfc72
commit 5ada268713
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_agents/ChangeLog
View File

@ -1,3 +1,7 @@
2011-09-01 Vanessa Gil <vanessa.gil@artica.es>
* win32/pandora_windows_service.php: Add information about the parent agent name to xml file.
2011-09-01 Sancho Lerena <slerena@artica.es> 2011-09-01 Sancho Lerena <slerena@artica.es>
* unix/plugins/grep_log, * unix/plugins/grep_log,

8
pandora_agents/win32/pandora_windows_service.cc
View File

@ -355,7 +355,7 @@ Pandora_Windows_Service::lauchTentacleProxy() {
string string
Pandora_Windows_Service::getXmlHeader () { Pandora_Windows_Service::getXmlHeader () {
char timestamp[20]; char timestamp[20];
string agent_name, os_name, os_version, encoding, value, xml, address; string agent_name, os_name, os_version, encoding, value, xml, address, parent_agent_name;
time_t ctime; time_t ctime;
struct tm *ctime_tm = NULL; struct tm *ctime_tm = NULL;
@ -365,6 +365,9 @@ Pandora_Windows_Service::getXmlHeader () {
agent_name = Pandora_Windows_Info::getSystemName (); agent_name = Pandora_Windows_Info::getSystemName ();
} }
// Get parent agent name
parent_agent_name = conf->getValue ("parent_agent_name");
// Get timestamp // Get timestamp
ctime = time(0); ctime = time(0);
ctime_tm = localtime(&ctime); ctime_tm = localtime(&ctime);
@ -413,7 +416,8 @@ Pandora_Windows_Service::getXmlHeader () {
xml += "\" interval=\"" + conf->getValue ("interval") + xml += "\" interval=\"" + conf->getValue ("interval") +
"\" os_name=\"" + os_name + "\" os_name=\"" + os_name +
"\" os_version=\"" + os_version + "\" os_version=\"" + os_version +
"\" group=\"" + conf->getValue ("group") + "\">\n"; "\" group=\"" + conf->getValue ("group") +
"\" parent_agent_name=\"" + conf->getValue ("parent_agent_name") + "\">\n";
return xml; return xml;
} }