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

2010-08-17 Junichi Satoh <junichi@rworks.jp> 

* unix/pandora_agent_daemon, unix/tentacle_client: Added support for
	Solaris	virtualization, "zone".



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3144 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2010-08-17 01:58:46 +00:00
parent 1bdd0e7ebe
commit a7f9e8c5d8
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_agents/ChangeLog
View File

@ -1,3 +1,8 @@
2010-08-17 Junichi Satoh <junichi@rworks.jp>
* unix/pandora_agent_daemon, unix/tentacle_client: Added support for
Solaris virtualization, "zone".
2010-08-04 Dario Rodriguez <dario.rodriguez@artica.es>
* win32/bin/collections: Added collections directory.

5
pandora_agents/unix/ChangeLog
View File

@ -1,3 +1,8 @@
2010-08-17 Junichi Satoh <junichi@rworks.jp>
* pandora_agent_daemon, tentacle_client: Added support for Solaris
virtualization, "zone".
2010-08-11 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Fixed collection issues related to the agent. See

19
pandora_agents/unix/pandora_agent_daemon
View File

@ -35,7 +35,24 @@ pidof_pandora () {
then
PANDORA_PID=`ps -ex | grep "$DAEMON $PANDORA_PATH" | grep -v grep | head -1 | awk '{ print $1 }'`
else
PANDORA_PID=`ps -Af | grep "$DAEMON $PANDORA_PATH" | grep -v grep | head -1 | awk '{ print $2 }'`
if [ "$OS_NAME" = "SunOS" ]
then
ZONENAME_CMD="/bin/zonename"
if [ -x $ZONENAME_CMD ]
then
ZONE=`$ZONENAME_CMD`
else
ZONE=
fi
if [ "$ZONE" = "global" ]
then
PANDORA_PID=`ps -f -z global | grep "$DAEMON $PANDORA_PATH" | grep -v grep | head -1 | awk '{ print $2 }'`
else
PANDORA_PID=`ps -Af | grep "$DAEMON $PANDORA_PATH" | grep -v grep | head -1 | awk '{ print $2 }'`
fi
else
PANDORA_PID=`ps -Af | grep "$DAEMON $PANDORA_PATH" | grep -v grep | head -1 | awk '{ print $2 }'`
fi
fi
echo $PANDORA_PID

2
pandora_agents/unix/tentacle_client
View File

@ -271,9 +271,11 @@ sub parse_options {
sub start_client {
# Connect to server
# Note: "Type => SOCK_STREAM" should be clearly defined for Solaris zone.
$t_socket = IO::Socket::INET->new (
PeerAddr => $t_address,
PeerPort => $t_port,
Type => SOCK_STREAM,
);
if (! defined ($t_socket)) {