From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Fri, 24 Jun 2011 04:07:50 +0000 (+0000)
Subject: Replace missing rpm commands on collection.
X-Git-Tag: monitor-3.1-5~4
X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=commitdiff_plain;h=fbe2fbd7f5d866205f878e68968dcef14a3812ab

Replace missing rpm commands on collection.
---

diff --git a/monitor/scanapi.py b/monitor/scanapi.py
index eef53aa..177affc 100644
--- a/monitor/scanapi.py
+++ b/monitor/scanapi.py
@@ -249,8 +249,8 @@ class ScanNodeInternal(ScanInterface):
 					echo '  "princeton_comon_running":"'`ls -d /proc/virtual/$ID`'",'
 					echo '  "princeton_comon_procs":"'`vps ax | grep $ID | grep -v grep | wc -l`'",'
 					echo '  "fs_status":"'`grep proc /proc/mounts | grep ro, ; if [ -x /usr/bin/timeout.pl ] ; then timeout.pl 20 touch /var/log/monitor 2>&1 ; if [ -d /vservers/ ] ; then timeout.pl 20 touch /vservers/monitor.log 2>&1  ; fi ; fi`'",'
-					echo '  "rpm_version":"''",'
-					echo '  "rpm_versions":"''",'
+					echo '  "rpm_version":"'`if [ -x /usr/bin/timeout.pl ] ; then /usr/bin/timeout.pl 30 rpm -q NodeManager ; fi`'",'
+					echo '  "rpm_versions":"'`if [ -x /usr/bin/timeout.pl ] ; then /usr/bin/timeout.pl 45 rpm -q -a | sort ; fi`'",'
 					echo '  "md5sums":"'`md5sum /etc/yum.conf /etc/yum.myplc.d/myplc.repo /etc/yum.myplc.d/stock.repo  | awk '{print $1}'`'",'
 					echo '  "md5sum_yum":"'`grep -v -E "^#" /etc/yum.myplc.d/myplc.repo | md5sum`'",'
 					echo '  "nada":"'``'",'