1 diff -ur munin-monitoring-contrib.orig/plugins/virtualization/xen munin-monitoring-contrib/plugins/virtualization/xen
2 --- munin-monitoring-contrib.orig/plugins/virtualization/xen 2015-09-11 07:54:03.000000000 +0000
3 +++ munin-monitoring-contrib/plugins/virtualization/xen 2015-10-14 20:47:08.051042000 +0000
5 statefile="/var/lib/munin/plugin-state/munin-plugin-xen.state"
7 if [ "$1" = "autoconf" ]; then
8 - if which xm > /dev/null ; then
9 + if which xl > /dev/null ; then
13 - echo "no (xm not found)"
14 + echo "no (xl not found)"
19 echo 'graph_category Virtualization'
20 echo 'graph_info This graph shows how many percent of the CPU time was used by each domain'
22 - xm list | grep -v "^Name .* Time(s)$" | \
23 + xl list | grep -v "^Name\s.*\sTime(s)$" | \
24 while read name domid mem cpu state time console; do
25 name=`echo $name | sed -e"s/[-.]/_/g"`
26 TEST=`less $statefile | grep "^${name}$" | wc -l`
31 -xm list | grep -v "^Name .* Time(s)$" | \
32 +xl list | grep -v "^Name\s.*\sTime(s)$" | \
33 while read name domid mem cpu state time console; do
34 name=`echo $name | sed -e "s/[-.]/_/g"`
36 diff -ur munin-monitoring-contrib.orig/plugins/virtualization/xen_cpu_v2 munin-monitoring-contrib/plugins/virtualization/xen_cpu_v2
37 --- munin-monitoring-contrib.orig/plugins/virtualization/xen_cpu_v2 2015-09-11 07:54:03.000000000 +0000
38 +++ munin-monitoring-contrib/plugins/virtualization/xen_cpu_v2 2015-10-14 20:47:08.052042000 +0000
42 # Define where to find xm tools
43 -my $XM = '/usr/sbin/xm';
44 +my $XM = '/usr/sbin/xl';
45 my $XMTOP = '/usr/sbin/xentop';
47 -my $basename = `/usr/bin/basename $0`; chop ($basename);
48 +my $basename = `/bin/basename $0`; chop ($basename);
49 my $TEMPFILE = "/tmp/$basename";
52 diff -ur munin-monitoring-contrib.orig/plugins/virtualization/xen_memory munin-monitoring-contrib/plugins/virtualization/xen_memory
53 --- munin-monitoring-contrib.orig/plugins/virtualization/xen_memory 2015-09-11 07:54:03.000000000 +0000
54 +++ munin-monitoring-contrib/plugins/virtualization/xen_memory 2015-10-14 20:47:08.052042000 +0000
56 # autoconf (optional - used by munin-config)
62 if [ "$1" = "autoconf" ]; then
67 - echo "no (xm not found)"
68 + echo "no (xl not found)"
72 Only in munin-monitoring-contrib/plugins/virtualization: xen.orig
73 diff -ur munin-monitoring-contrib.orig/plugins/virtualization/xen_traffic_ munin-monitoring-contrib/plugins/virtualization/xen_traffic_
74 --- munin-monitoring-contrib.orig/plugins/virtualization/xen_traffic_ 2015-09-11 07:54:03.000000000 +0000
75 +++ munin-monitoring-contrib/plugins/virtualization/xen_traffic_ 2015-10-14 20:47:08.052042000 +0000
77 NAME=$( echo $DOMAIN | sed -e's/-/_/g' )
79 if [ "$1" = "autoconf" ]; then
80 - if which xm > /dev/null ; then
81 + if which xl > /dev/null ; then
84 - echo "no (xm not found)"
85 + echo "no (xl not found)"
88 if [ -r /proc/net/dev ]; then
92 if [ "$1" = "suggest" ]; then
93 - xm list | awk '{print $1}' | egrep -v "^(Name|Domain-0)"
94 + xl list | awk '{print $1}' | egrep -v "^(Name|Domain-0)"
102 -dev=$( xm network-list $DOMAIN | egrep "^[0-9]+" | sed 's@^.*vif/\([0-9]*\)/\([0-9]*\).*$@vif\1.\2@')
103 +dev=$( xl network-list $DOMAIN | egrep "^[0-9]+" | sed 's@^.*vif/\([0-9]*\)/\([0-9]*\).*$@vif\1.\2@')
105 awk -v interface="$dev" \
106 'BEGIN { gsub(/\./, "\\.", interface) } \
107 diff -ur munin-monitoring-contrib.orig/plugins/virtualization/xen_traffic_all munin-monitoring-contrib/plugins/virtualization/xen_traffic_all
108 --- munin-monitoring-contrib.orig/plugins/virtualization/xen_traffic_all 2015-09-11 07:54:03.000000000 +0000
109 +++ munin-monitoring-contrib/plugins/virtualization/xen_traffic_all 2015-10-14 20:49:36.783042000 +0000
111 #%# capabilities=autoconf
113 if [ "$1" = "autoconf" ]; then
114 - if which xm > /dev/null ; then
115 + if which xl > /dev/null ; then
118 - echo "no (xm not found)"
119 + echo "no (xl not found)"
122 if [ -r /proc/net/dev ]; then
124 echo 'graph_vlabel bits received (-) / sent (+) per ${graph_period}'
125 echo 'graph_args --base 1024 -l 0'
126 echo 'graph_category Virtualization'
127 - DOMAINS=$(xm list | awk '{print $1}' | egrep -v "^(Name|Domain-0)")
128 + DOMAINS=$(xl list | awk '{print $1}' | egrep -v "^(Name|Domain-0|\(null)")
129 for dom in $DOMAINS; do
130 name=$( echo $dom | tr .- __ )
131 #echo $name"UP.label $name"
136 -DOMAINS=$(xm list | awk '{print $1}' | egrep -v "^(Name|Domain-0)")
137 +DOMAINS=$(xl list | awk '{print $1}' | egrep -v "^(Name|Domain-0|\(null)")
138 for dom in $DOMAINS; do
139 - dev=$( xm list $dom --long | awk '/vifname / { print $2 }' | sed 's/)//' )
140 + dev=$( xl list $dom --long | awk '/vifname / { print $2 }' | sed 's/)//' )
141 if [ "$dev" = "" ]; then
142 - dev=$( xm network-list $dom |\
143 + dev=$( xl network-list $dom |\
144 egrep "^[0-9]+" | sed 's@^.*vif/\([0-9]*\)/\([0-9]*\).*$@vif\1.\2@')
146 name=$( echo $dom | tr .- __ )
147 diff -ur munin-monitoring-contrib.orig/plugins/virtualization/xen_vbd munin-monitoring-contrib/plugins/virtualization/xen_vbd
148 --- munin-monitoring-contrib.orig/plugins/virtualization/xen_vbd 2015-09-11 07:54:03.000000000 +0000
149 +++ munin-monitoring-contrib/plugins/virtualization/xen_vbd 2015-10-14 20:47:08.054042000 +0000
151 #%# capabilities=autoconf
153 # Location of xm tools
154 -$XM = '/usr/sbin/xm';
155 +$XM = '/usr/sbin/xl';
156 $XMTOP = '/usr/sbin/xentop';
158 # ah, parameters coming in
161 @domains = `$XM list`;
162 shift(@domains); # we don't need the header line
163 + shift(@domains); # we don't need the header line
165 foreach $domain ( @domains )
168 @stats = split (/\n/, pop(@chunks));
178 foreach $domain (@stats)