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

[Jon Tai]

[Jon Tai (jontai)]

Jeff, please review -- especially the MUMPS changes. Thanks!

[jeff.apple (jeff-apple)]

It looks like MSCZJOBS will only report the first socket. Is that intentional and/or acceptable?

review: Approve

[Jon Tai (jontai)]

> It looks like MSCZJOBS will only report the first socket. Is that intentional
> and/or acceptable?

I think it's acceptable... most vista processes only use a single socket anyway, right? The alternative would be to do multi-line output.

[jeff.apple (jeff-apple)]

> > It looks like MSCZJOBS will only report the first socket. Is that
> intentional
> > and/or acceptable?
>
> I think it's acceptable... most vista processes only use a single socket
> anyway, right? The alternative would be to do multi-line output.

I believe that to be true. I would say it's OK.

[lp:~jontai/openvista-gtm-integration/bug337644]

106. By Jon Tai on 2009-10-21

oops, forgot to package the plugin conf file -- without it, the plugin will run as root

[Jon Tai (jontai)]

Doh -- when I was doing the merge, I realized that I forgot the munun plugin conf file. I've committed r106 to add it. Can you have a quick look?

[jeff.apple (jeff-apple)]

> Doh -- when I was doing the merge, I realized that I forgot the munun plugin
> conf file. I've committed r106 to add it. Can you have a quick look?
Looks fine

review: Approve

=== modified file 'mumps/MSCZJOBS.m'
--- mumps/MSCZJOBS.m	2009-06-26 17:39:51 +0000
+++ mumps/MSCZJOBS.m	2009-10-21 23:30:24 +0000
@@ -1,4 +1,4 @@
-MSCZJOBS	;JKT/MSC - OpenVista System status ;26JUN2009
+MSCZJOBS	;JKT/MSC - OpenVista System status ;24AUG2009
 	;;8.0;KERNEL;**MSC**
 	;
 ALL	D SS() Q
@@ -37,7 +37,14 @@
 	Q $J(PID,8)_$S($J=PID:"*",1:"")
 	;
 DEVICE(PID) ;Return device
-	Q $$FIND(PID,"I","$PRINCIPAL")
+	N PRI S PRI=$$FIND(PID,"I","$PRINCIPAL")
+	Q:PRI'="0" PRI ; FIXME: this could probably be more general
+	;
+	; look at devices for sockets
+	N SOCK S SOCK=$$FIND(PID,"D","        SOCKET[0]")
+	I $P(SOCK," ",3)="LISTENING" Q $P($P(SOCK," PORT=",2)," ")_",LISTENING"
+	I $P(SOCK," ",3)="CONNECTED" Q $P($P($P(SOCK," LOCAL=",2)," "),"@",2)_",CONNECTED"
+	Q ""
 	;
 INSTANCE(PID) ;Return name of OpenVista instance
 	N ZG S ZG=$$FIND(PID,"I","$ZGBLDIR")
@@ -56,5 +63,5 @@
 	;
 FIND(PID,ARR,KEY) ;Return the value of a key in one of the ZSHOW arrays
 	N I,X S I="",X=""
-        F  S I=$O(@MSC@(PID,ARR,I)) Q:'I  I $P(@MSC@(PID,ARR,I),KEY_"=")="" S X=$TR($P(@MSC@(PID,ARR,I),"=",2),"""") Q
+	F  S I=$O(@MSC@(PID,ARR,I)) Q:'I  I $P(@MSC@(PID,ARR,I),KEY_"=")="" S X=$TR($P(@MSC@(PID,ARR,I),"=",2,999),"""") Q
 	Q X

