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 | |
| 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')
| -rwxr-xr-x | files/plugins/xen | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/files/plugins/xen b/files/plugins/xen index a9f1a1e..378e040 100755 --- a/files/plugins/xen +++ b/files/plugins/xen @@ -20,7 +20,7 @@ fi # 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" = "config" ]; then |