fix a few other issues

3 files changed, 3 insertions, 4 deletions

diff --git a/files/plugins/xen_mem b/files/plugins/xen_mem
index edfc926..a260fbd 100644
--- a/files/plugins/xen_mem
+++ b/files/plugins/xen_mem
@@ -63,7 +63,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_info This graph shows affected memory for each domain.'
 	echo 'Domain_0.label Domain-0'
 	echo 'Domain_0.draw AREA'
-cat /var/lib/munin/plugin-state/xm_list.state | grep -v 'Mem' | grep -v 'Domain-0' | while read i; do
+cat /var/lib/munin/plugin-state/xm_list.state | grep -v 'Domain-0' | while read i; do
 	name=`echo $i | awk '{ print $1 }' | sed 's/[\/.-]/_/g'`
 	echo -n "$name.label "
 	echo $i | awk '{ print $1 }'
@@ -73,7 +73,7 @@ done
 	exit 0
 fi
 
-cat /var/lib/munin/plugin-state/xm_list.state | grep -v 'Mem' | while read i; do
+cat /var/lib/munin/plugin-state/xm_list.state | while read i; do
 	name=`echo $i | awk '{ print $1 }' | sed 's/[\/.-]/_/g'`
 	echo -n "$name.value "
 	echo $i | awk '{ print $3 * 1024 * 1024 }'
diff --git a/files/plugins/xen_vbd b/files/plugins/xen_vbd
index ccea940..a684839 100755
--- a/files/plugins/xen_vbd
+++ b/files/plugins/xen_vbd
@@ -51,7 +51,6 @@ if ( defined($ARGV[0]))
                 );
 
                 @domains = `cat /var/lib/munin/plugin-state/xm_list.state`;
-                shift(@domains); # we don't need the header line
 
                 foreach $domain ( @domains )
                 {
diff --git a/files/plugins/xen_vm b/files/plugins/xen_vm
index 18ee9a8..725e800 100644
--- a/files/plugins/xen_vm
+++ b/files/plugins/xen_vm
@@ -69,4 +69,4 @@ fi
 domains=`cat /var/lib/munin/plugin-state/xm_list.state | wc -l`
 
 echo -n "domains.value "
-echo $(($domains-2))
+echo $(($domains-1))