Merge lp:~jontai/openvista-gtm-integration/bug594343 into lp:openvista-gtm-integration

[Jon Tai]

[jeff.apple (jeff-apple)]

Looks good to me.

review: Approve

=== modified file 'scripts/usr/share/munin/plugins/openvista_processes_'
--- scripts/usr/share/munin/plugins/openvista_processes_	2009-12-04 21:07:51 +0000
+++ scripts/usr/share/munin/plugins/openvista_processes_	2010-06-14 20:54:27 +0000
@@ -4,7 +4,7 @@
 # OpenVista instance.
 
 
-# Copyright (C) 2009 Medsphere Systems Corporation
+# Copyright (C) 2009-2010 Medsphere Systems Corporation
 #
 # This program is free software; you can redistribute it and/or modify it solely
 # under the terms of the GNU Affero General Public License version 3 as published
@@ -92,8 +92,8 @@
         cd "$root/$INSTANCE/tmp"
 
         ss=`mumps -run THIS^%SS | tail -n +7 | head -n -2`
-        terminal=`echo "$ss" | grep -v '^$' | awk '{ print $2 }' | grep '/dev/pts' | wc -l`
-        rpc=`echo "$ss" | grep -v '^$' | awk '{ print $2 }' | grep 'CONNECTED' | wc -l`
+        terminal=`echo "$ss" | grep -v '^$' | awk '{ print $2 " " $3 }' | grep '/dev/pts' | wc -l`
+        rpc=`echo "$ss" | grep -v '^$' | awk '{ print $2 " " $3 }' | grep 'CONNECTED' | wc -l`
         all=`echo "$ss" | grep -v '^$' | wc -l`
         other=`expr $all - $terminal - $rpc`
         echo "terminal.value $terminal"