=== modified file 'packages/deb/openvista-gtm-integration/debian/changelog'
--- packages/deb/openvista-gtm-integration/debian/changelog	2009-10-20 02:23:22 +0000
+++ packages/deb/openvista-gtm-integration/debian/changelog	2009-10-21 23:30:24 +0000
@@ -1,3 +1,9 @@
+openvista-gtm-integration (0.8.5-0ubuntu2) jaunty; urgency=low
+
+  * Package munin plugins. (Closes: #337644)
+
+ -- Jonathan Tai <[e-mail]>  Wed, 21 Oct 2009 08:00:34 -0700
+
 openvista-gtm-integration (0.8.5-0ubuntu1) jaunty; urgency=low
 
   * Consolidate openvista-utils and openvista-libs-* packages into a single

=== modified file 'packages/deb/openvista-gtm-integration/debian/control'
--- packages/deb/openvista-gtm-integration/debian/control	2009-10-20 02:23:22 +0000
+++ packages/deb/openvista-gtm-integration/debian/control	2009-10-21 23:30:24 +0000
@@ -50,3 +50,18 @@
  utilities used to send signals to other GT.M processes.
  .
  The shared library in this package was built against GT.M V5.3-004A.
+
+Package: openvista-munin-plugins
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, munin-node, openvista-utils
+Description: Munin plugins to monitor OpenVista instances
+ OpenVista is a cost-effective, open, trusted and complete EHR which enhances
+ patient safety, increases clinical and operational efficiency and provides an
+ opportunity to improve quality of care delivery.
+ .
+ Munin is a highly flexible and powerful solution used to create graphs of
+ virtually everything imaginable throughout your network, while still
+ maintaining a rattling ease of installation and configuration.
+ .
+ This package contains plugins for the Munin node to monitor OpenVista
+ instances.

=== added file 'packages/deb/openvista-gtm-integration/debian/openvista-munin-plugins.dirs'
--- packages/deb/openvista-gtm-integration/debian/openvista-munin-plugins.dirs	1970-01-01 00:00:00 +0000
+++ packages/deb/openvista-gtm-integration/debian/openvista-munin-plugins.dirs	2009-10-21 23:30:24 +0000
@@ -0,0 +1,3 @@
+etc/munin/plugin-conf.d
+usr/share/doc/openvista-munin-plugins
+usr/share/munin/plugins

=== modified file 'packages/deb/openvista-gtm-integration/debian/rules'
--- packages/deb/openvista-gtm-integration/debian/rules	2009-10-20 22:04:58 +0000
+++ packages/deb/openvista-gtm-integration/debian/rules	2009-10-21 23:30:24 +0000
@@ -86,9 +86,10 @@
 	dh_prep -i 
 	dh_installdirs -i
 
-	# Add here commands to install the indep part of the package into
-	# debian/<package>-doc.
-	#INSTALLDOC#
+	install scripts/etc/munin/plugin-conf.d/openvista debian/openvista-munin-plugins/etc/munin/plugin-conf.d/
+	install scripts/usr/share/munin/plugins/openvista_databases_ debian/openvista-munin-plugins/usr/share/munin/plugins/
+	install scripts/usr/share/munin/plugins/openvista_locks_ debian/openvista-munin-plugins/usr/share/munin/plugins/
+	install scripts/usr/share/munin/plugins/openvista_processes_ debian/openvista-munin-plugins/usr/share/munin/plugins/
 
 	dh_install -i
 

=== modified file 'packages/rpm/openvista-gtm-integration.spec'
--- packages/rpm/openvista-gtm-integration.spec	2009-10-20 22:17:48 +0000
+++ packages/rpm/openvista-gtm-integration.spec	2009-10-21 23:30:24 +0000
@@ -114,6 +114,14 @@
 install -d %{buildroot}/sbin
 install -m 4550 src/ovauth/ovauth %{buildroot}/sbin
 
+install -d %{buildroot}%{_sysconfdir}/munin/plugin-conf.d/
+install scripts/etc/munin/plugin-conf.d/openvista %{buildroot}%{_sysconfdir}/munin/plugin-conf.d/
+
+install -d %{buildroot}%{_datadir}/munin/plugins/
+for plugin in scripts/usr/share/munin/plugins/*; do
+    install $plugin %{buildroot}%{_datadir}/munin/plugins/
+done
+
 %clean
 rm -rf %{buildroot}
 
@@ -405,3 +413,38 @@
 fi
 
 /sbin/service httpd reload > /dev/null 2>&1 || :
+
+
+
+
+
+%package -n openvista-munin-plugins
+Release:	3
+Summary:	Munin plugins to monitor OpenVista instances
+Group:		Applications/System
+
+Requires:	/bin/bash, coreutils
+Requires:	munin-node
+Requires:	openvista-utils
+
+%description -n openvista-munin-plugins
+OpenVista is a cost-effective, open, trusted and complete EHR which enhances
+patient safety, increases clinical and operational efficiency and provides an
+opportunity to improve quality of care delivery.
+
+Munin is a highly flexible and powerful solution used to create graphs of
+virtually everything imaginable throughout your network, while still
+maintaining a rattling ease of installation and configuration.
+
+This package contains plugins for the Munin node to monitor OpenVista
+instances.
+
+%files -n openvista-munin-plugins
+%defattr(-,root,root)
+%doc README
+%doc COPYING
+%doc COPYING.AGPL
+%doc NEWS
+%{_sysconfdir}/munin/plugin-conf.d/openvista
+%{_datadir}/munin/plugins/*
+

=== added directory 'scripts/etc/munin'
=== added directory 'scripts/etc/munin/plugin-conf.d'
=== added file 'scripts/etc/munin/plugin-conf.d/openvista'
--- scripts/etc/munin/plugin-conf.d/openvista	1970-01-01 00:00:00 +0000
+++ scripts/etc/munin/plugin-conf.d/openvista	2009-10-21 23:30:24 +0000
@@ -0,0 +1,2 @@
+[openvista*]
+group openvista, gtm

=== added directory 'scripts/usr/share'
=== added directory 'scripts/usr/share/munin'
=== added directory 'scripts/usr/share/munin/plugins'
=== added file 'scripts/usr/share/munin/plugins/openvista_databases_'
--- scripts/usr/share/munin/plugins/openvista_databases_	1970-01-01 00:00:00 +0000
+++ scripts/usr/share/munin/plugins/openvista_databases_	2009-10-21 23:30:24 +0000
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# This is a munin plugin that monitors the size of each OpenVista database on
+# the system.
+
+
+# Copyright (C) 2009 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
+# by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+# for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses>.
+# 
+# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar 
+# Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
+
+INSTANCE=`basename $0 | sed 's/^openvista_databases_//g'`
+
+. /usr/lib/openvista/functions
+
+root="/opt/openvista"
+user="openvista"
+
+case $1 in
+    autoconf)
+        for instance in `ls $root`; do
+            [ -L "$root/$instance/gtm" ] || continue
+
+            echo "yes"
+            exit 0
+        done
+
+        echo "no"
+        exit 1
+        ;;
+
+    suggest)
+        for instance in `ls $root`; do
+            [ -L "$root/$instance/gtm" ] || continue
+
+            echo $instance
+        done
+        ;;
+
+    config)
+        echo "graph_args --base 1024 -l 0"
+        echo "graph_vlabel Bytes"
+        echo "graph_title Database files in $INSTANCE"
+        echo "graph_category OpenVista"
+        echo "graph_info The size of the OpenVista database files in $INSTANCE"
+        echo "graph_order default scratch"
+
+        echo "default.label DEFAULT"
+        echo "default.draw LINE2"
+        echo "default.info The size of the default.dat file"
+
+        echo "scratch.label SCRATCH"
+        echo "scratch.draw LINE2"
+        echo "default.info The size of the scratch.dat file"
+
+        echo "all.label Total"
+        echo "all.draw LINE2"
+        echo "all.info The total size of all .dat files"
+        ;;
+
+    *)
+        # check permissions
+        in_groups || {
+            echo "permission denied"
+            exit 1
+        }
+
+        # check for for valid arguments (requires correct permissions to do; must happen after permission checks)
+        set_gtm_env "$INSTANCE" || {
+            echo "not an OpenVista instance"
+            exit 1
+        }
+
+        default=`stat -c%s "$root/$instance/globals/default.dat"`
+        scratch=`stat -c%s "$root/$instance/globals/scratch.dat"`
+        all=`expr $default + $scratch`
+        echo "default.value $default"
+        echo "scratch.value $scratch"
+        echo "all.value $all"
+        ;;
+esac

=== added file 'scripts/usr/share/munin/plugins/openvista_locks_'
--- scripts/usr/share/munin/plugins/openvista_locks_	1970-01-01 00:00:00 +0000
+++ scripts/usr/share/munin/plugins/openvista_locks_	2009-10-21 23:30:24 +0000
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+# This is a munin plugin that monitors the number of locks in an OpenVista
+# instance.
+
+
+# Copyright (C) 2009 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
+# by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+# for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses>.
+# 
+# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar 
+# Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
+
+
+INSTANCE=`basename $0 | sed 's/^openvista_locks_//g'`
+
+. /usr/lib/openvista/functions
+
+root="/opt/openvista"
+user="openvista"
+
+case $1 in
+    autoconf)
+        for instance in `ls $root`; do
+            [ -L "$root/$instance/gtm" ] || continue
+
+            echo "yes"
+            exit 0
+        done
+
+        echo "no"
+        exit 1
+        ;;
+
+    suggest)
+        for instance in `ls $root`; do
+            [ -L "$root/$instance/gtm" ] || continue
+
+            echo $instance
+        done
+        ;;
+
+    config)
+        echo "graph_args -l 0"
+        echo "graph_vlabel Locks"
+        echo "graph_title Locks in $INSTANCE"
+        echo "graph_category OpenVista"
+        echo "graph_info The number of locks in $INSTANCE"
+        echo "graph_order default scratch"
+
+        echo "default.label DEFAULT"
+        echo "default.draw LINE2"
+        echo "default.info The number of locks in the DEFAULT region"
+
+        echo "scratch.label SCRATCH"
+        echo "scratch.draw LINE2"
+        echo "scratch.info The number of locks in the SCRATCH region"
+        ;;
+
+    *)
+        # check permissions
+        in_groups || {
+            echo "permission denied"
+            exit 1
+        }
+
+        # check for for valid arguments (requires correct permissions to do; must happen after permission checks)
+        set_gtm_env "$INSTANCE" || {
+            echo "not an OpenVista instance"
+            exit 1
+        }
+
+        # object files should be created with permissions 660
+        umask 007
+
+        # switch to temp directory so *.mj[eo] files are created there
+        # because of the umask, even if two users job off the same routine, 
+        # the second user will be able to overwrite the *.mj[eo] files and 
+        # the JOB command will succeed, but the *.mj[eo] files will become 
+        # garbled (both JOBs will write to them in no particular order) 
+        cd "$root/$INSTANCE/tmp"
+
+        echo -n "default.value "
+        lke show -region=DEFAULT 2>&1 | grep -v '^$' | grep -v '^DEFAULT$' | grep -v 'No locks were found' | grep -v '^ ' | wc -l
+
+        echo -n "scratch.value "
+        lke show -region=SCRATCH 2>&1 | grep -v '^$' | grep -v '^SCRATCH$' | grep -v 'No locks were found' | grep -v '^ ' | wc -l
+        ;;
+esac

=== added file 'scripts/usr/share/munin/plugins/openvista_processes_'
--- scripts/usr/share/munin/plugins/openvista_processes_	1970-01-01 00:00:00 +0000
+++ scripts/usr/share/munin/plugins/openvista_processes_	2009-10-21 23:30:24 +0000
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+# This is a munin plugin that monitors the number of processes running in an
+# OpenVista instance.
+
+
+# Copyright (C) 2009 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
+# by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+# for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses>.
+# 
+# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar 
+# Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
+
+
+INSTANCE=`basename $0 | sed 's/^openvista_processes_//g'`
+
+. /usr/lib/openvista/functions
+
+root="/opt/openvista"
+user="openvista"
+
+case $1 in
+    autoconf)
+        for instance in `ls $root`; do
+            [ -L "$root/$instance/gtm" ] || continue
+
+            echo "yes"
+            exit 0
+        done
+
+        echo "no"
+        exit 1
+        ;;
+
+    suggest)
+        for instance in `ls $root`; do
+            [ -L "$root/$instance/gtm" ] || continue
+
+            echo $instance
+        done
+        ;;
+
+    config)
+        echo "graph_args -l 0"
+        echo "graph_vlabel Processes"
+        echo "graph_title Processes running in $INSTANCE"
+        echo "graph_category OpenVista"
+        echo "graph_info The number of processes running in $INSTANCE"
+        echo "graph_order terminal rpc other all"
+
+        echo "terminal.label Terminal User Processes"
+        echo "terminal.draw LINE2"
+        echo "terminal.info The number of processes servicing terminal user connections"
+
+        echo "rpc.label RPC Broker Processes"
+        echo "rpc.draw LINE2"
+        echo "rpc.info The number of processes servicing RPC broker connections"
+
+        echo "other.label Other Processes"
+        echo "other.draw LINE2"
+        echo "other.info The number of processes running in the background"
+
+        echo "all.label Total"
+        echo "all.draw LINE2"
+        echo "all.info The total number of OpenVista processes running in $INSTANCE"
+        ;;
+
+    *)
+        # check permissions
+        in_groups || {
+            echo "permission denied"
+            exit 1
+        }
+
+        # check for for valid arguments (requires correct permissions to do; must happen after permission checks)
+        set_gtm_env "$INSTANCE" || {
+            echo "not an OpenVista instance"
+            exit 1
+        }
+
+        # object files should be created with permissions 660
+        umask 007
+
+        # switch to temp directory so *.mj[eo] files are created there
+        # because of the umask, even if two users job off the same routine, 
+        # the second user will be able to overwrite the *.mj[eo] files and 
+        # the JOB command will succeed, but the *.mj[eo] files will become 
+        # garbled (both JOBs will write to them in no particular order) 
+        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`
+        all=`echo "$ss" | grep -v '^$' | wc -l`
+        other=`expr $all - $terminal - $rpc`
+        echo "terminal.value $terminal"
+        echo "rpc.value $rpc"
+        echo "other.value $other"
+        echo "all.value $all"
+        ;;
+esac