From e636b5c88775bd389a368ae9511f8b502579b0da Mon Sep 17 00:00:00 2001
From: pabloconcepcion <noreply@pandorafms.org>
Date: Tue, 12 Jan 2010 17:29:03 +0000
Subject: [PATCH] =?UTF-8?q?2010-01-12=09Pablo=20de=20la=20Concepcip=C3=B3n?=
 =?UTF-8?q?=20<pablo.concepcion@artica.es>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* unix/Linux/pandora_agent.conf, unix/AIX/pandora_agent.conf,
	unix/HP-UX/pandora_agent.conf, unix/pandora_agent,
	unix/SunOS/pandora_agent.conf: Updated unix agent to send
	GIS information (altitude, latitude, longitude, and timezone_offset)




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2263 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_agents/ChangeLog                     |  7 +++++++
 pandora_agents/unix/AIX/pandora_agent.conf   | 13 +++++++++++++
 pandora_agents/unix/HP-UX/pandora_agent.conf | 13 +++++++++++++
 pandora_agents/unix/Linux/pandora_agent.conf | 13 +++++++++++++
 pandora_agents/unix/SunOS/pandora_agent.conf | 13 +++++++++++++
 pandora_agents/unix/pandora_agent            |  9 +++++++--
 6 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 2443ab9541..81b0b090f3 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-12	Pablo de la Concepcipón <pablo.concepcion@artica.es>
+	
+	* unix/Linux/pandora_agent.conf, unix/AIX/pandora_agent.conf,
+	unix/HP-UX/pandora_agent.conf, unix/pandora_agent,
+	unix/SunOS/pandora_agent.conf: Updated unix agent to send 
+	GIS information (altitude, latitude, longitude, and timezone_offset)
+
 2009-12-29  Sancho Lerena <slerena@artica.es>
 
 	* linux/pandora_agent_daemon: Some ugly warnings are fixed.
diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf
index 127f4a3e8a..24c662b538 100755
--- a/pandora_agents/unix/AIX/pandora_agent.conf
+++ b/pandora_agents/unix/AIX/pandora_agent.conf
@@ -33,6 +33,19 @@ debug 		0
 # this feature
 # autotime 1
 
+# Timezone offset: Difference with the server timezone
+#timezone_offset 0
+
+# Agent position paramters
+# Those parameters define the geographical position of the agent 
+
+# latitude 
+#latitude 0
+# longitude
+#longitude 0
+# altitude
+#altitude 0
+
 # By default agent try to take default encoding defined in host.
 # encoding 	iso-8859-15
 
diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf
index f9a41f2d8e..ea4944c69f 100755
--- a/pandora_agents/unix/HP-UX/pandora_agent.conf
+++ b/pandora_agents/unix/HP-UX/pandora_agent.conf
@@ -33,6 +33,19 @@ debug 		0
 # this feature
 # autotime 1
 
+# Timezone offset: Difference with the server timezone
+#timezone_offset 0
+
+# Agent position paramters
+# Those parameters define the geographical position of the agent 
+
+# latitude 
+#latitude 0
+# longitude
+#longitude 0
+# altitude
+#altitude 0
+
 # By default agent try to take default encoding defined in host.
 # encoding 	iso-8859-15
 
diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index 8e75b0e047..1139530b66 100755
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -33,6 +33,19 @@ debug 		0
 # this feature
 # autotime 1
 
+# Timezone offset: Difference with the server timezone
+#timezone_offset 0
+
+# Agent position paramters
+# Those parameters define the geographical position of the agent 
+
+# latitude 
+#latitude 0
+# longitude
+#longitude 0
+# altitude
+#altitude 0
+
 # By default agent try to take default encoding defined in host.
 # encoding 	iso-8859-15
 
diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf
index b7c16640ae..ceb623d325 100755
--- a/pandora_agents/unix/SunOS/pandora_agent.conf
+++ b/pandora_agents/unix/SunOS/pandora_agent.conf
@@ -33,6 +33,19 @@ debug 		0
 # this feature
 # autotime 1
 
+# Timezone offset: Difference with the server timezone
+#timezone_offset 0
+
+# Agent position paramters
+# Those parameters define the geographical position of the agent 
+
+# latitude 
+#latitude 0
+# longitude
+#longitude 0
+# altitude
+#altitude 0
+
 # By default agent try to take default encoding defined in host.
 # encoding 	iso-8859-15
 
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index c7d1c65de9..adeb40f485 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -59,7 +59,11 @@ my %Conf = (
 	'secondary_server_pwd' => 'mypassword',
 	'secondary_server_ssl' => 'no',
 	'secondary_server_opts' => '',
-	'autotime' => 0
+	'autotime' => 0,
+	'timezone_offset' => 0,
+	'latitude' => 0,
+	'longitude' => 0,
+	'altitude' => 0
 # Missing: group, 
 );
 
@@ -536,7 +540,8 @@ while (1) {
 	          "<agent_data description='" . $Conf{'description'} ."' group='" . $Conf{'group'} .
 			  "' os_name='$OS' os_version='$OS_VERSION' interval='" . $Conf{'interval'} .
 			  "' version='" . AGENT_VERSION . ($Conf{'autotime'} eq '1' ? '' : "' timestamp='" .  strftime ('%Y/%m/%d %H:%M:%S', localtime ())) .
-			  "' agent_name='" . $Conf{'agent_name'} . "'>\n";
+			  "' agent_name='" . $Conf{'agent_name'} . "' timezone_offset='". $Conf{'timezone_offset'}. "' longitude='" .$Conf{'longitude'} .
+			  "' latitude='" .$Conf{'latitude'} ."' altitude='" .$Conf{'altitude'}."'>\n";
 
 	# Execute modules
 	foreach my $module (@Modules) {