summaryrefslogtreecommitdiff
path: root/files/plugins/xen_vbd
diff options
context:
space:
mode:
Diffstat (limited to 'files/plugins/xen_vbd')
-rwxr-xr-xfiles/plugins/xen_vbd14
1 files changed, 5 insertions, 9 deletions
diff --git a/files/plugins/xen_vbd b/files/plugins/xen_vbd
index 4eca5a6..e34d41c 100755
--- a/files/plugins/xen_vbd
+++ b/files/plugins/xen_vbd
@@ -17,8 +17,8 @@ $XM = '/usr/sbin/xm';
$XMTOP = '/usr/sbin/xentop';
# we cache xm list for 5 min for perfomance reasons
-system('((find /var/lib/munin/plugin-state/xm_list.state -mmin -5 2>&1 | grep -qE \'^\/var\/lib\/munin\/plugin-state\/xm_list\.state$\') && [ `cat /var/lib/munin/plugin-state/xm_list.state | wc -l` -gt 1 ]) || /usr/sbin/xm list | grep -v "^Name .* Console$" > /var/lib/munin/plugin-state/xm_list.state');
-system('((find /var/lib/munin/plugin-state/xm_top.state -mmin -5 2>&1 | grep -qE \'^\/var\/lib\/munin\/plugin-state\/xm_top\.state$\') && [ `cat /var/lib/munin/plugin-state/xm_top.state | wc -l` -gt 1 ]) || /usr/sbin/xentop -b -i1 > /var/lib/munin/plugin-state/xm_top.state');
+system('((find /var/lib/munin/plugin-state/xm_list.state -mmin -5 2>&1 | grep -qE \'^\/var\/lib\/munin\/plugin-state\/xm_list\.state$\') && [ `cat /var/lib/munin/plugin-state/xm_list.state | wc -l` -gt 1 ]) || /usr/sbin/xm list | grep -v "^Name .* ID" > /var/lib/munin/plugin-state/xm_list.state');
+system('((find /var/lib/munin/plugin-state/xm_top.state -mmin -5 2>&1 | grep -qE \'^\/var\/lib\/munin\/plugin-state\/xm_top\.state$\') && [ `cat /var/lib/munin/plugin-state/xm_top.state | wc -l` -gt 1 ]) || /usr/sbin/xentop -b -i1 | grep -E "^ " > /var/lib/munin/plugin-state/xm_top.state');
# ah, parameters coming in
if ( defined($ARGV[0]))
@@ -50,8 +50,7 @@ if ( defined($ARGV[0]))
'graph_info' => 'Display the I/O operations for each domain',
);
- @domains = `cat /var/lib/munin/plugin-state/xm_list.state`;
- shift(@domains); # we don't need the header line
+ @domains = `cat /var/lib/munin/plugin-state/xm_list.state | grep -v 'Domain-0'`;
foreach $domain ( @domains )
{
@@ -86,12 +85,9 @@ if ( defined($ARGV[0]))
# No args, get rolling
-my @stats = `cat /var/lib/munin/plugin-state/xm_top.state`;
+my @stats = `cat /var/lib/munin/plugin-state/xm_top.state | grep -v 'Domain-0'`;
-# remove the first 4 items that are junk that we don't need.
-shift(@stats);
-shift(@stats);
-shift(@stats);
+# remove the first line
shift(@stats);
my %vals; undef(%vals);