diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-17 16:36:37 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-17 16:36:37 -0400 |
| commit | 8f7c0071eb82591477876eeb3f309067853a3261 (patch) | |
| tree | b095f01b960b7ba3699da2dfa4d84cd5bb8a6361 /files/plugins/xen_vm | |
| parent | ea31faee76141646c173d88bd5bec5aa4a773c1c (diff) | |
| parent | a5ce0a9317fc5dd5228cff4c5b6d36366c17b6d5 (diff) | |
Merge branch 'master' into leap
Conflicts:
README
manifests/host/cgi.pp
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)) |