diff options
| author | micah <micah@muck.riseup.net> | 2013-03-20 18:25:28 -0400 |
|---|---|---|
| committer | micah <micah@muck.riseup.net> | 2013-03-20 18:25:28 -0400 |
| commit | c9748747c5c755443d80445a9a6c3f5d2ab3bc7f (patch) | |
| tree | 65887003b9bceefd7a6ba3e3692b9a6f08373304 /files/plugins/xen_vm | |
| parent | 149a78e7a8465da97f8ea267cd6a75e3bcdefe4d (diff) | |
| parent | f79f662bedbbd75c7e2022da282ba48c1b323e90 (diff) | |
Merge branch 'immerda/master'
Conflicts:
files/plugins/xen-cpu
templates/munin-node.conf.Debian.squeeze
Diffstat (limited to 'files/plugins/xen_vm')
| -rw-r--r-- | files/plugins/xen_vm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/files/plugins/xen_vm b/files/plugins/xen_vm index a69b5fe..725e800 100644 --- a/files/plugins/xen_vm +++ b/files/plugins/xen_vm @@ -48,7 +48,7 @@ XM="/usr/sbin/xm" # we cache xm list for 5 min for perfomance reasons ((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 + /usr/sbin/xm list | grep -v "^Name .* ID" > /var/lib/munin/plugin-state/xm_list.state if [ "$1" = "autoconf" ]; then echo yes @@ -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)) |